From 2dae197eaab5f44e63b25f1a8ca4b374321fe2d7 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 11 Oct 2018 17:54:03 +0200 Subject: [PATCH] Updates i18n --- config/locales/en/admin.yml | 25 +++++++++++-------- config/locales/en/settings.yml | 20 ++++++++++----- config/locales/es/admin.yml | 25 +++++++++++-------- config/locales/es/settings.yml | 22 ++++++++++------ spec/features/admin/dashboard/actions_spec.rb | 2 +- .../dashboard/administrator_tasks_spec.rb | 12 +++------ 6 files changed, 62 insertions(+), 44 deletions(-) diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index a772fe651..6afada0ea 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -325,17 +325,19 @@ en: proposed_action: Proposed action resource: Resource index: - create: Create + create: Create resource or action edit: Edit delete: Delete no_records: No records found active: 'Yes' inactive: 'No' - title: Resources/Recomended actions + title: Resources and actions action_title: Title action_type: Type required_supports: Required supports + day_offset: Required days action_active: Active + order: Order new: creating: New action for the proposals dashboard back: Back to list @@ -348,22 +350,23 @@ en: success: Action successfully deleted form: submit_button: Save - day_offset_help_text: Enter 0 so that this value is not taken into account. - required_supports_help_text: Enter 0 so that this value is not taken into account. + day_offset_help_text: Enter 0 so that this value is not taken into account + required_supports_help_text: Enter 0 so that this value is not taken into account + order_help_text: Order to show to user administrator_tasks: index: title: Pending tasks solve: Solve no_records: There are no pending tasks source: Source + resource: Requested resource edit: back: Back to pending tasks list solving: Solve pending task form: solve: Mark as solved - proposal: "The proposal: %{title}" - request: "Has requested: %{title}" - check_details: Check the proposal details + proposal: Proposal + request: Requested resource update: success: The task has been marked as solved. debates: @@ -595,8 +598,8 @@ en: legislation: Collaborative Legislation users: Users dashboard: Proposals dashboard - administrator_tasks: Pending tasks - dashboard_actions: Proposal dashboard actions + administrator_tasks: Pending tasks + dashboard_actions: Resources and actions administrators: index: title: Administrators @@ -1067,8 +1070,8 @@ en: update: Map configuration updated succesfully. form: submit: Update - proposals: - title: Proposal related settings + dashboard: + title: Proposals dashboard shared: booths_search: button: Search diff --git a/config/locales/en/settings.yml b/config/locales/en/settings.yml index 76ed6652a..cbef7c50a 100644 --- a/config/locales/en/settings.yml +++ b/config/locales/en/settings.yml @@ -65,10 +65,18 @@ en: proposal_improvement_path: Proposal improvement info internal link proposals: successful_proposal_id: Successful proposal - poll_short_title: Subtitle for polls feature - poll_description: Description for polls feature + successful_proposal_id_description: This proposal is used as a reference for a successful proposal in supports number and will be displayed in the dashboard graph. + poll_short_title: Polls + poll_short_title_description: Short description of the survey feature. Allows users to create surveys on a proposal + poll_description: Polls description + poll_description_description: Detailed description of the survey feature poll_link: Additional information link - email_short_title: Subtitle for email feature - email_description: Description for email feature - poster_short_title: Subtitle for poster feature - poster_description: Description for poster feature + poll_link_description: Añade un enlace de información adicional a la funcionalidad de encuestas del panel de control + email_short_title: Email + email_short_title_description: Short description of the email feature. Allows users to send an email to promote their proposal + email_description: Email description + email_description_description: Detailed description of the email feature + poster_short_title: Poster + poster_short_title_description: Short description of the poster feature. Allows users to download a poster on PDF format to promote their proposal + poster_description: Poster description + poster_description_description: Detailed description of the poster feature diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 65a1c763e..44f9c2f7f 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -326,17 +326,19 @@ es: proposed_action: Acción propuesta resource: Recurso index: - create: Crear + create: Crear recurso o acción edit: Editar delete: Borrar no_records: No se encontraron registros active: 'Si' inactive: 'No' - title: Recursos/Acciones recomendadas + title: Recursos y acciones action_title: Título action_type: Tipo required_supports: Apoyos necesarios + day_offset: Días necesarios action_active: Activo + order: Orden new: creating: Nueva acción para el dashboard de propuestas back: Volver a la lista @@ -347,8 +349,9 @@ es: back: Volver a la lista form: submit_button: Guardar - day_offset_help_text: Introduce 0 para que este valor no se tenga en cuenta. - required_supports_help_text: Introduce 0 para que este valor no se tenga en cuenta. + day_offset_help_text: Introduce 0 para que este valor no se tenga en cuenta + required_supports_help_text: Introduce 0 para que este valor no se tenga en cuenta + order_help_text: Orden para mostrar al usuario delete: success: Acción borrada con éxito administrator_tasks: @@ -356,15 +359,15 @@ es: title: Tareas pendientes solve: Resolver no_records: No hay tareas pendientes - source: Origen + source: Propuesta + resource: Recurso solicitado edit: back: Volver a la lista de tareas pendientes solving: Resolver tarea pendiente form: solve: Marcar como resuelta - proposal: "La propuesta: %{title}" - request: "Ha solicitado: %{title}" - check_details: Ver los detalles de la propuesta + proposal: Propuesta + request: Recurso solicitado update: success: La tarea ha sido marcada como resuelta debates: @@ -597,7 +600,7 @@ es: users: Usuarios dashboard: Panel de control de propuestas administrator_tasks: Tareas pendientes - dashboard_actions: Acciones del panel de control de propuestas + dashboard_actions: Recursos y acciones administrators: index: title: Administradores @@ -1068,8 +1071,8 @@ es: update: La configuración del mapa se ha guardado correctamente. form: submit: Actualizar - proposals: - title: Ajustes para propuestas + dashboard: + title: Panel de control de propuestas shared: booths_search: button: Buscar diff --git a/config/locales/es/settings.yml b/config/locales/es/settings.yml index b51f5efdc..44f9fb406 100644 --- a/config/locales/es/settings.yml +++ b/config/locales/es/settings.yml @@ -65,10 +65,18 @@ es: proposal_improvement_path: Link a información para mejorar propuestas proposals: successful_proposal_id: Propuesta exitosa - poll_short_title: Subtítulo funcionalidad encuestas - poll_description: Descripción funcionalidad encuestas - poll_link: Enlace información adicional - email_short_title: Subtítulo funcionalidad de correo electrónico - email_description: Descripción funcionalidad de correo electrónico - poster_short_title: Subtítulo funcionalidad póster - poster_description: Descripción funcionalidad póster + successful_proposal_id_description: Esta propuesta se utiliza como referencia de una propuesta exitosa en número de apoyos y se mostrará en el gráfico del panel de control + poll_short_title: Encuestas + poll_short_title_description: Breve descripción de la funcionalidad de encuestas. Permite a los usuarios crear encuestas sobre una propuesta. + poll_description: Descripción encuestas + poll_description_description: Descripción detallada de la funcionalidad de encuestas + poll_link: Enlace de información adicional + poll_link_description: Añade un enlace de información adicional a la funcionalidad de encuestas del panel de control + email_short_title: Correo electrónico + email_short_title_description: Breve descripción de la funcionalidad de correo electrónico. Permite a los usuarios enviar un email para difundir su propuesta + email_description: Descripción correo electrónico + email_description_description: Descripción detallada de la funcionalidad de correo electrónico + poster_short_title: Póster + poster_short_title_description: Breve descripción de la funcionalidad de póster. Permite a los usuarios descargar un póster en formato PDF para difundir su propuesta + poster_description: Descripción póster + poster_description_description: Descripción detallada de la funcionalidad de póster diff --git a/spec/features/admin/dashboard/actions_spec.rb b/spec/features/admin/dashboard/actions_spec.rb index 3d790eac4..4246ca845 100644 --- a/spec/features/admin/dashboard/actions_spec.rb +++ b/spec/features/admin/dashboard/actions_spec.rb @@ -36,7 +36,7 @@ feature 'Admin dashboard actions' do before do visit admin_dashboard_actions_path - click_link 'Create' + click_link 'Create resource or action' end scenario 'Creates a new action' do diff --git a/spec/features/admin/dashboard/administrator_tasks_spec.rb b/spec/features/admin/dashboard/administrator_tasks_spec.rb index 5626eb121..f2b7b25ce 100644 --- a/spec/features/admin/dashboard/administrator_tasks_spec.rb +++ b/spec/features/admin/dashboard/administrator_tasks_spec.rb @@ -29,7 +29,7 @@ feature 'Admin administrator tasks' do expect(page).to have_content(task.source.proposal.title) expect(page).to have_content(task.source.action.title) end - + scenario 'has a link that allows solving the request' do expect(page).to have_link('Solve') end @@ -45,14 +45,10 @@ feature 'Admin administrator tasks' do click_link 'Solve' end - scenario 'Shows task details' do - expect(page).to have_content(task.source.proposal.title) + scenario 'Shows task details and link to proposal' do + expect(page).to have_link(task.source.proposal.title) expect(page).to have_content(task.source.action.title) end - - scenario 'contains a link to the proposal' do - expect(page).to have_link('Check the proposal details') - end scenario 'contains a button that solves the request' do expect(page).to have_button('Mark as solved') @@ -61,7 +57,7 @@ feature 'Admin administrator tasks' do scenario 'After it is solved dissapears from the list' do click_button 'Mark as solved' - expect(page).not_to have_content(task.source.proposal.title) + expect(page).not_to have_link(task.source.proposal.title) expect(page).not_to have_content(task.source.action.title) expect(page).to have_content('The task has been marked as solved') end