tml-rails 5.2.7 → 5.2.8

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c6b47a76c76790abf803730c425e68876938c354
4
- data.tar.gz: 54ccda8dbe9f4efb4caba514961d4129effa943b
3
+ metadata.gz: ad5bd440d0417b56b6c7628994cedf56b5c90723
4
+ data.tar.gz: 47ade4667be7a5ce93a3812922e12bbc56f618c1
5
5
  SHA512:
6
- metadata.gz: b5c3859299b769e356a778568934c7aa8955efc60739fbe14aa6d8c1778b8888b007f3ec765b91fb10cb987c5a6d84b938dd291e5aa513b2d73f754b3f03bddb
7
- data.tar.gz: c70317ed3effb0f16d20526441d4ffdd619e34593293de363701b0fa291b8d62120e3d4a9118bec4de6dcafc486a5fb351f4e4e746ac287bddafa23e51ece56f
6
+ metadata.gz: fcd4d446e33eddd16911249bd2a933a47935db463214b45b8e8d8f01ad85182c2af22d1891cdc537d5c60bbc6d0aefaebf64c97b7750e28fa7df08e234343aa2
7
+ data.tar.gz: 3960daeeea705c3375ce1643258ab56545095d8a7ab477a63eade2b0735c48d007dbdadb916e52ab2d3be2890727734a521e44cec9fc809bbd2393f3ce87153c
@@ -1,12 +1,4 @@
1
1
  <% if Tml.config.enabled? %>
2
- <style type="text/css">
3
- .tml_fltr {<%=tml_style_attribute_tag('float', 'right')%> !important;}
4
- .tml_fltl {<%=tml_style_attribute_tag('float', 'left')%> !important;}
5
- .tml_txtr {<%=tml_style_attribute_tag('text-align', 'right')%> !important;}
6
- .tml_txtl {<%=tml_style_attribute_tag('text-align', 'left')%> !important;}
7
- <%= tml_application.css %>
8
- </style>
9
-
10
2
  <% if Tml.config.respond_to?(:agent) and Tml.config.agent %>
11
3
  <% if Tml.config.agent[:type].to_s == 'tools' %>
12
4
  <%= render(:partial => '/tml_rails/tags/scripts_tools') %>
@@ -17,6 +17,7 @@
17
17
  flag_url: lang.flag_url
18
18
  }
19
19
  end
20
+ agent_config[:css] = tml_application.css
20
21
  %>
21
22
  (function() {
22
23
  var script = window.document.createElement('script');
@@ -1,3 +1,11 @@
1
+ <style type="text/css">
2
+ .tml_fltr {<%=tml_style_attribute_tag('float', 'right')%> !important;}
3
+ .tml_fltl {<%=tml_style_attribute_tag('float', 'left')%> !important;}
4
+ .tml_txtr {<%=tml_style_attribute_tag('text-align', 'right')%> !important;}
5
+ .tml_txtl {<%=tml_style_attribute_tag('text-align', 'left')%> !important;}
6
+ <%= tml_application.css %>
7
+ </style>
8
+
1
9
  <script>
2
10
  (function() {
3
11
  if (window.tml_already_initialized) return;
@@ -60,9 +60,11 @@ module I18n
60
60
  def lookup(locale, key, scope = [], options = {})
61
61
  # pp [locale, key, scope, options]
62
62
 
63
- default_key = super(application.default_locale, key, scope, options)
64
- return default_key if key.to_s.match(/^(support|i18n)/)
63
+ if key.to_s.match(/^(support|i18n|number|human|distance)/)
64
+ return super(locale, key, scope, options)
65
+ end
65
66
 
67
+ default_key = super(application.default_locale, key, scope, options)
66
68
  default_key ||= key.to_s.split('.').last.gsub('_', ' ').capitalize
67
69
 
68
70
  if default_key.is_a?(String)
@@ -30,5 +30,5 @@
30
30
  #++
31
31
 
32
32
  module TmlRails
33
- VERSION = '5.2.7'
33
+ VERSION = '5.2.8'
34
34
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tml-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.2.7
4
+ version: 5.2.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Michael Berkovich
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-01-13 00:00:00.000000000 Z
11
+ date: 2016-01-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails