jro_apps/redmine Commit - r11722:ebb73fa258db

set html lang by user locale (#14206)...

Toshi MARUYAMA -

r11722:ebb73fa258db

parent child

Context file:

r11722:ebb73fa258db

Collapse all files

app/views/layouts/base.html.erb +1 -1

             <!DOCTYPE html>
-            <html lang="en">
+            <html lang="<%= current_language %>">
             <head>
             <meta charset="utf-8" />
             <title><%=h html_title %></title>
             <meta name="description" content="<%= Redmine::Info.app_name %>" />
             <meta name="keywords" content="issue,bug,tracker" />
             <%= csrf_meta_tag %>
             <%= favicon %>
             <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', :media => 'all' %>
             <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
             <%= javascript_heads %>
             <%= heads_for_theme %>
             <%= call_hook :view_layouts_base_html_head %>
             <!-- page specific tags -->
             <%= yield :header_tags -%>
             </head>
             <body class="<%=h body_css_classes %>">
             <div id="wrapper">
             <div id="wrapper2">
             <div id="wrapper3">
             <div id="top-menu">
                 <div id="account">
                     <%= render_menu :account_menu -%>
                 </div>
                 <%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %>
                 <%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%>
             </div>
             <div id="header">
                 <% if User.current.logged? || !Setting.login_required? %>
                 <div id="quick-search">
                     <%= form_tag({:controller => 'search', :action => 'index', :id => @project}, :method => :get ) do %>
                     <%= hidden_field_tag(controller.default_search_scope, 1, :id => nil) if controller.default_search_scope %>
                     <label for='q'>
                       <%= link_to l(:label_search), {:controller => 'search', :action => 'index', :id => @project}, :accesskey => accesskey(:search) %>:
                     </label>
                     <%= text_field_tag 'q', @question, :size => 20, :class => 'small', :accesskey => accesskey(:quick_search) %>
                     <% end %>
                     <%= render_project_jump_box %>
                 </div>
                 <% end %>
                 <h1><%= page_header_title %></h1>
                 <% if display_main_menu?(@project) %>
                 <div id="main-menu">
                     <%= render_main_menu(@project) %>
                 </div>
                 <% end %>
             </div>
             <div id="main" class="<%= sidebar_content? ? '' : 'nosidebar' %>">
                 <div id="sidebar">
                     <%= yield :sidebar %>
                     <%= view_layouts_base_sidebar_hook_response %>
                 </div>
                 <div id="content">
                     <%= render_flash_messages %>
                     <%= yield %>
                     <%= call_hook :view_layouts_base_content %>
                     <div style="clear:both;"></div>
                 </div>
             </div>
             </div>
             <div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
             <div id="ajax-modal" style="display:none;"></div>
             <div id="footer">
               <div class="bgl"><div class="bgr">
                 Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2013 Jean-Philippe Lang
               </div></div>
             </div>
             </div>
             </div>
             <%= call_hook :view_layouts_base_body_bottom %>
             </body>
             </html>

test/integration/application_test.rb +3 0

             # Redmine - project management software
             # Copyright (C) 2006-2013  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             class ApplicationTest < ActionController::IntegrationTest
               include Redmine::I18n
               fixtures :projects, :trackers, :issue_statuses, :issues,
                        :enumerations, :users, :issue_categories,
                        :projects_trackers,
                        :roles,
                        :member_roles,
                        :members,
                        :enabled_modules
               def test_set_localization
                 Setting.default_language = 'en'
                 # a french user
                 get 'projects', { }, 'HTTP_ACCEPT_LANGUAGE' => 'fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3'
                 assert_response :success
                 assert_tag :tag => 'h2', :content => 'Projets'
                 assert_equal :fr, current_language
+                assert_select "html[lang=?]", "fr"
                 # then an italien user
                 get 'projects', { }, 'HTTP_ACCEPT_LANGUAGE' => 'it;q=0.8,en-us;q=0.5,en;q=0.3'
                 assert_response :success
                 assert_tag :tag => 'h2', :content => 'Progetti'
                 assert_equal :it, current_language
+                assert_select "html[lang=?]", "it"
                 # not a supported language: default language should be used
                 get 'projects', { }, 'HTTP_ACCEPT_LANGUAGE' => 'zz'
                 assert_response :success
                 assert_tag :tag => 'h2', :content => 'Projects'
+                assert_select "html[lang=?]", "en"
               end
               def test_token_based_access_should_not_start_session
                 # issue of a private project
                 get 'issues/4.atom'
                 assert_response 302
                 rss_key = User.find(2).rss_key
                 get "issues/4.atom?key=#{rss_key}"
                 assert_response 200
                 assert_nil session[:user_id]
               end
               def test_missing_template_should_respond_with_404
                 get '/login.png'
                 assert_response 404
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages