r18n-core 0.3.1 → 0.3.2

data/ChangeLog

@@ -1,3 +1,9 @@
+== 0.3.2 (Pidgin)
+* Print path of untranslated string by filters.
+* Add Italian locale (by Guido De Rosa).
+* Fix Polish locale (by Adrian Pacała).
+* Fix American English locale (by Max Aller).
+
 == 0.3.1 (Yield)
 * Add Chinese locale (by Ilia Zayats).
 * Add Spanish locale (by Andre O Moura).

data/README.rdoc

@@ -2,7 +2,7 @@
 
 R18n is a i18n tool to translate your Ruby application in several languages.
 
-Use <tt>sinatra-r18n</tt> or teamon’s +merb_i18n+ to localize Web applications and 
+Use <tt>sinatra-r18n</tt> or teamon’s <tt>merb_i18n</tt> to localize Web applications and 
 <tt>r18n-desktop</tt> to localize desktop application.
 
 == Features

data/base/it.yml

@@ -0,0 +1,31 @@
+ok: OK
+save: Salva
+cancel: Annulla
+yes: Sì
+no: No
+exit: Esci
+delete: Cancella
+ 
+human_time:
+  after_days: !!pl
+    1: dopo %1 giorno
+    n: dopo %1 giorni
+  tomorrow: domani
+  after_hours: !!pl
+    1: dopo %1 ora
+    n: dopo %1 ore
+  after_minutes: !!pl
+    1: dopo %1 minuto
+    n: dopo %1 minuti
+  now: ora
+  today: oggi
+  minutes_ago: !!pl
+    1: %1 minuto fa
+    n: %1 minuti fa
+  hours_ago: !!pl
+    1: %1 ora fa
+    n: %1 ore fa
+  yesterday: ieri
+  days_ago: !!pl
+    1: %1 giorno fa
+    n: %1 giorni fa

data/lib/r18n-core/filters.rb

@@ -214,6 +214,10 @@ module R18n
     content
   end
   
+  Filters.add(Untranslated, :untranslated) do |v, c, translated, untranslated|
+    "#{translated}[#{untranslated}]"
+  end
+  
   Filters.add('escape', :escape_html) do |content, config|
     config.dont_escape_html = true
     Utils.escape_html(content)

data/lib/r18n-core/translated.rb

@@ -136,7 +136,7 @@ module R18n
               return R18n::Filters.process(result, locale, path, type, params)
             end
             
-            R18n::Untranslated.new(path, '#{name}')
+            R18n::Untranslated.new(path, '#{name}', R18n.get.locales)
           end
         EOS
         

data/lib/r18n-core/translation.rb

@@ -186,7 +186,7 @@ module R18n
          return Filters.process(result, @locales[i], path, type, params)
       end
       
-      Untranslated.new(path, name)
+      Untranslated.new(path, name, @locales)
     end
   end
 end

data/lib/r18n-core/untranslated.rb

@@ -23,6 +23,22 @@ require 'singleton'
 module R18n
   # Return if translation isn’t exists. Unlike nil, it didn’t raise error when
   # you try to access for subtranslations.
+  #
+  # You can set format to print untranslated string by filters. For example:
+  # Disable standart output:
+  # 
+  #   R18n::Filters.off(:untranslated)
+  # 
+  # For development environment:
+  # 
+  #   R18n::Filters.add(R18n::Untranslated, :untranslated_html) do
+  #     |content, config, translated_path, untranslated_path, path|
+  #     "#{translated_path}<span style='color: red'>#{untranslated_path}</span>"
+  #   end
+  # 
+  # For production environment:
+  # 
+  #   R18n::Filters.add(R18n::Untranslated, :hide_untranslated) { '' }
   class Untranslated
     # Path to translation.
     attr_reader :path
@@ -33,8 +49,9 @@ module R18n
     # Path, that exists in translation.
     attr_reader :translated_path
     
-    def initialize(path, untranslated_path)
+    def initialize(path, untranslated_path, locales)
       @path = path
+      @locales = locales
       @untranslated_path = untranslated_path
       @translated_path = path[0...(-untranslated_path.length)]
     end
@@ -49,15 +66,14 @@ module R18n
     
     def [](*params)
       Untranslated.new("#{@path}.#{params.first}",
-                       "#{@untranslated_path}.#{params.first}")
+                       "#{@untranslated_path}.#{params.first}", @locales)
     end
     
     def to_s
-      if R18n.untranslated.respond_to? :gsub
-        R18n.untranslated.gsub('%1', @path).gsub('%2', @translated_path).
-                          gsub('%3', @untranslated_path)
-      else
-        R18n.untranslated
+      config = OpenStruct.new(:locale  => @locales.first, :path => @path,
+                              :locales => @locales)
+      Filters.enabled[Untranslated].inject(@path) do |string, filter|
+        filter.call(string, config, @translated_path, @untranslated_path, @path)
       end
     end
   end

data/lib/r18n-core/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module R18n
-  VERSION = '0.3.1' unless defined? R18n::VERSION
+  VERSION = '0.3.2' unless defined? R18n::VERSION
 end

data/lib/r18n-core.rb

@@ -44,24 +44,5 @@ module R18n
     def get
       Thread.current['i18n']
     end
-    
-    # String, which will be print by untranslated items. You can use special
-    # values:
-    # * <tt>%1</tt> – path to untranslated string.
-    # * <tt>%2</tt> – part in path, that exists in translation.
-    # * <tt>%3</tt> – part in path, that isn’t exists in translation.
-    #
-    # For example, if you have in translation only:
-    #   user:
-    #     login: Login
-    #
-    # And write code:
-    #
-    #   R18n.untranslated = '%2[%3]'
-    #   
-    #   i18n.user.password #=> "user.[password]"
-    attr_accessor :untranslated
   end
-  
-  self.untranslated = '%2[%3]'
 end

data/locales/en-us.yml

@@ -7,3 +7,4 @@ sublocales: [en]
 time:
   date: "%m/%d/%Y"
   full: "%B %e"
+  time: " %I:%M %p"

data/locales/it.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+module R18n
+  module Locales
+    class It < R18n::Locale
+      def format_date_full(i18n, date, year = true)
+        full = super(i18n, date, year)
+        if ' 1' == full[0..1]
+          "1º" + full[2..-1]
+        else
+          full
+        end
+      end
+    end
+  end
+end

data/locales/it.yml

@@ -0,0 +1,26 @@
+title: Italiano
+code: it
+sublocales: [en]
+direction: ltr
+ 
+week:
+  start: monday
+  days: [domenica, lunedì, martedì, mercoledì, giovedì, venerdì, sabato]
+  abbrs: [dom, lun, mar, mer, gio, ven, sab]
+ 
+months:
+  names: [gennaio, febbraio, marzo, aprile, maggio, giugno, luglio, agosto, settembre, ottobre, novembre, dicembre]
+  abbrs: [gen, feb, mar, apr, mag, giu, lug, ago, set, ott, nov, dic]
+  standalone: [gennaio, febbraio, marzo, aprile, maggio, giugno, luglio, agosto, settembre, ottobre, novembre, dicembre]
+ 
+time:
+  am: AM
+  pm: PM
+  time: " %H:%M"
+  date: "%d/%m/%Y"
+  full: "%e %B"
+  year: "_ %Y"
+ 
+numbers:
+  decimal_separator: ","
+  group_delimiter: "."

data/locales/pl.yml

@@ -5,13 +5,13 @@ direction: ltr
 
 week:
   start: monday
-  days: [Niedziela, Poniedziałek, Wtorek, Sroda, Czwartek, Piątek, Sobota]
-  abbrs: [Niedz, Pon, Wt, Sr, Czw, Pt, Sob]
+  days: [niedziela, poniedziałek, wtorek, środa, czwartek, piątek, sobota]
+  abbrs: [nd, pn, wt, śr, czw, pt, sob]
 
 months:
-  names: [Stycznia, Lutego, Marca, Kwietnia, Maja, Czerwca, Lipa, Sierpnia, Września, Pażdziernika, Listopada, Grudnia]
-  abbrs: [Sty, Lut, Mar, Kwi, Maj, Cze, Lip, Sie, Wrz, Paź, Lis, Gru]
-  standalone: [Styczen, Luty, Marzec, Kwiecień, Maj, Czerwiec, Lipiec, Sierpień, Wrzesień, Pażdziernik, Listopad, Grudzień]
+  names: [stycznia, lutego, marca, kwietnia, maja, czerwca, lipca, sierpnia, września, pażdziernika, listopada, grudnia]
+  abbrs: [I, II, III, IV, V, VI, VII, VIII, IX, X, XI, XII]
+  standalone: [styczeń, luty, marzec, kwiecień, maj, czerwiec, lipiec, sierpień, wrzesień, październik, listopad, grudzień]
 
 time:
   am: AM
@@ -22,5 +22,5 @@ time:
   year: "_ %Y"
 
 numbers:
-  decimal_separator: "."
-  group_delimiter: ","
+  decimal_separator: ","
+  group_delimiter: " "

data/spec/filters_spec.rb

@@ -138,6 +138,18 @@ describe R18n::Filters do
     @i18n.params(-1, 2).should == 'Is −1 between −1 and 2?'
   end
   
+  it "should format untranslated" do
+    @i18n.in.not.to_s.should == 'in.[not]'
+    
+    R18n::Filters.off(:untranslated)
+    @i18n.in.not.to_s.should == 'in.not'
+    
+    R18n::Filters.add(R18n::Untranslated) do |v, c, trans, untrans, path|
+      "#{path} #{trans}[#{untrans}]"
+    end
+    @i18n.in.not.to_s.should == 'in.not in.[not]'
+  end
+  
   it "should have filter for escape HTML" do
     @i18n.html.should == '<script>true && false</script>'
   end

data/spec/locales/it_spec.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.dirname(__FILE__), '..', '..', 'locales', 'it')
+ 
+describe R18n::Locales::It do
+  it "should format Italian date" do
+    italian = R18n::I18n.new('it')
+    italian.l(Date.parse('2009-07-01'), :full).should == "1º luglio 2009"
+    italian.l(Date.parse('2009-07-02'), :full).should == ' 2 luglio 2009'
+    italian.l(Date.parse('2009-07-12'), :full).should == '12 luglio 2009'
+  end
+end

data/spec/r18n_spec.rb

@@ -25,14 +25,5 @@ describe R18n do
   it "should convert Time to Date" do
       R18n::Utils.to_date(Time.now).should == Date.today
   end
-  
-  it "should set untranslated format" do
-    i18n = R18n::I18n.new('en', DIR)
-    R18n.untranslated = nil
-    i18n.in.not.to_s.should be_nil
-    
-    R18n.untranslated = '%1 %2[%3]'
-    i18n.in.not.to_s.should == 'in.not in.[not]'
-  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: r18n-core
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Andrey "A.I." Sitnik
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-10 00:00:00 +04:00
+date: 2009-11-29 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
-description: R18n is a i18n tool to translate your Ruby application. It can format numbers and time to the rules of the user locale, has translation for common words, storage translation in YAML format with pluralization, procedures and user filters and has special support for countries with two official languages.
+description: "    R18n is a i18n tool to translate your Ruby application.\n    It can format numbers and time to the rules of the user locale,\n    has translation for common words, storage translation in YAML format with\n    pluralization, procedures and user filters and has special support for\n    countries with two official languages.\n"
 email: andrey@sitnik.ru
 executables: []
 
@@ -24,52 +24,56 @@ extra_rdoc_files:
 - LICENSE
 - ChangeLog
 files: 
-- base/pt_br.yml
-- base/ru.yml
 - base/kk.yml
-- base/fr.yml
-- base/es.yml
-- base/en.yml
+- base/it.yml
+- base/ru.yml
 - base/pl.yml
 - base/de.yml
-- base/cs.yml
 - base/eo.yml
+- base/cs.yml
+- base/pt_br.yml
+- base/es.yml
+- base/fr.yml
+- base/en.yml
 - base/zh.yml
-- lib/r18n-core
+- lib/r18n-core.rb
+- lib/r18n-core/filters.rb
 - lib/r18n-core/untranslated.rb
-- lib/r18n-core/translated.rb
-- lib/r18n-core/i18n.rb
-- lib/r18n-core/locale.rb
-- lib/r18n-core/utils.rb
 - lib/r18n-core/version.rb
-- lib/r18n-core/translation.rb
+- lib/r18n-core/utils.rb
 - lib/r18n-core/translated_string.rb
-- lib/r18n-core/filters.rb
+- lib/r18n-core/translation.rb
+- lib/r18n-core/translated.rb
 - lib/r18n-core/unsupported_locale.rb
-- lib/r18n-core.rb
-- locales/ru.rb
-- locales/ru.yml
-- locales/en.rb
-- locales/pt-br.yml
+- lib/r18n-core/locale.rb
+- lib/r18n-core/i18n.rb
+- locales/it.rb
+- locales/pl.rb
 - locales/kk.yml
-- locales/fr.yml
-- locales/es.yml
-- locales/en.yml
+- locales/it.yml
+- locales/en.rb
+- locales/ru.yml
 - locales/pl.yml
-- locales/de.yml
-- locales/cs.yml
-- locales/fr.rb
 - locales/cs.rb
+- locales/de.yml
 - locales/eo.yml
 - locales/en-us.rb
-- locales/zh.yml
 - locales/en-us.yml
-- locales/pl.rb
+- locales/pt-br.yml
+- locales/cs.yml
+- locales/es.yml
+- locales/fr.yml
+- locales/fr.rb
+- locales/ru.rb
+- locales/en.yml
+- locales/zh.yml
 - LICENSE
 - ChangeLog
 - README.rdoc
 has_rdoc: true
 homepage: http://r18n.rubyforge.org/
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -90,33 +94,29 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: r18n-core
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: I18n tool to translate your Ruby application.
 test_files: 
-- spec/locales
-- spec/locales/en_spec.rb
+- spec/translated_spec.rb
+- spec/locales/it_spec.rb
+- spec/locales/fr_spec.rb
 - spec/locales/pl_spec.rb
 - spec/locales/cs_spec.rb
-- spec/locales/en-us_spec.rb
-- spec/locales/fr_spec.rb
 - spec/locales/ru_spec.rb
+- spec/locales/en_spec.rb
+- spec/locales/en-us_spec.rb
 - spec/spec_helper.rb
-- spec/translations
-- spec/translations/two
-- spec/translations/two/fr.yml
-- spec/translations/two/en.yml
-- spec/translations/general
+- spec/r18n_spec.rb
+- spec/translation_spec.rb
 - spec/translations/general/ru.yml
 - spec/translations/general/en.yml
 - spec/translations/general/no-lc.yml
-- spec/translations/extension
+- spec/translations/two/fr.yml
+- spec/translations/two/en.yml
 - spec/translations/extension/no-tr.yml
 - spec/translations/extension/en.yml
-- spec/translation_spec.rb
-- spec/r18n_spec.rb
 - spec/filters_spec.rb
-- spec/locale_spec.rb
 - spec/i18n_spec.rb
-- spec/translated_spec.rb
+- spec/locale_spec.rb