r18n-rails 0.4.5 → 0.4.6

data/README.rdoc

@@ -2,12 +2,12 @@
 
 R18n-rails is a gem to add out-of-box R18n support to Rails I18n.
 
-It is just a wrapper for R18n Rails API and R18n core libraries. See R18n core
+It is a wrapper for R18n Rails API and R18n core libraries. See R18n core
 documentation for more information.
 
 == Features
 
-R18n for Rails has full compatibility with Rails I18n, but add extra features:
+R18n for Rails is fully compatibile with Rails I18n, and add extra features:
 
 === R18n Syntax
 
@@ -22,7 +22,7 @@ Translations in R18n format will be loaded from <tt>app/i18n/_locale_.yml</tt>:
       1: 1 user
       n: %1 users
 
-R18n extend +t+ helper to add optional R18n syntax:
+R18n extends +t+ helper to add optional R18n syntax:
 
   t.user.name('John')      #=> "User name is John"
   t.user.count(5)          #=> "5 users"
@@ -31,7 +31,7 @@ R18n extend +t+ helper to add optional R18n syntax:
 === Filters
 
 R18n has flexible architecture based on filters. Variables, pluralization,
-untranslated are a common filters, and you can change all of them. For example,
+untranslated are common filters, and you can change them all. For example,
 write untranslated keys to file:
 
   R18n::Filters.add(::R18n::Untranslated, :write_untranslated) do
@@ -55,7 +55,7 @@ R18n already has filters for HTML escaping, lambdas, Textile and Markdown:
 
 R18n can add i18n support for your ActiveRecord model and any other class:
 
-1. Add separated column for all supported translations:
+1. Add separate columns for all supported translations:
    
      def self.up
        create_table :posts do |t|
@@ -78,7 +78,7 @@ R18n can add i18n support for your ActiveRecord model and any other class:
      post.title_ru = 'Запись'
      post.title = 'Запись'
      
-     post.title = 'Другая' # will user title_ru, by user first locale
+     post.title = 'Другая' # will use title_ru, by first user's locale
 
 === Time Fomatters
 
@@ -92,8 +92,8 @@ R18n add +full+ time formatter based on locale info:
 
 === Locales
 
-R18n contain locales info, so it out-of-box support locale plural and fallback
-rules for non-English locales:
+R18n contains locales info, so it supports locale pluralization and fallback
+rules for non-English locales out-of-box:
 
   # Russian have different plural rules:
   user:
@@ -108,9 +108,9 @@ rules for non-English locales:
 
 === Autodetect User Locales
 
-R18n automatically generate fallback for current user, based on
-user locales list from HTTP_ACCEPT_LANGUAGE, locale info (in some country people
-know several languages) and default locale.
+R18n automatically generate fallbacks for current user, based on
+user locales list from HTTP_ACCEPT_LANGUAGE, locale info (in some countries
+people know several languages), and default locale.
 
 For example, if user know Kazakh and German, R18n will try find translations in:
 Kazakh → German → Russian (second language in Kazakhstan) → English (default
@@ -121,7 +121,7 @@ locale).
 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 on French
+  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)
@@ -132,15 +132,16 @@ to send e-mail for English admin on error with French user:
    
      config.gem 'r18n-rails'
    
-   Now R18n will be autodetect user locales.
-2. Add your way to set locale manually. R18n will find it in
+   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 choise it manually (and to search engines):
+3. Print available translations, to choose from them manually (and to helpsearch
+   engines):
 
      <ul>
      <% r18n.available_locales.each do |locale| %>
@@ -150,17 +151,18 @@ to send e-mail for English admin on error with French user:
      <% end %>
      </ul>
    
-4. Translations with I18n format put to <tt>config/locales/_locale_.yml</tt>:
+4. Translations in I18n format are stored in
+   <tt>config/locales/_locale_.yml</tt>:
    
      en:
        user:
-         name: "User name is {{name}}"
+         name: "User name is %{name}"
          count:
            zero: "No users"
            one:  "One user"
-           many: "{{count}} users"
+           many: "%{count} users"
    
-   Translations with R18n format put to <tt>app/i18n/_locale_.yml</tt>:
+   Translations in R18n format go to <tt>app/i18n/_locale_.yml</tt>:
    
      user:
        name: User name is %1
@@ -174,13 +176,13 @@ to send e-mail for English admin on error with French user:
      t 'user.name', :name => 'John'
      t 'user.count', :count => 5
    
-   Or R18n syntax:
+   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 tradition:
+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"
@@ -188,7 +190,7 @@ to send e-mail for English admin on error with French user:
 
 7. Translate models:
    
-   1. Add to migration columns for each supported locales, with name
+   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
@@ -202,11 +204,11 @@ to send e-mail for English admin on error with French user:
         class Post < ActiveRecord::Base
           include R18n::Translated
       
-   3. Call +translations+ method in model with all columns to translated:
+   3. Call +translations+ method in model with all columns to be translated:
       
           translations :title, :text
    
-      Now model will be have virtual methods +title+, +text+, <tt>title=</tt>
+      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.
    

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

@@ -9,7 +9,7 @@ class TestController < ApplicationController
   end
   
   def available
-    render :text => R18n.get.available_locales.map { |i| i.code }.join(', ')
+    render :text => R18n.get.available_locales.map { |i| i.code }.sort.join(' ')
   end
   
   def helpers

data/spec/app/config/environment.rb

@@ -1,5 +1,3 @@
-RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
-
 require File.join(File.dirname(__FILE__), 'boot')
 
 Rails::Initializer.run do |config|

data/spec/app/log/test.log

@@ -6291,3 +6291,696 @@ Completed in 66ms (View: 0, DB: 0) | 200 OK [http://test.host/en/human_time]
 
   SQL (0.1ms)   SELECT version FROM "schema_migrations"
   SQL (0.1ms)   INSERT INTO "schema_migrations" (version) VALUES ('20091218130034')
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-04-19 20:04:26) [GET]
+Completed in 25ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-04-19 20:04:26) [GET]
+  Parameters: {"locale"=>"ru"}
+Completed in 13ms (View: 0, DB: 0) | 200 OK [http://test.host/ru/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-04-19 20:04:26) [GET]
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-04-19 20:04:26) [GET]
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#translations (for 0.0.0.0 at 2010-04-19 20:04:26) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 18ms (View: 0, DB: 0) | 200 OK [http://test.host/en/translations]
+
+
+Processing TestController#available (for 0.0.0.0 at 2010-04-19 20:04:26) [GET]
+Completed in 8ms (View: 0, DB: 0) | 200 OK [http://test.host/available]
+
+
+Processing TestController#helpers (for 0.0.0.0 at 2010-04-19 20:04:26) [GET]
+  Parameters: {"locale"=>"en"}
+Rendering test/helpers
+Completed in 84ms (View: 73, DB: 0) | 200 OK [http://test.host/en/helpers]
+
+
+Processing TestController#untranslated (for 0.0.0.0 at 2010-04-19 20:04:26) [GET]
+Completed in 11ms (View: 0, DB: 0) | 200 OK [http://test.host/untranslated]
+
+
+Processing TestController#controller (for 0.0.0.0 at 2010-04-19 20:04:26) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/en/controller]
+
+
+Processing TestController#time (for 0.0.0.0 at 2010-04-19 20:04:26) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 19ms (View: 0, DB: 0) | 200 OK [http://test.host/en/time]
+
+
+Processing TestController#human_time (for 0.0.0.0 at 2010-04-19 20:04:26) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/en/human_time]
+  SQL (0.4ms)   select sqlite_version(*)
+  SQL (0.5ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.8ms)   CREATE TABLE "posts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title_en" varchar(255), "title_ru" varchar(255)) 
+  SQL (0.2ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.2ms)   CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+  SQL (0.3ms)   CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  SQL (0.2ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM "schema_migrations"
+  SQL (0.1ms)   INSERT INTO "schema_migrations" (version) VALUES ('20091218130034')
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-04-30 21:44:38) [GET]
+Completed in 25ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-04-30 21:44:38) [GET]
+  Parameters: {"locale"=>"ru"}
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/ru/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-04-30 21:44:38) [GET]
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-04-30 21:44:38) [GET]
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#translations (for 0.0.0.0 at 2010-04-30 21:44:38) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/en/translations]
+
+
+Processing TestController#available (for 0.0.0.0 at 2010-04-30 21:44:38) [GET]
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/available]
+
+
+Processing TestController#helpers (for 0.0.0.0 at 2010-04-30 21:44:38) [GET]
+  Parameters: {"locale"=>"en"}
+Rendering test/helpers
+Completed in 62ms (View: 50, DB: 0) | 200 OK [http://test.host/en/helpers]
+
+
+Processing TestController#untranslated (for 0.0.0.0 at 2010-04-30 21:44:38) [GET]
+Completed in 10ms (View: 0, DB: 0) | 200 OK [http://test.host/untranslated]
+
+
+Processing TestController#controller (for 0.0.0.0 at 2010-04-30 21:44:38) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/en/controller]
+
+
+Processing TestController#time (for 0.0.0.0 at 2010-04-30 21:44:38) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/en/time]
+
+
+Processing TestController#human_time (for 0.0.0.0 at 2010-04-30 21:44:38) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 13ms (View: 0, DB: 0) | 200 OK [http://test.host/en/human_time]
+  SQL (0.3ms)   select sqlite_version(*)
+  SQL (19.5ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (46.6ms)   CREATE TABLE "posts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title_en" varchar(255), "title_ru" varchar(255)) 
+  SQL (0.3ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.2ms)   CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+  SQL (0.4ms)   CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  SQL (0.3ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM "schema_migrations"
+  SQL (0.1ms)   INSERT INTO "schema_migrations" (version) VALUES ('20091218130034')
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-05-09 05:37:38) [GET]
+Completed in 24ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-05-09 05:37:38) [GET]
+  Parameters: {"locale"=>"ru"}
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/ru/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-05-09 05:37:38) [GET]
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-05-09 05:37:38) [GET]
+Completed in 11ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#translations (for 0.0.0.0 at 2010-05-09 05:37:38) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/en/translations]
+
+
+Processing TestController#available (for 0.0.0.0 at 2010-05-09 05:37:38) [GET]
+Completed in 10ms (View: 0, DB: 0) | 200 OK [http://test.host/available]
+
+
+Processing TestController#helpers (for 0.0.0.0 at 2010-05-09 05:37:38) [GET]
+  Parameters: {"locale"=>"en"}
+Rendering test/helpers
+Completed in 53ms (View: 42, DB: 0) | 200 OK [http://test.host/en/helpers]
+
+
+Processing TestController#untranslated (for 0.0.0.0 at 2010-05-09 05:37:38) [GET]
+Completed in 10ms (View: 0, DB: 0) | 200 OK [http://test.host/untranslated]
+
+
+Processing TestController#controller (for 0.0.0.0 at 2010-05-09 05:37:38) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 16ms (View: 0, DB: 0) | 200 OK [http://test.host/en/controller]
+
+
+Processing TestController#time (for 0.0.0.0 at 2010-05-09 05:37:38) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 14ms (View: 0, DB: 0) | 200 OK [http://test.host/en/time]
+
+
+Processing TestController#human_time (for 0.0.0.0 at 2010-05-09 05:37:38) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 68ms (View: 0, DB: 0) | 200 OK [http://test.host/en/human_time]
+  SQL (0.3ms)   select sqlite_version(*)
+  SQL (0.4ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (11.6ms)   CREATE TABLE "posts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title_en" varchar(255), "title_ru" varchar(255)) 
+  SQL (0.2ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.2ms)   CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+  SQL (0.4ms)   CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  SQL (0.3ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM "schema_migrations"
+  SQL (0.1ms)   INSERT INTO "schema_migrations" (version) VALUES ('20091218130034')
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-05-09 05:38:48) [GET]
+Completed in 22ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-05-09 05:38:48) [GET]
+  Parameters: {"locale"=>"ru"}
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/ru/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-05-09 05:38:48) [GET]
+Completed in 11ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-05-09 05:38:48) [GET]
+Completed in 11ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#translations (for 0.0.0.0 at 2010-05-09 05:38:49) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 11ms (View: 0, DB: 0) | 200 OK [http://test.host/en/translations]
+
+
+Processing TestController#available (for 0.0.0.0 at 2010-05-09 05:38:49) [GET]
+
+
+Processing TestController#helpers (for 0.0.0.0 at 2010-05-09 05:38:49) [GET]
+  Parameters: {"locale"=>"en"}
+Rendering test/helpers
+Completed in 21ms (View: 10, DB: 0) | 200 OK [http://test.host/en/helpers]
+
+
+Processing TestController#untranslated (for 0.0.0.0 at 2010-05-09 05:38:49) [GET]
+Completed in 9ms (View: 0, DB: 0) | 200 OK [http://test.host/untranslated]
+
+
+Processing TestController#controller (for 0.0.0.0 at 2010-05-09 05:38:49) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/en/controller]
+
+
+Processing TestController#time (for 0.0.0.0 at 2010-05-09 05:38:49) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/en/time]
+
+
+Processing TestController#human_time (for 0.0.0.0 at 2010-05-09 05:38:49) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 67ms (View: 0, DB: 0) | 200 OK [http://test.host/en/human_time]
+  SQL (0.3ms)   select sqlite_version(*)
+  SQL (0.4ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.7ms)   CREATE TABLE "posts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title_en" varchar(255), "title_ru" varchar(255)) 
+  SQL (0.2ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.2ms)   CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+  SQL (0.3ms)   CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  SQL (0.3ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM "schema_migrations"
+  SQL (0.1ms)   INSERT INTO "schema_migrations" (version) VALUES ('20091218130034')
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-05-09 05:39:01) [GET]
+Completed in 22ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-05-09 05:39:01) [GET]
+  Parameters: {"locale"=>"ru"}
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/ru/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-05-09 05:39:01) [GET]
+Completed in 11ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-05-09 05:39:01) [GET]
+Completed in 11ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#translations (for 0.0.0.0 at 2010-05-09 05:39:01) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 11ms (View: 0, DB: 0) | 200 OK [http://test.host/en/translations]
+
+
+Processing TestController#available (for 0.0.0.0 at 2010-05-09 05:39:01) [GET]
+Completed in 9ms (View: 0, DB: 0) | 200 OK [http://test.host/available]
+
+
+Processing TestController#helpers (for 0.0.0.0 at 2010-05-09 05:39:01) [GET]
+  Parameters: {"locale"=>"en"}
+Rendering test/helpers
+Completed in 21ms (View: 10, DB: 0) | 200 OK [http://test.host/en/helpers]
+
+
+Processing TestController#untranslated (for 0.0.0.0 at 2010-05-09 05:39:01) [GET]
+Completed in 9ms (View: 0, DB: 0) | 200 OK [http://test.host/untranslated]
+
+
+Processing TestController#controller (for 0.0.0.0 at 2010-05-09 05:39:01) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/en/controller]
+
+
+Processing TestController#time (for 0.0.0.0 at 2010-05-09 05:39:01) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/en/time]
+
+
+Processing TestController#human_time (for 0.0.0.0 at 2010-05-09 05:39:01) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 67ms (View: 0, DB: 0) | 200 OK [http://test.host/en/human_time]
+  SQL (0.3ms)   select sqlite_version(*)
+  SQL (0.3ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.7ms)   CREATE TABLE "posts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title_en" varchar(255), "title_ru" varchar(255)) 
+  SQL (0.2ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.2ms)   CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+  SQL (0.3ms)   CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  SQL (0.3ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM "schema_migrations"
+  SQL (0.1ms)   INSERT INTO "schema_migrations" (version) VALUES ('20091218130034')
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-05-09 05:39:24) [GET]
+Completed in 22ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-05-09 05:39:24) [GET]
+  Parameters: {"locale"=>"ru"}
+Completed in 11ms (View: 0, DB: 0) | 200 OK [http://test.host/ru/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-05-09 05:39:24) [GET]
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-05-09 05:39:25) [GET]
+Completed in 11ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#translations (for 0.0.0.0 at 2010-05-09 05:39:25) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 11ms (View: 0, DB: 0) | 200 OK [http://test.host/en/translations]
+
+
+Processing TestController#available (for 0.0.0.0 at 2010-05-09 05:39:25) [GET]
+Completed in 9ms (View: 0, DB: 0) | 200 OK [http://test.host/available]
+
+
+Processing TestController#helpers (for 0.0.0.0 at 2010-05-09 05:39:25) [GET]
+  Parameters: {"locale"=>"en"}
+Rendering test/helpers
+Completed in 20ms (View: 9, DB: 0) | 200 OK [http://test.host/en/helpers]
+
+
+Processing TestController#untranslated (for 0.0.0.0 at 2010-05-09 05:39:25) [GET]
+Completed in 9ms (View: 0, DB: 0) | 200 OK [http://test.host/untranslated]
+
+
+Processing TestController#controller (for 0.0.0.0 at 2010-05-09 05:39:25) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/en/controller]
+
+
+Processing TestController#time (for 0.0.0.0 at 2010-05-09 05:39:25) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/en/time]
+
+
+Processing TestController#human_time (for 0.0.0.0 at 2010-05-09 05:39:25) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 66ms (View: 0, DB: 0) | 200 OK [http://test.host/en/human_time]
+  SQL (0.3ms)   select sqlite_version(*)
+  SQL (0.3ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.8ms)   CREATE TABLE "posts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title_en" varchar(255), "title_ru" varchar(255)) 
+  SQL (0.2ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.2ms)   CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+  SQL (0.3ms)   CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  SQL (0.2ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM "schema_migrations"
+  SQL (0.1ms)   INSERT INTO "schema_migrations" (version) VALUES ('20091218130034')
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-06-17 21:09:32) [GET]
+Completed in 23ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-06-17 21:09:32) [GET]
+  Parameters: {"locale"=>"ru"}
+Completed in 11ms (View: 0, DB: 0) | 200 OK [http://test.host/ru/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-06-17 21:09:32) [GET]
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-06-17 21:09:32) [GET]
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#translations (for 0.0.0.0 at 2010-06-17 21:09:32) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 11ms (View: 0, DB: 0) | 200 OK [http://test.host/en/translations]
+
+
+Processing TestController#available (for 0.0.0.0 at 2010-06-17 21:09:32) [GET]
+Completed in 9ms (View: 0, DB: 0) | 200 OK [http://test.host/available]
+
+
+Processing TestController#helpers (for 0.0.0.0 at 2010-06-17 21:09:32) [GET]
+  Parameters: {"locale"=>"en"}
+Rendering test/helpers
+Completed in 14ms (View: 3, DB: 0) | 200 OK [http://test.host/en/helpers]
+
+
+Processing TestController#untranslated (for 0.0.0.0 at 2010-06-17 21:09:32) [GET]
+Completed in 9ms (View: 0, DB: 0) | 200 OK [http://test.host/untranslated]
+
+
+Processing TestController#controller (for 0.0.0.0 at 2010-06-17 21:09:32) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/en/controller]
+
+
+Processing TestController#time (for 0.0.0.0 at 2010-06-17 21:09:32) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/en/time]
+
+
+Processing TestController#human_time (for 0.0.0.0 at 2010-06-17 21:09:32) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/en/human_time]
+  SQL (0.2ms)   select sqlite_version(*)
+  SQL (0.3ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.6ms)   CREATE TABLE "posts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title_en" varchar(255), "title_ru" varchar(255)) 
+  SQL (0.1ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.2ms)   CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+  SQL (0.1ms)   PRAGMA index_list("schema_migrations")
+  SQL (0.3ms)   CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  SQL (0.1ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM "schema_migrations"
+  SQL (0.1ms)   INSERT INTO "schema_migrations" (version) VALUES ('20091218130034')
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-06-17 21:09:44) [GET]
+Completed in 74ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-06-17 21:09:44) [GET]
+  Parameters: {"locale"=>"ru"}
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/ru/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-06-17 21:09:44) [GET]
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-06-17 21:09:44) [GET]
+Completed in 11ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#translations (for 0.0.0.0 at 2010-06-17 21:09:44) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/en/translations]
+
+
+Processing TestController#available (for 0.0.0.0 at 2010-06-17 21:09:44) [GET]
+Completed in 9ms (View: 0, DB: 0) | 200 OK [http://test.host/available]
+
+
+Processing TestController#helpers (for 0.0.0.0 at 2010-06-17 21:09:44) [GET]
+  Parameters: {"locale"=>"en"}
+Rendering test/helpers
+Completed in 14ms (View: 3, DB: 0) | 200 OK [http://test.host/en/helpers]
+
+
+Processing TestController#untranslated (for 0.0.0.0 at 2010-06-17 21:09:44) [GET]
+Completed in 9ms (View: 0, DB: 0) | 200 OK [http://test.host/untranslated]
+
+
+Processing TestController#controller (for 0.0.0.0 at 2010-06-17 21:09:44) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 14ms (View: 0, DB: 0) | 200 OK [http://test.host/en/controller]
+
+
+Processing TestController#time (for 0.0.0.0 at 2010-06-17 21:09:45) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/en/time]
+
+
+Processing TestController#human_time (for 0.0.0.0 at 2010-06-17 21:09:45) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 13ms (View: 0, DB: 0) | 200 OK [http://test.host/en/human_time]
+  SQL (0.2ms)   select sqlite_version(*)
+  SQL (0.3ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.6ms)   CREATE TABLE "posts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title_en" varchar(255), "title_ru" varchar(255)) 
+  SQL (0.1ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.2ms)   CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+  SQL (0.1ms)   PRAGMA index_list("schema_migrations")
+  SQL (0.3ms)   CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  SQL (0.1ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM "schema_migrations"
+  SQL (0.1ms)   INSERT INTO "schema_migrations" (version) VALUES ('20091218130034')
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-06-17 21:09:55) [GET]
+Completed in 22ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-06-17 21:09:55) [GET]
+  Parameters: {"locale"=>"ru"}
+Completed in 11ms (View: 0, DB: 0) | 200 OK [http://test.host/ru/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-06-17 21:09:55) [GET]
+Completed in 11ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-06-17 21:09:55) [GET]
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#translations (for 0.0.0.0 at 2010-06-17 21:09:55) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 12ms (View: 1, DB: 0) | 200 OK [http://test.host/en/translations]
+
+
+Processing TestController#available (for 0.0.0.0 at 2010-06-17 21:09:55) [GET]
+Completed in 9ms (View: 0, DB: 0) | 200 OK [http://test.host/available]
+
+
+Processing TestController#helpers (for 0.0.0.0 at 2010-06-17 21:09:55) [GET]
+  Parameters: {"locale"=>"en"}
+Rendering test/helpers
+Completed in 13ms (View: 3, DB: 0) | 200 OK [http://test.host/en/helpers]
+
+
+Processing TestController#untranslated (for 0.0.0.0 at 2010-06-17 21:09:55) [GET]
+Completed in 9ms (View: 0, DB: 0) | 200 OK [http://test.host/untranslated]
+
+
+Processing TestController#controller (for 0.0.0.0 at 2010-06-17 21:09:55) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/en/controller]
+
+
+Processing TestController#time (for 0.0.0.0 at 2010-06-17 21:09:55) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/en/time]
+
+
+Processing TestController#human_time (for 0.0.0.0 at 2010-06-17 21:09:55) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 11ms (View: 0, DB: 0) | 200 OK [http://test.host/en/human_time]
+  SQL (0.2ms)   select sqlite_version(*)
+  SQL (0.3ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.7ms)   CREATE TABLE "posts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title_en" varchar(255), "title_ru" varchar(255)) 
+  SQL (0.1ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.2ms)   CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+  SQL (0.1ms)   PRAGMA index_list("schema_migrations")
+  SQL (0.3ms)   CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  SQL (0.1ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM "schema_migrations"
+  SQL (0.1ms)   INSERT INTO "schema_migrations" (version) VALUES ('20091218130034')
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-06-22 21:58:54) [GET]
+Completed in 30ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-06-22 21:58:54) [GET]
+  Parameters: {"locale"=>"ru"}
+Completed in 13ms (View: 0, DB: 0) | 200 OK [http://test.host/ru/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-06-22 21:58:54) [GET]
+Completed in 15ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#locales (for 0.0.0.0 at 2010-06-22 21:58:54) [GET]
+Completed in 11ms (View: 0, DB: 0) | 200 OK [http://test.host/locales]
+
+
+Processing TestController#translations (for 0.0.0.0 at 2010-06-22 21:58:54) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 14ms (View: 0, DB: 0) | 200 OK [http://test.host/en/translations]
+
+
+Processing TestController#available (for 0.0.0.0 at 2010-06-22 21:58:54) [GET]
+Completed in 9ms (View: 0, DB: 0) | 200 OK [http://test.host/available]
+
+
+Processing TestController#helpers (for 0.0.0.0 at 2010-06-22 21:58:54) [GET]
+  Parameters: {"locale"=>"en"}
+Rendering test/helpers
+Completed in 38ms (View: 20, DB: 0) | 200 OK [http://test.host/en/helpers]
+
+
+Processing TestController#untranslated (for 0.0.0.0 at 2010-06-22 21:58:54) [GET]
+Completed in 10ms (View: 0, DB: 0) | 200 OK [http://test.host/untranslated]
+
+
+Processing TestController#controller (for 0.0.0.0 at 2010-06-22 21:58:54) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/en/controller]
+
+
+Processing TestController#time (for 0.0.0.0 at 2010-06-22 21:58:54) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/en/time]
+
+
+Processing TestController#human_time (for 0.0.0.0 at 2010-06-22 21:58:54) [GET]
+  Parameters: {"locale"=>"en"}
+Completed in 12ms (View: 0, DB: 0) | 200 OK [http://test.host/en/human_time]
+  SQL (0.2ms)   select sqlite_version(*)
+  SQL (0.8ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.7ms)   CREATE TABLE "posts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title_en" varchar(255), "title_ru" varchar(255)) 
+  SQL (0.1ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.2ms)   CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+  SQL (0.1ms)   PRAGMA index_list("schema_migrations")
+  SQL (0.3ms)   CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  SQL (0.1ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM "schema_migrations"
+  SQL (0.1ms)   INSERT INTO "schema_migrations" (version) VALUES ('20091218130034')

data/spec/rails_spec.rb

@@ -40,7 +40,7 @@ describe 'R18n for Rails', :type => :controller do
   it 'should return available translations' do
     get :available
     response.should be_success
-    response.body.should == 'ru, en'
+    response.body.should == 'en ru'
   end
   
   it 'should add helpers' do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 5
-  version: 0.4.5
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - Andrey "A.I." Sitnik
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-19 00:00:00 +04:00
+date: 2010-06-22 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,9 +39,9 @@ extra_rdoc_files:
 - README.rdoc
 - LICENSE
 files: 
+- lib/r18n-rails.rb
 - lib/r18n-rails/helpers.rb
 - lib/r18n-rails/controller.rb
-- lib/r18n-rails.rb
 - LICENSE
 - README.rdoc
 has_rdoc: true
@@ -75,25 +75,25 @@ signing_key:
 specification_version: 3
 summary: R18n for Rails
 test_files: 
-- spec/rails_spec.rb
 - spec/spec_helper.rb
-- spec/app/db/migrate/20091218123631_create_posts.rb
 - spec/app/db/test.sqlite3
-- spec/app/config/routes.rb
-- spec/app/config/environment.rb
-- spec/app/config/locales/en.yml
-- spec/app/config/boot.rb
-- spec/app/config/database.yml
-- spec/app/config/initializers/session_store.rb
-- spec/app/config/environments/development.rb
-- spec/app/config/environments/production.rb
-- spec/app/config/environments/test.rb
-- spec/app/app/views/test/helpers.html.erb
+- spec/app/db/migrate/20091218123631_create_posts.rb
+- spec/app/app/models/post.rb
 - spec/app/app/helpers/application_helper.rb
-- spec/app/app/i18n/ru.yml
+- spec/app/app/views/test/helpers.html.erb
 - spec/app/app/i18n/en.yml
-- spec/app/app/controllers/test_controller.rb
+- spec/app/app/i18n/ru.yml
 - spec/app/app/controllers/application_controller.rb
-- spec/app/app/models/post.rb
-- spec/app/log/test.log
+- spec/app/app/controllers/test_controller.rb
+- spec/app/config/environments/development.rb
+- spec/app/config/environments/test.rb
+- spec/app/config/environments/production.rb
+- spec/app/config/initializers/session_store.rb
+- spec/app/config/database.yml
+- spec/app/config/environment.rb
+- spec/app/config/locales/en.yml
+- spec/app/config/boot.rb
+- spec/app/config/routes.rb
 - spec/app/script/server
+- spec/app/log/test.log
+- spec/rails_spec.rb