r18n-core 0.4.10 → 0.4.11

data/ChangeLog

@@ -1,3 +1,8 @@
+== 0.4.11 (Nancy)
+* Support for Sinatra 1.3.
+* Fix JRuby support by Paul Walker.
+* Add R18n helpers to Rails mailer by Alexey Medvedev.
+
 == 0.4.10 (Kvantum)
 * Add R18n.set(locales, places), R18n.t and R18n.l shortcuts.
 * Convert float to number on pluralization.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    r18n-core (0.4.10)
+    r18n-core (0.4.11)
 
 GEM
   remote: http://rubygems.org/

data/README.rdoc

@@ -24,7 +24,7 @@ To access translation you can call methods with the same names:
   t.user.edit         #=> "Edit user"
   t.user.name('John') #=> "User name is John"
   t.user.count(5)     #=> "There are 5 users"
-  
+
   t.not.exists | 'default' #=> "default"
   t.not.exists.translated? #=> false
 
@@ -85,7 +85,7 @@ need to create loader object with 2 methods: +available+ and +load+:
       Translation.find(locale).to_hash
     end
   end
-  
+
   R18n.set(user_locales, DBLoader.new)
 
 You can also set a list of different translation locations or set extension
@@ -98,16 +98,16 @@ You can translate any class, including ORM models (ActiveRecord, DataMapper,
 MongoMapper, Mongoid or others):
 
   require 'r18n-core/translated'
-  
+
   class Product < ActiveRecord::Base
     include R18n::Translated
     # Model has two normal properties: title_en and title_ru
     translations :title
   end
-  
+
   # For English users
   product.title #=> "Anthrax"
-  
+
   # For Russian users
   product.title #=> "Сибирская язва"
 
@@ -128,10 +128,10 @@ cultures with two official languages (e.g., exUSSR) it takes the second language
 (e.g., if a translation isn’t available in Kazakh R18n will look for Russian):
 
   i18n = R18n::I18n.new(['kk', 'de'], 'dir/with/translations')
-  
+
   i18n.locales    #=> [Locale kk (Қазақша), Locale de (Deutsch),
                   #    Locale ru (Русский), Locale en (English)]
-  
+
   i18n.kazakh  #=> "Қазақша", main user language
   i18n.deutsch #=> "Deutsch", not in Kazakh, use next user locale
   i18n.russian #=> "Русский", not in kk and de, use Kazakh sublocale
@@ -153,11 +153,11 @@ create an I18n object and by using <tt>R18n.set</tt> or, for the current thread,
 by using <tt>R18n.thread_set</tt>:
 
   R18n.set('en', 'path/to/translations')
-  
+
 You can add helpers to access the current R18n object:
 
   include R18n::Helpers
-  
+
   t.yes              #=> "Yes"
   l Time.now, :human #=> "now"
   r18n.locale.code   #=> "en"
@@ -206,7 +206,7 @@ instance or code string if locale is’t supported in R18n):
   i18n.not.in.english.locale #=> Locale ru (Русский)
 
 You can include parameters in the translated string by specifying arguments:
-  
+
   name: "My name is %1"
 
   t.name('John') #=> "My name is John"
@@ -252,7 +252,7 @@ loaded.
   friendship: !!gender
     f: She adds a friend
     m: He adds a friend
-  
+
   R18n::Filters.add('gender', :user_gender) do |content, config, user|
     if user.female?
       content['f']
@@ -260,9 +260,9 @@ loaded.
       content['m']
     end
   end
-  
+
   t.friendship(anne) #=> "She adds a friend"
-  
+
 To create a filter you pass the following to <tt>R18n::Filters.add</tt>:
 
 * Filter target. YAML type (<tt>!!type</tt>), <tt>String</tt> for all
@@ -365,26 +365,26 @@ You can add i18n support to any classes, including ORM models (ActiveRecord,
 DataMapper, MongoMapper, Mongoid or others):
 
   require 'r18n-core/translated'
-  
+
   class Product
     include DataMapper::Resource
     property :title_ru, String
     property :title_en, String
-    
+
     include R18n::Translated
     translations :title
   end
-  
+
   # For example, user only knows Russian
-  
+
   # Set English (default) title
   product.title_en = "Anthrax"
   product.title #=> "Anthrax"
-  
+
   # Set value for user locale (Russian)
   product.title = "Сибирская язва"
   product.title #=> "Сибирская язва"
-  
+
   product.title_en #=> "Anthrax"
   product.title_ru #=> "Сибирская язва"
 
@@ -403,16 +403,16 @@ To get information about a locale create an R18n::Locale instance:
 You can then get the following from the locale:
 
 * Locale title and RFC 3066 code:
-  
+
     locale.title #=> "English"
     locale.code  #=> "en"
-  
+
 * Language direction (left to right, or right to left for Arabic and Hebrew):
-  
+
     locale.ltr? #=> true
-  
+
 * Week start day (+:monday+ or +:sunday+):
-  
+
     locale.week_start #=> :sunday
 
 === Loaders
@@ -438,7 +438,7 @@ If you want to load a translation with some type for filter, use
 
   # Loader will return something like:
   { 'users' => R18n::Typed.new('pl', { 1 => '1 user', 'n' => '%1 users' }) }
-  
+
   # To use pluralization filter (+pl+ type):
   t.users(5) #=> "5 users"
 

data/Rakefile

@@ -3,7 +3,6 @@
 require 'rubygems'
 
 begin
-  require 'bundler'
   require 'bundler/setup'
   Bundler::GemHelper.install_tasks
 rescue LoadError

data/lib/r18n-core.rb

@@ -37,7 +37,7 @@ require dir + 'helpers'
 
 module R18n
   class << self
-    
+
     # Set I18n object globally.
     def set(i18n = nil, dir = nil, &block)
       if block_given?
@@ -76,12 +76,12 @@ module R18n
     def thread
       Thread.current
     end
-    
+
     # Translate message. Alias for <tt>R18n.get.t</tt>.
     def t(*params)
       get.t(*params)
     end
-    
+
     # Localize object. Alias for <tt>R18n.get.l</tt>.
     def l(*params)
       get.l(*params)
@@ -94,11 +94,11 @@ module R18n
     # Loaders with extension translations. If application translations with
     # same locale isn’t exists, extension file willn’t be used.
     attr_accessor :extension_places
-    
+
     # Hash of hash-like (see Moneta) object to store loaded translations.
     attr_accessor :cache
   end
-  
+
   self.default_loader = R18n::Loader::YAML
   self.extension_places = [
       Loader::YAML.new(Pathname(__FILE__).dirname.expand_path + '../base')]

data/lib/r18n-core/filters.rb

@@ -19,55 +19,55 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 =end
 
 require 'ostruct'
-    
+
 module R18n
   # Filter is a way, to process translations: escape HTML entries, convert from
   # Markdown syntax, etc.
-  # 
+  #
   # In translation file filtered content must be marked by YAML type:
-  # 
+  #
   #   filtered: !!custom_type
   #     This content will be processed by filter
-  # 
+  #
   # Filter function will be receive filtered content as first argument, struct
   # with filter config as second and filter parameters as next arguments. You
   # can set passive filter, which will process translation only on loading.
-  # 
+  #
   #   R18n::Filters.add('custom_type', :no_space) do |content, config, replace|
   #     content.gsub(' ', replace)
   #   end
   #   R18n::Filters.add('custom_type', :passive => true) do |content, config|
   #     content + '!'
   #   end
-  #   
+  #
   #   i18n.filtered('_') #=> "This_content_will_be_processed_by_filter!"
   # 
   # Use String class as type to add global filter for all translated strings:
-  # 
+  #
   #   R18n::Filters.add(String, :escape_html) do |content, config, params|
   #     escape_html(content)
   #   end
   #
   # Filter config contain two parameters: translation locale and path. But it is
   # Hash and you can add you own parameter to cross-filter communications:
-  # 
+  #
   #   R18n::Filters.add(String, :hide_truth) do |content, config|
   #     return content if config[:censorship_check]
-  #     
+  #
   #     if content.scan(CENSORSHIP_WORDS[config[:locale]]).empty?
   #       content
   #     else
   #       "Error in #{config[:path]}"
   #     end
   #   end
-  #   
+  #
   #   R18n::Filters.add('passed', :show_lie) do |content, config|
   #     config[:censorship_check] = true
   #     content
   #   end
-  # 
+  #
   # You can disable, enabled and delete filters:
-  # 
+  #
   #   R18n::Filters.off(:no_space))
   #   i18n.filtered('_') #=> "This content will be processed by filter!"
   #   R18n::Filters.on(:no_space)
@@ -77,27 +77,27 @@ module R18n
     class << self
       # Hash of filter names to Filters.
       attr_accessor :defined
-      
+
       # Hash of types to all Filters.
       attr_accessor :by_type
-      
+
       # Hash of types to enabled active filters.
       attr_accessor :active_enabled
-      
+
       # Hash of types to enabled passive filters.
       attr_accessor :passive_enabled
-      
+
       # Hash of types to enabled passive and active filters.
       attr_accessor :enabled
-      
+
       # Process +value+ by filters in +enabled+.
       def process(enabled, type, value, locale, path, params)
         config = { :locale => locale, :path => path }
-        
+
         enabled[type].each do |filter|
           value = filter.call(value, config, *params)
         end
-        
+
         if value.is_a? String
           value = TranslatedString.new(value, locale, path)
           process_string(enabled, value, config, params)
@@ -105,7 +105,7 @@ module R18n
           value
         end
       end
-      
+
       # Process +value+ by global filters in +enabled+.
       def process_string(enabled, value, config, params)
         if config.is_a? String
@@ -116,13 +116,13 @@ module R18n
         end
         value
       end
-      
+
       # Rebuild +active_enabled+ and +passive_enabled+ for +type+.
       def rebuild_enabled!(type)
         @passive_enabled[type] = []
         @active_enabled[type] = []
         @enabled[type] = []
-        
+
         @by_type[type].each do |filter|
           if filter.enabled?
             @enabled[type] << filter
@@ -134,7 +134,7 @@ module R18n
           end
         end
       end
-      
+
       # Add new filter for +type+ with +name+ and return filter object. You
       # can use String class as +type+ to add global filter for all translated
       # string.
@@ -150,7 +150,7 @@ module R18n
       def add(types, name = nil, options = {}, &block)
         options, name = name, nil if name.is_a? Hash
         types = Array(types)
-        
+
         unless name
           @last_auto_name ||= 0
           begin
@@ -160,10 +160,10 @@ module R18n
         else
           delete(name)
         end
-        
+
         filter = Filter.new(name, types, block, true, options[:passive])
         @defined[name] = filter
-        
+
         types.each do |type|
           @by_type[type] = [] unless @by_type.has_key? type
           if options.has_key? :position
@@ -173,58 +173,58 @@ module R18n
           end
           rebuild_enabled! type
         end
-        
+
         filter
       end
-      
+
       # Delete +filter+ by name or Filter object.
       def delete(filter)
         filter = @defined[filter] unless filter.is_a? Filter
         return unless filter
-        
+
         @defined.delete(filter.name)
         filter.types.each do |type|
           @by_type[type].delete(filter)
           rebuild_enabled! type
         end
       end
-      
+
       # Disable +filter+ by name or Filter object.
       def off(filter)
         filter = @defined[filter] unless filter.is_a? Filter
         return unless filter
-        
+
         filter.enabled = false
         filter.types.each { |type| rebuild_enabled! type }
       end
-      
+
       # Turn on disabled +filter+ by name or Filter object.
       def on(filter)
         filter = @defined[filter] unless filter.is_a? Filter
         return unless filter
-        
+
         filter.enabled = true
         filter.types.each { |type| rebuild_enabled! type }
       end
     end
-    
+
     Filters.defined         = {}
     Filters.by_type         = Hash.new([])
     Filters.active_enabled  = Hash.new([])
     Filters.passive_enabled = Hash.new([])
     Filters.enabled         = Hash.new([])
-  
+
     Filter = Struct.new(:name, :types, :block, :enabled, :passive) do
       def call(*params); block.call(*params); end
       def enabled?; enabled; end
       def passive?; passive; end
     end
   end
-  
+
   Filters.add('proc', :procedure) do |content, config, *params|
     eval("proc { #{content} }").call(*params)
   end
-  
+
   Filters.add('pl', :pluralization) do |content, config, param|
     param = param.to_i if param.is_a? Float
     if param.is_a? Numeric
@@ -235,7 +235,7 @@ module R18n
       content
     end
   end
-  
+
   Filters.add(String, :variables) do |content, config, *params|
     content = content.clone
     params.each_with_index do |param, i|
@@ -243,27 +243,27 @@ module R18n
     end
     content
   end
-  
+
   Filters.add(Untranslated, :untranslated) do |v, c, translated, untranslated|
     "#{translated}[#{untranslated}]"
   end
-  
+
   Filters.add(Untranslated, :untranslated_html) do |v, c, transl, untransl|
     Utils.escape_html(transl) <<
       '<span style="color: red">' << Utils.escape_html(untransl) << '</span>'
   end
   Filters.off(:untranslated_html)
-  
+
   Filters.add('escape', :escape_html, :passive => true) do |content, config|
     config[:dont_escape_html] = true
     Utils.escape_html(content)
   end
-  
+
   Filters.add('html', :dont_escape_html, :passive => true) do |content, config|
     config[:dont_escape_html] = true
     content
   end
-  
+
   Filters.add([String, 'markdown', 'textile'],
               :global_escape_html, :passive => true) do |html, config|
     if config[:dont_escape_html]
@@ -274,12 +274,12 @@ module R18n
     end
   end
   Filters.off(:global_escape_html)
-  
+
   Filters.add('markdown', :maruku, :passive => true) do |content, config|
     require 'maruku'
     ::Maruku.new(content).to_html
   end
-  
+
   Filters.add('textile', :redcloth, :passive => true) do |content, config|
     R18n::Utils.use_syck { require 'redcloth' }
     ::RedCloth.new(content).to_html