r18n-core 0.2.2 → 0.2.3

data/base/pl.yml

@@ -0,0 +1,7 @@
+ok: OK
+save: Zapisz
+cancel: Anuluj
+yes: Tak
+no: Nie
+exit: Wyjście
+delete: Usuń

data/lib/r18n-core.rb

@@ -18,13 +18,14 @@ You should have received a copy of the GNU Lesser General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 =end
 
-$KCODE = 'u'
+$KCODE = 'u' if '1.8.' == RUBY_VERSION[0..3]
 
 require 'pathname'
 
 dir = Pathname(__FILE__).dirname.expand_path + 'r18n-core'
 require dir + 'version'
 require dir + 'locale'
+require dir + 'unsupported_locale'
 require dir + 'translated_string'
 require dir + 'untranslated'
 require dir + 'translation'
@@ -41,8 +42,27 @@ 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 = '%1'
+  
   module Utils
     # Recursively hash merge.
     def self.deep_merge!(a, b)

data/lib/r18n-core/i18n.rb

@@ -106,13 +106,7 @@ module R18n
     def initialize(locales, translations_dirs = nil)
       locales = [locales] if locales.is_a? String
       
-      @locales = locales.map do |locale|
-        if Locale.exists? locale
-          Locale.load(locale)
-        else
-          locale
-        end
-      end
+      @locales = locales.map { |i| Locale.load(i) }
       
       locales << @@default
       if @locales.first.kind_of? Locale
@@ -138,8 +132,8 @@ module R18n
       end
     end
     
-    # Return Hash with titles (or code for translation without locale file) of
-    # available translations.
+    # Return Hash with titles (or code for unsupported locales) for available
+    # translations.
     def translations
       Translation.available(@translations_dirs).inject({}) do |all, code|
         all[code] = if Locale.exists? code

data/lib/r18n-core/locale.rb

@@ -67,22 +67,21 @@ module R18n
       File.exists?(File.join(LOCALES_DIR, locale + '.yml'))
     end
 
-    # Default pluralization rule to translation without locale file
-    def self.default_pluralize(n)
-      n == 0 ? 0 : n == 1 ? 1 : 'n'
-    end
-
     # Load locale by RFC 3066 +code+
     def self.load(code)
       code.delete! '/'
       code.delete! '\\'
       code.delete! ';'
       
+      return UnsupportedLocale.new(code) unless exists? code
+      
       data = {}
       klass = R18n::Locale
-      while code
+      default_loaded = false
+      
+      while code and exists? code
         file = LOCALES_DIR + "#{code}.yml"
-        raise "Locale #{code} isn't exists" if not File.exists? file
+        default_loaded = true if I18n.default == code
         
         if R18n::Locale == klass and File.exists? LOCALES_DIR + "#{code}.rb"
           require LOCALES_DIR + "#{code}.rb"
@@ -94,31 +93,41 @@ module R18n
         data = Utils.deep_merge! loaded, data
       end
       
+      unless default_loaded
+        code = I18n.default
+        while code and exists? code
+          loaded = YAML.load_file(LOCALES_DIR + "#{code}.yml")
+          code = loaded['include']
+          data = Utils.deep_merge! loaded, data
+        end
+      end
+      
       klass.new(data)
     end
+    
+    attr_reader :data
 
-    # Create locale object hash with +locale+ data.
+    # Create locale object with locale +data+.
     #
     # This is internal a constructor. To load translation use
     # <tt>R18n::Translation.load(locales, translations_dir)</tt>.
-    def initialize(locale)
-      p 1 if locale.is_a? String
-      @locale = locale
+    def initialize(data)
+      @data = data
     end
 
     # Get information about locale
     def [](name)
-      @locale[name]
+      @data[name]
     end
 
     # Is another locale has same code
     def ==(locale)
-      @locale['code'] == locale['code']
+      @data['code'] == locale['code']
     end
 
     # Human readable locale code and title
     def inspect
-      "Locale #{@locale['code']} (#{@locale['title']})"
+      "Locale #{@data['code']} (#{@data['title']})"
     end
     
     # Returns the integer in String form, according to the rules of the locale.
@@ -126,7 +135,7 @@ module R18n
     def format_integer(integer)
       str = integer.to_s
       str[0] = '−' if 0 > integer # Real typographic minus
-      group = @locale['numbers']['group_delimiter']
+      group = @data['numbers']['group_delimiter']
       
       str.gsub(/(\d)(?=(\d\d\d)+(?!\d))/) do |match|
         match + group
@@ -136,7 +145,7 @@ module R18n
     # Returns the float in String form, according to the rules of the locale.
     # It will also put real typographic minus.
     def format_float(float)
-      decimal = @locale['numbers']['decimal_separator']
+      decimal = @data['numbers']['decimal_separator']
       self.format_integer(float.to_i) + decimal + float.to_s.split('.').last
     end
     
@@ -150,27 +159,27 @@ module R18n
     def strftime(time, format)
       if format.is_a? Symbol
         if :month == format
-          return @locale['months']['standalone'][time.month - 1]
+          return @data['months']['standalone'][time.month - 1]
         end
-        format = @locale['formats'][format.to_s]
+        format = @data['formats'][format.to_s]
       end
       
       translated = ''
       format.scan(/%[EO]?.|./o) do |c|
         case c.sub(/^%[EO]?(.)$/o, '%\\1')
         when '%A'
-          translated << @locale['week']['days'][time.wday]
+          translated << @data['week']['days'][time.wday]
         when '%a'
-          translated << @locale['week']['abbrs'][time.wday]
+          translated << @data['week']['abbrs'][time.wday]
         when '%B'
-          translated << @locale['months']['names'][time.month - 1]
+          translated << @data['months']['names'][time.month - 1]
         when '%b'
-          translated << @locale['months']['abbrs'][time.month - 1]
+          translated << @data['months']['abbrs'][time.month - 1]
         when '%p'
           translated << if time.hour < 12
-            @locale['time']['am']
+            @data['time']['am']
           else
-            @locale['time']['pm']
+            @data['time']['pm']
           end
         else
           translated << c

data/lib/r18n-core/translated_string.rb

@@ -24,11 +24,15 @@ module R18n
     # String locale
     attr_reader :locale
     
+    # Path for this translation.
+    attr_reader :path
+    
     # Returns a new string object containing a copy of +str+, which translated
-    # to +locale+
-    def initialize(str, locale)
+    # for +path+ to +locale+
+    def initialize(str, locale, path)
       super(str)
       @locale = locale
+      @path = path
     end
   end
 end

data/lib/r18n-core/translation.rb

@@ -137,11 +137,7 @@ module R18n
         end
         translations << translation
         
-        if Locale.exists? locale
-          Locale.load(locale)
-        else
-          locale
-        end
+        Locale.load(locale)
       end
   
       self.new(locales, translations)
@@ -158,13 +154,15 @@ module R18n
       @@call_proc
     end
     
-    # Create translation hash with messages in +translations+ for +locales+.
+    # Create translation hash for +path+ with messages in +translations+ for
+    # +locales+.
     #
     # This is internal a constructor. To load translation use
     # <tt>R18n::Translation.load(locales, translations_dir)</tt>.
-    def initialize(locales, translations)
+    def initialize(locales, translations, path = '')
       @locales = locales
       @translations = translations
+      @path = path
     end
     
     # Short and pretty way to get translation by method name. If translation
@@ -182,6 +180,8 @@ module R18n
     # Translation can contain variable part. Just set is as <tt>%1</tt>,
     # <tt>%2</tt>, etc in translations file and set values in next +params+.
     def [](name, *params)
+      path = @path.empty? ? name : "#{@path}.#{name}"
+      
       @translations.each_with_index do |translation, i|
         result = translation[name]
         next if result.nil?
@@ -197,16 +197,11 @@ module R18n
           when 'pl'
             locale = @locales[i]
             
-            if locale.is_a? Locale
-              type = locale.pluralize(params.first)
-              
-              if params.first.is_a? Float
-                params[0] = locale.format_float(params.first)
-              elsif params.first.is_a? Integer
-                params[0] = locale.format_integer(params.first)
-              end
-            else
-              type = Locale.default_pluralize(params.first)
+            type = locale.pluralize(params.first)
+            if params.first.is_a? Float
+              params[0] = locale.format_float(params.first)
+            elsif params.first.is_a? Integer
+              params[0] = locale.format_integer(params.first)
             end
             
             type = 'n' if not result.value.include? type
@@ -221,17 +216,17 @@ module R18n
           params.each_with_index do |param, i|
             result.gsub! "%#{i+1}", param.to_s
           end
-          return TranslatedString.new(result, @locales[i])
+          return TranslatedString.new(result, @locales[i], path)
         elsif result.is_a? Hash
           return self.class.new(@locales, @translations.map { |i|
             i[name] or {}
-          })
+          }, path)
         else
           return result.clone
         end
       end
       
-      return Untranslated.instance
+      return Untranslated.new(path, name)
     end
   end
 end

data/lib/r18n-core/unsupported_locale.rb

@@ -0,0 +1,59 @@
+# encoding: utf-8
+=begin
+Locale withou information file to i18n support.
+
+Copyright (C) 2008 Andrey “A.I.” Sitnik <andrey@sitnik.ru>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
+module R18n
+  # Locale without information file. Contain only it code, empty title and data
+  # from default locale.
+  class UnsupportedLocale
+    # Create object for unsupported locale with +code+ and load other locale
+    # data from default locale.
+    def initialize(code)
+      @@default_locale ||= Locale.load(I18n.default)
+      @code = code
+    end
+    
+    # Human readable locale code and title
+    def inspect
+      "Unsupported locale #{@code}"
+    end
+
+    # Get information about locale
+    def [](name)
+      case name
+      when 'code'
+        @code
+      when 'title'
+        ''
+      else
+        @@default_locale[name]
+      end
+    end
+
+    # Is another locale has same code
+    def ==(locale)
+      @code == locale['code']
+    end
+    
+    #  Proxy to default locale object.
+    def method_missing(name, *params)
+      @@default_locale.send(name, *params)
+    end
+  end
+end

data/lib/r18n-core/untranslated.rb

@@ -24,18 +24,41 @@ module R18n
   # Return if translation isn’t exists. Unlike nil, it didn’t raise error when
   # you try to access for subtranslations.
   class Untranslated
-    include ::Singleton
+    # Path to translation.
+    attr_reader :path
+    
+    # Path, that isn’t in translation.
+    attr_reader :untranslated_path
+    
+    # Path, that exists in translation.
+    attr_reader :translated_path
+    
+    def initialize(path, untranslated_path)
+      @path = path
+      @untranslated_path = untranslated_path
+      @translated_path = path[0...(-untranslated_path.length)]
+    end
     
     def nil?
       true
     end
     
     def method_missing(*params)
-      self
+      self[params.first]
     end
     
     def [](*params)
-      self
+      Untranslated.new("#{@path}.#{params.first}",
+                       "#{@untranslated_path}.#{params.first}")
+    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
+      end
     end
   end
 end

data/lib/r18n-core/version.rb

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

data/locales/en.yml

@@ -2,8 +2,6 @@ title: English
 code: en
 sublocales: []
 direction: ltr
-
-pluralization: "n == 0 ? 0 : n == 1 ? 1 : 'n'"
 
 week:
   start: sunday

data/locales/pl.rb

@@ -0,0 +1,22 @@
+module R18n
+  module Locales
+    class Pl < R18n::Locale
+      def pluralize(n)
+        return 0 if n == 0
+        # 0 - 0
+        # 1 - 1
+        # 2..4 - 2
+        # n
+    
+        case n % 10
+        when 1
+          n > 10 ? 'n' : 1
+        when 2..4
+          n % 100 > 10 && n % 100 < 20 ? 'n' : 2
+        else
+          'n'
+        end
+      end
+    end
+  end
+end

data/locales/pl.yml

@@ -0,0 +1,33 @@
+title: Polski
+code: pl
+sublocales: []
+direction: ltr
+
+pluralization: "n == 0 ? 0 : n == 1 ? 1 : 'n'"
+
+week:
+  start: monday
+  days: [Niedziela, Poniedziałek, Wtorek, Sroda, Czwartek, Piątek, Sobota]
+  abbrs: [Niedz, Pon, Wt, Sr, 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ń]
+
+time:
+  am: AM
+  pm: PM
+
+formats:
+  time: "%H:%M"
+  date: "%d/%m/%Y"
+  short_date: "%d %b"
+  long_date: "%d %B, %Y"
+  datetime: "%a %d %b %H:%M:%S %Z %Y"
+  short_datetime: "%d %b %H:%M"
+  long_datetime: "%d %B, %Y %H:%M"
+
+numbers:
+  decimal_separator: "."
+  group_delimiter: ","

data/spec/i18n_spec.rb

@@ -20,7 +20,8 @@ describe R18n::I18n do
     i18n.locales.should == [R18n::Locale.load('en')]
   
     i18n = R18n::I18n.new(['ru', 'no_LC'], DIR)
-    i18n.locales.should == [R18n::Locale.load('ru'), 'no_LC']
+    i18n.locales.should == [R18n::Locale.load('ru'),
+                            R18n::UnsupportedLocale.new('no_LC')]
   end
 
   it "should return translations dir" do

data/spec/locale_spec.rb

@@ -30,12 +30,6 @@ describe R18n::Locale do
     en_US['week'].should == en['week']
   end
 
-  it "should raise error if locale isn't exists" do
-    lambda {
-      R18n::Locale.load('no_LC')
-    }.should raise_error
-  end
-
   it "should be equal to another locale with same code" do
     ru = R18n::Locale.load('ru')
     en = R18n::Locale.load('en')
@@ -60,10 +54,13 @@ describe R18n::Locale do
     locale.pluralize(5).should == 'n'
   end
 
-  it "should has default pluralization to translation without locale file" do
-    R18n::Locale.default_pluralize(0).should == 0
-    R18n::Locale.default_pluralize(1).should == 1
-    R18n::Locale.default_pluralize(5).should == 'n'
+  it "should use UnsupportedLocale if locale file isn't exists" do
+    locale = R18n::Locale.load('no_LC')
+    locale.should be_a(R18n::UnsupportedLocale)
+    locale['code'].should == 'no_LC'
+    locale['title'].should be_empty
+    locale['direction'].should == 'ltr'
+    locale.pluralize(5).should == 'n'
   end
 
   it "should format number in local traditions" do
@@ -89,9 +86,8 @@ describe R18n::Locale do
   end
 
   it "should delete slashed from locale for security reasons" do
-    lambda {
-      R18n::Locale.load('../spec/translations/general/en')
-    }.should raise_error
+    locale = R18n::Locale.load('../spec/translations/general/en')
+    locale.should be_a(R18n::UnsupportedLocale)
   end
 
 end

data/spec/locales/pl_spec.rb

@@ -0,0 +1,25 @@
+require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require File.join(File.dirname(__FILE__), "..", "..", "locales", "pl")
+
+describe R18n::Locales::Pl do
+  it "should use Polish pluralization" do
+    ru = R18n::Locale.load 'pl'
+    ru.pluralize(0).should == 0
+    
+    ru.pluralize(1).should == 1
+    ru.pluralize(21).should == 'n'
+    ru.pluralize(101).should == 'n'
+    
+    ru.pluralize(2).should == 2
+    ru.pluralize(4).should == 2
+    ru.pluralize(22).should == 2
+    ru.pluralize(102).should == 2
+    
+    ru.pluralize(5).should == 'n'
+    ru.pluralize(11).should == 'n'
+    ru.pluralize(12).should == 'n'
+    ru.pluralize(57).should == 'n'
+    ru.pluralize(111).should == 'n'
+    ru.pluralize(112).should == 'n'
+  end
+end

data/spec/r18n_spec.rb

@@ -21,5 +21,14 @@ describe R18n do
                   :b => { :ba => 1, :bb => 2, :bc => 2 },
                   :c => 2 }
   end
+  
+  it "should set untranslated format" do
+    translation = R18n::Translation.load('en', DIR)
+    R18n.untranslated = nil
+    translation.in.not.to_s.should be_nil
+    
+    R18n.untranslated = '%1 %2[%3]'
+    translation.in.not.to_s.should == 'in.not in.[not]'
+  end
 
 end

data/spec/translation_spec.rb

@@ -35,21 +35,34 @@ describe R18n::Translation do
 
   it "should load use hierarchical translations" do
     translation = R18n::Translation.load(['ru', 'en'], DIR)
-    translation.in.another.should == 'Иерархический'
-    translation['in']['another'].should == 'Иерархический'
+    translation.in.another.level.should == 'Иерархический'
+    translation['in']['another']['level'].should == 'Иерархический'
     translation.only.english.should == 'Only in English'
   end
+  
+  it "should save path for translation" do
+    translation = R18n::Translation.load('en', DIR)
+    
+    translation.in.another.level.path.should == 'in.another.level'
+    
+    translation.in.another.not.exists.path.should == 'in.another.not.exists'
+    translation.in.another.not.exists.untranslated_path.should == 'not.exists'
+    translation.in.another.not.exists.translated_path.should == 'in.another.'
+    
+    translation.not.untranslated_path.should == 'not'
+    translation.not.translated_path.should == ''
+  end
 
   it "should return string with locale info" do
     translation = R18n::Translation.load(['no_LC', 'en'], DIR)
-    translation.one.locale.should == 'no_LC'
+    translation.one.locale.should == R18n::UnsupportedLocale.new('no_LC')
     translation.two.locale.should == R18n::Locale.load('en')
   end
 
   it "should load translations from several dirs" do
     translation = R18n::Translation.load(['no_LC', 'en'], [TWO, DIR])
     translation.in.two.should == 'Two'
-    translation.in.another.should == 'Hierarchical'
+    translation.in.another.level.should == 'Hierarchical'
   end
 
   it "should use extension translations" do

data/spec/translations/general/en.yml

@@ -4,7 +4,8 @@ two: Two
 params: Is %1 between %1 and %2?
 
 in:
-  another: Hierarchical
+  another:
+    level: Hierarchical
 
 only:
   english: Only in English

data/spec/translations/general/ru.yml

@@ -1,4 +1,5 @@
 one: Один
 
 in:
-  another: Иерархический
+  another:
+    level: Иерархический

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: r18n-core
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Andrey "A.I." Sitnik
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-25 00:00:00 +04:00
+date: 2009-07-22 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -23,28 +23,32 @@ extra_rdoc_files:
 - README.rdoc
 - LICENSE
 files: 
-- base/ru.yml
-- base/kk.yml
-- base/fr.yml
-- base/en.yml
 - base/de.yml
+- base/en.yml
+- base/fr.yml
+- base/pl.yml
+- base/ru.yml
 - base/eo.yml
+- base/kk.yml
+- lib/r18n-core.rb
 - lib/r18n-core
+- lib/r18n-core/unsupported_locale.rb
+- lib/r18n-core/translation.rb
 - lib/r18n-core/untranslated.rb
 - lib/r18n-core/i18n.rb
+- lib/r18n-core/translated_string.rb
 - lib/r18n-core/locale.rb
 - lib/r18n-core/version.rb
-- lib/r18n-core/translation.rb
-- lib/r18n-core/translated_string.rb
-- lib/r18n-core.rb
+- locales/de.yml
+- locales/en.yml
 - locales/ru.rb
-- locales/ru.yml
-- locales/kk.yml
+- locales/pl.rb
 - locales/fr.yml
+- locales/pl.yml
+- locales/ru.yml
 - locales/en_US.yml
-- locales/en.yml
-- locales/de.yml
 - locales/eo.yml
+- locales/kk.yml
 - LICENSE
 - README.rdoc
 has_rdoc: true
@@ -74,21 +78,22 @@ signing_key:
 specification_version: 2
 summary: I18n tool to translate your Ruby application.
 test_files: 
-- spec/locales
-- spec/locales/ru_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/translations/general/ru.yml
-- spec/translations/general/no_LC.yml
-- spec/translations/general/en.yml
 - spec/translations/extension
 - spec/translations/extension/no_TR.yml
 - spec/translations/extension/en.yml
-- spec/translation_spec.rb
-- spec/r18n_spec.rb
+- spec/translations/general
+- spec/translations/general/en.yml
+- spec/translations/general/no_LC.yml
+- spec/translations/general/ru.yml
+- spec/translations/two
+- spec/translations/two/en.yml
+- spec/translations/two/fr.yml
+- spec/locales
+- spec/locales/pl_spec.rb
+- spec/locales/ru_spec.rb
 - spec/locale_spec.rb
 - spec/i18n_spec.rb
+- spec/r18n_spec.rb
+- spec/spec_helper.rb
+- spec/translation_spec.rb