flame-r18n 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69bd2e6db6ed7abde28c22f4492b15b4178b29e1
-  data.tar.gz: 9a378e6ba2e23b69d09365d84059dbda391b8a67
+  metadata.gz: 8daf054a8ea79ca57a77ae6e3e5e240bfa94627d
+  data.tar.gz: 01775fe27ded5a3d85ead697773fbd51c08327fd
 SHA512:
-  metadata.gz: 3f9d73601ce2aef09de850fd05a32860b9462b785392e402788208aaa64d9e2248fcca68c429ad5846d68203b7cc0059ba53c8048b0fbe2b9f4eccb80a0d2096
-  data.tar.gz: eada5ba6df5ae02f72e531819cd3a8abb90556a6b0c8614ddc61c8c56c0ae97cc47959e1afa4af42e785e87cd0d9aee9d580b0813ffa6557f057234820a8bf9f
+  metadata.gz: 5741b0494fdfb8cef18c0b54e5790ba9ed4f681a6e03c5b0d9d639683f4869af0c26ac1ed0baa7e79944a6d3ef641fd7c6efaa40d53c641a1cd095a052ebdeed
+  data.tar.gz: e364419d620577191e8e6c4a2a1726057e9e73efeb9d0061c7ecff557729c08ffe1405a0aa4ccaff4332180aef81684c235ffabbab2b6e6ff82a2dbfca8bf56b

data/lib/flame/r18n.rb

@@ -41,6 +41,7 @@ module Flame
 		end
 
 		def preferred_locale
+			return super if defined? super
 			params[:locale] || session[:locale]
 		end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flame-r18n
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Alexander Popov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2016-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flame