russian 0.0.6 → 0.0.7

data/README.textile

@@ -16,7 +16,7 @@ Russian -- это библиотека для полноценной подде
 
 Цель проекта -- построить полноценную среду для русской локализации Ruby и Rails проектов, при этом используя минимально возможное количество хаков, сохраняя при этом поддержку локализации приложения на другие языки, а также форсировать включение в основную ветку I18n и Rails всех функций локализации, необходимых для работы с русским языком.
 
-Russian использует библиотеку I18n (включена в поставку), несколько хаков поверх нее (собственный бекэнд с поддержкой спецефичного для русского форматирования даты и времени, поддержкой плюрализации), несколько хаков поверх Rails (хаки хелперов даты-времени, хак для сообщений валидации) и файлы переводов, а также набор хелперов, упрощающий работу с русским языком (простая плюрализация, простой strftime и др.).
+Russian использует библиотеку I18n (включена в поставку), несколько хаков поверх нее (собственный бекэнд с поддержкой специфичного для русского форматирования даты и времени, поддержкой плюрализации), несколько хаков поверх Rails (хаки хелперов даты-времени, хак для сообщений валидации) и файлы переводов, а также набор хелперов, упрощающий работу с русским языком (простая плюрализация, простой strftime и др.).
 
 Russian стремится быть минимально деструктивной для окружения и быть полностью совместимой с другими языками (таким образом, когда приложение использует Russian и собственный бекэнд Russian, оно остается полностью совместимым с Rails i18n). 
 
@@ -92,7 +92,7 @@ h1. Использование
 * _NB:_ локаль русского языка (@ru-RU@) становится локалью по умолчанию
 * загружаются все файлы переводов, в том числе переводы для Rails.
 
-После этого можно использовать все стандартные функции библиотеки I18n, пользоваться измененным функицоналом для лучшей поддержки русского языка, или использовать хелперы модуля Russian для еще более простой работы с русским языком.
+После этого можно использовать все стандартные функции библиотеки I18n, пользоваться измененным функционалом для лучшей поддержки русского языка, или использовать хелперы модуля Russian для еще более простой работы с русским языком.
 
 h2. Отличия от стандартной библиотеки I18n
 
@@ -125,7 +125,7 @@ Russian.locale
 Russian::LOCALE
 </code></pre>
 
--- возвращает локаль русского языка (@ru-RU@).
+-- возвращает локаль русского языка (@:'ru-RU'@).
 
 <pre><code>
 Russian::i18n_backend_class

data/Rakefile

@@ -5,7 +5,7 @@ require 'rubygems/specification'
 require 'date'
 
 GEM = "russian"
-GEM_VERSION = "0.0.6"
+GEM_VERSION = "0.0.7"
 AUTHOR = "Yaroslav Markin"
 EMAIL = "yaroslav@markin.net"
 HOMEPAGE = "http://github.com/yaroslav/russian/"

data/TODO

@@ -4,6 +4,7 @@ TODO
 * check Unicode CLDR to ensure all datetime formats are correct
 * refactor Advanced backend localize method (looks ugly)
 * refactor DateTimeSelector#translated_month_names
+* stuff from english gem
 * Countries list (not in Rails I18n)
 
 Questionable

data/lib/russian.rb

@@ -22,7 +22,7 @@ module Russian
   module VERSION
     MAJOR = 0
     MINOR = 0
-    TINY  = 6
+    TINY  = 7
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/russian/locale/actionview.yml

@@ -33,7 +33,6 @@ ru-RU:
         # These three are to override number.format and are optional
         # separator: 
         delimiter: ""
-        precision: 2
         
     # Used in number_to_precision()
     precision:

data/lib/russian/locale/activerecord.yml

@@ -43,7 +43,7 @@ ru-RU:
         greater_than: "может иметь значение большее {{count}}"
         greater_than_or_equal_to: "может иметь значение большее или равное {{count}}"
         equal_to: "может иметь лишь значение, равное {{count}}"
-        less_than: "может иметь значение меньше чем {{count}}"
+        less_than: "может иметь значение меньшее чем {{count}}"
         less_than_or_equal_to: "может иметь значение меньшее или равное {{count}}"
         odd: "может иметь лишь четное значение"
         even: "может иметь лишь нечетное значение"

data/lib/russian/locale/activesupport.yml

@@ -6,3 +6,4 @@ ru-RU:
   support:
     array:
       sentence_connector: "и"
+      skip_last_comma: true

data/lib/vendor/i18n/README.textile

@@ -2,6 +2,8 @@ h1. Ruby I18n gem
 
 I18n and localization solution for Ruby.
 
+For information please refer to http://rails-i18n.org
+
 h2. Authors
 
 * "Matt Aimonetti":http://railsontherun.com

data/lib/vendor/i18n/i18n.gemspec

@@ -1,24 +1,27 @@
 Gem::Specification.new do |s|
   s.name = "i18n"
-  s.version = "0.0.1"
-  s.date = "2008-06-13"
-  s.summary = "Internationalization for Ruby"
-  s.email = "rails-patch-i18n@googlegroups.com"
-  s.homepage = "http://groups.google.com/group/rails-patch-i18n"
-  s.description = "Add Internationalization to your Ruby application."
+  s.version = "0.1.0"
+  s.date = "2008-10-26"
+  s.summary = "Internationalization support for Ruby"
+  s.email = "rails-i18n@googlegroups.com"
+  s.homepage = "http://rails-i18n.org"
+  s.description = "Add Internationalization support to your Ruby application."
   s.has_rdoc = false
-  s.authors = ['Sven Fuchs', 'Matt Aimonetti', 'Stephan Soller', 'Saimon Moore']
+  s.authors = ['Sven Fuchs', 'Joshua Harvey', 'Matt Aimonetti', 'Stephan Soller', 'Saimon Moore']
   s.files = [
-    "lib/i18n/backend/minimal.rb",
-    "lib/i18n/core_ext.rb",
-    "lib/i18n/localization.rb",
-    "lib/i18n/translation.rb",
-    "lib/i18n.rb",
-    "LICENSE",
-    "README",
-    "spec/core_ext_spec.rb",
-    "spec/i18n_spec.rb",
-    "spec/spec.opts",
-    "spec/spec/helper.rb"
+    'i18n.gemspec',
+    'lib/i18n/backend/simple.rb',
+    'lib/i18n/exceptions.rb',
+    'lib/i18n.rb',
+    'MIT-LICENSE',
+    'README.textile'
+  ]
+  s.test_files = [
+    'test/all.rb',
+    'test/i18n_exceptions_test.rb',
+    'test/i18n_test.rb',
+    'test/locale/en-US.rb',
+    'test/locale/en-US.yml',
+    'test/simple_backend_test.rb'
   ]
 end

data/lib/vendor/i18n/lib/i18n.rb

@@ -2,39 +2,39 @@
 #             Sven Fuchs (http://www.artweb-design.de),
 #             Joshua Harvey (http://www.workingwithrails.com/person/759-joshua-harvey),
 #             Saimon Moore (http://saimonmoore.net),
-#             Stephan Soller (http://www.arkanis-development.de/) 
+#             Stephan Soller (http://www.arkanis-development.de/)
 # Copyright:: Copyright (c) 2008 The Ruby i18n Team
 # License::   MIT
 require 'i18n/backend/simple'
 require 'i18n/exceptions'
 
-module I18n  
+module I18n
   @@backend = nil
-  @@load_path = []
+  @@load_path = nil
   @@default_locale = :'en-US'
   @@exception_handler = :default_exception_handler
-    
+
   class << self
     # Returns the current backend. Defaults to +Backend::Simple+.
     def backend
       @@backend ||= Backend::Simple.new
     end
-    
+
     # Sets the current backend. Used to set a custom backend.
-    def backend=(backend) 
+    def backend=(backend)
       @@backend = backend
     end
-  
+
     # Returns the current default locale. Defaults to 'en-US'
     def default_locale
-      @@default_locale 
+      @@default_locale
     end
-    
+
     # Sets the current default locale. Used to set a custom default locale.
-    def default_locale=(locale) 
-      @@default_locale = locale 
+    def default_locale=(locale)
+      @@default_locale = locale
     end
-    
+
     # Returns the current locale. Defaults to I18n.default_locale.
     def locale
       Thread.current[:locale] ||= default_locale
@@ -44,46 +44,55 @@ module I18n
     def locale=(locale)
       Thread.current[:locale] = locale
     end
-    
+
     # Sets the exception handler.
     def exception_handler=(exception_handler)
       @@exception_handler = exception_handler
     end
-    
-    # Allow clients to register paths providing translation data sources. The 
+
+    # Allow clients to register paths providing translation data sources. The
     # backend defines acceptable sources.
     #
     # E.g. the provided SimpleBackend accepts a list of paths to translation
     # files which are either named *.rb and contain plain Ruby Hashes or are
-    # named *.yml and contain YAML data. So for the SimpleBackend clients may 
+    # named *.yml and contain YAML data. So for the SimpleBackend clients may
     # register translation files like this:
     #   I18n.load_path << 'path/to/locale/en-US.yml'
     def load_path
-      @@load_path
+      @@load_path ||= []
     end
 
+    # Sets the load path instance. Custom implementations are expected to
+    # behave like a Ruby Array.
     def load_path=(load_path)
       @@load_path = load_path
     end
-    
-    # Translates, pluralizes and interpolates a given key using a given locale, 
+
+    # Tells the backend to reload translations. Used in situations like the
+    # Rails development environment. Backends can implement whatever strategy
+    # is useful.
+    def reload!
+      backend.reload!
+    end
+
+    # Translates, pluralizes and interpolates a given key using a given locale,
     # scope, and default, as well as interpolation values.
     #
     # *LOOKUP*
     #
-    # Translation data is organized as a nested hash using the upper-level keys 
-    # as namespaces. <em>E.g.</em>, ActionView ships with the translation: 
+    # Translation data is organized as a nested hash using the upper-level keys
+    # as namespaces. <em>E.g.</em>, ActionView ships with the translation:
     # <tt>:date => {:formats => {:short => "%b %d"}}</tt>.
-    # 
-    # Translations can be looked up at any level of this hash using the key argument 
-    # and the scope option. <em>E.g.</em>, in this example <tt>I18n.t :date</tt> 
+    #
+    # Translations can be looked up at any level of this hash using the key argument
+    # and the scope option. <em>E.g.</em>, in this example <tt>I18n.t :date</tt>
     # returns the whole translations hash <tt>{:formats => {:short => "%b %d"}}</tt>.
-    # 
-    # Key can be either a single key or a dot-separated key (both Strings and Symbols 
+    #
+    # Key can be either a single key or a dot-separated key (both Strings and Symbols
     # work). <em>E.g.</em>, the short format can be looked up using both:
     #   I18n.t 'date.formats.short'
     #   I18n.t :'date.formats.short'
-    # 
+    #
     # Scope can be either a single key, a dot-separated key or an array of keys
     # or dot-separated keys. Keys and scopes can be combined freely. So these
     # examples will all look up the same short date format:
@@ -96,9 +105,9 @@ module I18n
     #
     # Translations can contain interpolation variables which will be replaced by
     # values passed to #translate as part of the options hash, with the keys matching
-    # the interpolation variable names. 
+    # the interpolation variable names.
     #
-    # <em>E.g.</em>, with a translation <tt>:foo => "foo {{bar}}"</tt> the option 
+    # <em>E.g.</em>, with a translation <tt>:foo => "foo {{bar}}"</tt> the option
     # value for the key +bar+ will be interpolated into the translation:
     #   I18n.t :foo, :bar => 'baz' # => 'foo baz'
     #
@@ -107,7 +116,7 @@ module I18n
     # Translation data can contain pluralized translations. Pluralized translations
     # are arrays of singluar/plural versions of translations like <tt>['Foo', 'Foos']</tt>.
     #
-    # Note that <tt>I18n::Backend::Simple</tt> only supports an algorithm for English 
+    # Note that <tt>I18n::Backend::Simple</tt> only supports an algorithm for English
     # pluralization rules. Other algorithms can be supported by custom backends.
     #
     # This returns the singular version of a pluralized translation:
@@ -116,9 +125,9 @@ module I18n
     # These both return the plural version of a pluralized translation:
     #   I18n.t :foo, :count => 0 # => 'Foos'
     #   I18n.t :foo, :count => 2 # => 'Foos'
-    # 
-    # The <tt>:count</tt> option can be used both for pluralization and interpolation. 
-    # <em>E.g.</em>, with the translation 
+    #
+    # The <tt>:count</tt> option can be used both for pluralization and interpolation.
+    # <em>E.g.</em>, with the translation
     # <tt>:foo => ['{{count}} foo', '{{count}} foos']</tt>, count will
     # be interpolated to the pluralized translation:
     #   I18n.t :foo, :count => 1 # => '1 foo'
@@ -128,11 +137,11 @@ module I18n
     # This returns the translation for <tt>:foo</tt> or <tt>default</tt> if no translation was found:
     #   I18n.t :foo, :default => 'default'
     #
-    # This returns the translation for <tt>:foo</tt> or the translation for <tt>:bar</tt> if no 
+    # This returns the translation for <tt>:foo</tt> or the translation for <tt>:bar</tt> if no
     # translation for <tt>:foo</tt> was found:
     #   I18n.t :foo, :default => :bar
     #
-    # Returns the translation for <tt>:foo</tt> or the translation for <tt>:bar</tt> 
+    # Returns the translation for <tt>:foo</tt> or the translation for <tt>:bar</tt>
     # or <tt>default</tt> if no translations for <tt>:foo</tt> and <tt>:bar</tt> were found.
     #   I18n.t :foo, :default => [:bar, 'default']
     #
@@ -148,13 +157,13 @@ module I18n
     #   I18n.t [:foo, :bar], :scope => :baz
     def translate(key, options = {})
       locale = options.delete(:locale) || I18n.locale
-      backend.translate locale, key, options
+      backend.translate(locale, key, options)
     rescue I18n::ArgumentError => e
       raise e if options[:raise]
-      send @@exception_handler, e, locale, key, options
-    end        
+      send(@@exception_handler, e, locale, key, options)
+    end
     alias :t :translate
-    
+
     # Localizes certain objects, such as dates and numbers to local formatting.
     def localize(object, options = {})
       locale = options[:locale] || I18n.locale
@@ -162,7 +171,7 @@ module I18n
       backend.localize(locale, object, format)
     end
     alias :l :localize
-    
+
   protected
     # Handles exceptions raised in the backend. All exceptions except for
     # MissingTranslationData exceptions are re-raised. When a MissingTranslationData
@@ -172,14 +181,14 @@ module I18n
       return exception.message if MissingTranslationData === exception
       raise exception
     end
-          
+
     # Merges the given locale, key and scope into a single array of keys.
     # Splits keys that contain dots into multiple keys. Makes sure all
     # keys are Symbols.
     def normalize_translation_keys(locale, key, scope)
       keys = [locale] + Array(scope) + [key]
-      keys = keys.map{|k| k.to_s.split(/\./) }
-      keys.flatten.map{|k| k.to_sym}
+      keys = keys.map { |k| k.to_s.split(/\./) }
+      keys.flatten.map { |k| k.to_sym }
     end
   end
-end
+end

data/lib/vendor/i18n/lib/i18n/backend/simple.rb

@@ -6,42 +6,48 @@ module I18n
       INTERPOLATION_RESERVED_KEYS = %w(scope default)
       MATCH = /(\\\\)?\{\{([^\}]+)\}\}/
 
-      # Accepts a list of paths to translation files. Loads translations from 
+      # Accepts a list of paths to translation files. Loads translations from
       # plain Ruby (*.rb) or YAML files (*.yml). See #load_rb and #load_yml
       # for details.
       def load_translations(*filenames)
-        filenames.each {|filename| load_file filename }
+        filenames.each { |filename| load_file(filename) }
       end
-      
-      # Stores translations for the given locale in memory. 
+
+      # Stores translations for the given locale in memory.
       # This uses a deep merge for the translations hash, so existing
       # translations will be overwritten by new ones only at the deepest
       # level of the hash.
       def store_translations(locale, data)
         merge_translations(locale, data)
       end
-      
+
       def translate(locale, key, options = {})
         raise InvalidLocale.new(locale) if locale.nil?
-        return key.map{|k| translate locale, k, options } if key.is_a? Array
+        return key.map { |k| translate(locale, k, options) } if key.is_a? Array
 
         reserved = :scope, :default
         count, scope, default = options.values_at(:count, *reserved)
         options.delete(:default)
-        values = options.reject{|name, value| reserved.include? name }
+        values = options.reject { |name, value| reserved.include?(name) }
 
-        entry = lookup(locale, key, scope) || default(locale, default, options) || raise(I18n::MissingTranslationData.new(locale, key, options))
-        entry = pluralize locale, entry, count
-        entry = interpolate locale, entry, values
+        entry = lookup(locale, key, scope)
+        if entry.nil?
+          entry = default(locale, default, options)
+          if entry.nil?
+            raise(I18n::MissingTranslationData.new(locale, key, options))
+          end
+        end
+        entry = pluralize(locale, entry, count)
+        entry = interpolate(locale, entry, values)
         entry
       end
-      
-      # Acts the same as +strftime+, but returns a localized version of the 
-      # formatted date string. Takes a key from the date/time formats 
-      # translations as a format argument (<em>e.g.</em>, <tt>:short</tt> in <tt>:'date.formats'</tt>).        
+
+      # Acts the same as +strftime+, but returns a localized version of the
+      # formatted date string. Takes a key from the date/time formats
+      # translations as a format argument (<em>e.g.</em>, <tt>:short</tt> in <tt>:'date.formats'</tt>).
       def localize(locale, object, format = :default)
         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?
         formats = translate(locale, :"#{type}.formats")
@@ -51,56 +57,70 @@ module I18n
 
         # TODO only translate these if the format string is actually present
         # TODO check which format strings are present, then bulk translate then, then replace them
-        format.gsub!(/%a/, translate(locale, :"date.abbr_day_names")[object.wday]) 
+        format.gsub!(/%a/, translate(locale, :"date.abbr_day_names")[object.wday])
         format.gsub!(/%A/, translate(locale, :"date.day_names")[object.wday])
         format.gsub!(/%b/, translate(locale, :"date.abbr_month_names")[object.mon])
         format.gsub!(/%B/, translate(locale, :"date.month_names")[object.mon])
         format.gsub!(/%p/, translate(locale, :"time.#{object.hour < 12 ? :am : :pm}")) if object.respond_to? :hour
         object.strftime(format)
       end
-      
+
+      def initialized?
+        @initialized ||= false
+      end
+
+      def reload!
+        @initialized = false
+        @translations = nil
+      end
+
       protected
-      
         def init_translations
           load_translations(*I18n.load_path)
           @initialized = true
         end
-        
+
         def translations
           @translations ||= {}
         end
-        
-        # Looks up a translation from the translations hash. Returns nil if 
+
+        # Looks up a translation from the translations hash. Returns nil if
         # eiher key is nil, or locale, scope or key do not exist as a key in the
         # nested translations hash. Splits keys or scopes containing dots
         # into multiple keys, i.e. <tt>currency.format</tt> is regarded the same as
         # <tt>%w(currency format)</tt>.
         def lookup(locale, key, scope = [])
           return unless key
-          init_translations unless @initialized 
-          keys = I18n.send :normalize_translation_keys, locale, key, scope
-          keys.inject(translations){|result, k| result[k.to_sym] or return nil }
+          init_translations unless initialized?
+          keys = I18n.send(:normalize_translation_keys, locale, key, scope)
+          keys.inject(translations) do |result, k|
+            if (x = result[k.to_sym]).nil?
+              return nil
+            else
+              x
+            end
+          end
         end
-      
-        # Evaluates a default translation. 
+
+        # Evaluates a default translation.
         # If the given default is a String it is used literally. If it is a Symbol
         # it will be translated with the given options. If it is an Array the first
         # translation yielded will be returned.
-        # 
-        # <em>I.e.</em>, <tt>default(locale, [:foo, 'default'])</tt> will return +default+ if 
+        #
+        # <em>I.e.</em>, <tt>default(locale, [:foo, 'default'])</tt> will return +default+ if
         # <tt>translate(locale, :foo)</tt> does not yield a result.
         def default(locale, default, options = {})
           case default
             when String then default
             when Symbol then translate locale, default, options
-            when Array  then default.each do |obj| 
+            when Array  then default.each do |obj|
               result = default(locale, obj, options.dup) and return result
             end and nil
           end
         rescue MissingTranslationData
           nil
         end
-      
+
         # Picks a translation from an array according to English pluralization
         # rules. It will pick the first translation if count is not equal to 1
         # and the second translation if it is equal to 1. Other backends can
@@ -113,20 +133,18 @@ module I18n
           raise InvalidPluralizationData.new(entry, count) unless entry.has_key?(key)
           entry[key]
         end
-  
+
         # Interpolates values into a given string.
-        # 
-        #   interpolate "file {{file}} opened by \\{{user}}", :file => 'test.txt', :user => 'Mr. X'  
+        #
+        #   interpolate "file {{file}} opened by \\{{user}}", :file => 'test.txt', :user => 'Mr. X'
         #   # => "file test.txt opened by {{user}}"
-        # 
+        #
         # Note that you have to double escape the <tt>\\</tt> when you want to escape
         # the <tt>{{...}}</tt> key in a string (once for the string and once for the
         # interpolation).
         def interpolate(locale, string, values = {})
           return string unless string.is_a?(String)
 
-          string = string.gsub(/%d/, '{{count}}').gsub(/%s/, '{{value}}')
-
           if string.respond_to?(:force_encoding)
             original_encoding = string.encoding
             string.force_encoding(Encoding::BINARY)
@@ -149,45 +167,45 @@ module I18n
           result.force_encoding(original_encoding) if original_encoding
           result
         end
-        
-        # Loads a single translations file by delegating to #load_rb or 
+
+        # Loads a single translations file by delegating to #load_rb or
         # #load_yml depending on the file extension and directly merges the
         # data to the existing translations. Raises I18n::UnknownFileType
         # for all other file extensions.
         def load_file(filename)
           type = File.extname(filename).tr('.', '').downcase
-          raise UnknownFileType.new(type, filename) unless respond_to? :"load_#{type}"
+          raise UnknownFileType.new(type, filename) unless respond_to?(:"load_#{type}")
           data = send :"load_#{type}", filename # TODO raise a meaningful exception if this does not yield a Hash
-          data.each{|locale, d| merge_translations locale, d }
+          data.each { |locale, d| merge_translations(locale, d) }
         end
-        
+
         # Loads a plain Ruby translations file. eval'ing the file must yield
         # a Hash containing translation data with locales as toplevel keys.
         def load_rb(filename)
-          eval IO.read(filename), binding, filename
+          eval(IO.read(filename), binding, filename)
         end
-        
-        # Loads a YAML translations file. The data must have locales as 
+
+        # Loads a YAML translations file. The data must have locales as
         # toplevel keys.
         def load_yml(filename)
-          YAML::load IO.read(filename)
+          YAML::load(IO.read(filename))
         end
-        
+
         # Deep merges the given translations hash with the existing translations
         # for the given locale
         def merge_translations(locale, data)
           locale = locale.to_sym
           translations[locale] ||= {}
-          data = deep_symbolize_keys data
+          data = deep_symbolize_keys(data)
 
           # deep_merge by Stefan Rusterholz, see http://www.ruby-forum.com/topic/142809
-          merger = proc{|key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
-          translations[locale].merge! data, &merger
+          merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
+          translations[locale].merge!(data, &merger)
         end
-        
+
         # Return a new hash with all keys and nested keys converted to symbols.
         def deep_symbolize_keys(hash)
-          hash.inject({}){|result, (key, value)|
+          hash.inject({}) { |result, (key, value)|
             value = deep_symbolize_keys(value) if value.is_a? Hash
             result[(key.to_sym rescue key) || key] = value
             result
@@ -195,4 +213,4 @@ module I18n
         end
     end
   end
-end
+end