r18n-rails 0.4.10 → 0.4.11

data/Gemfile.lock

@@ -1,20 +1,20 @@
 PATH
   remote: .
   specs:
-    r18n-rails (0.4.10)
-      r18n-rails-api (= 0.4.10)
+    r18n-rails (0.4.11)
+      r18n-rails-api (= 0.4.11)
 
 PATH
   remote: ../r18n-core/
   specs:
-    r18n-core (0.4.10)
+    r18n-core (0.4.11)
 
 PATH
   remote: ../r18n-rails-api/
   specs:
-    r18n-rails-api (0.4.10)
+    r18n-rails-api (0.4.11)
       i18n
-      r18n-core (= 0.4.10)
+      r18n-core (= 0.4.11)
 
 GEM
   remote: http://rubygems.org/

data/README.rdoc

@@ -57,28 +57,28 @@ R18n can add i18n support for your ActiveRecord model and any other class
 (include DataMapper, MongoMapper, Mongoid):
 
 1. Add separate columns for all supported translations:
-   
+
      def self.up
        create_table :posts do |t|
          t.string :title_en
          t.string :title_ru
        end
      end
-   
+
 2. Add virtual method +title+, which will use <tt>title_<i>locale</i></tt>
    methods to find actual translation:
-   
+
      class Post < ActiveRecord::Base
        include R18n::Translated
        translations :title
      end
-     
+
      # For Russian user
      post = Post.new
      post.title_en = 'Post'
      post.title_ru = 'Запись'
      post.title = 'Запись'
-     
+
      post.title = 'Другая' # will use title_ru, by first user's locale
 
 === Time Fomatters
@@ -87,7 +87,7 @@ R18n add +full+ time formatter based on locale info:
 
   # English
   l Time.now, :full #=> "1st of December, 2009 12:00"
-  
+
   # French
   l Time.now, :full #=> "1er décembre 2009 12:00"
 
@@ -103,7 +103,7 @@ rules for non-English locales out-of-box:
       1: %1 пользователь
       2: %1 пользователя
       n: %1 пользователей
-  
+
   t.user.count(2)  #=> "2 пользователя"
   t.user.count(21) #=> "21 пользователь"
 
@@ -123,24 +123,24 @@ You can create another R18n I18n instance with another languages. For example,
 to send e-mail for English admin on error with French user:
 
   puts I18n.t :error # Show error in French
-  
+
   admin_i18n = R18n::I18n.new(@admin_locales, Rails.root + 'app/i18n')
   send_email(admin_i18n.error_messages)
 
 == How To
 
 1. Add <tt>r18n-rails</tt> gem to your <tt>config/environment.rb</tt>:
-   
+
      config.gem 'r18n-rails'
-   
+
    Now R18n will autodetect user locales.
 2. Define your way to set locale manually. R18n will find it in
    <tt>params[:locale]</tt> or <tt>session[:locale]</tt>. Best way is a put
    optional locale prefix to URLs:
-   
+
        map.connect ':controller/:action'
        map.connect ':locale/:controller/:action'
-   
+
 3. Print available translations, to choose from them manually (and to helpsearch
    engines):
 
@@ -151,10 +151,10 @@ to send e-mail for English admin on error with French user:
          </li>
      <% end %>
      </ul>
-   
+
 4. Translations in I18n format are stored in
    <tt>config/locales/_locale_.yml</tt>:
-   
+
      en:
        user:
          name: "User name is %{name}"
@@ -162,57 +162,57 @@ to send e-mail for English admin on error with French user:
            zero: "No users"
            one:  "One user"
            many: "%{count} users"
-   
+
    Translations in R18n format go to <tt>app/i18n/_locale_.yml</tt>:
-   
+
      user:
        name: User name is %1
        count: !!pl
          0: No users
          1: 1 user
          n: %1 users
-   
+
 5. Use translated messages in views. You can use Rails I18n syntax:
-   
+
      t 'user.name', :name => 'John'
      t 'user.count', :count => 5
-   
+
    or R18n syntax:
-   
+
      t.user.name(:name => 'John') # for Rails I18n named variables
      t.user.name('John')          # for R18n variables
      t.user.count(5)
-   
+
 6. Print dates and numbers in user’s tradition:
-   
+
      l Date.today, :standard #=> "20/12/2009"
      l Time.now,   :full     #=> "20th of December, 2009 12:00"
      l 1234.5                #=> "1,234.5"
 
 7. Translate models:
-   
+
    1. Add to migration columns for each of the supported locales, named as
       <tt><i>name</i>_<i>locale</i></tt>:
-      
+
          t.string :title_en
          t.string :title_ru
-         
+
          t.string :text_en
          t.string :text_ru
-      
+
    2. Add <tt>R18n::Translated</tt> mixin to model:
-      
+
         class Post < ActiveRecord::Base
           include R18n::Translated
-      
+
    3. Call +translations+ method in model with all columns to be translated:
-      
+
           translations :title, :text
-   
+
       Now model will have virtual methods +title+, +text+, <tt>title=</tt>
       and <tt>text=</tt>, which will call +title_ru+ or +title_en+ and etc based
       on current user locales.
-   
+
    You can use <tt>R18n::Translated</tt> mixin for any Ruby class, not only for
    ActiveRecord models.
 

data/Rakefile

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

data/lib/r18n-rails.rb

@@ -33,3 +33,5 @@ R18n::Filters.on(:untranslated_html)
 ActionController::Base.helper(R18n::Rails::Helpers)
 ActionController::Base.send(:include, R18n::Rails::Controller)
 ActionController::Base.send(:before_filter, :set_r18n)
+
+ActionMailer::Base.helper(R18n::Rails::Helpers)

data/lib/r18n-rails/controller.rb

@@ -23,26 +23,26 @@ module R18n
   module Rails
     module Controller
       include Helpers
-      
+
       private
-      
+
       # Auto detect user locales and change backend.
       def set_r18n
         R18n.set do
           R18n::I18n.default = ::I18n.default_locale.to_s
           locales = R18n::I18n.parse_http(request.env['HTTP_ACCEPT_LANGUAGE'])
-          
+
           if params[:locale]
             locales.insert(0, params[:locale])
           elsif session[:locale]
             locales.insert(0, session[:locale])
           end
-          
+
           places = [::Rails.root.join('app/i18n'), R18n::Loader::Rails.new]
-          
+
           R18n::I18n.new(locales, places)
         end
-      
+
         ::I18n.backend = R18n::Backend.new
       end
     end

data/lib/r18n-rails/helpers.rb

@@ -30,7 +30,7 @@ module R18n
       def r18n
         R18n.get
       end
-      
+
       # Extend +t+ helper to use also R18n syntax.
       # 
       #   t 'user.name' # Rails I18n style
@@ -43,7 +43,7 @@ module R18n
         end
       end
       alias :translate :t
-      
+
       # Extend +l+ helper to use also R18n syntax.
       # 
       #   l Time.now                    # Rails I18n default format

data/r18n-rails.gemspec

@@ -14,20 +14,19 @@ Gem::Specification.new do |s|
     user language support, agnostic core package with out-of-box support for
     Rails, Sinatra, Merb and desktop applications.
   EOF
-  
+
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.extra_rdoc_files = ['README.rdoc', 'LICENSE']
   s.require_path = 'lib'
-  s.has_rdoc = true
-  
+
   s.author = 'Andrey "A.I." Sitnik'
   s.email = 'andrey@sitnik.ru'
   s.homepage = 'http://r18n.rubyforge.org/'
   s.rubyforge_project = 'r18n-rails'
-  
+
   s.add_dependency 'r18n-rails-api', ["= #{R18n::VERSION}"]
-  
+
   s.add_development_dependency "bundler", [">= 1.0.10"]
   s.add_development_dependency "hanna", [">= 0"]
   s.add_development_dependency "rake", [">= 0", "!= 0.9.0"]

data/spec/app/app/controllers/test_controller.rb

@@ -1,38 +1,38 @@
 class TestController < ApplicationController
   layout false
-  
+
   def locales
     render :text => R18n.get.locales.map { |i| i.code }.join(', ')
   end
-  
+
   def translations
     render :text => "R18n: #{R18n.get.r18n.translations}. " +
                     "Rails I18n: #{R18n.get.i18n.translations}"
   end
-  
+
   def available
     render :text => R18n.get.available_locales.map { |i| i.code }.sort.join(' ')
   end
-  
+
   def helpers
     @from_controller = r18n.user.name
     render
   end
-  
+
   def untranslated
     render :text => "#{R18n.get.user.not.exists}"
   end
-  
+
   def controller
     render :text => "#{t('user.name')}" + "#{t.user.name}" +
                     "#{r18n.t.user.name}"
   end
-  
+
   def time
     render :text => l(Time.at(0).utc) + "\n" +
                     l(Time.at(0).utc, :format => :short)
   end
-  
+
   def human_time
     render :text => l(Time.now, :human)
   end

data/spec/rails_spec.rb

@@ -3,74 +3,74 @@ require File.expand_path('../spec_helper', __FILE__)
 
 describe TestController, :type => :controller do
   render_views
-  
+
   it 'should use default locale' do
     get :locales
     response.should be_success
     response.body.should == 'ru'
-  end 
-  
+  end
+
   it 'should get locale from param' do
     get :locales, :locale => 'ru'
     response.should be_success
     response.body.should == 'ru, en'
   end
-  
+
   it 'should get locale from session' do
     get :locales, {}, { :locale => 'ru' }
     response.should be_success
     response.body.should == 'ru, en'
   end
-  
+
   it 'should get locales from http' do
     request.env['HTTP_ACCEPT_LANGUAGE'] = 'ru,fr;q=0.9'
     get :locales
     response.should be_success
     response.body.should == 'ru, fr, en'
   end
-  
+
   it 'should load translations' do
     get :translations, :locale => 'en'
     response.should be_success
     response.body.should == 'R18n: supported. Rails I18n: supported'
   end
-  
+
   it 'should return available translations' do
     get :available
     response.should be_success
     response.body.should == 'en ru'
   end
-  
+
   it 'should add helpers' do
     get :helpers, :locale => 'en'
     response.should be_success
     response.body.should == "Name\nName\nName\nName\n"
   end
-  
+
   it 'should format untranslated' do
     get :untranslated
     response.should be_success
     response.body.should == 'user.<span style="color: red">not.exists</span>'
   end
-  
+
   it "should add methods to controller" do
     get :controller, :locale => 'en'
     response.should be_success
     response.body.should == "NameNameName"
   end
-  
+
   it "should localize time by Rails I18n" do
     get :time, :locale => 'en'
     response.should be_success
     response.body.should == "Thu, 01 Jan 1970 00:00:00 +0000\n01 Jan 00:00"
   end
-  
+
   it "should localize time by R18n" do
     get :human_time, :locale => 'en'
     response.should be_success
     response.body.should == "now"
   end
-  
+
   it "should translate models" do
     ActiveRecord::Schema.verbose = false
     ActiveRecord::Schema.define(:version => 20091218130034) do
@@ -79,22 +79,22 @@ describe TestController, :type => :controller do
         t.string "title_ru"
       end
     end
-    
+
     Post.unlocalized_getters(:title).should == { 'ru' => 'title_ru',
                                                  'en' => 'title_en' }
     Post.unlocalized_setters(:title).should == { 'ru' => 'title_ru=',
                                                  'en' => 'title_en=' }
-    
+
     @post = Post.new
     @post.title_en = 'Record'
-    
+
     R18n.set('ru')
     @post.title.should == 'Record'
-    
+
     @post.title = 'Запись'
     @post.title_ru.should == 'Запись'
     @post.title_en.should == 'Record'
     @post.title.should == 'Запись'
   end
-  
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: r18n-rails
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 0
   - 4
-  - 10
-  version: 0.4.10
+  - 11
+  version: 0.4.11
 platform: ruby
 authors: 
 - Andrey "A.I." Sitnik
@@ -15,26 +15,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-08 00:00:00 +04:00
-default_executable: 
+date: 2011-10-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
+  name: r18n-rails-api
   prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 25
         segments: 
         - 0
         - 4
-        - 10
-        version: 0.4.10
+        - 11
+        version: 0.4.11
   requirement: *id001
-  type: :runtime
-  name: r18n-rails-api
 - !ruby/object:Gem::Dependency 
+  type: :development
+  name: bundler
   prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -48,9 +49,9 @@ dependencies:
         - 10
         version: 1.0.10
   requirement: *id002
-  type: :development
-  name: bundler
 - !ruby/object:Gem::Dependency 
+  type: :development
+  name: hanna
   prerelease: false
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -62,9 +63,9 @@ dependencies:
         - 0
         version: "0"
   requirement: *id003
-  type: :development
-  name: hanna
 - !ruby/object:Gem::Dependency 
+  type: :development
+  name: rake
   prerelease: false
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -84,9 +85,9 @@ dependencies:
         - 0
         version: 0.9.0
   requirement: *id004
-  type: :development
-  name: rake
 - !ruby/object:Gem::Dependency 
+  type: :development
+  name: rails
   prerelease: false
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -98,9 +99,9 @@ dependencies:
         - 3
         version: "3"
   requirement: *id005
-  type: :development
-  name: rails
 - !ruby/object:Gem::Dependency 
+  type: :development
+  name: rspec
   prerelease: false
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -112,9 +113,9 @@ dependencies:
         - 2
         version: "2"
   requirement: *id006
-  type: :development
-  name: rspec
 - !ruby/object:Gem::Dependency 
+  type: :development
+  name: rspec-rails
   prerelease: false
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -126,9 +127,9 @@ dependencies:
         - 2
         version: "2"
   requirement: *id007
-  type: :development
-  name: rspec-rails
 - !ruby/object:Gem::Dependency 
+  type: :development
+  name: rcov
   prerelease: false
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -140,8 +141,6 @@ dependencies:
         - 0
         version: "0"
   requirement: *id008
-  type: :development
-  name: rcov
 description: "    Out-of-box R18n support for Ruby on Rails.\n    It is just a wrapper for R18n Rails API and R18n core libraries.\n    R18n has nice Ruby-style syntax, filters, flexible locales, custom loaders,\n    translation support for any classes, time and number localization, several\n    user language support, agnostic core package with out-of-box support for\n    Rails, Sinatra, Merb and desktop applications.\n"
 email: andrey@sitnik.ru
 executables: []
@@ -187,7 +186,6 @@ files:
 - spec/app/script/rails
 - spec/rails_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://r18n.rubyforge.org/
 licenses: []
 
@@ -217,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: r18n-rails
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: R18n for Rails