Changeset 0cbd7353bfa01b4f1e3ffd78bc098fe434ac4e36

Timestamp:

07/28/10 11:45:38 (6 weeks ago)

Author:

Alban Peignier <alban.peignier@…>

Parents:

9c0140d30eb37fa37a5108d371ef26b82b3675a1, fa9b78b4f288d57831f48eabfed053a5653b31f7

git-committer:

Alban Peignier <alban.peignier@free.fr> / 2010-07-28T11:45:38Z+0200

Message:

Merge branch 'master' of www.dbx.tryphon.priv:/srv/git/user_interface

Conflicts:

spec/locale_management_spec.rb

Files:

• app/controllers/languages_controller.rb (added)
• app/helpers/languages_helper.rb (added)
• config/locales/en/actions.yml (added)
• config/locales/en/common.yml (added)
• config/locales/en/language.yml (added)
• config/locales/fr/actions.yml (added)
• config/locales/fr/common.yml (added)
• config/locales/fr/language.yml (added)
• config/locales/fr/will_paginate.yml (added)
• config/routes.rb (added)
• images/streambox.png (added)
• images/ui/flags/en.gif (added)
• images/ui/flags/fr.gif (added)
• images/ui/help.png (added)
• init.rb (modified) (1 diff)
• lib/user_interface.rb (modified) (1 diff)
• lib/user_interface/helpers/will_paginate_helper.rb (added)
• lib/user_interface/locale_management.rb (modified) (1 diff)
• lib/user_interface/user_session.rb (added)
• lib/user_interface/user_session_management.rb (added)
• spec/helpers/languages_helper_spec.rb (added)
• spec/locale_management_spec.rb (modified) (1 diff)
• spec/user_session_management_spec.rb (added)
• spec/user_session_spec.rb (added)
• tryphon.less (modified) (3 diffs)

init.rb

@@ -1 +1 @@
 # Include hook code here
 require 'user_interface'
+
+config.to_prepare do
+  ApplicationController.helper LanguagesHelper
+
+  ActionView::Base.send :include, UserInterface::FlashHelper
+  ActionView::Base.send :include, UserInterface::TitleHelper
+
+  if defined?(WillPaginate::ViewHelpers)
+    require 'user_interface/helpers/will_paginate_helper'
+    ActionView::Base.send :include, UserInterface::WillPaginateHelper
+  end
+end
+
+

lib/user_interface.rb

@@ -8 +8 @@
 require 'user_interface/helpers/flash_helper'
 require 'user_interface/helpers/title_helper'
-
-if defined?(ActionView::Base)
-  ActionView::Base.send :include, UserInterface::FlashHelper
-  ActionView::Base.send :include, UserInterface::TitleHelper
-end
-

lib/user_interface/locale_management.rb

@@ -10 +10 @@
 
   def change_locale
-    I18n.locale = params[:lang] if params[:lang]
+    if params[:lang]
+      logger.debug "Overrides session language with param lang : #{params[:lang]}"
+      user_session.language = params[:lang] 
+    end
+    I18n.locale = user_session.language
   end
 

spec/locale_management_spec.rb

@@ -15 +15 @@
     end
 
+    attr_reader :user_session
+    def initialize(user_session)
+      @user_session = user_session
+    end
+
+    def params
+      {}
+    end
+
+    def logger
+      Rails.logger
+    end
+
     include UserInterface::LocaleManagement
   end
 
-  before(:each) do
-    @locale_management = TestLocaleManagement.new
+  let(:user_session) { mock UserInterface::UserSession, :language => :fr, :language= => nil }
+  let(:locale_management) { TestLocaleManagement.new user_session }
+
+  it "should add a before_filter :change_locale" do
+    locale_management.before_filters.should == [ :change_locale ]
   end
 
-  it "should add a before_filter :change_locale" do
-    @locale_management.before_filters.should == [ :change_locale ]
+  it "should change I18n.locale to UserSession#langague" do
+    locale_management.send(:change_locale)
+    I18n.locale.should == user_session.language
   end
 
-  it "should change I18n.locale with params :lang" do
-    @locale_management.stub!(:params).and_return(:lang => "fr")
-    @locale_management.send(:change_locale)
-    I18n.locale.should == :fr
+  context 'when params :lang is present' do
+
+    before(:each) do
+      locale_management.stub!(:params).and_return(:lang => "dummy")
+    end
+
+    it "should change UserSession#language" do
+      user_session.should_receive(:language=).with("dummy")
+      locale_management.send(:change_locale)
+    end
+
   end
 

tryphon.less

@@ -248 +248 @@
       background: url("../images/ui/tags.png") no-repeat 0px 6px;
   }
+
+  .inline_help {
+      padding-left: 20px;
+      font-size: 90%; 
+      font-style: italic;
+      background: url("../images/ui/help.png") no-repeat;    
+      margin-top: 20px;
+
+      p {
+          margin: 6px 0;
+      }
+  }
+
 }
 
@@ -272 +285 @@
       font-size: 90%;
       margin: 4px 0;
+  }
+  p.languages {
+      margin: -5px 0 10px 0;
+      padding: 0px;
+      text-align: center;
   }
   form.search { 
@@ -379 +397 @@
     }
 
+    ul li {
+        padding: 0 !important; 
+        margin-left: 0 !important;
+    }
+
     .textile_editor_help {
         padding: 4px 0 10px 10px;