tml 4.3.7 → 4.3.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/tml/application.rb +2 -1
- data/lib/tml/language.rb +1 -1
- data/lib/tml/version.rb +1 -1
- 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: 48d0f38ec48a97068f472083a436e475acc64755
|
|
4
|
+
data.tar.gz: 8877fd7031ff8471a4ea36ed5996c6773d5526c9
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 5350c4b99a3301d8534832ba3baf7c0481200ffbf6be6d85180a4c3a93439114be7fd8307a038a357905678371fff099247fa8e561f8504424fccea45f37216a
|
|
7
|
+
data.tar.gz: c9861cf3b9ed4c8b416e0a97630005643bfe011e4e02c815f79821705e869a50a5a911f83ce95a562d4ecf12f36aaf573bfe81d17c308f9d5742ca348ec29d3a
|
data/lib/tml/application.rb
CHANGED
|
@@ -45,7 +45,8 @@ class Tml::Application < Tml::Base
|
|
|
45
45
|
end
|
|
46
46
|
|
|
47
47
|
def fetch
|
|
48
|
-
|
|
48
|
+
data = api_client.get('applications/current', {:definition => true}, {:cache_key => self.class.cache_key})
|
|
49
|
+
update_attributes(data) if data
|
|
49
50
|
rescue Tml::Exception => ex
|
|
50
51
|
Tml.logger.error("Failed to load application: #{ex}")
|
|
51
52
|
self
|
data/lib/tml/language.rb
CHANGED
|
@@ -138,7 +138,7 @@ class Tml::Language < Tml::Base
|
|
|
138
138
|
params[:tokens] ||= {}
|
|
139
139
|
params[:tokens][:viewing_user] ||= Tml.session.current_user
|
|
140
140
|
|
|
141
|
-
if Tml.config.disabled? or self.locale == translation_key.locale
|
|
141
|
+
if Tml.config.disabled? or self.locale == translation_key.locale or application.nil?
|
|
142
142
|
return translation_key.substitute_tokens(
|
|
143
143
|
params[:label],
|
|
144
144
|
params[:tokens],
|
data/lib/tml/version.rb
CHANGED