coaster 0.1.1 → 0.1.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/coaster/core_ext/object_translation.rb +3 -0
- data/lib/coaster/version.rb +1 -1
- data/test/locales/en.yml +1 -1
- data/test/test_object_translation.rb +3 -3
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 21812083028d71953c74456cf8b8894b0a4eb369
|
4
|
+
data.tar.gz: 78de02ddd0825583b846adbd474e1e697a092e3a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8689c98beac5d6848c30173efdffa8bdffdcf5d79386a50677d9d7090f4017c4e16644e274495b44e214198b93ac0b071c18427c3863ca75a1b296a74f0cfc32
|
7
|
+
data.tar.gz: cdce5cd7c248d8e6088da46bbdef84d94726e1a32561e17e6b2def0f34fe3a826e1375871c2a9cdc09a2c81b14e4c3e7c5ffbdecbdc1d18a4970f840ee0fef4b
|
@@ -31,6 +31,7 @@ class Object
|
|
31
31
|
unless options.key?(:original_throw)
|
32
32
|
options[:original_throw] = options.delete(:throw)
|
33
33
|
end
|
34
|
+
options[:tkey] ||= key
|
34
35
|
options.merge!(throw: true)
|
35
36
|
result = catch(:exception) do
|
36
37
|
I18n.t(key, *args, options)
|
@@ -48,6 +49,7 @@ class Object
|
|
48
49
|
missing = options[:original_missing] || result
|
49
50
|
msg = missing.message
|
50
51
|
msg.instance_variable_set(:@missing, missing)
|
52
|
+
msg.instance_variable_set(:@tkey, options[:tkey])
|
51
53
|
msg
|
52
54
|
else
|
53
55
|
options[:class] = key_class.superclass
|
@@ -55,6 +57,7 @@ class Object
|
|
55
57
|
end
|
56
58
|
else
|
57
59
|
result.instance_variable_set(:@translated, true)
|
60
|
+
result.instance_variable_set(:@tkey, options[:tkey])
|
58
61
|
result
|
59
62
|
end
|
60
63
|
end
|
data/lib/coaster/version.rb
CHANGED
data/test/locales/en.yml
CHANGED
@@ -35,8 +35,8 @@ module Coaster
|
|
35
35
|
end
|
36
36
|
|
37
37
|
def test_translation_sub
|
38
|
-
assert_equal 'Coaster SampleObject Title', SampleObject._translate('.title')
|
39
|
-
assert_equal 'Coaster SampleObject Title', SampleObject._translate(:title)
|
38
|
+
assert_equal 'Coaster SampleObject Title (class.Coaster.SampleObject.title)', SampleObject._translate('.title')
|
39
|
+
assert_equal 'Coaster SampleObject Title (class.Coaster.SampleObject.title)', SampleObject._translate(:title)
|
40
40
|
end
|
41
41
|
|
42
42
|
def test_translation_with_key
|
@@ -45,7 +45,7 @@ module Coaster
|
|
45
45
|
|
46
46
|
def test_translation_inheritance
|
47
47
|
assert_equal 'Coaster SampleObject Translated', Inherited._translate
|
48
|
-
assert_equal 'Coaster SampleObject Title', Inherited._translate(:title)
|
48
|
+
assert_equal 'Coaster SampleObject Title (class.Coaster.Inherited.title)', Inherited._translate(:title)
|
49
49
|
end
|
50
50
|
|
51
51
|
def teardown
|