Skip to content

Commit

Permalink
More translations
Browse files Browse the repository at this point in the history
  • Loading branch information
cguess committed Jan 31, 2025
1 parent 489c9b9 commit 147ccb2
Show file tree
Hide file tree
Showing 12 changed files with 66 additions and 30 deletions.
1 change: 1 addition & 0 deletions app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ class ApplicationController < ActionController::Base
protect_from_forgery with: :null_session, if: :json_request?, prepend: true

before_action :set_site_from_host
before_action { @pagy_locale = params[:locale] }
around_action :switch_locale

sig { void }
Expand Down
10 changes: 5 additions & 5 deletions app/views/accounts/_change_email.html.erb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div class="account-page__box account-update-box" data-controller="change-email">
<div class="account-page__box--settings__header">
<h3><%= t("settings.change_email.title") %></h3>
<h3><%= t("account_admin.change_email.title") %></h3>
<p>
<%= t("settings.change_email.instructions") %>
<%= t("account_admin.change_email.instructions") %>
</p>
</div>
<div class="account-page__box--settings__form">
Expand All @@ -22,22 +22,22 @@
autofocus: true,
autocomplete: "new-email",
autocapitalize: "off",
placeholder: t("settings.change_email.new_email"),
placeholder: t("account_admin.change_email.new_email"),
class: "input input--email") %>
</div>

<div class="field">
<%= f.text_field(
:email_confirmation,
"data-change-email-target": "emailConfirmationInput",
placeholder: t("seed_confirmation.confirm_email"),
placeholder: t("account_admin.change_email.confirm_email"),
autocomplete: "new-email",
autocapitalize: "off",
class: "input input--email") %>
</div>

<div class="actions">
<%= f.submit t("settings.change_email.button"), class: "btn btn--submit" %>
<%= f.submit t("account_admin.change_email.button"), class: "btn btn--submit" %>
</div>
<% end %>
</div>
Expand Down
8 changes: 4 additions & 4 deletions app/views/media_vault/archive/_add.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</button>

<div class="modal--add_media--view--header pt-6 px-8">
Save A Post
<%= t("dashboard.save_a_post") %>
</div>

<div class="pb-6 pt-2 px-6">
Expand All @@ -19,12 +19,12 @@
<%= form_with url: media_vault_archive_add_path, class: "form__field" do |f| %>
<div class="search-box__form--text">
<fieldset class="search-box__fieldset" data-media-vault--search-box-target="searchByTextFieldset" style="margin-right: 10%">
<%= f.label :url_to_archive, "URL To Archive", class: "search-box__form__label" %>
<%= f.label :url_to_archive, t("dashboard.url_to_archive"), class: "search-box__form__label" %>
<%= f.text_field :url_to_archive, class: "search-box__form__field", value: (@query if defined?(@query) && !@query.nil?), "data-media-vault--search-box-target": "searchByTextField" %>
<%= f.submit "Archive", class: "search-box__form__submit btn btn--reversed-subtle" %>
<%= f.submit t("dashboard.archive"), class: "search-box__form__submit btn btn--reversed-subtle" %>
</fieldset>
<div class="search-box__toggle-mode-message">
Archive a URL of a social media post to your MyVault
<%= t("dashboard.archive_a_url_of_a_social_media") %>
</div>
</div>
<% end %>
Expand Down
16 changes: 8 additions & 8 deletions app/views/media_vault/archive/_filter_form.html.erb
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<div data-controller="media-vault--archive" class="form form--filter">
<% if show %>
<button data-action="media-vault--archive#showFilters" data-media-vault--archive-target="filterWrapperToggle">
Hide Filters &nbsp;&nbsp;<span style="font-size: 0.5em"></span>
<%= t("dashboard.hide_filters") %> &nbsp;&nbsp;<span style="font-size: 0.5em"></span>
</button>
<% else %>
<button data-action="media-vault--archive#showFilters" data-media-vault--archive-target="filterWrapperToggle">
Show Filters &nbsp;&nbsp;<span style="font-size: 0.5em"></span>
<%= t("dashboard.show_filters") %> &nbsp;&nbsp;<span style="font-size: 0.5em"></span>
</button>
<% end %>
<div class="<%= show ? "": "hidden" %>" data-media-vault--archive-target="filterWrapper">
Expand All @@ -16,19 +16,19 @@

<% unless myvault %>
<div class="field field__wrapper--input">
<label>Filter</label>
<%= select_tag("org-filter", options_for_select(@fact_check_organizations, selected: organization_id), prompt: "Organization", "data-media-vault--archive-target": "organizationFilter") %>
<label><%= t("dashboard.filter") %></label>
<%= select_tag("org-filter", options_for_select(@fact_check_organizations, selected: organization_id), prompt: t("dashboard.organization"), "data-media-vault--archive-target": "organizationFilter") %>
</div>
<% end %>
<div class="field field__wrapper--input">
<label>From</label><%= date_field_tag("time-filter-start", time_filter_from, min: "1995-09-24", max: Date.today.to_s, "data-media-vault--archive-target": "fromDateFilter") %>
<label><%= t("dashboard.from") %></label><%= date_field_tag("time-filter-start", time_filter_from, min: "1995-09-24", max: Date.today.to_s, "data-media-vault--archive-target": "fromDateFilter") %>
</div>
<div class="field field__wrapper--input">
<label>To</label><%= date_field_tag("time-filter-start", time_filter_to, min: "1995-09-24", max: Date.today.to_s, "data-media-vault--archive-target": "toDateFilter") %>
<label><%= t("dashboard.to") %></label><%= date_field_tag("time-filter-start", time_filter_to, min: "1995-09-24", max: Date.today.to_s, "data-media-vault--archive-target": "toDateFilter") %>
</div>
<div class="actions">
<button class="btn btn--submit" data-action="media-vault--archive#filterResults">Filter</button>
<button class="btn btn--clear" data-action="media-vault--archive#clearFilters">Clear Filters</button>
<button class="btn btn--submit" data-action="media-vault--archive#filterResults"><%= t("dashboard.filter") %></button>
<button class="btn btn--clear" data-action="media-vault--archive#clearFilters"><%= t("dashboard.clear_filters") %></button>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/views/media_vault/archive/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
<% if @myvault %>
MyVault&nbsp;<span style="font-size: 1.5rem; vertical-align: text-top; color: gray;" class="super">Beta</span> :
<% else %>
Recently-archived media:
<%= t("dashboard.recently_archived_media") %>
<% end %>
</h2>
</div>
<% if Flipper.enabled?(:adhoc, current_user) %>
<div>
<%= link_to media_vault_archive_add_path, class: "btn btn--naked icon-prefixed", data: { turbo_stream: 'modal' } do %>
<%= use_svg "plus", svg_attrs: { class: "icon icon--lg", aria: { hidden: true } } %>
<span>Save A Post</span>
<span><%= t("dashboard.save_a_post") %></span>
<% end %>
</div>
<% end %>
Expand Down
3 changes: 2 additions & 1 deletion config/initializers/pagy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,8 @@
# Pagy::I18n.load(locale: 'de')
#
# load the "de" locale defined in the custom file at :filepath:
Pagy::I18n.load(locale: "en", filepath: Rails.root.join("config/locales/pagy.en.yml"))
Pagy::I18n.load({ locale: "en", filepath: Rails.root.join("config/locales/pagy.en.yml") },
{ locale: "es" })
#
# load the "de", "en" and "es" built-in locales:
# (the first passed :locale will be used also as the default_locale)
Expand Down
6 changes: 6 additions & 0 deletions config/locales/Account admin/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ en:
new_password: "New password"
confirm_new_password: "Confirm new password"
change_my_password: "Change my password"
change_email:
title: "Change email"
instructions: "To change your email, fill out the form below."
new_email: "New email"
confirm_email: "Confirm new email"
button: "Change my email"
delete_password:
delete_account: "Delete account"
to_delete_your_account: "To delete your account, enter your password below, then accept the browser alert."
Expand Down
27 changes: 27 additions & 0 deletions config/locales/Account admin/es.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
es:
account_admin:
settings: "Configuración"
text_searches: "Búsquedas de texto"
image_searches: "Búsquedas de imágenes"
update_account_details: "Actualizar detalles de cuenta"
text_search_history: "Historial de búsquedas de texto:"
no_results_found: "No se encontraron resultados"
image_search_history: "Historial de búsquedas de imágenes:"
change_password:
change_password: "Cambiar contraseña"
to_change_your_password: "Para cambiar su contraseña, complete el siguiente formulario."
characters_minimum: "caracteres mínimo"
new_password: "Nueva contraseña"
confirm_new_password: "Confirmar nueva contraseña"
change_my_password: "Cambiar mi contraseña"
change_email:
title: "Cambiar correo electrónico"
instructions: "Para cambiar tu correo electrónico, completa el formulario a continuación."
new_email: "Nuevo correo electrónico"
confirm_email: "Confirmar nuevo correo electrónico"
button: "Cambiar mi correo electrónico"
delete_password:
delete_account: "Eliminar cuenta"
to_delete_your_account: "Para eliminar su cuenta, introduzca su contraseña a continuación y luego acepte la alerta del navegador."
password: "Contraseña"
delete_my_account: "Eliminar mi cuenta"
8 changes: 6 additions & 2 deletions config/locales/Dashboard/en.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
en:
dashboard:
recently-archived_media:: "Recently-archived media:"
recently_archived_media: "Recently-archived media:"
show_filters: "Show Filters"
hide_filters: "Hide Filters"
organization: "Organization"
Expand All @@ -9,10 +9,14 @@ en:
filter: "Filter"
clear_filters: "Clear Filters"
save_a_post: "Save a post"
organization: "Organization"
archive_a_url_of_a_social_media: "Archive a URL of a social media post to your MyVault"
archive: "Archive"
url_to_archive: "URL To Archive"
published_on_twitter: "Published on Twitter"
archived_at: "Archived at"
view_media_detail: "View media detail"
download_media_metadata: "Download media metadata"
showing_xx_of_yy : "Showing XX of YY "
showing_xx_of_yy: "Showing XX of YY"
prev: "Prev"
next: "Next"
5 changes: 4 additions & 1 deletion config/locales/Dashboard/es.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
es:
dashboard:
recently-archived_media:: "Medios recientemente archivados:"
recently_archived_media: "Medios recientemente archivados:"
show_filters: "Mostrar filtros"
hide_filters: "Ocultar filtros"
organization: "Organización"
Expand All @@ -9,6 +9,9 @@ es:
filter: "Filtrar"
clear_filters: "Borrar filtros"
save_a_post: "Guardar una publicación"
archive_a_url_of_a_social_media: "Archive a URL of a social media post to your MyVault"
archive: "Archivo"
url_to_archive: "URL al archivo"
published_on_twitter: "Publicado en Twitter"
archived_at: "Archivado en"
view_media_detail: "Ver detalles de los medio"
Expand Down
6 changes: 0 additions & 6 deletions config/locales/Settings/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,3 @@ en:
add_totp: "Add App TOTP Authentication"
image_search_history:
search_date: "Search date"
change_email:
title: "Change email"
instructions: "To change your email, fill out the form below."
new_email: "New email"
confirm_email: "Confirm new email"
button: "Change my email"
2 changes: 1 addition & 1 deletion config/locales/Settings/es.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
en:
es:
settings:
mfa:
title: "Gestionar MFA"
Expand Down

0 comments on commit 147ccb2

Please sign in to comment.