iugusdk 1.0.0.alpha.16 → 1.0.0.alpha.17

data/app/mailers/iugu_mailer.rb

@@ -7,17 +7,38 @@ class IuguMailer < Devise::Mailer
     "iugu/mailer"
   end
 
+  def reset_password_instructions(record, opts={})
+    set_locale(record)
+    super(record)
+    set_default_locale
+  end
+
   def invitation(user_invitation)
+    set_locale(user)
     @user_invitation = user_invitation
-    mail(to: @user_invitation.email, :subject => "Convite para sua conta") do |format|
+    mail(to: @user_invitation.email, :subject => I18n.t("user_invitation")) do |format|
       format.html { render "iugu/mailer/invitation" }
     end
+    set_default_locale
   end
 
   def welcome(user)
+    set_locale(user)
     @user = user
-    mail(to: @user.email, :subject => "Bem vindo!") do |format|
+    mail(to: @user.email, :subject => I18n.t("user_welcome")) do |format|
       format.html { render "iugu/mailer/welcome" }
     end
+    set_default_locale
+  end
+
+  private
+
+  def set_locale(user)  
+    @default_locale = I18n.locale 
+    I18n.locale = user.locale
+  end
+
+  def set_default_locale
+    I18n.locale = @default_locale
   end
 end

data/app/views/iugu/settings/profile.html.haml

@@ -106,23 +106,23 @@
         = @user.token.token
     = link_to I18n.t("iugu.api_renew"), renew_user_token_path + "#api", :class => "button no-bottom-margin"
 
-  %hr
-  .container.no-bottom-margin{ :style => "background-color:#FFF5F5" }
-    = render partial: "iugu/shared/notices", locals: { group: :remove_user }
-    - if @user.destroying?
-      .element-spacing
-        = I18n.t("iugu.user_destruction_in")
-        %div
-          %strong
-            = I18n.l( @user.destruction_job.run_at, :format => :default )
-
-      - unless @user.destruction_job.locked_at
-        = link_to I18n.t("iugu.undo"), profile_cancel_destruction_path + "#remove_user", :confirm => I18n.t("iugu.are_you_sure?"), :class => "button warning no-bottom-margin"
-
-    - else
-      %h3
-        = I18n.t("iugu.remove_user")
-      %p
-        = I18n.t("iugu.remove_user_warning")
-      - if IuguSDK::enable_user_cancel
-        = link_to I18n.t("iugu.remove_user"), profile_destroy_path + "#remove_user", :confirm => I18n.t("iugu.are_you_sure?"), :class => "button warning no-bottom-margin"
+  - if IuguSDK::enable_user_cancel
+    %hr
+    .container.no-bottom-margin{ :style => "background-color:#FFF5F5" }
+      = render partial: "iugu/shared/notices", locals: { group: :remove_user }
+      - if @user.destroying?
+        .element-spacing
+          = I18n.t("iugu.user_destruction_in")
+          %div
+            %strong
+              = I18n.l( @user.destruction_job.run_at, :format => :default )
+
+        - unless @user.destruction_job.locked_at
+          = link_to I18n.t("iugu.undo"), profile_cancel_destruction_path + "#remove_user", :confirm => I18n.t("iugu.are_you_sure?"), :class => "button warning no-bottom-margin"
+
+      - else
+        %h3
+          = I18n.t("iugu.remove_user")
+        %p
+          = I18n.t("iugu.remove_user_warning")
+          = link_to I18n.t("iugu.remove_user"), profile_destroy_path + "#remove_user", :confirm => I18n.t("iugu.are_you_sure?"), :class => "button warning no-bottom-margin"

data/lib/iugusdk/engine.rb

@@ -17,7 +17,7 @@ module IuguSDK
     initializer 'iugusdk.action_controller' do |app|
       ActiveSupport.on_load(:action_controller) do
         include IuguSDK::Controllers::Helpers
-        helper_method "search_user_account", "current_user_account", "is_active?", "body_classes", "current_account"
+        helper_method "search_user_account", "current_user_account", "is_active?", "body_classes", "current_account", "get_compatible_locale"
         ActionController::Base.send(:include, IuguSDKBaseController)
       end
     end

data/lib/iugusdk/iugusdk_base_controller.rb

@@ -8,12 +8,38 @@ module IuguSDKBaseController
     set_account(current_user) if current_user
   end
 
+  def http_preferred_languages(header)
+    @user_preferred_languages ||= header.split(/\s*,\s*/).collect do |l|
+      if l =~ /\?\?\?/i
+        ["none",0] 
+      else
+        l += ';q=1.0' unless l =~ /;q=\d+\.\d+$/
+          l.split(';q=')
+      end
+    end.sort do |x,y|
+      raise "Not correctly formatted" unless x.first =~ /^[a-z\-]+$/i
+      y.last.to_f <=> x.last.to_f
+    end.collect do |l|
+      l.first.downcase.gsub(/-[a-z]+$/i) { |x| x.upcase }
+    end
+  rescue Exception => e
+    []
+  end
+
+  def preferred_language_from(array, http_accepted_languages)
+    (http_preferred_languages(http_accepted_languages) & array.collect { |i| i.to_s }).first
+  end
+
+  def get_compatible_locale(http_accepted_languages)
+    preferred_language_from( AvailableLanguage.all.values, http_accepted_languages)
+  end
+
   def configure_locale
     if(params[:hl])
       locale = params[:hl] if AvailableLanguage.all.values.include? params[:hl]
     end
     unless locale
-      @matched_locale_from_browser = request.preferred_language_from(AvailableLanguage.all.values)
+      @matched_locale_from_browser = get_compatible_locale( request.env['HTTP_ACCEPT_LANGUAGE'] ) 
       if user_signed_in?
         if current_user.locale.blank?
           locale = "en" 
@@ -23,6 +49,8 @@ module IuguSDKBaseController
       else
         locale = @matched_locale_from_browser
       end
+    else
+      @matched_locale_from_browser = locale
     end
     I18n.locale = locale
   end

data/lib/iugusdk/version.rb

@@ -1,3 +1,3 @@
 module IuguSDK
-  VERSION = "1.0.0.alpha.16"
+  VERSION = "1.0.0.alpha.17"
 end

data/lib/iugusdk.rb

@@ -7,7 +7,7 @@ require 'iugusdk/root_tenancy_url'
 require 'iugusdk/session_parameter_middleware'
 require "iugusdk/engine"
 require "iugusdk/iugusdk_base_controller"
-require "http_accept_language"
+# require "http_accept_language"
 require 'devise'
 require 'omniauth'
 require 'omniauth-twitter'