localyzed 0.0.6 → 0.0.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -9,14 +9,14 @@ module Localyzed::LocalyzedController
|
|
|
9
9
|
{:locale => I18n.locale.to_s}.merge(super)
|
|
10
10
|
end
|
|
11
11
|
|
|
12
|
-
# sets the locale by checking user data then request param then session data then retrieving accept language data
|
|
12
|
+
# sets the locale by checking user data then request param then session data then retrieving accept language data
|
|
13
13
|
def set_locale
|
|
14
14
|
cl = ( user_language || 'en')
|
|
15
15
|
if params[:locale].nil? and user_signed_in? and cl and I18n.available_locales.include?(cl)
|
|
16
16
|
locale = I18n.locale = cl
|
|
17
17
|
session[:locale] = locale
|
|
18
18
|
else
|
|
19
|
-
current_user.try(:user_profile).try(:update_attributes,{:language => params[:locale]}) if params[:locale] && cl.try(:!=, params[:locale])
|
|
19
|
+
current_user.try(:user_profile).try(:update_attributes,{:language => params[:locale]}) if params[:locale] && cl.try(:!=, params[:locale]) && current_user.try(:respond_to?, :user_profile)
|
|
20
20
|
define_locale
|
|
21
21
|
end
|
|
22
22
|
end
|
|
@@ -38,11 +38,11 @@ module Localyzed::LocalyzedController
|
|
|
38
38
|
session[:locale] = requested_locale
|
|
39
39
|
I18n.locale = requested_locale
|
|
40
40
|
end
|
|
41
|
-
|
|
41
|
+
|
|
42
42
|
def simplified_locale(locale)
|
|
43
43
|
locale.to_s.gsub(/(-|_).*$/,'').try(:to_sym)
|
|
44
44
|
end
|
|
45
|
-
|
|
45
|
+
|
|
46
46
|
def user_language
|
|
47
47
|
if respond_to?(:user_signed_in?) && current_user
|
|
48
48
|
if current_user.respond_to?(:user_profile) && current_user.user_profile.try(:respond_to?,:language)
|
|
@@ -52,4 +52,4 @@ module Localyzed::LocalyzedController
|
|
|
52
52
|
end
|
|
53
53
|
end
|
|
54
54
|
end
|
|
55
|
-
end
|
|
55
|
+
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.
|
|
4
|
+
version: 0.0.7
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,11 +9,11 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2014-
|
|
12
|
+
date: 2014-06-03 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: rails
|
|
16
|
-
requirement: &
|
|
16
|
+
requirement: &70179111558720 !ruby/object:Gem::Requirement
|
|
17
17
|
none: false
|
|
18
18
|
requirements:
|
|
19
19
|
- - ~>
|
|
@@ -21,10 +21,10 @@ dependencies:
|
|
|
21
21
|
version: 3.2.12
|
|
22
22
|
type: :runtime
|
|
23
23
|
prerelease: false
|
|
24
|
-
version_requirements: *
|
|
24
|
+
version_requirements: *70179111558720
|
|
25
25
|
- !ruby/object:Gem::Dependency
|
|
26
26
|
name: rack-rewrite
|
|
27
|
-
requirement: &
|
|
27
|
+
requirement: &70179111557380 !ruby/object:Gem::Requirement
|
|
28
28
|
none: false
|
|
29
29
|
requirements:
|
|
30
30
|
- - ~>
|
|
@@ -32,10 +32,10 @@ dependencies:
|
|
|
32
32
|
version: 1.2.1
|
|
33
33
|
type: :runtime
|
|
34
34
|
prerelease: false
|
|
35
|
-
version_requirements: *
|
|
35
|
+
version_requirements: *70179111557380
|
|
36
36
|
- !ruby/object:Gem::Dependency
|
|
37
37
|
name: rails-translate-routes-na
|
|
38
|
-
requirement: &
|
|
38
|
+
requirement: &70179111556700 !ruby/object:Gem::Requirement
|
|
39
39
|
none: false
|
|
40
40
|
requirements:
|
|
41
41
|
- - ~>
|
|
@@ -43,10 +43,10 @@ dependencies:
|
|
|
43
43
|
version: 1.0.0
|
|
44
44
|
type: :runtime
|
|
45
45
|
prerelease: false
|
|
46
|
-
version_requirements: *
|
|
46
|
+
version_requirements: *70179111556700
|
|
47
47
|
- !ruby/object:Gem::Dependency
|
|
48
48
|
name: rails-i18n
|
|
49
|
-
requirement: &
|
|
49
|
+
requirement: &70179111555940 !ruby/object:Gem::Requirement
|
|
50
50
|
none: false
|
|
51
51
|
requirements:
|
|
52
52
|
- - ~>
|
|
@@ -54,10 +54,10 @@ dependencies:
|
|
|
54
54
|
version: 3.0.0.pre
|
|
55
55
|
type: :runtime
|
|
56
56
|
prerelease: false
|
|
57
|
-
version_requirements: *
|
|
57
|
+
version_requirements: *70179111555940
|
|
58
58
|
- !ruby/object:Gem::Dependency
|
|
59
59
|
name: mysql2
|
|
60
|
-
requirement: &
|
|
60
|
+
requirement: &70179111555480 !ruby/object:Gem::Requirement
|
|
61
61
|
none: false
|
|
62
62
|
requirements:
|
|
63
63
|
- - ! '>='
|
|
@@ -65,7 +65,7 @@ dependencies:
|
|
|
65
65
|
version: '0'
|
|
66
66
|
type: :development
|
|
67
67
|
prerelease: false
|
|
68
|
-
version_requirements: *
|
|
68
|
+
version_requirements: *70179111555480
|
|
69
69
|
description: ! "Includes ActionController helpers implementing unlocalized routes
|
|
70
70
|
redirection \n + a rack_rewrite redirecting /en to /en/ for SEO
|
|
71
71
|
+\n the rails-translate-routes gem to be used in target apps"
|