localyzed 0.0.1.3 → 0.0.1.4
Sign up to get free protection for your applications and to get access to all the features.
@@ -1,7 +1,7 @@
|
|
1
1
|
class ActionController::Base
|
2
2
|
|
3
3
|
def url_options
|
4
|
-
{:locale => I18n.locale.to_s
|
4
|
+
{:locale => I18n.locale.to_s}.merge(super)
|
5
5
|
end
|
6
6
|
|
7
7
|
before_filter :set_locale
|
@@ -24,11 +24,6 @@ class ActionController::Base
|
|
24
24
|
@translatable = true # used to display or hide the languages menu
|
25
25
|
if ( !request.xhr? && ( !request.path.match(/\/(en|fr)(\/|$)/) || params[:locale] != I18n.locale.to_s) && request.method == 'GET')
|
26
26
|
flash.keep
|
27
|
-
# rediredct 302 for root / 301 for other pages
|
28
|
-
if request.path == '/'
|
29
|
-
params.delete(:action) # removes the action param from params so that it doesn't appear anymore in the redirected url ("?action=root")
|
30
|
-
redirect_to url_for(params.merge(:locale => I18n.locale.to_s))
|
31
|
-
else
|
32
27
|
redirect_to(url_for(params.merge(:locale => I18n.locale.to_s, :from_l => (params[:locale] if params[:locale]))), :status => :moved_permanently)
|
33
28
|
end
|
34
29
|
end
|
data/lib/localyzed/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: localyzed
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.1.
|
4
|
+
version: 0.0.1.4
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-12-
|
12
|
+
date: 2012-12-06 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rails
|