merb_r18n 0.1.1 → 0.2

data/README.rdoc

@@ -19,12 +19,14 @@ information.
   pluralization (“1 comment”, “5 comments”) in your translation.
 
 == How To
-1. Add merb_r18n to your merb application in <tt>config/init.rb</tt>:
+
+=== Merb App
+1. Add merb_r18n to your merb application in <tt>config/dependencies.rb</tt>:
    
      dependency 'merb_r18n'
    
-2. Add route to set locale manually in your <tt>config/router.rb</tt>. For example set
-   available translations:
+2. Add route to set locale manually in your <tt>config/router.rb</tt>.
+   For example set available translations:
    
      Merb::Router.prepare do
        match('(/:locale)', :locale => /(en|ru)/) do
@@ -34,7 +36,8 @@ information.
      end
   
    You may use another way, just set :locale param.
-3. Create translations file in <tt>app/i18n/</tt>. For example <tt>app/i18n/en.yml</tt>:
+3. Create translations file in <tt>app/i18n/</tt>.
+   For example <tt>app/i18n/en.yml</tt>:
    
      post:
        add: Add post
@@ -65,6 +68,38 @@ information.
        <% end %>
      </ul>
 
+=== Merb Slice
+1. Add merb_r18n to your merb slice in <tt>lib/_YOUR_SLICE_.rb</tt>:
+   
+     load_dependency 'merb_r18n'
+
+2. Create translations file in <tt>app/i18n/</tt>.
+   For example <tt>app/i18n/en.yml</tt>:
+   
+     post:
+       add: Add post
+       edit: Edit %1
+    
+     comments: !!pl
+       0: No comments
+       1: One comment
+       n: %1 comments
+   
+3. Use translation messages in view. For example:
+     
+     <h1><%= i18n.comments(@post.comments.size) %></h1>
+   
+4. Print localized time and numbers. For example:
+   
+     <%= i18n.l @post.created_at, :date %>
+  
+5. In host application you can override translations. Just create files in
+   <tt>app/i18n/</tt> in _application_ root.
+   For example <tt>app/i18n/en.yml</tt>:
+   
+     post:
+       add: Write your idea
+   
 == License
 R18n is licensed under the GNU Lesser General Public License version 3.
 You can read it in LICENSE file or in http://www.gnu.org/licenses/lgpl.html.

data/lib/merb_r18n.rb

@@ -18,36 +18,55 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 =end
 
 require 'rubygems'
-gem 'r18n-core', '~>0.1'
+gem 'r18n-core', '~>0.2'
 require 'r18n-core'
 
 # make sure we're running inside Merb
-if defined?(Merb::Plugins)
-  Merb.push_path(:i18n, Merb.root / "app" / "i18n")
-  
+if defined? Merb::Plugins
   Merb::Plugins.config[:merb_r18n] = {
-    :default_locale   => 'en',
-    :translations_dir => Merb.dir_for(:i18n)
+    :default_locale   => 'en'
   }
-  
+  unless Merb.load_paths.include? :i18n
+    Merb.push_path(:i18n, Merb.root / 'app' / 'i18n')
+  end
+
   module Merb
     class Controller
-      # Parse +http_accept_language+ and load I18n object with locales
-      # information and translations from translations_dir. If user set locale
-      # manual put it as last argument.
-      before do
-        config = Merb::Plugins.config[:merb_r18n]
-        R18n::I18n.default = config[:default_locale]
-        
-        locales = R18n::I18n.parse_http(request.env['HTTP_ACCEPT_LANGUAGE'])
-        locales.insert(0, params[:locale]) if not params[:locale].nil?
-        R18n.set R18n::I18n.new(locales, config[:translations_dir])
-      end
-      
-      # Return tool fot i18n support. It will be R18n::I18n object, see it
+      protected
+      # Return tool for i18n support. It will be R18n::I18n object, see it
       # documentation for more information.
       def i18n
-        R18n.get
+        unless @i18n
+          R18n::I18n.default = Merb::Plugins.config[:merb_r18n][:default_locale]
+          
+          locales = R18n::I18n.parse_http(request.env['HTTP_ACCEPT_LANGUAGE'])
+          locales.insert(0, params[:locale]) if params[:locale]
+          
+          @i18n = R18n::I18n.new(locales, self.i18n_dirs)
+        end
+        @i18n
+      end
+      
+      # Dirs to load translations
+      def i18n_dirs
+        Merb.dir_for(:i18n)
+      end
+    end
+  end
+  
+  Merb::BootLoader.after_app_loads do
+    if defined? Merb::Slices
+      Merb::Slices.each_slice do |slice|
+        unless slice.slice_paths.include? :i18n
+          slice.push_path :i18n, slice.root_path('app' / 'i18n')
+        end
+      end
+      
+      module Merb::Slices::ControllerMixin::MixinMethods::InstanceMethods
+        protected
+        def i18n_dirs
+          [self.slice.dir_for(:i18n), Merb.dir_for(:i18n)]
+        end
       end
     end
   end

data/spec/app/i18n/en.yml

@@ -4,3 +4,5 @@ created:
   at: Created at %1
 
 other: "Translations: %1"
+
+app: APP

data/spec/app/slice/app/i18n/en.yml

@@ -0,0 +1 @@
+slice: SLICE

data/spec/app/slice/application.rb

@@ -0,0 +1,8 @@
+module Slice
+  class Main < Merb::Controller
+    controller_for_slice
+    def index
+      render i18n.slice + ' and ' + i18n.app
+    end
+  end
+end

data/spec/app/slice/lib/slice.rb

@@ -0,0 +1,20 @@
+if defined? Merb::Plugins
+  load_dependency 'merb-slices'
+  Merb::Slices::register(__FILE__)
+  
+  module Slice
+    self.description = 'Test i18n for slices'
+    self.version = '0.0.1'
+    self.author = 'Andrey A.I. Sitnik'
+    
+    def self.loaded; end
+    def self.activate; end
+    def self.deactivate; end
+    
+    def self.setup_router(scope)
+      scope.default_routes
+    end
+  end
+  
+  require File.dirname(__FILE__) / '../application'
+end

data/spec/merb_r18n_spec.rb

@@ -17,5 +17,9 @@ describe "merb_r18n" do
     c = dispatch_to(I18n, :code, {:locale => "en"}, "HTTP_ACCEPT_LANGUAGE" => "ru")
     c.body.should == "en\n"
   end
+  
+  it "should provide i18n support in slice controller" do
+    dispatch_to(Slice::Main, :index).body.should == 'SLICE and APP'
+  end
 
 end

data/spec/spec_helper.rb

@@ -2,12 +2,16 @@ $TESTING=true
 
 require 'rubygems'
 require 'merb-core'
+require 'merb-slices'
 
 require File.dirname(__FILE__) / '../lib/merb_r18n'
 require File.dirname(__FILE__) / 'app/controllers/i18n'
 
-Merb::Plugins.config[:merb_r18n][:translations_dir] = 
-  File.dirname(__FILE__) / 'app/i18n'
+Merb.push_path(:i18n, File.dirname(__FILE__) / 'app/i18n')
+
+Merb::Plugins.config[:merb_slices][:auto_register] = true
+Merb::Plugins.config[:merb_slices][:search_path] = File.dirname(__FILE__) / 'app/'
+Merb::Router.prepare { add_slice(:slice) }
 
 Merb.start :environment => 'test'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_r18n
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: "0.2"
 platform: ruby
 authors: 
 - Andrey "A.I." Sitnik
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-23 00:00:00 +03:00
+date: 2008-12-06 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.1.1
+        version: "0.2"
     version: 
 description: A plugin for the Merb framework that provides i18n support to translate your site in several languages. It is just a wrap for R18n core library. It can format numbers and time to the rules of the user locale, has translation for common words, storage translation in YAML format with pluralization and procedures and has special support for countries with two official languages.
 email: andrey@sitnik.ru
@@ -78,6 +78,13 @@ test_files:
 - spec/app/i18n
 - spec/app/i18n/ru.yml
 - spec/app/i18n/en.yml
+- spec/app/slice
+- spec/app/slice/app
+- spec/app/slice/app/i18n
+- spec/app/slice/app/i18n/en.yml
+- spec/app/slice/lib
+- spec/app/slice/lib/slice.rb
+- spec/app/slice/application.rb
 - spec/app/views
 - spec/app/views/i18n
 - spec/app/views/i18n/index.html.erb