diff --git a/app/assets/javascripts/globalize.js b/app/assets/javascripts/globalize.js index a7757f520..c653bf627 100644 --- a/app/assets/javascripts/globalize.js +++ b/app/assets/javascripts/globalize.js @@ -77,9 +77,10 @@ update_description: function() { var count, description; count = App.Globalize.enabled_locales().length; - description = App.Globalize.language_description(count); - $(".js-languages-description").html(description); - $(".js-languages-count").text(count); + description = $(App.Globalize.language_description(count)).filter(".description").text(); + + $(".js-languages-description .description").text(description); + $(".js-languages-description .count").text(count); }, language_description: function(count) { switch (count) { diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index b08677ab4..44b7c9358 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -806,9 +806,9 @@ en: remove_language: Remove language add_language: Add language languages_in_use: - zero: "0 languages in use" - one: "1 language in use" - other: "%{count} languages in use" + zero: "0 languages in use" + one: "1 language in use" + other: "%{count} languages in use" social: facebook: "%{org} Facebook" twitter: "%{org} Twitter" diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 4b2391528..791d98cb1 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -803,9 +803,9 @@ es: remove_language: Eliminar idioma add_language: AƱadir idioma languages_in_use: - zero: "0 idiomas en uso" - one: "1 idioma en uso" - other: "%{count} idiomas en uso" + zero: "0 idiomas en uso" + one: "1 idioma en uso" + other: "%{count} idiomas en uso" social: facebook: "Facebook de %{org}" twitter: "Twitter de %{org}" diff --git a/spec/features/xss_spec.rb b/spec/features/xss_spec.rb index 4852e3396..32114b89c 100644 --- a/spec/features/xss_spec.rb +++ b/spec/features/xss_spec.rb @@ -61,6 +61,16 @@ describe "Cross-Site Scripting protection", :js do expect(page.text).not_to be_empty end + scenario "languages in use" do + I18nContent.create(key: "shared.translations.languages_in_use", value: attack_code) + + login_as(create(:administrator).user) + visit edit_admin_budget_path(create(:budget)) + click_link "Remove language" + + expect(page.text).not_to be_empty + end + scenario "proposal actions in dashboard" do proposal = create(:proposal)