diff --git a/app/assets/javascripts/globalize.js b/app/assets/javascripts/globalize.js index c653bf627..79c2aae9d 100644 --- a/app/assets/javascripts/globalize.js +++ b/app/assets/javascripts/globalize.js @@ -77,19 +77,18 @@ update_description: function() { var count, description; count = App.Globalize.enabled_locales().length; - description = $(App.Globalize.language_description(count)).filter(".description").text(); + description = App.Globalize.language_description(count); - $(".js-languages-description .description").text(description); - $(".js-languages-description .count").text(count); + $(".js-languages-description").text(description.replace("%{count}", count)); }, language_description: function(count) { switch (count) { case 0: - return $(".globalize-languages").data("zero-languages-description"); + return $(".globalize-languages").data("languages-description").zero; case 1: - return $(".globalize-languages").data("one-languages-description"); + return $(".globalize-languages").data("languages-description").one; default: - return $(".globalize-languages").data("other-languages-description"); + return $(".globalize-languages").data("languages-description").other; } }, initialize: function() { diff --git a/app/views/shared/_common_globalize_locales.html.erb b/app/views/shared/_common_globalize_locales.html.erb index 7eed43d55..a66bf4426 100644 --- a/app/views/shared/_common_globalize_locales.html.erb +++ b/app/views/shared/_common_globalize_locales.html.erb @@ -1,7 +1,5 @@
" - data-one-languages-description="<%= t("shared.translations.languages_in_use", count: 1) %>" - data-other-languages-description="<%= t("shared.translations.languages_in_use", count: 2) %>"> + data-languages-description="<%= t("shared.translations.languages_in_use").to_json %>">
<%= selected_languages_description(resource) %> diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index d93ef8c31..43337febb 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -788,9 +788,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 b7ae03654..b4aa427d9 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -786,9 +786,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}"