rails_i18n_extended 0.1.2 → 0.1.3
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.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/lib/rails_i18n_extended/i18n_overrides.rb +11 -13
- data/lib/rails_i18n_extended/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5cb26034602a59290e068729def78b2944d2963faacb18f162108d6c258052a3
|
|
4
|
+
data.tar.gz: 3752b3fe15b4460ab036eba1ecb54f9492cef0ac7adde75beebee02fcf4d712b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 1257d55e226ff56d2c31cfa3de33bf3f8af1df6db10f3610a18ea148150f9f56931acd2d0fce7df5d1a036c1f11391d1e67d6042af22f7cb4bc48d0d0ad360fa
|
|
7
|
+
data.tar.gz: 1d0be4257ee048b8303d827582d4491c7f07405c6ce82ff71515bbccee74f28bdfcc76b262b4b748d36f77a635fc331b7a3d3fcf61205c378cd67ac38a22c17b
|
data/Gemfile.lock
CHANGED
|
@@ -4,22 +4,19 @@ module I18n
|
|
|
4
4
|
class << self
|
|
5
5
|
|
|
6
6
|
def translate_with_default key, options={}, original=nil
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
v = split.pop
|
|
15
|
-
v2 = split.pop
|
|
16
|
-
split.pop if v2 == 'defaults'
|
|
17
|
-
split << 'defaults' << v
|
|
18
|
-
new_key = split.join('.')
|
|
19
|
-
translate_with_default new_key, options, original || key
|
|
7
|
+
defaults = []
|
|
8
|
+
chain = key.to_s.split('.')
|
|
9
|
+
unless chain[-2] == 'defaults'
|
|
10
|
+
last = chain.pop
|
|
11
|
+
while chain.size > 0
|
|
12
|
+
chain.pop
|
|
13
|
+
defaults << (chain + ['defaults', last]).join('.').to_sym
|
|
20
14
|
end
|
|
21
15
|
end
|
|
16
|
+
|
|
17
|
+
translate_without_default(key, **{default: defaults}.update(options))
|
|
22
18
|
end
|
|
19
|
+
|
|
23
20
|
alias_method :translate_without_default, :translate
|
|
24
21
|
alias_method :translate, :translate_with_default
|
|
25
22
|
alias_method :t, :translate
|
|
@@ -27,6 +24,7 @@ module I18n
|
|
|
27
24
|
def translate_with_fallback(key = nil, **options)
|
|
28
25
|
locale = options[:locale] || I18n.locale
|
|
29
26
|
intended_to_raise = options[:raise]
|
|
27
|
+
|
|
30
28
|
translate_without_fallback(key, options.dup.update(raise: true))
|
|
31
29
|
rescue I18n::MissingTranslationData => e
|
|
32
30
|
raise if locale == I18n.default_locale && intended_to_raise
|