consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3337 from consul/generalize-i18n

Browse Source 
Generalize i18n texts
This commit is contained in:
Alberto
2019-03-05 18:58:31 +01:00
committed by GitHub
parent c6fead6a72 4a532bf807
commit cce852d303
12 changed files with 33 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/views/admin/legislation/processes/_form.html.erb
View File

@@ -24,7 +24,6 @@
<div class="small-12 medium-3 column">
<%= f.text_field :draft_start_date,
label: t("admin.legislation.processes.form.start"),
value: format_date_for_calendar_form(@process.draft_start_date),
class: "js-calendar-full",
id: "draft_start_date" %>
@@ -32,7 +31,6 @@
<div class="small-12 medium-3 column">
<%= f.text_field :draft_end_date,
label: t("admin.legislation.processes.form.end"),
value: format_date_for_calendar_form(@process.draft_end_date),
class: "js-calendar-full",
id: "draft_end_date" %>
@@ -50,18 +48,14 @@
</div>
<div class="small-12 medium-3 column">
<%= f.label :start_date, t("admin.legislation.processes.form.start") %>
<%= f.text_field :start_date,
label: false,
value: format_date_for_calendar_form(@process.start_date),
class: "js-calendar-full",
id: "start_date" %>
</div>
<div class="small-12 medium-3 column">
<%= f.label :end_date, t("admin.legislation.processes.form.end") %>
<%= f.text_field :end_date,
label: false,
value: format_date_for_calendar_form(@process.end_date),
class: "js-calendar-full",
id: "end_date" %>
@@ -79,18 +73,14 @@
</div>
<div class="small-12 medium-3 column">
<%= f.label :debate_start_date, t("admin.legislation.processes.form.start") %>
<%= f.text_field :debate_start_date,
label: false,
value: format_date_for_calendar_form(@process.debate_start_date),
class: "js-calendar-full",
id: "debate_start_date" %>
</div>
<div class="small-12 medium-3 column">
<%= f.label :debate_end_date, t("admin.legislation.processes.form.end") %>
<%= f.text_field :debate_end_date,
label: false,
value: format_date_for_calendar_form(@process.debate_end_date),
class: "js-calendar-full",
id: "debate_end_date" %>
@@ -108,18 +98,14 @@
</div>
<div class="small-12 medium-3 column">
<%= f.label :proposals_phase_start_date, t("admin.legislation.processes.form.start") %>
<%= f.text_field :proposals_phase_start_date,
label: false,
value: format_date_for_calendar_form(@process.proposals_phase_start_date),
class: "js-calendar-full",
id: "proposals_phase_start_date" %>
</div>
<div class="small-12 medium-3 column">
<%= f.label :proposals_phase_end_date, t("admin.legislation.processes.form.end") %>
<%= f.text_field :proposals_phase_end_date,
label: false,
value: format_date_for_calendar_form(@process.proposals_phase_end_date),
class: "js-calendar-full",
id: "proposals_phase_end_date" %>
@@ -137,18 +123,14 @@
</div>
<div class="small-12 medium-3 column">
<%= f.label :allegations_start_date, t("admin.legislation.processes.form.start") %>
<%= f.text_field :allegations_start_date,
label: false,
value: format_date_for_calendar_form(@process.allegations_start_date),
class: "js-calendar-full",
id: "allegations_start_date" %>
</div>
<div class="small-12 medium-3 column">
<%= f.label :allegations_end_date, t("admin.legislation.processes.form.end") %>
<%= f.text_field :allegations_end_date,
label: false,
value: format_date_for_calendar_form(@process.allegations_end_date),
class: "js-calendar-full",
id: "allegations_end_date" %>
@@ -162,9 +144,7 @@
</div>
<div class="small-12 medium-3 column end">
<%= f.label :draft_publication_date %>
<%= f.text_field :draft_publication_date,
label: false,
value: format_date_for_calendar_form(@process.draft_publication_date),
class: "js-calendar-full",
id: "draft_publication_date" %>
@@ -178,9 +158,7 @@
</div>
<div class="small-12 medium-3 column end">
<%= f.label :result_publication_date %>
<%= f.text_field :result_publication_date,
label: false,
value: format_date_for_calendar_form(@process.result_publication_date),
class: "js-calendar-full",
id: "result_publication_date" %>

20
config/locales/en/activerecord.yml
View File

@@ -234,15 +234,17 @@ en:
summary: Summary
description: Description
additional_info: Additional info
start_date: Start date
end_date: End date
debate_start_date: Debate start date
debate_end_date: Debate end date
draft_start_date: Draft start date
draft_end_date: Draft end date
start_date: Start
end_date: End
debate_start_date: Start
debate_end_date: End
draft_start_date: Start
draft_end_date: End
draft_publication_date: Draft publication date
allegations_start_date: Allegations start date
allegations_end_date: Allegations end date
allegations_start_date: Start
allegations_end_date: End
proposals_phase_start_date: Start
proposals_phase_end_date: End
result_publication_date: Final result publication date
background_color: Background color
font_color: Font color
@@ -356,7 +358,7 @@ en:
draft_end_date:
invalid_date_range: must be on or after the draft start date
allegations_end_date:
invalid_date_range: must be on or after the allegations start date
invalid_date_range: must be on or after the comments start date
proposal:
attributes:
tag_list:

2
config/locales/en/admin.yml
View File

@@ -423,8 +423,6 @@ en:
draft_phase_description: If this phase is active, the process won't be listed on processes index. Allow to preview the process and create content before the start.
allegations_phase: Comments phase
proposals_phase: Proposals phase
start: Start
end: End
use_markdown: Use Markdown to format the text
title_placeholder: The title of the process
summary_placeholder: Short summary of the description

2
config/locales/en/budgets.yml
View File

@@ -72,7 +72,7 @@ en:
index:
title: Participatory budgeting
unfeasible: Unfeasible investment projects
unfeasible_text: "The investments must meet a number of criteria (legality, concreteness, be the responsibility of the city, not exceed the limit of the budget) to be declared viable and reach the stage of final vote. All investments don't meet these criteria are marked as unfeasible and published in the following list, along with its report of infeasibility."
unfeasible_text: "The investments must meet a number of criteria (legality, concreteness, not exceed the limit of the budget) to be declared viable and reach the stage of final vote. All investments don't meet these criteria are marked as unfeasible and published in the following list, along with its report of infeasibility."
by_heading: "Investment projects with scope: %{heading}"
search_form:
button: Search

2
config/locales/en/legislation.yml
View File

@@ -71,7 +71,7 @@ en:
help: Help about collaborative legislation
section_footer:
title: Help about collaborative legislation
description: Participate in the debates and processes prior to the approval of a ordinance or a municipal action. Your opinion will be considered by the City Council.
description: Participate in the debates and processes prior to the approval of new regulations or strategies. Your opinion will be considered.
phase_not_open:
not_open: This phase is not open yet
phase_empty:

6
config/locales/en/settings.yml
View File

@@ -78,7 +78,7 @@ en:
direct_message_max_per_day_description: "Number max of direct messages one user can send per day"
feature:
budgets: "Participatory budgeting"
budgets_description: "With participatory budgets, citizens decide which projects presented by their neighbours will receive a part of the municipal budget"
budgets_description: "With participatory budgets, citizens decide which projects presented by their neighbours will receive a part of the budget"
twitter_login: "Twitter login"
twitter_login_description: "Allow users to sign up with their Twitter account"
facebook_login: "Facebook login"
@@ -86,7 +86,7 @@ en:
google_login: "Google login"
google_login_description: "Allow users to sign up with their Google Account"
proposals: "Proposals"
proposals_description: "Citizens' proposals are an opportunity for neighbours and collectives to decide directly how they want their city to be, after getting sufficient support and submitting to a citizens' vote"
proposals_description: "Citizens' proposals are an opportunity for neighbours and collectives to decide directly how they want their society to be, after getting sufficient support and submitting to a citizens' vote"
featured_proposals: "Featured proposals"
featured_proposals_description: "Shows featured proposals on index proposals page"
debates: "Debates"
@@ -96,7 +96,7 @@ en:
signature_sheets: "Signature sheets"
signature_sheets_description: "It allows adding from the Administration panel signatures collected on-site to Proposals and investment projects of the Participative Budgets"
legislation: "Legislation"
legislation_description: "In participatory processes, citizens are offered the opportunity to participate in the drafting and modification of regulations that affect the city and to give their opinion on certain actions that are planned to be carried out"
legislation_description: "In participatory processes, citizens are offered the opportunity to participate in the drafting and modification of regulations and to give their opinion on certain actions that are planned to be carried out"
spending_proposals: "Spending proposals"
spending_proposals_description: "⚠️ NOTE: This functionality has been replaced by Participatory Budgeting and will disappear in new versions"
spending_proposal_features:

20
config/locales/es/activerecord.yml
View File

@@ -234,15 +234,17 @@ es:
summary: Resumen
description: En qué consiste
additional_info: Información adicional
start_date: Fecha de inicio del proceso
end_date: Fecha de fin del proceso
debate_start_date: Fecha de inicio del debate
debate_end_date: Fecha de fin del debate
draft_start_date: Fecha de inicio del borrador
draft_end_date: Fecha de fin del borrador
start_date: Inicio
end_date: Fin
debate_start_date: Inicio
debate_end_date: Fin
draft_start_date: Inicio
draft_end_date: Fin
draft_publication_date: Fecha de publicación del borrador
allegations_start_date: Fecha de inicio de alegaciones
allegations_end_date: Fecha de fin de alegaciones
allegations_start_date: Inicio
allegations_end_date: Fin
proposals_phase_start_date: Inicio
proposals_phase_end_date: Fin
result_publication_date: Fecha de publicación del resultado final
background_color: Color del fondo
font_color: Color del texto
@@ -356,7 +358,7 @@ es:
draft_end_date:
invalid_date_range: tiene que ser igual o posterior a la fecha de inicio del borrador
allegations_end_date:
invalid_date_range: tiene que ser igual o posterior a la fecha de inicio de las alegaciones
invalid_date_range: tiene que ser igual o posterior a la fecha de inicio de los comentarios
proposal:
attributes:
tag_list:

2
config/locales/es/admin.yml
View File

@@ -423,8 +423,6 @@ es:
draft_phase_description: Si esta fase está activa, el proceso no aparecerá en la página de procesos. Permite previsualizar el proceso y crear contenido antes del inicio.
allegations_phase: Fase de comentarios
proposals_phase: Fase de propuestas
start: Inicio
end: Fin
use_markdown: Usa Markdown para formatear el texto
title_placeholder: Escribe el título del proceso
summary_placeholder: Resumen corto de la descripción

2
config/locales/es/budgets.yml
View File

@@ -72,7 +72,7 @@ es:
index:
title: Presupuestos participativos
unfeasible: Proyectos de gasto no viables
unfeasible_text: "Los proyectos presentados deben cumplir una serie de criterios (legalidad, concreción, ser competencia del Ayuntamiento, no superar el tope del presupuesto) para ser declarados viables y llegar hasta la fase de votación final. Todos los proyectos que no cumplen estos criterios son marcados como inviables y publicados en la siguiente lista, junto con su informe de inviabilidad."
unfeasible_text: "Los proyectos presentados deben cumplir una serie de criterios (legalidad, concreción, no superar el tope del presupuesto) para ser declarados viables y llegar hasta la fase de votación final. Todos los proyectos que no cumplen estos criterios son marcados como inviables y publicados en la siguiente lista, junto con su informe de inviabilidad."
by_heading: "Proyectos de gasto con ámbito: %{heading}"
search_form:
button: Buscar

2
config/locales/es/legislation.yml
View File

@@ -71,7 +71,7 @@ es:
help: Ayuda sobre legislación colaborativa
section_footer:
title: Ayuda sobre Legislación colaborativa
description: Participa en los debates y procesos previos a la aprobación de una norma o de una actuación municipal. Tu opinión será tenida en cuenta por el Ayuntamiento.
description: Participa en los debates y procesos previos a la aprobación de nuevas normas o planes. Tu opinión será tenida en cuenta.
phase_not_open:
not_open: Esta fase del proceso todavía no está abierta
phase_empty:

6
config/locales/es/settings.yml
View File

@@ -78,7 +78,7 @@ es:
direct_message_max_per_day_description: "Número de mensajes directos máximos que un usuario puede enviar por día"
feature:
budgets: "Presupuestos participativos"
budgets_description: "Con los presupuestos participativos la ciudadanía decide a qué proyectos presentados por los vecinos y vecinas va destinada una parte del presupuesto municipal"
budgets_description: "Con los presupuestos participativos la ciudadanía decide a qué proyectos presentados por los vecinos y vecinas va destinada una parte del presupuesto"
twitter_login: "Registro con Twitter"
twitter_login_description: "Permitir que los usuarios se registren con su cuenta de Twitter"
facebook_login: "Registro con Facebook"
@@ -86,7 +86,7 @@ es:
google_login: "Registro con Google"
google_login_description: "Permitir que los usuarios se registren con su cuenta de Google"
proposals: "Propuestas"
proposals_description: "Las propuestas ciudadanas son una oportunidad para que los vecinos y colectivos decidan directamente cómo quieren que sea su ciudad, después de conseguir los apoyos suficientes y de someterse a votación ciudadana"
proposals_description: "Las propuestas ciudadanas son una oportunidad para que los vecinos y colectivos decidan directamente cómo quieren que sea su sociedad, después de conseguir los apoyos suficientes y de someterse a votación ciudadana"
featured_proposals: "Propuestas destacadas"
featured_proposals_description: "Muestra propuestas destacadas en la página principal de propuestas"
debates: "Debates"
@@ -96,7 +96,7 @@ es:
signature_sheets: "Hojas de firmas"
signature_sheets_description: "Permite añadir desde el panel de Administración firmas recogidas de forma presencial a Propuestas y proyectos de gasto de los Presupuestos participativos"
legislation: "Legislación"
legislation_description: "En los procesos participativos se ofrece a la ciudadanía la oportunidad de participar en la elaboración y modificación de normativa que afecta a la ciudad y de dar su opinión sobre ciertas actuaciones que se tiene previsto llevar a cabo"
legislation_description: "En los procesos participativos se ofrece a la ciudadanía la oportunidad de participar en la elaboración y modificación de normativa y de dar su opinión sobre ciertas actuaciones que se tiene previsto llevar a cabo"
spending_proposals: "Propuestas de inversión"
spending_proposals_description: "⚠️ NOTA: Esta funcionalidad ha sido sustituida por Pesupuestos Participativos y desaparecerá en nuevas versiones"
spending_proposal_features:

2
spec/models/legislation/process_spec.rb
View File

@@ -82,7 +82,7 @@ describe Legislation::Process do
allegations_end_date: Date.current - 1.day)
expect(process).to be_invalid
expect(process.errors.messages[:allegations_end_date])
.to include("must be on or after the allegations start date")
.to include("must be on or after the comments start date")
end
it "is valid if allegations_end_date is the same as allegations_start_date" do