tml-rails 5.4.2 → 5.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffdece5f603640ee9d91afeb285083b5d6c069a5
-  data.tar.gz: 0cf0d219ccc84e0b0f78694fac2280b8f1527f70
+  metadata.gz: 1e92569acda830248647c0a632260bcc00af8734
+  data.tar.gz: ec8c30058fbdd2eaf40e5b99abb1cff201ad9327
 SHA512:
-  metadata.gz: bf289e23781bd7d4e6a218fc7c103852f52b11404d0d645bb26d029303476b9c8cd61fe658ae0da6fde04e73e12bc5c16b225863e40995345dbb819595b66431
-  data.tar.gz: 3e005b6e0e72eefe6be2b71fa8a429de4adf9668dba56273939835822127116aa8932ab31f4050761ebfaca64da4a14ffa36690d0e17e7a43ed437ef3c8918d9
+  metadata.gz: 3437a07b6c8e9aacfb62ee32ef4685e83d865c6873db1ef4c3b6d51573edb3a27121da1e9b492f2e06ac1afef718bbfb11667ddf2c96f6b63d6817fecf47177d
+  data.tar.gz: b09e2edfda10a52141f4c80756990400d520b316794d042e25b6566c49f8f19c374018bd922a17766084c651eacd8c40a9a4712e4ac6710589a72b319514a17b

data/lib/i18n/backend/tml.rb

@@ -64,17 +64,25 @@ module I18n
             return super(locale, key, scope, options)
           end
 
+          # if language is not available, return default value
+          target_language = application.language(locale.to_s)
+          target_language ||= application.language(application.default_locale)
+
+          unless target_language
+            return super(locale, key, scope, options)
+          end
+
           default_key = super(application.default_locale, key, scope, options)
           default_key ||= key.to_s.split('.').last.gsub('_', ' ').capitalize
 
           if default_key.is_a?(String)
-            translated_key = application.language(locale.to_s).translate(convert_to_tml(default_key), options, options)
+            translated_key = target_language.translate(convert_to_tml(default_key), options, options)
           elsif default_key.is_a?(Hash)
             translated_key = {}
 
             default_key.each do |key, value|
               if value.is_a?(String)
-                value = application.language(locale.to_s).translate(convert_to_tml(value), options, options)
+                value = target_language.translate(convert_to_tml(value), options, options)
               end
               translated_key[key] = value
             end

data/lib/tml_rails/version.rb

@@ -30,5 +30,5 @@
 #++
 
 module TmlRails
-  VERSION = '5.4.2'
+  VERSION = '5.4.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tml-rails
 version: !ruby/object:Gem::Version
-  version: 5.4.2
+  version: 5.4.3
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails