delocalize 0.3.0 → 0.3.1

data/README.markdown

@@ -105,6 +105,102 @@ You can also customize the output using some options:
   Since `I18n.localize` supports localizing `strftime` strings, we can also do this:
       <%= f.text_field :released_on, :format => "%B %Y" %>
 
+### Ruby 1.9 + Psych YAML Parser
+
+You will need to adjust the localization formatting when using the new YAML parser Psych.  Below is an example error message you may receive in your logs as well as an example of acceptable formatting and helpful links for reference:
+
+__Error message from logs:__
+
+    Psych::SyntaxError (couldn't parse YAML at line x column y):
+
+__References:__
+
+The solution can be found here: http://stackoverflow.com/questions/4980877/rails-error-couldnt-parse-yaml#answer-5323060
+
+http://pivotallabs.com/users/mkocher/blog/articles/1692-yaml-psych-and-ruby-1-9-2-p180-here-there-be-dragons
+
+__Psych Preferred Formatting:__
+
+    en:
+      number:
+        format:
+          separator: '.'
+          delimiter: ','
+          precision: 2
+      date:
+        input:
+          formats:
+            - :default
+            - :long
+            - :short
+        formats:
+          default: "%m/%d/%Y"
+          short: "%b %e"
+          long: "%B %e, %Y"
+          only_day: "%e"
+        day_names:
+          - Sunday
+          - Monday
+          - Tuesday
+          - Wednesday
+          - Thursday
+          - Friday
+          - Saturday
+        abbr_day_names:
+          - Sun
+          - Mon
+          - Tue
+          - Wed
+          - Thur
+          - Fri
+          - Sat
+        month_names:
+          - ~
+          - January
+          - February
+          - March
+          - April
+          - May
+          - June
+          - July
+          - August
+          - September
+          - October
+          - November
+          - December
+        abbr_month_names:
+          - ~
+          - Jan
+          - Feb
+          - Mar
+          - Apr
+          - May
+          - Jun
+          - Jul
+          - Aug
+          - Sep
+          - Oct
+          - Nov
+          - Dec
+        order:
+          - :month
+          - :day
+          - :year
+      time:
+        input:
+          formats: 
+            - :default
+            - :long
+            - :short
+            - :time
+        formats:
+          default: "%m/%d/%Y %I:%M%p"
+          short: "%B %e %I:%M %p"
+          long: "%A, %B %e, %Y %I:%M%p"
+          time: "%l:%M%p"
+        am: "am"
+        pm: "pm"
+
 ### Compatibility
 
 * Tested with Rails 2.3.5 in Ruby 1.8.7, Ruby 1.9.1 and Ruby 1.9.2 (head)
@@ -115,10 +211,14 @@ You can also customize the output using some options:
 People who have contributed to delocalize (in no particular order):
 
 * [Fernando Luizao](http://github.com/fernandoluizao)
-* [Stephan](http://github.com/stepahn)
+* [Stephan Zalewski](http://github.com/stepahn)
 * [Lailson Bandeira](http://github.com/lailsonbm)
 * [Carlos Antonio da Silva](http://github.com/carlosantoniodasilva)
 * [Michele Franzin](http://github.com/michelefranzin)
+* [Raphaela Wrede](https://github.com/rwrede)
+* [Jan De Poorter](https://github.com/DefV)
+* [Blake Lucchesi](https://github.com/BlakeLucchesi)
+* [Ralph von der Heyden](https://github.com/ralph)
 
 ### TODO
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/delocalize/localized_date_time_parser.rb

@@ -61,7 +61,7 @@ module Delocalize
       def input_formats(type)
         # Date uses date formats, all others use time formats
         type = type == Date ? :date : :time
-        (@input_formats ||= {})[type] ||= I18n.t(:"#{type}.formats").slice(*I18n.t(:"#{type}.input.formats")).values
+        I18n.t(:"#{type}.formats").slice(*I18n.t(:"#{type}.input.formats")).values
       end
 
       def apply_regex(format)

data/test/delocalize_test.rb

@@ -29,6 +29,19 @@ class DelocalizeActiveRecordTest < ActiveRecord::TestCase
     assert_equal date, @product.released_on
   end
 
+  test "delocalizes localized date with year even if locale changes" do
+    date = Date.civil(2009, 10, 19)
+
+    @product.released_on = '19. Oktober 2009'
+    assert_equal date, @product.released_on
+
+    I18n.with_locale :tt do
+      @product.released_on = '10|11|2009'
+      date = Date.civil(2009, 11, 10)
+      assert_equal date, @product.released_on
+    end
+  end
+
   test "delocalizes localized date without year" do
     date = Date.civil(Date.today.year, 10, 19)
 

data/test/test_helper.rb

@@ -11,7 +11,7 @@ require 'delocalize/rails_ext/action_view'
 require 'delocalize/rails_ext/active_record'
 require 'delocalize/rails_ext/time_zone'
 
-I18n.backend.store_translations :de, {
+de = {
   :date => {
     :input => {
       :formats => [:long, :short, :default]
@@ -50,6 +50,13 @@ I18n.backend.store_translations :de, {
   }
 }
 
+# deeply clone the hash for a fantasy language called tt
+tt = Marshal.load(Marshal.dump(de))
+tt[:date][:formats][:default] = '%d|%m|%Y'
+
+I18n.backend.store_translations :de, de
+I18n.backend.store_translations :tt, tt
+
 I18n.locale = :de
 
 class NonArProduct

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delocalize
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-25 00:00:00.000000000Z
+date: 2011-11-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2156597040 !ruby/object:Gem::Requirement
+  requirement: &2160177200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156597040
+  version_requirements: *2160177200
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2156596420 !ruby/object:Gem::Requirement
+  requirement: &2160175980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *2156596420
+  version_requirements: *2160175980
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2156595740 !ruby/object:Gem::Requirement
+  requirement: &2160174480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *2156595740
+  version_requirements: *2160174480
 description: Delocalize is a tool for parsing localized dates/times and numbers.
 email: clemens@railway.at
 executables: []