diff options
| -rw-r--r-- | app/views/layouts/base.html.erb | 2 | ||||
| -rw-r--r-- | test/integration/application_test.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb index 90cf1e886..fe31c0816 100644 --- a/app/views/layouts/base.html.erb +++ b/app/views/layouts/base.html.erb @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html lang="en"> +<html lang="<%= current_language %>"> <head> <meta charset="utf-8" /> <title><%=h html_title %></title> diff --git a/test/integration/application_test.rb b/test/integration/application_test.rb index 409dcfd22..7f4e3b595 100644 --- a/test/integration/application_test.rb +++ b/test/integration/application_test.rb @@ -36,17 +36,20 @@ class ApplicationTest < ActionController::IntegrationTest 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 |