From ce8f7993c2bd50e31c37ec007a8d21cdd284a794 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Tue, 10 Dec 2019 15:54:30 +0200 Subject: [PATCH] Use default translations --- app/views/admin/api_users/_form.html.erb | 2 +- app/views/admin/api_users/index.html.erb | 4 ++-- app/views/admin/api_users/show.html.erb | 10 +++++----- config/locales/admin/api_users.en.yml | 3 --- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/app/views/admin/api_users/_form.html.erb b/app/views/admin/api_users/_form.html.erb index 6119bc727..23dd27b26 100644 --- a/app/views/admin/api_users/_form.html.erb +++ b/app/views/admin/api_users/_form.html.erb @@ -40,7 +40,7 @@
diff --git a/app/views/admin/api_users/index.html.erb b/app/views/admin/api_users/index.html.erb index 1ca018bb1..9c00f32d6 100644 --- a/app/views/admin/api_users/index.html.erb +++ b/app/views/admin/api_users/index.html.erb @@ -12,10 +12,10 @@ <%= sort_link(@q, 'username') %> - <%= sort_link(@q, 'registrar_name', t(:registrar_name)) %> + <%= sort_link(@q, 'registrar_name', Registrar.model_name.human) %> - <%= sort_link(@q, 'active', t('.active')) %> + <%= sort_link(@q, 'active', ApiUser.human_attribute_name(:active)) %> diff --git a/app/views/admin/api_users/show.html.erb b/app/views/admin/api_users/show.html.erb index 5022bc58b..3e7c5347d 100644 --- a/app/views/admin/api_users/show.html.erb +++ b/app/views/admin/api_users/show.html.erb @@ -35,19 +35,19 @@
-
<%= t(:username) %>
+
<%= ApiUser.human_attribute_name :username %>
<%= @api_user.username %>
-
<%= t(:password) %>
+
<%= ApiUser.human_attribute_name :plain_text_password %>
<%= @api_user.plain_text_password %>
-
<%= t(:registrar_name) %>
+
<%= Registrar.model_name.human %>
<%= link_to(@api_user.registrar, admin_registrar_path(@api_user.registrar)) %>
-
<%= t(:role) %>
+
<%= ApiUser.human_attribute_name :roles %>
<%= @api_user.roles.join(', ') %>
-
<%= t('.active') %>
+
<%= ApiUser.human_attribute_name :active %>
<%= @api_user.active %>
diff --git a/config/locales/admin/api_users.en.yml b/config/locales/admin/api_users.en.yml index 49b72a2bd..39c1006f6 100644 --- a/config/locales/admin/api_users.en.yml +++ b/config/locales/admin/api_users.en.yml @@ -3,7 +3,6 @@ en: api_users: index: header: API users - active: Active new: header: New API user @@ -12,7 +11,6 @@ en: created: API user has been successfully created show: - active: Active subject: Subject edit_btn: Edit delete_btn: Delete @@ -27,6 +25,5 @@ en: deleted: API user has been successfully deleted form: - active: Active create_btn: Create API user update_btn: Update API user