translation_engine 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb36f44885cef5545e9df7361ab089e45bee2b80
-  data.tar.gz: b4df90289442d36754e104d8179b11d8a2711e29
+  metadata.gz: 9fe1fe423c1d6f03f4ae78c9844c6a3d323145aa
+  data.tar.gz: 587f1400dc639320918de9d263eba5f64882e9a0
 SHA512:
-  metadata.gz: 5ac92beba66ec7ac5e2ce84286d850e37d3264134d0c0ab97779b839c0d434f81d19f0a3970821d5f50edbab75b6f7f11b0d8ed7d8070d4a7a64931dbfc73f98
-  data.tar.gz: 41e21bdad0790d639ffec1878c01ead3467e86cda7c59de4a4bb0d0b7238a3006ccad36cfb49a1c43f8f8f827a03d4063eda2fbaf3cc4d34995e7c15a97a36d9
+  metadata.gz: b9700d616cbd5d57b8c87a6a56111f15e2641c03ed8e7783ad324df5592ff597304356c98209a4f7e4e7590b01ad1e1f2331b56d05fe6a8dbbc9d7018aa39c56
+  data.tar.gz: 72b45e1e4728d1d6af962047bb8ca9794b849dad7bacd59e45a8332b5a600eaa956fd0cd2028497ec1f83553d26b07a73f44228f8795880b6bd5a20877af32b4

data/app/models/translation_engine/downloader.rb

@@ -10,8 +10,12 @@ class TranslationEngine::Downloader
     response
   end
 
+  def self.cache_timeout
+    @cache_timeout
+  end
+
   def update
-    return nil if @cache_timeout && Time.now < @cache_timeout
+    return nil if self.class.cache_timeout && Time.now < self.class.cache_timeout
     return nil if self.class.etag?(connection.get_translations_head[:etag])
     I18n.backend.reload!
   end

data/app/models/translation_engine/translation.rb

@@ -58,7 +58,7 @@ class TranslationEngine::Translation
   end
 
   def to_s
-    if TranslationEngine.use_screenshots && @text.is_a?(String)
+    if TranslationEngine.use_screenshots && @text.is_a?(String) && !full_key.include?('.routes')
       "--TRANSLATION--#{full_key}--#{@text}"
     else
       @text

data/lib/translation_engine/engine.rb

@@ -24,6 +24,40 @@ module TranslationEngine
       config.after_initialize do |app|
         if TranslationEngine.use_catcher || TranslationEngine.use_screenshots
           I18n.backend = TranslationEngine::Backend.new
+
+          I18n::Backend::Fallbacks.module_eval do
+            # Fixing problem in Fallback Backend!
+            # https://github.com/svenfuchs/i18n/blob/master/lib/i18n/backend/fallbacks.rb#L37
+            def translate(locale, key, options = {})
+              return super unless options.fetch(:fallback, true)
+              return super if (@fallback_locked ||= false)
+              default = extract_non_symbol_default!(options) if options[:default]
+
+              begin
+                @fallback_locked = true
+                I18n.fallbacks[locale].each do |fallback|
+                  begin
+                    catch(:exception) do
+                      result = super(fallback, key, options)
+                      return result if (result.nil? && options.key?(:default) && options[:default].nil?) || !result.nil?
+                    end
+                  rescue I18n::InvalidLocale
+                    # we do nothing when the locale is invalid, as this is a fallback anyways.
+                  end
+                end
+              ensure
+                @fallback_locked = false
+              end
+
+              # Original code is:
+              # return super(locale, nil, options.merge(:default => default)) if default
+              # And fix is adding key:
+              return super(locale, key, options.merge(:default => default)) if default
+
+              throw(:exception, I18n::MissingTranslation.new(locale, key, options))
+            end
+          end
+
         end
       end
     end

data/lib/translation_engine/version.rb

@@ -1,3 +1,3 @@
 module TranslationEngine
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: translation_engine
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Ondrej Bartas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-15 00:00:00.000000000 Z
+date: 2017-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails