localeapp 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49934a232ff496462c5acf3466e26a4c7e420fcd
-  data.tar.gz: 45b94a7e5ae24ef7d2d3bf75dca90f9dd121fd25
+  metadata.gz: 43785b36844af9847b8326daab04090d1ab40d49
+  data.tar.gz: 7156df0e8530172294d41302b545d34c2b4ed2a3
 SHA512:
-  metadata.gz: b852479fc11e37c471f74506fc9a4db112103c4235db72509bf9bdbf503780122d7450bccab5700653295e9abbb18a2f082cd0b6bd5d87f07ea38cee1f06ecf2
-  data.tar.gz: d0ab7261a4d75727089ac38d3713a6581a6f036f7e9cb11baed510b815f4b37a8191a93a490094822164855518e20ba12c6aa362fa8fab301b11e309db95d455
+  metadata.gz: ca9c2892df8e20e6492885c65bfc479ca577af7a83e91e8a512fe87623c24f80168a9d9e1cd344ca3242614403ba326d1ff9ae107a0a6c9b46acb3a6a428d16d
+  data.tar.gz: b01a5cd563aafbdfd3e235a0eeb0a7ccb8ca433a79b4019f8d246eb229e3c709b552a1a24fc29b1bb107dd9210f4b43ca860b4474d5a1ec405684cd12e304498

data/.travis.yml

@@ -3,11 +3,12 @@ dist: trusty
 before_install:
   - gem install bundler
 rvm:
-  - 2.4.1
-  - 2.3.4
-  - 2.2.7
+  - 2.5.0
+  - 2.4.3
+  - 2.3.6
+  - 2.2.9
   - 2.1.10
-  - jruby
+  - jruby-9.1.15.0
 gemfile:
   - Gemfile
   - gemfiles/i18n_0.4.gemfile

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # master
 
+# Version 2.5.0
+
+* Show fully-scoped keys in `ExceptionHandler` log messages (thanks to @leonhooijer)
+* Don't force raising an exception for blacklisted keys (thanks to @leonhooijer)
+
 # Version 2.4.0
 
 * Support pulling of single locales

data/lib/localeapp/exception_handler.rb

@@ -2,16 +2,17 @@ module Localeapp
   class ExceptionHandler
     def self.call(exception, locale, key_or_keys, options)
       keys = Array(key_or_keys).map { |key| ERB::Util.html_escape(key.to_s) }
+      scoped_keys = keys.map { |key| [options[:scope], key].compact.join(".") }
       Localeapp.log(exception.message)
       # Which exact exception is set up by our i18n shims
       if exception.is_a? Localeapp::I18nMissingTranslationException
-        Localeapp.log("Detected missing translation for key(s) #{keys.inspect}")
+        Localeapp.log("Detected missing translation for key(s) #{scoped_keys.inspect}")
 
         keys.each do |key|
           Localeapp.missing_translations.add(locale, key, nil, options || {})
         end
 
-        [locale, keys].join(', ')
+        [locale, scoped_keys].join(', ')
       else
         Localeapp.log('Raising exception')
         raise

data/lib/localeapp/rails/force_exception_handler_in_translation_helper.rb

@@ -14,7 +14,11 @@
 module Localeapp
   module ForceExceptionHandlerInTranslationHelper
     def translate(key, options = {})
-      super(key, {:raise => false}.merge(options))
+      if [options[:scope], key].compact.join(".").match?(Localeapp.configuration.blacklisted_keys_pattern)
+        super(key, options)
+      else
+        super(key, {:raise => false}.merge(options))
+      end
     end
     alias :t :translate
   end

data/lib/localeapp/version.rb

@@ -1,3 +1,3 @@
 module Localeapp
-  VERSION = "2.4.0"
+  VERSION = "2.5.0"
 end

data/spec/localeapp/exception_handler_spec.rb

@@ -46,4 +46,9 @@ describe Localeapp::ExceptionHandler, '#call(exception, locale, key, options)' d
       Localeapp::ExceptionHandler.call(exception, :en, 'foo', {})
     }.to_not raise_error
   end
+
+  it "handles the scope option" do
+    expect(I18n.t('foo.bar', scope: 'scoped')).to eq 'en, scoped.foo.bar'
+    expect(I18n.t(%w{foo.bar foo.baz}, scope: 'scoped')).to eq 'en, scoped.foo.bar, scoped.foo.baz'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: localeapp
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Christopher Dell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-29 00:00:00.000000000 Z
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -302,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: localeapp
-rubygems_version: 2.6.12
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Easy i18n translation management with localeapp.com