diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index aa3422566f8..009b6be5f5b 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -50,7 +50,7 @@ <% end %> - <%= link_to "Releases", news_url, class: "header__nav-link #{active?(news_path)}" %> + <%= link_to t('.footer.releases'), news_url, class: "header__nav-link #{active?(news_path)}" %> <%= link_to t('.footer.blog'), "https://blog.rubygems.org", class: "header__nav-link" %> <%- if request.path_info == '/gems' %> diff --git a/app/views/owners/_owners_table.html.erb b/app/views/owners/_owners_table.html.erb index 4ad86899233..509974d335b 100644 --- a/app/views/owners/_owners_table.html.erb +++ b/app/views/owners/_owners_table.html.erb @@ -50,13 +50,13 @@ <%= ownership.confirmed_at.strftime("%Y-%m-%d %H:%M %Z") if ownership.confirmed? %> - <%= button_to "Remove", + <%= button_to t("remove"), rubygem_owner_path(@rubygem.slug, ownership.user.display_id), method: "delete", data: { confirm: t("owners.index.confirm_remove") }, class: "form__submit form__submit--small" %>
- <%= button_to "Edit", + <%= button_to t("edit"), edit_rubygem_owner_path(@rubygem.name, ownership.user.display_id), disabled: ownership.user == current_user, method: "get", diff --git a/app/views/passwords/edit.html.erb b/app/views/passwords/edit.html.erb index e5e5bd17d08..544f5b45a69 100644 --- a/app/views/passwords/edit.html.erb +++ b/app/views/passwords/edit.html.erb @@ -3,7 +3,7 @@ <%= form_for(:password_reset, url: password_path, html: { method: :put }) do |form| %> <%= error_messages_for @user %>
- <%= form.label :password, "Password", :class => 'form__label' %> + <%= form.label :password, t("activerecord.attributes.user.password"), :class => 'form__label' %> <%= form.password_field :password, autocomplete: 'new-password', class: 'form__input' %>
diff --git a/app/views/profiles/delete.html.erb b/app/views/profiles/delete.html.erb index 9d42b613f88..6f09228ac2c 100644 --- a/app/views/profiles/delete.html.erb +++ b/app/views/profiles/delete.html.erb @@ -30,8 +30,8 @@

<%= t '.instructions' %>

<%= form_for current_user, url: destroy_profile_path, method: :delete do |form| %>
- <%= form.label :password, "Password", class: 'form__label' %> - <%= form.password_field :password, placeholder: 'password', autocomplete: 'current-password', class: 'form__input' %> + <%= form.label :password, t("activerecord.attributes.user.password"), class: 'form__label' %> + <%= form.password_field :password, placeholder: t("activerecord.attributes.user.password"), autocomplete: 'current-password', class: 'form__input' %>
<%= form.submit t('.confirm'), data: { confirm: "This action can't be UNDONE! Are you sure?" }, class: 'form__submit' %> <% end %> diff --git a/app/views/profiles/edit.html.erb b/app/views/profiles/edit.html.erb index 9328c5ba61d..0af673a168c 100644 --- a/app/views/profiles/edit.html.erb +++ b/app/views/profiles/edit.html.erb @@ -62,7 +62,7 @@
- <%= form.label :password, :class => 'form__label' %> + <%= form.label :password, t("activerecord.attributes.user.password"), :class => 'form__label' %>

<%= t('.enter_password') %>

@@ -76,7 +76,7 @@
- <%= form.submit 'Update', :data => {:disable_with => t('form_disable_with')}, :class => 'form__submit' %> + <%= form.submit t("update"), :data => {:disable_with => t('form_disable_with')}, :class => 'form__submit' %>
<% end %> diff --git a/app/views/settings/edit.html.erb b/app/views/settings/edit.html.erb index 81a34d6af89..074430d9887 100644 --- a/app/views/settings/edit.html.erb +++ b/app/views/settings/edit.html.erb @@ -71,7 +71,7 @@

<%= link_to t('oidc.pending_trusted_publishers.index.title'), profile_oidc_pending_trusted_publishers_path %>

- Pending trusted publishers allow you to configure trusted publishing before you have pushed the first version of a gem. For more information about how to set up trusted publishing, see the trusted publishing documentation. + <%= t("oidc.pending_trusted_publishers.index.description_html") %>
<% if @user.oidc_api_key_roles.any? %>