From c9c4f95fdc1fc330f2ea3a3c408b333b933a0628 Mon Sep 17 00:00:00 2001 From: kikito Date: Wed, 19 Aug 2015 21:07:17 +0200 Subject: [PATCH 1/7] Rename `language` style to locale --- app/assets/stylesheets/participacion.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss index 00028ac56..88ed47d65 100644 --- a/app/assets/stylesheets/participacion.scss +++ b/app/assets/stylesheets/participacion.scss @@ -186,7 +186,7 @@ header { } } - .language { + .locale { float: none; text-align: center; @@ -196,7 +196,7 @@ header { } .external-links { - @extend .language; + @extend .locale; @media (min-width: 480px) { float: right; From 332df09491301a7351204ac638a38c68ce9f4490 Mon Sep 17 00:00:00 2001 From: kikito Date: Wed, 19 Aug 2015 21:07:35 +0200 Subject: [PATCH 2/7] Add `locale` entry to each locale --- config/locales/en.yml | 1 + config/locales/es.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/config/locales/en.yml b/config/locales/en.yml index a739a2c34..79181cd13 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,4 +1,5 @@ en: + locale: English layouts: header: external_link_transparency: Transparency diff --git a/config/locales/es.yml b/config/locales/es.yml index 96284a743..856560e46 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -1,4 +1,5 @@ es: + locale: 'Español' layouts: header: external_link_transparency: Transparencia From 480ecd39c46f18f77ca08c3f0b546d0cf8d6ca44 Mon Sep 17 00:00:00 2001 From: kikito Date: Wed, 19 Aug 2015 21:25:56 +0200 Subject: [PATCH 3/7] Replaces locales helper which returns an array by another which returns select options --- app/helpers/application_helper.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index cee6db199..11e4cae8c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -14,7 +14,13 @@ module ApplicationHelper home_page? ? '' : 'results' end - def available_locales_to_switch - I18n.available_locales - [I18n.locale] + def available_locale_options_for_select + options_for_select(available_locales_array, I18n.locale) end + + private + def available_locales_array + I18n.available_locales.map { |loc| [I18n.t('locale', locale: loc), loc] } + end + end From 961a317c9b472bf318b4ffe3fadb5d73ab53569d Mon Sep 17 00:00:00 2001 From: kikito Date: Wed, 19 Aug 2015 21:26:29 +0200 Subject: [PATCH 4/7] Adds (a modified version of) queryParameters.js --- app/assets/javascripts/application.js | 2 ++ app/assets/javascripts/qp.js | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 app/assets/javascripts/qp.js diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index e630af974..a5aaf5c01 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -21,6 +21,7 @@ //= require d3 //= require c3 //= require c3ext +//= require qp //= require app //= require_tree . @@ -30,6 +31,7 @@ var initialize_modules = function() { App.Votes.initialize(); App.Tags.initialize(); App.Stats.initialize(); + App.LocaleSwitcher.initialize(); }; $(function(){ diff --git a/app/assets/javascripts/qp.js b/app/assets/javascripts/qp.js new file mode 100644 index 000000000..5e2b4f02d --- /dev/null +++ b/app/assets/javascripts/qp.js @@ -0,0 +1,12 @@ +/* + * getQueryParameters.js + * Copyright (c) 2014 Nicholas Ortenzio + * The MIT License (MIT) + * + */ + +window.getQueryParameters = function(str) { + str = (str || document.location.search).replace(/(^\?)/,''); + if(!str) { return {}; } + return str.split("&").reduce(function(o,n){n=n.split('=');o[n[0]]=n[1];return o},{}); +}; From 5205ac99e3444c105e2b0f3d2268e05727b39ef7 Mon Sep 17 00:00:00 2001 From: kikito Date: Wed, 19 Aug 2015 21:39:57 +0200 Subject: [PATCH 5/7] Moves the locale switcher to its own shared view --- app/views/layouts/_admin_header.html.erb | 10 +--------- app/views/layouts/_header.html.erb | 10 +--------- app/views/shared/_locale_switcher.html.erb | 10 ++++++++++ 3 files changed, 12 insertions(+), 18 deletions(-) create mode 100644 app/views/shared/_locale_switcher.html.erb diff --git a/app/views/layouts/_admin_header.html.erb b/app/views/layouts/_admin_header.html.erb index ffd7d34f4..13424e5e8 100644 --- a/app/views/layouts/_admin_header.html.erb +++ b/app/views/layouts/_admin_header.html.erb @@ -1,15 +1,7 @@
-
- - <%= t("layouts.header.language") %> - [ - <% available_locales_to_switch.each do |locale| %> - <%= link_to(locale, params.merge(locale: locale), id: "locale-link-#{locale}") %> - <% end %> - ] -
+ <%= render 'shared/locale_switcher' %>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 53899221e..b47de5f24 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -1,15 +1,7 @@
-
- - <%= t("layouts.header.language") %> - [ - <% available_locales_to_switch.each do |locale| %> - <%= link_to(locale, params.merge(locale: locale), id: "locale-link-#{locale}", data: { no_turbolink: true }) %> - <% end %> - ] -
+ <%= render 'shared/locale_switcher' %>
<%= link_to t("layouts.header.participation"), root_path, class: "selected" %> | <%= link_to t("layouts.header.external_link_transparency"), "#" %> | diff --git a/app/views/shared/_locale_switcher.html.erb b/app/views/shared/_locale_switcher.html.erb new file mode 100644 index 000000000..3ab2b0a98 --- /dev/null +++ b/app/views/shared/_locale_switcher.html.erb @@ -0,0 +1,10 @@ +
+ + <%= t("layouts.header.language") %> +
+ +
+ +
From 710e83fb22c71682e7725bcfc3f4b87e8bbfed9d Mon Sep 17 00:00:00 2001 From: kikito Date: Wed, 19 Aug 2015 21:40:17 +0200 Subject: [PATCH 6/7] Adds locale switcher js code + feature tests --- .../javascripts/locale_switcher.js.coffee | 19 ++++++++++++ spec/features/locale_switcher_spec.rb | 29 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 app/assets/javascripts/locale_switcher.js.coffee create mode 100644 spec/features/locale_switcher_spec.rb diff --git a/app/assets/javascripts/locale_switcher.js.coffee b/app/assets/javascripts/locale_switcher.js.coffee new file mode 100644 index 000000000..2bd88b8ef --- /dev/null +++ b/app/assets/javascripts/locale_switcher.js.coffee @@ -0,0 +1,19 @@ +App.LocaleSwitcher = + + href_with_params: (query_params) -> + loc = window.location + + loc.protocol + "//" + loc.hostname + + (if loc.port then ':' + loc.port else '') + + loc.pathname + + loc.hash + + '?' + $.param(query_params) + + initialize: -> + $('.js-locale-switcher').on 'change', -> + query_params = window.getQueryParameters() + query_params['locale'] = $(this).val() + window.location.assign(App.LocaleSwitcher.href_with_params(query_params)) + + + diff --git a/spec/features/locale_switcher_spec.rb b/spec/features/locale_switcher_spec.rb new file mode 100644 index 000000000..7f60e2c24 --- /dev/null +++ b/spec/features/locale_switcher_spec.rb @@ -0,0 +1,29 @@ +require 'rails_helper' + +feature 'Locale Switcher' do + + scenario 'Available locales appear in the locale switcher' do + visit '/' + + within('.js-locale-switcher') do + expect(page).to have_content 'Español' + expect(page).to have_content 'English' + end + end + + scenario 'The current locale is selected' do + visit '/' + expect(page).to have_select('locale-switcher', selected: 'English') + end + + scenario 'Changing the locale', :js do + visit '/' + expect(page).to have_content('Site language') + + select('Español', from: 'locale-switcher') + expect(page).to have_content('Idioma de la página') + expect(page).to_not have_content('Site language') + expect(page).to have_select('locale-switcher', selected: 'Español') + end + +end From b2f29215eec1740c5eb80b57ed799a66d3a7a5c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Wed, 19 Aug 2015 22:51:58 +0200 Subject: [PATCH 7/7] unifies localization specs --- spec/features/locale_switcher_spec.rb | 29 -------------------------- spec/features/localization_spec.rb | 30 +++++++++++++++++---------- 2 files changed, 19 insertions(+), 40 deletions(-) delete mode 100644 spec/features/locale_switcher_spec.rb diff --git a/spec/features/locale_switcher_spec.rb b/spec/features/locale_switcher_spec.rb deleted file mode 100644 index 7f60e2c24..000000000 --- a/spec/features/locale_switcher_spec.rb +++ /dev/null @@ -1,29 +0,0 @@ -require 'rails_helper' - -feature 'Locale Switcher' do - - scenario 'Available locales appear in the locale switcher' do - visit '/' - - within('.js-locale-switcher') do - expect(page).to have_content 'Español' - expect(page).to have_content 'English' - end - end - - scenario 'The current locale is selected' do - visit '/' - expect(page).to have_select('locale-switcher', selected: 'English') - end - - scenario 'Changing the locale', :js do - visit '/' - expect(page).to have_content('Site language') - - select('Español', from: 'locale-switcher') - expect(page).to have_content('Idioma de la página') - expect(page).to_not have_content('Site language') - expect(page).to have_select('locale-switcher', selected: 'Español') - end - -end diff --git a/spec/features/localization_spec.rb b/spec/features/localization_spec.rb index 9e4a64681..900477295 100644 --- a/spec/features/localization_spec.rb +++ b/spec/features/localization_spec.rb @@ -9,19 +9,27 @@ feature 'Localization' do expect(page).to have_text('Estamos abriendo Madrid') end - scenario 'Changing locale' do - visit root_path(locale: :es) - locale_switcher = find('#locale-switcher') + scenario 'Available locales appear in the locale switcher' do + visit '/' - expect(page).to have_text('Estamos abriendo Madrid') - expect(locale_switcher).to have_text('en') - expect(locale_switcher).to_not have_text('es') + within('.js-locale-switcher') do + expect(page).to have_content 'Español' + expect(page).to have_content 'English' + end + end - find('#locale-link-en').click - locale_switcher = find('#locale-switcher') + scenario 'The current locale is selected' do + visit '/' + expect(page).to have_select('locale-switcher', selected: 'English') + end - expect(page).to have_text('We are opening Madrid') - expect(locale_switcher).to have_text('es') - expect(locale_switcher).to_not have_text('en') + scenario 'Changing the locale', :js do + visit '/' + expect(page).to have_content('Site language') + + select('Español', from: 'locale-switcher') + expect(page).to have_content('Idioma de la página') + expect(page).to_not have_content('Site language') + expect(page).to have_select('locale-switcher', selected: 'Español') end end