diff --git a/app/views/admin/budgets/index.html.erb b/app/views/admin/budgets/index.html.erb index 6d9c4aee7..d585a9891 100644 --- a/app/views/admin/budgets/index.html.erb +++ b/app/views/admin/budgets/index.html.erb @@ -27,8 +27,10 @@ <%= t("budgets.phase.#{budget.phase}") %> - - <%= link_to t("admin.budgets.index.budget_investments"), admin_budget_budget_investments_path(budget_id: budget.id) %> + + <%= link_to t("admin.budgets.index.budget_investments"), + admin_budget_budget_investments_path(budget_id: budget.id), + class: "button hollow medium" %> <%= link_to t("admin.budgets.index.edit_groups"), admin_budget_path(budget) %> diff --git a/app/views/admin/comments/index.html.erb b/app/views/admin/comments/index.html.erb index 4a2c39cce..3af3b7d6e 100644 --- a/app/views/admin/comments/index.html.erb +++ b/app/views/admin/comments/index.html.erb @@ -1,4 +1,5 @@

<%= t("admin.comments.index.title") %>

+

<%= t("admin.shared.moderated_content") %>

<%= render 'shared/filter_subnav', i18n_namespace: "admin.comments.index" %> @@ -7,7 +8,7 @@ - + diff --git a/app/views/admin/debates/index.html.erb b/app/views/admin/debates/index.html.erb index 7715e1032..c0150dd84 100644 --- a/app/views/admin/debates/index.html.erb +++ b/app/views/admin/debates/index.html.erb @@ -1,4 +1,5 @@

<%= t("admin.debates.index.title") %>

+

<%= t("admin.shared.moderated_content") %>

<%= render 'shared/filter_subnav', i18n_namespace: "admin.debates.index" %> @@ -9,7 +10,7 @@ - + <% @debates.each do |debate| %> diff --git a/app/views/admin/hidden_users/index.html.erb b/app/views/admin/hidden_users/index.html.erb index 6bcea253c..87d04d579 100644 --- a/app/views/admin/hidden_users/index.html.erb +++ b/app/views/admin/hidden_users/index.html.erb @@ -1,4 +1,5 @@

<%= t("admin.hidden_users.index.title") %>

+

<%= t("admin.shared.moderated_content") %>

<%= render 'shared/filter_subnav', i18n_namespace: "admin.hidden_users.index" %> @@ -7,7 +8,7 @@
<%= t("admin.shared.description") %><%= t("admin.shared.description") %> <%= t("admin.shared.actions") %>
<%= t("admin.shared.title") %> <%= t("admin.shared.description") %><%= t("admin.shared.actions") %><%= t("admin.shared.actions") %>
- + diff --git a/app/views/admin/proposals/index.html.erb b/app/views/admin/proposals/index.html.erb index ba161ce77..0f94e276f 100644 --- a/app/views/admin/proposals/index.html.erb +++ b/app/views/admin/proposals/index.html.erb @@ -1,4 +1,5 @@

<%= t("admin.proposals.index.title") %>

+

<%= t("admin.shared.moderated_content") %>

<%= render 'shared/filter_subnav', i18n_namespace: "admin.proposals.index" %> @@ -9,7 +10,7 @@ - + <% @proposals.each do |proposal| %> diff --git a/app/views/admin/tags/index.html.erb b/app/views/admin/tags/index.html.erb index 55e51a8ac..57ca27ffd 100644 --- a/app/views/admin/tags/index.html.erb +++ b/app/views/admin/tags/index.html.erb @@ -1,4 +1,5 @@

<%= t("admin.tags.index.add_tag") %>

+

<%= t("admin.tags.index.help") %>

<%= form_for(@tag, url: admin_tags_path, as: :tag) do |f| %>
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 9b3023f28..168b0b933 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -5,7 +5,7 @@ en: actions: actions: Actions confirm: Are you sure? - confirm_hide: Confirm + confirm_hide: Confirm moderation hide: Hide hide_author: Hide author restore: Restore @@ -71,7 +71,7 @@ en: filters: open: Open finished: Finished - budget_investments: See budget investments + budget_investments: Manage projects table_name: Name table_phase: Phase table_investments: Investments @@ -472,7 +472,7 @@ en: activity: Moderator activity admin: Admin menu banner: Manage banners - poll_questions: Poll questions + poll_questions: Questions proposals_topics: Proposals topics budgets: Participatory budgets geozones: Manage geozones @@ -494,7 +494,7 @@ en: poll_shifts: Manage shifts officials: Officials organizations: Organisations - settings: Configuration settings + settings: Global settings spending_proposals: Spending proposals stats: Statistics signature_sheets: Signature Sheets @@ -503,13 +503,12 @@ en: pages: Custom Pages images: Custom Images content_blocks: Custom content blocks - title_categories: Categories title_moderated_content: Moderated content title_budgets: Budgets title_polls: Polls title_profiles: Profiles - title_banners: Banners - title_site_customization: Site customization + title_settings: Settings + title_site_customization: Site content legislation: Collaborative Legislation users: Users administrators: @@ -721,8 +720,8 @@ en: table_location: "Location" polls: index: - title: "List of polls" - no_polls: "There are no polls." + title: "List of active polls" + no_polls: "There are no polls coming up." create: "Create poll" name: "Name" dates: "Dates" @@ -834,8 +833,8 @@ en: title: "Results by booth" booths: index: - title: "List of booths" - no_booths: "There are no booths." + title: "List of active booths" + no_booths: "There are no active booths for any upcoming poll." add_booth: "Add booth" name: "Name" location: "Location" @@ -963,6 +962,12 @@ en: description: Description image: Image show_image: Show image + view: View + proposal: Proposal + author: Author + content: Content + created_at: Created at + moderated_content: "Check the content moderated by the moderators, and confirm if the moderation has been done correctly." spending_proposals: index: geozone_filter_all: All zones @@ -1125,6 +1130,7 @@ en: add_tag: Add a new proposal topic title: Proposal topics topic: Topic + help: "When a user creates a proposal, the following topics are suggested as default tags." name: placeholder: Type the name of the topic users: diff --git a/config/locales/en/budgets.yml b/config/locales/en/budgets.yml index dd53a80be..f43042052 100644 --- a/config/locales/en/budgets.yml +++ b/config/locales/en/budgets.yml @@ -30,14 +30,14 @@ en: unselected: See investments not selected for balloting phase phase: drafting: Draft (Not visible to the public) - informing: Informing + informing: Information accepting: Accepting projects reviewing: Reviewing projects selecting: Selecting projects valuating: Valuating projects publishing_prices: Publishing projects prices - balloting: Balloting projects - reviewing_ballots: Reviewing Ballots + balloting: Voting projects + reviewing_ballots: Reviewing voting finished: Finished budget index: title: Participatory budgets diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 991d88249..3cd3eb3f4 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -5,7 +5,7 @@ es: actions: actions: Acciones confirm: '¿Estás seguro?' - confirm_hide: Confirmar + confirm_hide: Confirmar moderación hide: Ocultar hide_author: Bloquear al autor restore: Volver a mostrar @@ -71,7 +71,7 @@ es: filters: open: Abiertos finished: Terminados - budget_investments: Ver proyectos de gasto + budget_investments: Gestionar proyectos de gasto table_name: Nombre table_phase: Fase table_investments: Proyectos de gasto @@ -472,7 +472,7 @@ es: activity: Actividad de moderadores admin: Menú de administración banner: Gestionar banners - poll_questions: Preguntas ciudadanas + poll_questions: Preguntas proposals_topics: Temas de propuestas budgets: Presupuestos participativos geozones: Gestionar distritos @@ -503,13 +503,12 @@ es: pages: Personalizar páginas images: Personalizar imágenes content_blocks: Personalizar bloques - title_categories: Categorías title_moderated_content: Contenido moderado title_budgets: Presupuestos title_polls: Votaciones title_profiles: Perfiles - title_banners: Banners - title_site_customization: Personalizar sitio + title_settings: Configuración + title_site_customization: Contenido del sitio legislation: Legislación colaborativa users: Usuarios administrators: @@ -721,8 +720,8 @@ es: table_location: "Ubicación" polls: index: - title: "Listado de votaciones" - no_polls: "No hay ninguna votación." + title: "Listado de votaciones activas" + no_polls: "No hay ninguna votación próximamente." create: "Crear votación" name: "Nombre" dates: "Fechas" @@ -834,8 +833,8 @@ es: title: "Resultados por urna" booths: index: - title: "Lista de urnas" - no_booths: "No hay urnas." + title: "Listado de urnas activas" + no_booths: "No hay urnas activas para ninguna votación próxima." add_booth: "Añadir urna" name: "Nombre" location: "Ubicación" @@ -963,6 +962,12 @@ es: description: Descripción image: Imagen show_image: Mostrar imagen + view: Ver + proposal: Propuesta + author: Autor + content: Contenido + created_at: Fecha de creación + moderated_content: "Revisa el contenido moderado por los moderadores, y confirma si la moderación se ha realizado correctamente." spending_proposals: index: geozone_filter_all: Todos los ámbitos de actuación @@ -1125,6 +1130,7 @@ es: add_tag: Añade un nuevo tema de propuesta title: Temas de propuesta topic: Tema + help: "Cuando un usuario crea una propuesta se le sugieren como etiquetas por defecto los siguientes temas." name: placeholder: Escribe el nombre del tema users:
<%= t("admin.hidden_users.index.user") %><%= t("admin.hidden_users.index.user") %> <%= t("admin.shared.actions") %>
<%= t("admin.shared.title") %> <%= t("admin.shared.description") %><%= t("admin.shared.actions") %><%= t("admin.shared.actions") %>