gettext_i18n_rails 0.3.4 → 0.3.5

data/Readme.md

@@ -211,6 +211,7 @@ lib/tasks/gettext.rake:
  - [Nikos Dimitrakopoulos](http://blog.nikosd.com)
  - [Ben Tucker](http://btucker.net/)
  - [Kamil Śliwak](https://github.com/cameel)
+ - [Paul McMahon](https://github.com/pwim)
 
 [Michael Grosser](http://grosser.it)<br/>
 grosser.michael@gmail.com<br/>

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/gettext_i18n_rails.gemspec

@@ -4,13 +4,13 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "gettext_i18n_rails"
-  s.version = "0.3.4"
+  s.name = %q{gettext_i18n_rails}
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = "2011-12-09"
-  s.email = "grosser.michael@gmail.com"
+  s.date = %q{2011-12-09}
+  s.email = %q{grosser.michael@gmail.com}
   s.files = [
     "Gemfile",
     "Gemfile.lock",
@@ -39,10 +39,10 @@ Gem::Specification.new do |s|
     "spec/gettext_i18n_rails_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = "http://github.com/grosser/gettext_i18n_rails"
+  s.homepage = %q{http://github.com/grosser/gettext_i18n_rails}
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.12"
-  s.summary = "Simple FastGettext Rails integration."
+  s.rubygems_version = %q{1.6.2}
+  s.summary = %q{Simple FastGettext Rails integration.}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/gettext_i18n_rails/action_controller.rb

@@ -1,6 +1,6 @@
 class ActionController::Base
   def set_gettext_locale
-    requested_locale = params[:locale] || session[:locale] || cookies[:locale] ||  request.env['HTTP_ACCEPT_LANGUAGE']
+    requested_locale = params[:locale] || session[:locale] || cookies[:locale] ||  request.env['HTTP_ACCEPT_LANGUAGE'] || I18n.default_locale
     locale = FastGettext.set_locale(requested_locale)
     session[:locale] = locale
     I18n.locale = locale # some weird overwriting in action-controller makes this necessary ... see I18nProxy

data/lib/gettext_i18n_rails/railtie.rb

@@ -2,6 +2,8 @@
 if defined?(Rails::Railtie)
   module GettextI18nRails
     class Railtie < ::Rails::Railtie
+      config.gettext_i18n_rails = ActiveSupport::OrderedOptions.new
+      config.gettext_i18n_rails.msgmerge = %w[--sort-output --no-location --no-wrap]
       rake_tasks do
         require 'gettext_i18n_rails/tasks'
       end

data/lib/gettext_i18n_rails/tasks.rb

@@ -18,12 +18,17 @@ namespace :gettext do
 
 
     if GetText.respond_to? :update_pofiles_org
+      if defined?(Rails.application)
+        msgmerge = Rails.application.config.gettext_i18n_rails.msgmerge
+      end
+      msgmerge ||= %w[--sort-output --no-location --no-wrap]
+
       GetText.update_pofiles_org(
         text_domain,
         files_to_translate,
         "version 0.0.1",
         :po_root => locale_path,
-        :msgmerge=>['--sort-output']
+        :msgmerge => msgmerge
       )
     else #we are on a version < 2.0
       puts "install new GetText with gettext:install to gain more features..."

data/spec/gettext_i18n_rails/action_controller_spec.rb

@@ -3,19 +3,23 @@ require File.expand_path("../spec_helper", File.dirname(__FILE__))
 FastGettext.silence_errors
 
 describe ActionController::Base do
-  before do
-    #controller
-    @c = ActionController::Base.new
+  def reset!
     fake_session = {}
     @c.stub!(:session).and_return fake_session
     fake_cookies = {}
     @c.stub!(:cookies).and_return fake_cookies
     @c.params = {}
     @c.request = stub(:env => {})
+  end
+
+  before do
+    #controller
+    @c = ActionController::Base.new
+    reset!
 
     #locale
     FastGettext.available_locales = nil
-    FastGettext.locale = 'fr'
+    FastGettext.locale = I18n.default_locale = 'fr'
     FastGettext.available_locales = ['fr','en']
   end
 
@@ -32,9 +36,19 @@ describe ActionController::Base do
     FastGettext.locale.should == 'fr'
   end
 
+  it "locale isn't cached over request" do
+    @c.params = {:locale=>'en'}
+    @c.set_gettext_locale
+    @c.session[:locale].should == 'en'
+
+    reset!
+    @c.set_gettext_locale
+    @c.session[:locale].should == 'fr'
+  end
+
   it "reads the locale from the HTTP_ACCEPT_LANGUAGE" do
     @c.request.stub!(:env).and_return 'HTTP_ACCEPT_LANGUAGE'=>'de-de,de;q=0.8,en-us;q=0.5,en;q=0.3'
     @c.set_gettext_locale
     FastGettext.locale.should == 'en'
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gettext_i18n_rails
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,9 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-09 00:00:00 Z
+date: 2011-12-09 00:00:00 -08:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -27,11 +29,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: fast_gettext
   version_requirements: *id001
   prerelease: false
-  name: fast_gettext
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -41,10 +43,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: ruby_parser
   version_requirements: *id002
   prerelease: false
-  name: ruby_parser
-  type: :runtime
 description: 
 email: grosser.michael@gmail.com
 executables: []
@@ -80,6 +81,7 @@ files:
 - spec/gettext_i18n_rails/string_interpolate_fix_spec.rb
 - spec/gettext_i18n_rails_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: http://github.com/grosser/gettext_i18n_rails
 licenses: []
 
@@ -109,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Simple FastGettext Rails integration.