localyzed 0.0.5 → 0.0.6

data/lib/localyzed/controllers/action_controller_extension.rb

@@ -11,7 +11,7 @@ module Localyzed::LocalyzedController
 
   # sets the locale by checking user data then request param then session data then retrieving accept language data 
   def set_locale
-    cl = ( ( respond_to?(:user_signed_in?) && current_user.try(:user_profile).try(:respond_to?,:language) ) ? current_user.user_profile.language : 'en')
+    cl = ( user_language || 'en')
     if params[:locale].nil? and user_signed_in? and cl and I18n.available_locales.include?(cl)
       locale = I18n.locale = cl
       session[:locale] = locale
@@ -42,4 +42,14 @@ module Localyzed::LocalyzedController
   def simplified_locale(locale)
     locale.to_s.gsub(/(-|_).*$/,'').try(:to_sym)
   end
+  
+  def user_language
+    if respond_to?(:user_signed_in?) && current_user
+      if current_user.respond_to?(:user_profile) && current_user.user_profile.try(:respond_to?,:language)
+        current_user.user_profile.language
+      elsif current_user.respond_to?(:language) && current_user.language
+        current_user.language
+      end
+    end
+  end
 end

data/lib/localyzed/version.rb

@@ -1,3 +1,3 @@
 module Localyzed
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: localyzed
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70239735993580 !ruby/object:Gem::Requirement
+  requirement: &70325622844720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.12
   type: :runtime
   prerelease: false
-  version_requirements: *70239735993580
+  version_requirements: *70325622844720
 - !ruby/object:Gem::Dependency
   name: rack-rewrite
-  requirement: &70239735991160 !ruby/object:Gem::Requirement
+  requirement: &70325622843500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70239735991160
+  version_requirements: *70325622843500
 - !ruby/object:Gem::Dependency
   name: rails-translate-routes-na
-  requirement: &70239735988340 !ruby/object:Gem::Requirement
+  requirement: &70325622842800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70239735988340
+  version_requirements: *70325622842800
 - !ruby/object:Gem::Dependency
   name: rails-i18n
-  requirement: &70239735987440 !ruby/object:Gem::Requirement
+  requirement: &70325622841680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 3.0.0.pre
   type: :runtime
   prerelease: false
-  version_requirements: *70239735987440
+  version_requirements: *70325622841680
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70239735986920 !ruby/object:Gem::Requirement
+  requirement: &70325622839880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70239735986920
+  version_requirements: *70325622839880
 description: ! "Includes ActionController helpers implementing unlocalized routes
   redirection \n                    + a rack_rewrite redirecting /en to /en/ for SEO
   +\n                    the rails-translate-routes gem to be used in target apps"