parsi-localize 0.2.1 → 0.3

data/.gitignore

@@ -1,5 +1,4 @@
 *.gem
 .bundle
-Gemfile.lock
 pkg/*
 

data/Gemfile.lock

@@ -0,0 +1,23 @@
+PATH
+  remote: .
+  specs:
+    parsi-localize (0.3)
+      i18n
+      parsi-date (>= 0.2.2)
+      parsi-digits (>= 0.3)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    i18n (0.6.1)
+    parsi-date (0.2.2)
+    parsi-digits (0.3)
+    rake (0.9.2.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  parsi-localize!
+  rake

data/README.markdown

@@ -1,57 +1,44 @@
 ParsiLocalize
 =============
 
-Change I18n localize to use parsi digits and jalaly dates in farsi (فارسی) locale.
-This gem contains two sections
+Enhance I18n localize to use Parsi digits and Jalaly dates in Farsi (فارسی) locale.
 
-ParsiDigits
------------
-Simply change digits in a string/integer/float to unicode parsi digits:
+For changing digits in string/integer/float with Unicode Parsi ones, we use
+[`parsi-digits`](https://github.com/hzamani/parsi-digits):
 
-    require 'parsi_digits'
-    ‪"15,000 تومان".with_parsi_digits
-      => ‫"۱۵,۰۰۰ تومان"
-    123.25.with_parsi_digits
-      => "۱۲۳/۲۵"
-
-It also dose the reverse action:
-
-    "۱۲۳۴۵".with_western_digits
-      => "12345"
+    require 'parsi-localize'
+    I18n.l ‪‪"15,000 تومان"
+      => ‫‫"۱۵,۰۰۰ تومان"
 
-And it undersanad parsi digits (which is useful especially for input forms):
+Another useful feature of `parsi-digits` is that you can parse strings with Unicode
+digits to numerics:
 
     "۱۲۳۴۵".to_i
       => 12345
     "۱۹/۸".to_f
       => 19.8
 
-ParsiLocalize
--------------
-Change behaivor of I18n#localize so that it localize digits and dates in 'farsi' locale.
+To have a real localization of dates in I18n#localize, we uses [`parsi-date`](https://github.com/hzamani/parsi-date) to convert dates to Jalali.
 
-    require 'parsi_localize'
-    I18n.l ‪‪"15,000 تومان" 
-      => ‫‫"۱۵,۰۰۰ تومان"
     I18n.l Time.now, fromat: "%y/%m/%d %H:%M:%S"
       => "۹۰/۱۰/۱۳ ۰۵:۴۳:۳۲"
 
-If you don't set date format, it uses the default locale format, wich you can set in your locale file.
+As you know, date and time formats can be sored in the locale file.
 For example with
 
     fa:
       time:
         formats:
           default: "%y/%m/%d %H:%M:%S"
-          short: "%d %b، %H:%M"
-          long: "%A، %e %b %Y، ساعت %H:%M:%S (%Z)"
+          short: "%d %B، %H:%M"
+          long: "%A، %e %B %Y، ساعت %H:%M:%S"
       date:
         formats:
           default: "%y/%m/%d"
-          short: "%d %b"
-          long: "%A، %e %b %Y"
-          
-in your locale file you will get:
+          short: "%d %B"
+          long: "%A، %e %B %Y"
+
+in your locale file, you will get:
 
     date = Date.today
     I18n.l date
@@ -67,8 +54,8 @@ in your locale file you will get:
     I18n.l time, format: :short
       => ‫"۱۶ بهمن، ۱۵:۴۳"
     I18n.l time, format: :long
-      => ‫"یک‌شنبه، ۱۶ بهمن ۱۳۹۰، ساعت ۱۵:۴۳:۳۰ (IRST)"
+      => ‫"یک‌شنبه، ۱۶ بهمن ۱۳۹۰، ساعت ۱۵:۴۳:۳۰"
 
-For more info on dateformating see 'jalalidate' docs
+For more info on date formating see `parsi-date` and Ruby's built-in `date` docs.
 
 Copyright (c) 2012 Hassan Zamani, released under the MIT license.

data/lib/parsi-localize.rb

@@ -0,0 +1,32 @@
+require 'parsi-digits'
+require 'parsi-date'
+require 'i18n'
+
+module I18n
+  class << self
+    def localize object, options={}
+      return '' if object.nil?
+
+      locale = options.delete(:locale) || config.locale
+      format = options.delete(:format) || :default
+
+      if [:default, :short, :long].include? format
+        format = I18n.t("date.formats.#{format}") if object.is_a? Date
+        format = I18n.t("time.formats.#{format}") if object.is_a? Time
+      end
+
+      if locale == :fa
+        if object.respond_to?(:with_parsi_digits)
+          object.with_parsi_digits
+        elsif [Date, DateTime, Time, Parsi::Date, Parsi::DateTime].include? object.class
+          object.to_jalali.strftime(format).with_parsi_digits
+        else
+          config.backend.localize locale, object, format, options
+        end
+      else
+        config.backend.localize locale, object, format, options
+      end
+    end
+    alias :l :localize
+  end
+end

data/lib/version.rb

@@ -1,5 +1,5 @@
-module I18n
-  module ParsiLocalize
-    VERSION = "0.2.1"
+module Parsi
+  module Localize
+    VERSION = "0.3"
   end
 end

data/locale/fa.yml

@@ -2,12 +2,12 @@ fa:
   time:
     formats:
       default: "%y/%m/%d %H:%M:%S"
-      short: "%d %b، %H:%M"
-      long: "%A، %e %b %Y، ساعت %H:%M:%S (%Z)"
+      short: "%d %B، %H:%M"
+      long: "%A، %e %B %Y، ساعت %H:%M:%S"
     am: "قبل از ظهر"
     pm: "بعد از ظهر"
   date:
     formats:
       default: "%y/%m/%d"
-      short: "%d %b"
-      long: "%A، %e %b %Y"
+      short: "%d %B"
+      long: "%A، %e %B %Y"

data/parsi-localize.gemspec

@@ -5,13 +5,13 @@ Gem::Specification.new do |s|
 
   # Description Meta...
   s.name        = 'parsi-localize'
-  s.version     = I18n::ParsiLocalize::VERSION
+  s.version     = Parsi::Localize::VERSION
   s.platform    = Gem::Platform::RUBY
   s.author      = 'Hassan Zamani'
   s.email       = 'hsn.zamani@gmail.com'
   s.homepage    = 'http://github.com/hzamani/parsi_localize'
-  s.summary     = 'Change I18n localize to use parsi digits and jalaly dates in farsi locale'
-  s.description = 'Change I18n localize to use parsi digits and jalaly dates in farsi locale'
+  s.summary     = 'Enhance I18n#localize to use parsi digits and Jalali dates in Farsi locale'
+  s.description = 'Enhance I18n#localize to use parsi digits and Jalali dates in Farsi locale'
 
 
   # Load Paths...
@@ -25,6 +25,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency("bundler")
   s.add_development_dependency("rake")
   s.add_dependency("i18n")
-  s.add_dependency("parsi-digits")
-  s.add_dependency("jalalidate")
+  s.add_dependency("parsi-digits", ">= 0.3")
+  s.add_dependency("parsi-date", ">= 0.2.2")
 end

data/test/parsi_localize_test.rb

@@ -27,6 +27,6 @@ class ParsiLocalizeTest < Test::Unit::TestCase
     assert_equal "۹۰/۱۱/۱۶ ۱۵:۴۳:۳۰", I18n.l(time)
     assert_equal "۹۰/۱۱/۱۶ ۱۵:۴۳:۳۰", I18n.l(time, format: :default)
     assert_equal "۱۶ بهمن، ۱۵:۴۳", I18n.l(time, format: :short)
-    assert_equal "یک‌شنبه، ۱۶ بهمن ۱۳۹۰، ساعت ۱۵:۴۳:۳۰ (IRST)", I18n.l(time, format: :long)
+    assert_equal "یک‌شنبه، ۱۶ بهمن ۱۳۹۰، ساعت ۱۵:۴۳:۳۰", I18n.l(time, format: :long)
   end
 end

data/test/test_helper.rb

@@ -1,7 +1,6 @@
 require 'test/unit'
 require 'i18n'
-require 'parsi_digits'
-require 'parsi_localize'
+require 'parsi-localize'
 
 I18n.load_path = ['locale/fa.yml']
 I18n.default_locale = :fa

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parsi-localize
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-13 00:00:00.000000000 Z
+date: 2012-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,15 +74,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: jalalidate
+  name: parsi-date
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,8 +90,8 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-description: Change I18n localize to use parsi digits and jalaly dates in farsi locale
+        version: 0.2.2
+description: Enhance I18n#localize to use parsi digits and Jalali dates in Farsi locale
 email: hsn.zamani@gmail.com
 executables: []
 extensions: []
@@ -99,10 +99,10 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - README.markdown
 - Rakefile
-- init.rb
-- lib/parsi_localize.rb
+- lib/parsi-localize.rb
 - lib/version.rb
 - locale/en.yml
 - locale/fa.yml
@@ -132,7 +132,7 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Change I18n localize to use parsi digits and jalaly dates in farsi locale
+summary: Enhance I18n#localize to use parsi digits and Jalali dates in Farsi locale
 test_files:
 - test/parsi_localize_test.rb
 - test/test_helper.rb

data/init.rb

@@ -1 +0,0 @@
-require 'parsi_localize'

data/lib/parsi_localize.rb

@@ -1,30 +0,0 @@
-require 'parsi_digits'
-require 'jalalidate'
-require 'i18n'
-
-module I18n
-  class << self
-    def localize(object, options={})
-      return '' if object.nil?
-
-      locale = options.delete(:locale) || config.locale
-      format = options.delete(:format) || :default
-
-      if locale == :fa and not object.nil?
-        if object.respond_to? :with_parsi_digits
-          object.with_parsi_digits
-        elsif object.is_a? Date or object.is_a? Time
-          jdate = JalaliDate.new object
-          if [:default, :short, :long].include? format
-            format = I18n.t("date.formats.#{format}") if object.is_a? Date
-            format = I18n.t("time.formats.#{format}") if object.is_a? Time
-          end
-          jdate.strftime(format).with_parsi_digits
-        end
-      else
-        config.backend.localize(locale, object, format, options)
-      end
-    end
-    alias :l :localize
-  end
-end