localeapp 3.1.1 → 3.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. checksums.yaml +5 -5
  2. data/.travis.yml +1 -1
  3. data/CHANGELOG.md +16 -0
  4. data/bin/localeapp +1 -1
  5. data/lib/localeapp/rails/backport_translation_helper_fix_to_honor_raise_option.rb +2 -1
  6. data/lib/localeapp/rails/force_exception_handler_in_translation_helper.rb +2 -2
  7. data/lib/localeapp/rails.rb +3 -1
  8. data/lib/localeapp/version.rb +1 -1
  9. data/lib/localeapp.rb +0 -1
  10. metadata +60 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 1a7cd53343b6eb12ea585524362dc60be3c0d2a5
4
- data.tar.gz: 04d96ff855e00b290e748324eff03a7a596bea8f
2
+ SHA256:
3
+ metadata.gz: 9ae1a6275c06e67be70d5928a931d76b6c82a3376baf3ac23d233694c74ae760
4
+ data.tar.gz: 8a223f69cf4b65bfb79bbbd650f1f1f71c85a376b136b26651c72104a9f93dfc
5
5
  SHA512:
6
- metadata.gz: c9624f8d6e81d35f9df063059aafaba5779cc607fd9fc45d1a785818b61159bf7776752ef8ee5b29da4d73a5d9748c8ad2bd091e5fe049469fe6c0c8cfaf6593
7
- data.tar.gz: beb7c4864b7c32b52de9c57cf732adcff5375c5833f6988c34603d9ea367ee43d88990bc36021c25abfd0a09c2dbf6cc1c6cd329a8b68606df608cecc8de3322
6
+ metadata.gz: 9fe3ac6532472f2b93cadbdb0ce8b3c4b7cf8bad59739db47044bb5cf2675bf6844bb2329f2f674bdc3d5c7011d366adee13b97b09b2ff05c07780a00f5e6541
7
+ data.tar.gz: 1f50388ec54d72d13d2129f5bc631b84a6e12900bc649c40266b1e2628b5e004be27c2a3bcb7c635afe0c3922f7bce84c2ae63d7b0e95296bcb0ce8ddb54bf0e
data/.travis.yml CHANGED
@@ -18,4 +18,4 @@ gemfile:
18
18
  - spec/gemfiles/i18n_1.0.gemfile
19
19
  notifications:
20
20
  slack:
21
- secure: JryUWfe2JR0cfNT+TIHwryy8NS8m9/hbRhg+5UqwuYWuEp6gtcWCA05wKsajQyRrGaNGYKu81RA9jpQrirgQWzDUJl5o3sEWbqKZv3pW0ybn8Tx52N1mxW3Puar5KLZ8TPRphKKIJ8/1EhAh4zpC5Mtxv8Sz1/AHuqnlu6l+bb4=
21
+ secure: dPiP4+6xO6L9/RfXyivr2X2UohSD8CDdnnY57BvNgGVvFtQ2LUP9s1mDxj7gbBGhRZJzTMZlM/PU7bT9O9JCJPcpUs4dWg748KZ0ZGOslnv8yfzNbRh9U5OzyEjch2PFkEhpQPnuVCiof+ahjfxQQSkokpsbNa9DLlDmUapXFPY=
data/CHANGELOG.md CHANGED
@@ -1,5 +1,21 @@
1
1
  # master
2
2
 
3
+ # Version 3.3.0
4
+
5
+ * Support I18n >= 1.9.0 (thanks to [@ryanb](https://github.com/ryanb))
6
+
7
+ # Version 3.2.0
8
+
9
+ * Support ruby 3.0 (thanks to [@spilin](https://github.com/spilin))
10
+
11
+ # Version 3.1.3
12
+
13
+ * Fix deprecation warning in Rails 6 initialization (thanks to [@ryanb](https://github.com/ryanb) for [reporting it](https://github.com/Locale/localeapp/issues/276))
14
+
15
+ # Version 3.1.2
16
+
17
+ * Fix a bug when `.env` is a directory (thanks to [@xijo](https://github.com/xijo) for [reporting it](https://github.com/Locale/localeapp/pull/262))
18
+
3
19
  # Version 3.1.1
4
20
 
5
21
  * Remove I18n Hash#deep_merge! usage
data/bin/localeapp CHANGED
@@ -34,7 +34,7 @@ module LocaleappGLIWrapper
34
34
  global_options[:k]
35
35
  elsif ENV['LOCALEAPP_API_KEY']
36
36
  ENV['LOCALEAPP_API_KEY']
37
- elsif File.exist?('.env') && IO.read('.env') =~ /^LOCALEAPP_API_KEY=(\w+)$/
37
+ elsif File.file?('.env') && IO.read('.env') =~ /^LOCALEAPP_API_KEY=(\w+)$/
38
38
  $1
39
39
  else
40
40
  nil
data/lib/localeapp/rails/backport_translation_helper_fix_to_honor_raise_option.rb CHANGED
@@ -49,7 +49,8 @@ module Localeapp::TranslationHelperRails41MonkeyPatch
49
49
 
50
50
  if html_safe_translation_key?(key)
51
51
  html_safe_options = options.dup
52
- options.except(*I18n::RESERVED_KEYS).each do |name, value|
52
+ options.each do |name, value|
53
+ next if I18n::RESERVED_KEYS.include?(name)
53
54
  unless name == :count && value.is_a?(Numeric)
54
55
  html_safe_options[name] = ERB::Util.html_escape(value.to_s)
55
56
  end
data/lib/localeapp/rails/force_exception_handler_in_translation_helper.rb CHANGED
@@ -16,9 +16,9 @@ module Localeapp
16
16
  def translate(key, options = {})
17
17
  full_key = [options[:scope], key].compact.join(".")
18
18
  if full_key =~ Localeapp.configuration.blacklisted_keys_pattern
19
- super(key, options)
19
+ super(key, **options)
20
20
  else
21
- super(key, {:raise => false}.merge(options))
21
+ super(key, **{:raise => false}.merge(options))
22
22
  end
23
23
  end
24
24
  alias :t :translate
data/lib/localeapp/rails.rb CHANGED
@@ -4,7 +4,9 @@ module Localeapp
4
4
  module Rails
5
5
  def self.initialize
6
6
 
7
- ActionController::Base.send(:include, Localeapp::Rails::Controller)
7
+ ActiveSupport.on_load(:action_controller) do
8
+ ActionController::Base.send(:include, Localeapp::Rails::Controller)
9
+ end
8
10
 
9
11
  # match all versions between https://github.com/rails/rails/commit/d57ce232a885b21e1d6d1f9fbf60bc5908ad880d and https://github.com/rails/rails/commit/4dbce79e95e3f56a9b48992dea4531493a5008cc on all branches
10
12
  if rails_version_matches_all?('~> 4.0.10.rc1') |
data/lib/localeapp/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Localeapp
2
- VERSION = "3.1.1"
2
+ VERSION = "3.3.0"
3
3
  end
data/lib/localeapp.rb CHANGED
@@ -1,5 +1,4 @@
1
1
  require 'i18n'
2
- require 'i18n/core_ext/hash'
3
2
  require 'yaml'
4
3
 
5
4
  require 'localeapp/i18n_shim'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: localeapp
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.1
4
+ version: 3.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Christopher Dell
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2019-01-11 00:00:00.000000000 Z
14
+ date: 2022-02-22 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: i18n
@@ -298,10 +298,64 @@ required_rubygems_version: !ruby/object:Gem::Requirement
298
298
  - !ruby/object:Gem::Version
299
299
  version: '0'
300
300
  requirements: []
301
- rubyforge_project: localeapp
302
- rubygems_version: 2.6.14
301
+ rubygems_version: 3.0.3.1
303
302
  signing_key:
304
303
  specification_version: 4
305
304
  summary: Easy i18n translation management with localeapp.com
306
- test_files: []
307
- has_rdoc:
305
+ test_files:
306
+ - features/add.feature
307
+ - features/bad_command.feature
308
+ - features/cp.feature
309
+ - features/env_file.feature
310
+ - features/environment.feature
311
+ - features/help.feature
312
+ - features/install.feature
313
+ - features/install/write_env_file.feature
314
+ - features/mv.feature
315
+ - features/options/api_key.feature
316
+ - features/pull.feature
317
+ - features/push.feature
318
+ - features/rm.feature
319
+ - features/step_definitions/cli_steps.rb
320
+ - features/step_definitions/execution_steps.rb
321
+ - features/step_definitions/filesystem_steps.rb
322
+ - features/step_definitions/output_steps.rb
323
+ - features/support/env.rb
324
+ - features/support/hooks.rb
325
+ - features/update.feature
326
+ - spec/fixtures/empty_log.yml
327
+ - spec/fixtures/en.yml
328
+ - spec/fixtures/es.yml
329
+ - spec/fixtures/string_log.yml
330
+ - spec/fixtures/symbol_log.yml
331
+ - spec/gemfiles/i18n_0.7.gemfile
332
+ - spec/gemfiles/i18n_0.8.gemfile
333
+ - spec/gemfiles/i18n_0.9.gemfile
334
+ - spec/gemfiles/i18n_1.0.gemfile
335
+ - spec/localeapp/api_call_spec.rb
336
+ - spec/localeapp/api_caller_spec.rb
337
+ - spec/localeapp/cli/add_spec.rb
338
+ - spec/localeapp/cli/copy_spec.rb
339
+ - spec/localeapp/cli/daemon_spec.rb
340
+ - spec/localeapp/cli/install_spec.rb
341
+ - spec/localeapp/cli/pull_spec.rb
342
+ - spec/localeapp/cli/push_spec.rb
343
+ - spec/localeapp/cli/rename_spec.rb
344
+ - spec/localeapp/cli/update_spec.rb
345
+ - spec/localeapp/configuration_spec.rb
346
+ - spec/localeapp/default_value_handler_spec.rb
347
+ - spec/localeapp/exception_handler_spec.rb
348
+ - spec/localeapp/key_checker_spec.rb
349
+ - spec/localeapp/missing_translations_spec.rb
350
+ - spec/localeapp/poller_spec.rb
351
+ - spec/localeapp/rails/controller_spec.rb
352
+ - spec/localeapp/routes_spec.rb
353
+ - spec/localeapp/sender_spec.rb
354
+ - spec/localeapp/sync_file_spec.rb
355
+ - spec/localeapp/updater_spec.rb
356
+ - spec/localeapp_spec.rb
357
+ - spec/spec_helper.rb
358
+ - spec/support/fakeweb_socket_close_patch.rb
359
+ - spec/support/i18n/missing_translation.rb
360
+ - spec/support/localeapp_integration_data.rb
361
+ - spec/support/localeapp_synchronization_data.rb