polish 0.0.4 → 0.0.5

data/README.md

@@ -25,8 +25,6 @@ or a plugin:
     script/plugin install git://github.com/grk/polish.git
 
 
-Then, magic happens. No need to set default locale.
-
 
 Overrides
 ---------

data/Rakefile

@@ -6,7 +6,7 @@ require 'date'
 require 'I18n'
  
 GEM = "polish"
-GEM_VERSION = "0.0.4"
+GEM_VERSION = "0.0.5"
 AUTHOR = "Grzesiek Kolodziejczyk"
 EMAIL = "gkolodziejczyk@gmail.com"
 HOMEPAGE = "http://github.com/grk/polish/"

data/lib/polish.rb

@@ -27,7 +27,7 @@ module Polish
   module VERSION
     MAJOR = 0
     MINOR = 0
-    TINY  = 1
+    TINY  = 5
  
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
@@ -47,11 +47,10 @@ module Polish
     I18n::Backend::Advanced
   end
   
-  # Init Polish i18n: set custom backend, set default locale to Polish locale,
+  # Init Polish i18n: set custom backend, 
   # load all translations shipped with library.
   def init_i18n
     I18n.backend = Polish.i18n_backend_class.new
-    I18n.default_locale = LOCALE
     I18n.load_path.unshift(*locale_files)
   end
  

data/lib/polish/backend/advanced.rb

@@ -8,8 +8,8 @@ module I18n
     # for DateTime localization and usage of user-defined Proc (lambda) pluralization
     # methods in translation tables.
     class Advanced < Simple
-      LOCALIZE_ABBR_MONTH_NAMES_MATCH = /(%d\.?|%e\.?)?(\s*)(%b)/
-      LOCALIZE_MONTH_NAMES_MATCH = /(%d\.?|%e\.?)?(\s*)(%B)/
+      LOCALIZE_ABBR_MONTH_NAMES_MATCH = /(%d|%e)(.*)(%b)/
+      LOCALIZE_MONTH_NAMES_MATCH = /(%d|%e)(.*)(%B)/
       LOCALIZE_STANDALONE_ABBR_DAY_NAMES_MATCH = /^%a/
       LOCALIZE_STANDALONE_DAY_NAMES_MATCH = /^%A/
       
@@ -19,7 +19,9 @@ module I18n
       #
       # Note that it differs from <tt>localize</tt> in Simple< backend by checking for 
       # "standalone" month name/day name keys in translation and using them if available.
-      def localize(locale, object, format = :default)
+      #
+      # <tt>options</tt> parameter added for i18n-0.3 compliance.
+      def localize(locale, object, format = :default, options = nil)
         raise ArgumentError, "Object must be a Date, DateTime or Time object. #{object.inspect} given." unless object.respond_to?(:strftime)
         type = object.respond_to?(:sec) ? 'time' : 'date'
         # TODO only translate these if format is a String?
@@ -45,18 +47,18 @@ module I18n
  
         if lookup(locale, :"date.standalone_abbr_month_names")
           format.gsub!(LOCALIZE_ABBR_MONTH_NAMES_MATCH) do
-            $1 ? $1 + $2 + translate(locale, :"date.abbr_month_names")[object.mon] : 
-              $2 + translate(locale, :"date.standalone_abbr_month_names")[object.mon]
+            $1 + $2 + translate(locale, :"date.abbr_month_names")[object.mon]
           end
+          format.gsub!(/%b/, translate(locale, :"date.standalone_abbr_month_names")[object.mon])
         else
           format.gsub!(/%b/, translate(locale, :"date.abbr_month_names")[object.mon])
         end
  
         if lookup(locale, :"date.standalone_month_names")
           format.gsub!(LOCALIZE_MONTH_NAMES_MATCH) do
-            $1 ? $1 + $2 + translate(locale, :"date.month_names")[object.mon] : 
-              $2 + translate(locale, :"date.standalone_month_names")[object.mon]
+            $1 + $2 + translate(locale, :"date.month_names")[object.mon]
           end
+          format.gsub!(/%B/, translate(locale, :"date.standalone_month_names")[object.mon])
         else
           format.gsub!(/%B/, translate(locale, :"date.month_names")[object.mon])
         end

data/lib/polish/locale/actionview.yml

@@ -10,6 +10,9 @@ pl:
     currency:
       format:
         format: "%n %u"
+        separator: ","
+        delimiter: ""
+        precision: 2
         unit: "PLN"
     percentage:
       format:
@@ -53,12 +56,15 @@ pl:
         other: "{{count}} minut"
       about_x_hours:
         one:   "około godziny"
+        few:   "około {{count}} godzin"
         other: "około {{count}} godzin"
       x_days:
         one:   "1 dzień"
+        few:   "{{count}} dni"
         other: "{{count}} dni"
       about_x_months:
         one:   "około miesiąca"
+        few:   "około {{count}} miesięcy"
         other: "około {{count}} miesięcy"
       x_months:
         one:   "1 miesiąc"
@@ -66,6 +72,7 @@ pl:
         other: "{{count}} miesięcy"
       about_x_years:
         one:   "około roku"
+        few:   "około {{count}} lat"
         other: "około {{count}} lat"
       over_x_years:
         one:   "ponad rok"
@@ -79,6 +86,16 @@ pl:
       minute: "Minuta"
       second: "Sekunda"
 
+  helpers:
+    select:
+      # Default value for :prompt => true in FormOptionsHelper
+      prompt: "Proszę wybrać"
+
+    submit:
+      create: 'Utwórz %{model}'
+      update: 'Aktualizuj %{model}'
+      submit: 'Zapisz %{model}'
+
   activerecord:
     errors:
       template:

data/lib/polish/locale/activerecord.yml

@@ -2,6 +2,7 @@ pl:
   activerecord:
     errors:
       messages:
+        record_invalid: "Znaleziono błędy: %{errors}"
         inclusion: "nie znajduje się na liście dopuszczalnych wartości"
         exclusion: "znajduje się na liście zabronionych wartości"
         invalid: "jest nieprawidłowe"
@@ -18,7 +19,7 @@ pl:
           few: "jest za krótkie (minimalnie {{count}} znaki)"
           other: "jest za krótkie (minimalnie {{count}} znaków)"
         wrong_length: "jest nieprawidłowej długości (powinna wynosić {{count}} znaków)"
-        taken: "zostało już zajęte"
+        taken: "jest już zajęte"
         not_a_number: "nie jest liczbą"
         greater_than: "musi być większe niż {{count}}"
         greater_than_or_equal_to: "musi być większe lub równe {{count}}"

data/lib/polish/locale/datetime.yml

@@ -14,7 +14,7 @@ pl:
     standalone_month_names: [~, Styczeń, Luty, Marzec, Kwiecień, Maj, Czerwiec, Lipiec, Sierpień, Wrzesień, Październik, Listopad, Grudzień]
     abbr_month_names: [~, sty., lut., mar., kwi., maj., cze., lip., sie., wrz., paź., lis., gru.]
     standalone_abbr_month_names: [~, Sty., Lut., Mar., Kwi., Maj., Cze., Lip., Sie., Wrz., Paź., Lis., Gru.]
-    order: [ :year, :month, :day ]
+    order: [ :day, :month, :year ]
 
   time:
     formats:

data/spec/i18n/locale/datetime_spec.rb

@@ -41,6 +41,9 @@ describe I18n, "Polish Date/Time localization" do
     it "should use month names" do
       l(@date, :format => "%d %B").should == "01 grudnia"
       l(@date, :format => "%e %B %Y").should == " 1 grudnia 1985"
+      l(@date, :format => "<b>%d</b> %B").should == "<b>01</b> grudnia"
+      l(@date, :format => "<strong>%e</strong> %B %Y").should == "<strong> 1</strong> grudnia 1985"
+      l(@date, :format => "A było to dnia %ego miesiąca %B %Y").should == "A było to dnia  1go miesiąca grudnia 1985"
     end
     
     it "should use standalone month names" do
@@ -62,7 +65,7 @@ describe I18n, "Polish Date/Time localization" do
   end
  
   it "should define default date components order: year, month, day" do
-    I18n.backend.translate(Polish.locale, :"date.order").should == [:year, :month, :day]
+    I18n.backend.translate(Polish.locale, :"date.order").should == [:day, :month, :year]
   end
  
   describe "with time formats" do

data/spec/locale_spec.rb

@@ -71,7 +71,10 @@ describe Polish, "loading locales" do
     activerecord.errors.template.header
     activerecord.errors.template.body
     
-    support.select.prompt
+    helpers.select.prompt
+    helpers.submit.create
+    helpers.submit.update
+    helpers.submit.submit
   ).each do |key| 
     it "should define '#{key}' in actionview translations" do
       lookup(key).should_not be_nil

data/spec/polish_spec.rb

@@ -48,9 +48,10 @@ describe Polish do
       I18n.t(:'date.formats.default', :locale => :'pl').should == "override"
     end
     
-    it "should set default locale to Polish locale" do
+    it "should not change default locale" do
+      locale = I18n.default_locale
       Polish.init_i18n
-      I18n.default_locale.should == Polish.locale
+      I18n.default_locale.should == locale
     end
   end
   

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: polish
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Grzesiek Kolodziejczyk
@@ -14,7 +15,7 @@ autorequire: polish
 bindir: bin
 cert_chain: []
 
-date: 2010-03-27 23:00:00 +01:00
+date: 2010-07-21 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -121,23 +122,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Polish language support for Ruby and Rails