From abf48af331feb152216282748846983f05311080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Mon, 19 Nov 2018 13:52:41 +0100 Subject: [PATCH 1/3] Rename `draft_texts` key to `draft_versions` This way we can refactor the legislation tabs, since now all translation keys follow the same convention (using the same name as the active tab name). --- app/views/admin/legislation/processes/_subnav.html.erb | 4 ++-- config/locales/de-DE/admin.yml | 2 +- config/locales/en/admin.yml | 2 +- config/locales/es-AR/admin.yml | 2 +- config/locales/es-CL/admin.yml | 2 +- config/locales/es/admin.yml | 2 +- config/locales/fr/admin.yml | 2 +- config/locales/gl/admin.yml | 2 +- config/locales/it/admin.yml | 2 +- config/locales/nl/admin.yml | 2 +- config/locales/pl-PL/admin.yml | 2 +- config/locales/pt-BR/admin.yml | 2 +- config/locales/sq-AL/admin.yml | 2 +- config/locales/sv-SE/admin.yml | 2 +- config/locales/val/admin.yml | 2 +- config/locales/zh-CN/admin.yml | 2 +- config/locales/zh-TW/admin.yml | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/views/admin/legislation/processes/_subnav.html.erb b/app/views/admin/legislation/processes/_subnav.html.erb index 2bfa9dd1d..7f3903101 100644 --- a/app/views/admin/legislation/processes/_subnav.html.erb +++ b/app/views/admin/legislation/processes/_subnav.html.erb @@ -31,11 +31,11 @@ <% if active == 'draft_versions' %>
  • -

    <%= t("admin.legislation.processes.subnav.draft_texts") %>

    +

    <%= t("admin.legislation.processes.subnav.draft_versions") %>

    • <% else %>
  • - <%= link_to t("admin.legislation.processes.subnav.draft_texts"), admin_legislation_process_draft_versions_path(process) %> + <%= link_to t("admin.legislation.processes.subnav.draft_versions"), admin_legislation_process_draft_versions_path(process) %>
    • <% end %> diff --git a/config/locales/de-DE/admin.yml b/config/locales/de-DE/admin.yml index 97d982f81..d557c88ac 100644 --- a/config/locales/de-DE/admin.yml +++ b/config/locales/de-DE/admin.yml @@ -403,7 +403,7 @@ de: status_planned: Geplant subnav: info: Information - draft_texts: Ausarbeitung + draft_versions: Ausarbeitung questions: Diskussion proposals: Vorschläge proposals: diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 6ee435c55..619158038 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -413,7 +413,7 @@ en: status_planned: Planned subnav: info: Information - draft_texts: Drafting + draft_versions: Drafting questions: Debate proposals: Proposals proposals: diff --git a/config/locales/es-AR/admin.yml b/config/locales/es-AR/admin.yml index 2b3def5f7..899de141d 100644 --- a/config/locales/es-AR/admin.yml +++ b/config/locales/es-AR/admin.yml @@ -367,7 +367,7 @@ es-AR: status_planned: Próximamente subnav: info: Información - draft_texts: Redacción + draft_versions: Redacción questions: Debate proposals: Propuestas proposals: diff --git a/config/locales/es-CL/admin.yml b/config/locales/es-CL/admin.yml index f47074f48..2c4f337dc 100644 --- a/config/locales/es-CL/admin.yml +++ b/config/locales/es-CL/admin.yml @@ -361,7 +361,7 @@ es-CL: status_planned: Próximamente subnav: info: Información - draft_texts: Redacción + draft_versions: Redacción questions: Debate proposals: Propuestas proposals: diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index b16f85bd8..6683718bc 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -413,7 +413,7 @@ es: status_planned: Próximamente subnav: info: Información - draft_texts: Redacción + draft_versions: Redacción questions: Debate proposals: Propuestas proposals: diff --git a/config/locales/fr/admin.yml b/config/locales/fr/admin.yml index bdc103d47..44606558e 100644 --- a/config/locales/fr/admin.yml +++ b/config/locales/fr/admin.yml @@ -402,7 +402,7 @@ fr: status_planned: Planifié subnav: info: Information - draft_texts: Brouillon + draft_versions: Brouillon questions: Débat proposals: Propositions proposals: diff --git a/config/locales/gl/admin.yml b/config/locales/gl/admin.yml index 341aef52f..b876dae35 100644 --- a/config/locales/gl/admin.yml +++ b/config/locales/gl/admin.yml @@ -411,7 +411,7 @@ gl: status_planned: Planificado subnav: info: Información - draft_texts: Redacción + draft_versions: Redacción questions: Debate proposals: Propostas proposals: diff --git a/config/locales/it/admin.yml b/config/locales/it/admin.yml index 064d2002c..4e24a115a 100644 --- a/config/locales/it/admin.yml +++ b/config/locales/it/admin.yml @@ -402,7 +402,7 @@ it: status_planned: Programmato subnav: info: Informazione - draft_texts: Redazione + draft_versions: Redazione questions: Dibattito proposals: Proposte proposals: diff --git a/config/locales/nl/admin.yml b/config/locales/nl/admin.yml index e8609b609..4f05f4a81 100644 --- a/config/locales/nl/admin.yml +++ b/config/locales/nl/admin.yml @@ -403,7 +403,7 @@ nl: status_planned: Gepland subnav: info: Informatie - draft_texts: Tekst + draft_versions: Tekst questions: Debat proposals: Voorstellen proposals: diff --git a/config/locales/pl-PL/admin.yml b/config/locales/pl-PL/admin.yml index b59aae930..4e3c5ad67 100644 --- a/config/locales/pl-PL/admin.yml +++ b/config/locales/pl-PL/admin.yml @@ -408,7 +408,7 @@ pl: status_planned: Zaplanowany subnav: info: Informacje - draft_texts: Opracowanie + draft_versions: Opracowanie questions: Debata proposals: Wnioski proposals: diff --git a/config/locales/pt-BR/admin.yml b/config/locales/pt-BR/admin.yml index 7d9a975b3..5a199a0b5 100644 --- a/config/locales/pt-BR/admin.yml +++ b/config/locales/pt-BR/admin.yml @@ -404,7 +404,7 @@ pt-BR: status_planned: Planejados subnav: info: Informação - draft_texts: Seleção + draft_versions: Seleção questions: Debate proposals: Propostas proposals: diff --git a/config/locales/sq-AL/admin.yml b/config/locales/sq-AL/admin.yml index 6ec432ca8..74367f811 100644 --- a/config/locales/sq-AL/admin.yml +++ b/config/locales/sq-AL/admin.yml @@ -404,7 +404,7 @@ sq: status_planned: Planifikuar subnav: info: Informacion - draft_texts: Hartimi + draft_versions: Hartimi questions: Debate proposals: Propozime proposals: diff --git a/config/locales/sv-SE/admin.yml b/config/locales/sv-SE/admin.yml index 2789798a0..322dfefba 100644 --- a/config/locales/sv-SE/admin.yml +++ b/config/locales/sv-SE/admin.yml @@ -403,7 +403,7 @@ sv: status_planned: Planerad subnav: info: Information - draft_texts: Utkast + draft_versions: Utkast questions: Diskussion proposals: Förslag proposals: diff --git a/config/locales/val/admin.yml b/config/locales/val/admin.yml index 71fc42fe0..2d36d0067 100644 --- a/config/locales/val/admin.yml +++ b/config/locales/val/admin.yml @@ -401,7 +401,7 @@ val: status_planned: Pròximament subnav: info: Informació - draft_texts: Text + draft_versions: Text questions: Debat proposals: Propostes proposals: diff --git a/config/locales/zh-CN/admin.yml b/config/locales/zh-CN/admin.yml index ec24af62e..3a5c9fb5b 100644 --- a/config/locales/zh-CN/admin.yml +++ b/config/locales/zh-CN/admin.yml @@ -401,7 +401,7 @@ zh-CN: status_planned: 计划 subnav: info: 信息 - draft_texts: 起草 + draft_versions: 起草 questions: 辩论 proposals: 提议 proposals: diff --git a/config/locales/zh-TW/admin.yml b/config/locales/zh-TW/admin.yml index 8756ab394..d320529e2 100644 --- a/config/locales/zh-TW/admin.yml +++ b/config/locales/zh-TW/admin.yml @@ -402,7 +402,7 @@ zh-TW: status_planned: 計劃 subnav: info: 資訊 - draft_texts: 起草 + draft_versions: 起草 questions: 辯論 proposals: 建議 proposals: From 9ad8c5728aa6f01a97be3ce6e23a5853e13bf389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Mon, 19 Nov 2018 14:07:03 +0100 Subject: [PATCH 2/3] Refactor legislation process subnav --- app/helpers/legislation_helper.rb | 9 ++++ .../legislation/processes/_subnav.html.erb | 48 ++++--------------- 2 files changed, 19 insertions(+), 38 deletions(-) diff --git a/app/helpers/legislation_helper.rb b/app/helpers/legislation_helper.rb index 38eba39ad..b2cd1399c 100644 --- a/app/helpers/legislation_helper.rb +++ b/app/helpers/legislation_helper.rb @@ -26,4 +26,13 @@ module LegislationHelper method: :patch, class: html_class end + + def legislation_process_tabs(process) + { + "info" => edit_admin_legislation_process_path(process), + "questions" => admin_legislation_process_questions_path(process), + "proposals" => admin_legislation_process_proposals_path(process), + "draft_versions" => admin_legislation_process_draft_versions_path(process) + } + end end diff --git a/app/views/admin/legislation/processes/_subnav.html.erb b/app/views/admin/legislation/processes/_subnav.html.erb index 7f3903101..56ec8971c 100644 --- a/app/views/admin/legislation/processes/_subnav.html.erb +++ b/app/views/admin/legislation/processes/_subnav.html.erb @@ -1,41 +1,13 @@ From baa7ddc4cc93080cf2b6eac2a3a761e47d468fdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Tue, 20 Nov 2018 14:09:22 +0100 Subject: [PATCH 3/3] Remove unused key --- config/locales/en/activerecord.yml | 3 --- config/locales/es/activerecord.yml | 3 --- 2 files changed, 6 deletions(-) diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml index 0ed4a9872..93040769b 100644 --- a/config/locales/en/activerecord.yml +++ b/config/locales/en/activerecord.yml @@ -82,9 +82,6 @@ en: legislation/draft_versions: one: "Draft version" other: "Draft versions" - legislation/draft_texts: - one: "Draft" - other: "Drafts" legislation/questions: one: "Question" other: "Questions" diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml index 15bbb35bf..2737073eb 100644 --- a/config/locales/es/activerecord.yml +++ b/config/locales/es/activerecord.yml @@ -82,9 +82,6 @@ es: legislation/draft_versions: one: "Versión borrador" other: "Versiones borrador" - legislation/draft_texts: - one: "Borrador" - other: "Borradores" legislation/questions: one: "Pregunta" other: "Preguntas"