gettext_i18n_rails 0.5.4 → 0.6.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gettext_i18n_rails (0.5.4)
+    gettext_i18n_rails (0.6.1)
       fast_gettext
 
 GEM
@@ -41,7 +41,7 @@ GEM
     builder (3.0.0)
     diff-lcs (1.1.2)
     erubis (2.7.0)
-    fast_gettext (0.5.13)
+    fast_gettext (0.6.7)
     gettext (2.1.0)
       locale (>= 2.0.5)
     haml (3.1.4)

data/lib/gettext_i18n_rails/i18n_hacks.rb

@@ -3,7 +3,7 @@ I18n::Config # autoload
 module I18n
   class Config
     def locale
-      FastGettext.locale.to_sym
+      FastGettext.locale.gsub("_","-").to_sym
     end
 
      def locale=(new_locale)

data/lib/gettext_i18n_rails/model_attributes_finder.rb

@@ -36,6 +36,7 @@ module GettextI18nRails
       found = ActiveSupport::OrderedHash.new([])
 
       models.each do |model|
+        next if model.abstract_class
         table_name = model.table_name
         next if ignored?(table_name,options[:ignore_tables])
         model.columns.each do |column|

data/lib/gettext_i18n_rails/version.rb

@@ -1,3 +1,3 @@
 module GettextI18nRails
-  Version = VERSION = '0.5.4'
+  Version = VERSION = '0.6.1'
 end

data/spec/gettext_i18n_rails_spec.rb

@@ -80,5 +80,12 @@ describe GettextI18nRails do
       FastGettext.locale.should == 'de'
       I18n.locale.should == :de
     end
+
+    it "converts gettext to i18n style for nested locales" do
+      FastGettext.available_locales = ['de_CH']
+      I18n.locale = :"de-CH"
+      FastGettext.locale.should == 'de_CH'
+      I18n.locale.should == :"de-CH"
+    end
   end
-end
+end

data/spec/spec_helper.rb

@@ -72,4 +72,8 @@ class NotConventional < ActiveRecord::Base
   set_table_name :not_at_all_conventionals
 end
 
+class Idea < ActiveRecord::Base
+  self.abstract_class = true
+end
+
 ActiveRecord::Base.extend GettextI18nRails::ActiveRecord

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gettext_i18n_rails
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 5
   prerelease: 
   segments: 
   - 0
-  - 5
-  - 4
-  version: 0.5.4
+  - 6
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-24 00:00:00 Z
+date: 2012-06-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fast_gettext