From 24fc2f91996bb501f9bb16745ee4b33cb78291d1 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Thu, 22 Mar 2018 21:01:19 +0100 Subject: [PATCH] Improve translation text and make it a default There was some inconsistency in this file, the `confirm_group` key was in both the custom translations file and the default translations file. Remove duplication and make it a default as it is a clearer message for users. If an installation want to edit this message they can still do it in the custom translations file --- config/i18n-tasks.yml | 2 +- config/locales/en/budgets.yml | 4 ++-- config/locales/en/general.yml | 4 +++- config/locales/es/budgets.yml | 4 ++-- config/locales/es/general.yml | 4 +++- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index e778ba104..628e2a15b 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -176,11 +176,11 @@ ignore_unused: - 'admin.site_customization.pages.page.status_*' - 'admin.legislation.processes.process.*' - 'legislation.processes.index.*' + - 'votes.budget_investments.different_heading_assigned*' # - '{devise,kaminari,will_paginate}.*' # - 'simple_form.{yes,no}' # - 'simple_form.{placeholders,hints,labels}.*' # - 'simple_form.{error_notification,required}.:' - ## Exclude these keys from the `i18n-tasks eq-base' report: # ignore_eq_base: # all: diff --git a/config/locales/en/budgets.yml b/config/locales/en/budgets.yml index 983262160..48d3b3462 100644 --- a/config/locales/en/budgets.yml +++ b/config/locales/en/budgets.yml @@ -131,8 +131,8 @@ en: already_supported: You have already supported this investment project. Share it! support_title: Support this project confirm_group: - one: "You can only support investments in %{count} heading. If you continue you cannot change your decision. Are you sure?" - other: "You can only support investments in %{count} headings. If you continue you cannot change your decision. Are you sure?" + one: "You can only support investments in %{count} district. If you continue you cannot change the election of your district. Are you sure?" + other: "You can only support investments in %{count} district. If you continue you cannot change the election of your district. Are you sure?" supports: one: 1 support other: "%{count} supports" diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 01ba0c2c3..66f392921 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -771,7 +771,9 @@ en: organization: Organizations are not permitted to vote unfeasible: Unfeasible investment projects can not be supported not_voting_allowed: Voting phase is closed - different_heading_assigned: You can only support investment projects in one heading + different_heading_assigned: + one: "You can only support investment projects in %{count} district" + other: "You can only support investment projects in %{count} districts" welcome: debates: description: For meeting, discussing and sharing the things that matter to us in our city. diff --git a/config/locales/es/budgets.yml b/config/locales/es/budgets.yml index 0b940f2de..67ad55d5f 100644 --- a/config/locales/es/budgets.yml +++ b/config/locales/es/budgets.yml @@ -131,8 +131,8 @@ es: already_supported: Ya has apoyado este proyecto de gasto. ¡Compártelo! support_title: Apoyar este proyecto confirm_group: - one: "Sólo puedes apoyar proyectos de %{count} partida. Si sigues adelante no podrás cambiar esta decisión. ¿Estás seguro?" - other: "Sólo puedes apoyar proyectos de %{count} partidas. Si sigues adelante no podrás cambiar esta decisión. ¿Estás seguro?" + one: "Sólo puedes apoyar proyectos en %{count} distritos. Si sigues adelante no podrás cambiar la elección de este distrito. ¿Estás seguro?" + other: "Sólo puedes apoyar proyectos en %{count} distritos. Si sigues adelante no podrás cambiar la elección de este distrito. ¿Estás seguro?" supports: zero: Sin apoyos one: 1 apoyo diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 2c3113e5f..08bbbdba6 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -770,7 +770,9 @@ es: organization: Las organizaciones no pueden votar. unfeasible: No se pueden votar propuestas inviables. not_voting_allowed: El periodo de votación está cerrado. - different_heading_assigned: Sólo puedes apoyar proyectos de gasto de una partida + different_heading_assigned: + one: "Sólo puedes apoyar proyectos de gasto de %{count} distrito" + other: "Sólo puedes apoyar proyectos de gasto de %{count} distritos" welcome: debates: description: Encontrarnos, debatir y compartir lo que nos parece importante en nuestra ciudad.