translation_engine 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9403edc4263e3baab5d75038e0ce23c2d3e3b46
-  data.tar.gz: 63b5ce8b73ebe6a3866913167d347feae3048830
+  metadata.gz: 498b874a47bd3849b2b910180113ddbce2bdecaf
+  data.tar.gz: fc2622bab03ff94006fa2c3a970a05a58834ff68
 SHA512:
-  metadata.gz: a527f2cc3b1387ce2e44d0fcfa04c169c87e1575acbe5d1e4319366ba39604ee37399d96959fc1e9e8cb6b525253690748314c41cc3bec96f61973faf9e62249
-  data.tar.gz: ac3c31d8ee464e4d11cd25be693122b0d9765c7e210b56c016c185559b6d2aea0fc877162a4709b50bb20bdc14409f97d3de5edd1e598e1fe522d8f54838ebd9
+  metadata.gz: b52e523013ea5d167280451c3b0d4b86a27b4a7ddff708ce00f8f9631448b6a3b9614e66ad4849ba70e3aa6eacec69bae7767dddb66677326c724c879f6c623d
+  data.tar.gz: 5d178901b241444101fd1d705e74a431a9a99db90e2113e2b9e21fe98a6b4a078fbb202e9f629c795140d88d6e00be1c17c99fb2fdc24ce6181e28b3037e7291

data/app/models/translation_engine/backend.rb

@@ -50,14 +50,24 @@ class TranslationEngine::Backend < I18n::Backend::Simple
     end
   end
 
-  def lookup(locale, key, scope = [], options = {})
-    keys = I18n.normalize_keys(locale, key, scope, options[:separator])
-    resolved = super
-    if resolved
-      enhance_translation(resolved, keys)
-    else
-      resolved
+  def resolve(locale, object, subject, options = {})
+    return subject if options[:resolve] == false
+
+    result = catch(:exception) do
+      case subject
+      when Symbol
+        I18n.translate(subject, options.merge(:locale => locale, :throw => true))
+      when Proc
+        date_or_time = options.delete(:object) || object
+        resolve(locale, object, subject.call(date_or_time, options))
+      when nil
+        nil
+      else
+        keys = I18n.normalize_keys(locale, object, options[:scope], options[:separator])
+        enhance_translation(subject, keys)
+      end
     end
+    result unless result.is_a?(I18n::MissingTranslation)
   end
 
   def enhance_translation(value, main_keys, catch_translation = true)

data/lib/translation_engine/version.rb

@@ -1,3 +1,3 @@
 module TranslationEngine
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: translation_engine
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ondrej Bartas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-09 00:00:00.000000000 Z
+date: 2017-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
 - !ruby/object:Gem::Dependency