i18n_csv 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fd247b725ef51da78c7892151f975099bbdc215
-  data.tar.gz: b51a480ce2588979d7d4cf34c01d744c9184c5e3
+  metadata.gz: 02e37ae91ef7e51bc52b1ecd0c97d6d6493e3561
+  data.tar.gz: f035e8841449cab7496b3d6e10561f2b1e2e2b5b
 SHA512:
-  metadata.gz: 48e07f947671fa68e79d1310d2a2a3412120d9de4c8f5ccd90a31a19cf5370d13c4514df23a4eff71ebd57635fd51bc4c68a7598704232604b253ec837171677
-  data.tar.gz: 065ca3572a915c126efe1ecd2e02b74800341d7159a9a4e621e0afc6b4e467e978be7fd0d43cc95c05e288638cfc486ec72e9329df5310c379c63025105c8d8a
+  metadata.gz: 94a27aa7fd96313fcc60ee59b7a9280d510820b8b76dbc8f24c8923962bc296a3a5ea1a93bc35f743db1e457a36475a9e34df9c1464e841e1140dea2c9101066
+  data.tar.gz: dd8292f0b955790b20ee147c30ceec22ad1e1066632f68a2d5c0c477bc6fad4caf3e0751548ced760ae974009eb9ee944a62d8c500d453f00a2cd055a38ecca3

data/lib/i18n_csv/i18n_csv.rb

@@ -8,11 +8,12 @@ module I18n
             def load_csv(filename)
                 begin
                     lines = CSV.read(filename)
-                    locale = ::File.basename(filename, '.csv').to_sym
+                    locale = ::File.basename(filename, '.csv').gsub /^([^.]+\.)/, ''
+                    locale = locale.to_sym
                     values = Hash[ lines.map { |l| l if l.size == 2 } ]
 
                     @translations ||= {}
-                    @translations[locale].merge! values
+                    @translations[locale] = values.merge @translations[locale]
 
                     { locale => values }
                 rescue Exception => e
@@ -25,13 +26,23 @@ module I18n
 
     class MissingTranslation
         module Base
+            def candidate_lookup
+                translations = I18n.backend.send :translations
+                locale = keys.first
+                path = ((keys - [ locale ]).map { |k| k.to_s }).join('.')
+
+                translations[locale][path] || keys.last.to_s
+            end
+
             def message
-                keys.last.to_s
+                candidate_lookup
             end
 
             def html_message
-                keys.last.to_s
+                candidate_lookup
             end
         end
     end
-end
+end
+
+I18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.csv')]

data/lib/i18n_csv/version.rb

@@ -1,3 +1,3 @@
 module I18nCsv
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n_csv
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Artem Shoobovych
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler