emipair-merb_global 0.0.1 → 0.0.2
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/lib/merb_global/controller.rb +1 -1
- metadata +2 -2
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.0.
|
|
1
|
+
0.0.2
|
|
@@ -29,7 +29,7 @@ module Merb
|
|
|
29
29
|
# Set up the language
|
|
30
30
|
accept_language = self.request.env['HTTP_ACCEPT_LANGUAGE']
|
|
31
31
|
Merb::Global::Locale.current =
|
|
32
|
-
(!params[:locale].nil? && params[:locale].to_s.length > 0 && Merb::Global::Locale.new(params[:locale])) ||
|
|
32
|
+
(!params[:locale].nil? && params[:locale].to_s.length > 0 && Merb::Global::Locale.new(h(params[:locale]))) ||
|
|
33
33
|
(self._mg_locale &&
|
|
34
34
|
Merb::Global::Locale.new(self.instance_eval(&self._mg_locale))) ||
|
|
35
35
|
Merb::Global::Locale.from_accept_language(accept_language) ||
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: emipair-merb_global
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.
|
|
4
|
+
version: 0.0.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Matt Kent
|
|
@@ -10,7 +10,7 @@ autorequire:
|
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
12
|
|
|
13
|
-
date: 2009-
|
|
13
|
+
date: 2009-10-06 00:00:00 -07:00
|
|
14
14
|
default_executable:
|
|
15
15
|
dependencies: []
|
|
16
16
|
|