polish 0.0.5 → 0.1.0

data/.gitignore

@@ -0,0 +1,2 @@
+pkg/*
+polish.xcworkspace

data/Gemfile

@@ -0,0 +1,14 @@
+source 'http://rubygems.org'
+
+group :runtime do
+  gem "rake"
+  gem "gemcutter"
+  gem "bundler"
+  gem "jeweler"
+end
+
+group :development do
+  gem "rspec"
+  gem "i18n"
+end
+

data/README.md

@@ -8,23 +8,22 @@ Based on [Russian](http://github.com/yaroslav/russian/) by [yaroslav](http://git
 
 Install
 -------
-Install as a gem:
+*Warning*: as of version 0.1.0, polish is only tested with Rails 3 and Bundler. Use with caution, might give unexpected results.
 
-in `config/environment.rb`:
+To add Polish to your Rails app, simply add it to your Gemfile:
 
-    Rails::Initializer.run do |config|
-      config.gem 'polish', :source => 'http://gemcutter.org'
-    end
+  gem "polish", ">= 0.1.0"
 
-and then:
-    rake gems:install
+Additionally, if you change the backend of I18n, you will need to make sure it includes the Pluralization module:
 
+  I18n.backend.class.send(:include, I18n::Backend::Pluralization)
 
-or a plugin:
-
-    script/plugin install git://github.com/grk/polish.git
+What it does
+------------
 
+The main feature of polish is fixing the date formats. It does that by setting the date.month\_names and date.day\_names translations to Procs that can detect the proper form.
 
+Polish also adds correct pluralization rules.
 
 Overrides
 ---------

data/Rakefile

@@ -1,40 +1,30 @@
-require 'rubygems'
-require 'rake/gempackagetask'
-require 'spec/rake/spectask'
-require 'rubygems/specification'
-require 'date'
-require 'I18n'
- 
-GEM = "polish"
-GEM_VERSION = "0.0.5"
-AUTHOR = "Grzesiek Kolodziejczyk"
-EMAIL = "gkolodziejczyk@gmail.com"
-HOMEPAGE = "http://github.com/grk/polish/"
-SUMMARY = "Polish language support for Ruby and Rails"
- 
-spec = Gem::Specification.new do |s|
-  s.name = GEM
-  s.version = GEM_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README.md", "LICENSE", "TODO"]
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-  
-  # Uncomment this to add a dependency
-  # s.add_dependency "foo"
-  
-  s.require_path = 'lib'
-  s.autorequire = GEM
-  s.files = %w(LICENSE README.md Rakefile TODO init.rb) + Dir.glob("{lib,spec}/**/*")
+require 'rake'
+require 'bundler'
+
+begin
+  Bundler.setup(:runtime, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
 end
- 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
+
+$LOAD_PATH.unshift('lib')
+
+require 'jeweler'
+Jeweler::Tasks.new do |gemspec|
+  gemspec.name = "polish"
+  gemspec.summary = "Polish language support for Ruby and Rails"
+  gemspec.email = "gkolodziejczyk@gmail.com"
+  gemspec.homepage = "http://github.com/grk/polish"
+  gemspec.authors = ["Grzesiek Kolodziejczyk"]
+
+  gemspec.add_dependency("i18n", ">= 0.3.3")
 end
+
+Jeweler::GemcutterTasks.new
+
+require 'spec/rake/spectask'
  
 task :default => :spec
 desc "Run specs"
@@ -43,14 +33,3 @@ Spec::Rake::SpecTask.new do |t|
   t.spec_opts = %w(-fs --color)
 end
  
-desc "install the gem locally"
-task :install => [:package] do
-  sh %{sudo gem install pkg/#{GEM}-#{GEM_VERSION}}
-end
- 
-desc "create a gemspec file"
-task :make_spec do
-  File.open("#{GEM}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
-  end
-end

data/VERSION

@@ -0,0 +1 @@
+0.1.0

data/lib/polish.rb

@@ -4,32 +4,19 @@ if RUBY_VERSION < "1.9"
   $KCODE = 'u'
 end
 
-$:.push File.join(File.dirname(__FILE__), 'polish')
-
-# I18n require
-unless defined?(I18n)
-  $:.push File.join(File.dirname(__FILE__), 'vendor', 'i18n', 'lib')
-  require 'i18n'
-end
-
-
-# Advanced backend
-require 'backend/advanced'
- 
 # Rails hacks
 if defined?(ActionView::Helpers)
   require 'action_view_ext/helpers/date_helper' 
 end
+
+require 'polish/proxies'
  
 module Polish
   extend self
   
   module VERSION
-    MAJOR = 0
-    MINOR = 0
-    TINY  = 5
- 
-    STRING = [MAJOR, MINOR, TINY].join('.')
+    STRING = File.open(File.dirname(__FILE__) + "/../VERSION").gets.chomp
+    MAJOR, MINOR, TINY = STRING.split('.')
   end
   
   # Polish locale
@@ -40,64 +27,18 @@ module Polish
     LOCALE
   end
   
-  # Returns custom backend class for usage with Polish library
-  # 
-  # See I18n::Backend
-  def i18n_backend_class
-    I18n::Backend::Advanced
-  end
-  
   # Init Polish i18n: set custom backend, 
   # load all translations shipped with library.
   def init_i18n
-    I18n.backend = Polish.i18n_backend_class.new
+    I18n.backend.class.send(:include, I18n::Backend::Pluralization)
     I18n.load_path.unshift(*locale_files)
   end
- 
-  # See I18n::translate
-  def translate(key, options = {})
-    I18n.translate(key, options.merge({ :locale => LOCALE }))
-  end        
-  alias :t :translate
-  
-  # See I18n::localize
-  def localize(object, options = {})
-    I18n.localize(object, options.merge({ :locale => LOCALE }))
-  end
-  alias :l :localize
-  
-  # strftime() proxy with Polish localization
-  def strftime(object, format = :default)
-    localize(object, { :format => format })
-  end
-  
-  # Simple pluralization proxy
-  #
-  # Usage: 
-  #   Polish.pluralize(1, "dom", "domy", "domów")
-  def pluralize(n, *variants)
-    raise ArgumentError, "Must have a Numeric as a first parameter" unless n.is_a?(Numeric)
-    raise ArgumentError, "Must have 3 variants for pluralization" if variants.size < 3
-    variants_hash = pluralization_variants_to_hash(*variants)
-    I18n.backend.send(:pluralize, LOCALE, variants_hash, n)
-  end
-  alias :p :pluralize
   
   protected
     # Returns all locale files shipped with library
     def locale_files
       Dir[File.join(File.dirname(__FILE__), "polish", "locale", "**/*")]
     end
-    
-    # Converts an array of pluralization variants to a Hash that can be used
-    # with I18n pluralization.
-    def pluralization_variants_to_hash(*variants)
-      {
-        :one => variants[0],
-        :few => variants[1],
-        :other => variants[2]
-      }
-    end
 end
  
 Polish.init_i18n

data/lib/polish/locale/actionview.yml

@@ -96,10 +96,14 @@ pl:
       update: 'Aktualizuj %{model}'
       submit: 'Zapisz %{model}'
 
-  activerecord:
+  activemodel:
     errors:
       template:
         header:
           one:    "{{model}} nie został zachowany z powodu jednego błędu"
           other:  "{{model}} nie został zachowany z powodu {{count}} błędów"
         body: "Błędy dotyczą następujących pól:"
+
+  attributes:
+    created_at: "Czas utworzenia"
+    updated_at: "Czas aktualizacji"

data/lib/polish/locale/activerecord.yml

@@ -1,6 +1,11 @@
 pl:
   activerecord:
     errors:
+      template:
+        header:
+          one:    "{{model}} nie został zachowany z powodu jednego błędu"
+          other:  "{{model}} nie został zachowany z powodu {{count}} błędów"
+        body: "Błędy dotyczą następujących pól:"
       messages:
         record_invalid: "Znaleziono błędy: %{errors}"
         inclusion: "nie znajduje się na liście dopuszczalnych wartości"
@@ -19,7 +24,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: "jest już zajęte"
+        taken: "zostało 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.rb

@@ -0,0 +1,44 @@
+# -*- encoding: utf-8 -*- 
+
+{
+  :'pl' => {
+    :date => {
+      :month_names => lambda { |date_or_time, opts|
+        if opts[:format] =~ /(%d|%e)(.*)(%B)/
+          [nil, 'stycznia', 'lutego', 'marca', 'kwietnia', 'maja', 'czerwca', 
+           'lipca', 'sierpnia', 'września', 'października', 'listopada', 
+           'grudnia']
+        else
+          [nil, 'Styczeń', 'Luty', 'Marzec', 'Kwiecień', 'Maj', 'Czerwiec', 
+           'Lipiec', 'Sierpień', 'Wrzesień', 'Październik', 'Listopad', 
+           'Grudzień']
+        end
+      },
+      :abbr_month_names => lambda { |date_or_time, opts|
+        if opts[:format] =~ /(%d|%e)(.*)(%b)/
+          [nil, 'sty.', 'lut.', 'mar.', 'kwi.', 'maj.', 'cze.', 'lip.', 'sie.', 
+           'wrz.', 'paź.', 'lis.', 'gru.']
+        else
+          [nil, 'Sty.', 'Lut.', 'Mar.', 'Kwi.', 'Maj', 'Cze.', 'Lip.', 'Sie.', 
+           'Wrz.', 'Paź.', 'Lis.', 'Gru.']
+        end
+      },
+      :day_names => lambda { |date_or_time, opts|
+        if opts[:format] =~ /^%A/
+          ['Niedziela', 'Poniedziałek', 'Wtorek', 'Środa', 'Czwartek', 
+           'Piątek', 'Sobota']
+        else
+          ['niedziela', 'poniedziałek', 'wtorek', 'środa', 'czwartek', 
+           'piątek', 'sobota']
+        end
+      },
+      :abbr_day_names => lambda { |date_or_time, opts|
+        if opts[:format] =~ /^%a/
+          ['Niedz.', 'Pon.', 'Wt.', 'Śr.', 'Czw.', 'Pt.', 'Sob.']
+        else
+          ['niedz.', 'pon.', 'wt.', 'śr.', 'czw.', 'pt.', 'sob.']
+        end
+      }
+    }
+  }
+}

data/lib/polish/locale/datetime.yml

@@ -2,24 +2,15 @@ pl:
   date:
     formats:
       default: "%d.%m.%Y"
-      short: "%d. %b"
-      long: "%d. %B %Y"
+      short: "%e %b"
+      long: "%e %B %Y"
     
-    day_names: [niedziela, poniedziałek, wtorek, środa, czwartek, piątek, sobota]
-    standalone_day_names: [Niedziela, Poniedziałek, Wtorek, Środa, Czwartek, Piątek, Sobota]
-    abbr_day_names: [nie., pon., wto., śro., czw., pią., sob.]
-    standalone_abbr_day_names: [Nie., Pon., Wto., Śro., Czw., Pią., Sob.]
-    
-    month_names: [~, stycznia, lutego, marca, kwietnia, maja, czerwca, lipca, sierpnia, września, października, listpoada, grudnia]
-    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: [ :day, :month, :year ]
 
   time:
     formats:
-      default: "%a, %d. %B %Y, %H:%M:%S"
-      short: "%d. %b, %H:%M"
-      long: "%d. %B %Y, %H:%M"
+      default: "%a, %e %B %Y, %H:%M:%S"
+      short: "%e %b, %H:%M"
+      long: "%e %B %Y, %H:%M"
     am: "przed południem"
-    pm: "po południu"
+    pm: "po południu"

data/lib/polish/locale/pluralize.rb

@@ -1,16 +1,21 @@
 # -*- encoding: utf-8 -*- 
- 
+
 {
   :'pl' => {
-    :pluralize => lambda { |n| 
-      # taken from http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html
-      # TODO: check if they're really wrong about 22..24
-      #
-      #   one -> n is 1;
-      #   few -> n mod 10 in 2..4 and n mod 100 not in 12..14;
-      #   other -> everything else
-      #
-      n == 1 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : :other 
+    :i18n => {
+      :plural => {
+        :rule => lambda { |n| 
+          # taken from http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html
+          # TODO: check if they're really wrong about 22..24
+          #
+          #   one -> n is 1;
+          #   few -> n mod 10 in 2..4 and n mod 100 not in 12..14;
+          #   other -> everything else
+          #
+          n == 1 ? :one : [2, 3, 4].include?(n % 10) && 
+                          ![12, 13, 14].include?(n % 100) ? :few : :other 
+        }
+      }
     }
   }
-}
+}

data/lib/polish/proxies.rb

@@ -0,0 +1,45 @@
+module Polish
+  module Proxies
+    # See I18n::translate
+    def translate(key, options = {})
+      I18n.translate(key, options.merge({ :locale => LOCALE }))
+    end
+    alias :t :translate
+
+    # See I18n::localize
+    def localize(object, options = {})
+      I18n.localize(object, options.merge({ :locale => LOCALE }))
+    end
+    alias :l :localize
+
+    # strftime() proxy with Polish localization
+    def strftime(object, format = :default)
+      localize(object, { :format => format })
+    end
+
+    # Simple pluralization proxy
+    #
+    # Usage: 
+    #   Polish.pluralize(1, "dom", "domy", "domów")
+    def pluralize(n, *variants)
+      raise ArgumentError, "Must have a Numeric as a first parameter" unless n.is_a?(Numeric)
+      raise ArgumentError, "Must have 3 variants for pluralization" if variants.size < 3
+      variants_hash = pluralization_variants_to_hash(*variants)
+      I18n.backend.send(:pluralize, LOCALE, variants_hash, n)
+    end
+    alias :p :pluralize
+
+    protected
+    # Converts an array of pluralization variants to a Hash that can be used
+    # with I18n pluralization.
+    def pluralization_variants_to_hash(*variants)
+      {
+        :one => variants[0],
+        :few => variants[1],
+        :other => variants[2]
+      }
+    end
+  end
+
+  include Proxies
+end

data/lib/proxies.rb

@@ -0,0 +1,2 @@
+
+

data/polish.gemspec

@@ -0,0 +1,75 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{polish}
+  s.version = "0.1.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Grzesiek Kolodziejczyk"]
+  s.date = %q{2010-07-23}
+  s.email = %q{gkolodziejczyk@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.md",
+     "TODO"
+  ]
+  s.files = [
+    ".gitignore",
+     "Gemfile",
+     "LICENSE",
+     "README.md",
+     "Rakefile",
+     "TODO",
+     "VERSION",
+     "lib/polish.rb",
+     "lib/polish/action_view_ext/helpers/date_helper.rb",
+     "lib/polish/locale/actionview.yml",
+     "lib/polish/locale/activerecord.yml",
+     "lib/polish/locale/activesupport.yml",
+     "lib/polish/locale/datetime.rb",
+     "lib/polish/locale/datetime.yml",
+     "lib/polish/locale/pluralize.rb",
+     "lib/polish/proxies.rb",
+     "lib/proxies.rb",
+     "polish.gemspec",
+     "rails/init.rb",
+     "spec/fixtures/en.yml",
+     "spec/fixtures/pl.yml",
+     "spec/i18n/locale/datetime_spec.rb",
+     "spec/i18n/locale/pluralization_spec.rb",
+     "spec/locale_spec.rb",
+     "spec/polish_spec.rb",
+     "spec/proxies_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/grk/polish}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Polish language support for Ruby and Rails}
+  s.test_files = [
+    "spec/i18n/locale/datetime_spec.rb",
+     "spec/i18n/locale/pluralization_spec.rb",
+     "spec/locale_spec.rb",
+     "spec/polish_spec.rb",
+     "spec/proxies_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<i18n>, [">= 0.3.3"])
+    else
+      s.add_dependency(%q<i18n>, [">= 0.3.3"])
+    end
+  else
+    s.add_dependency(%q<i18n>, [">= 0.3.3"])
+  end
+end
+