From 869dbd04acac1d5098900978a445612d4070bbc2 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 18 Jan 2017 19:02:16 +0200 Subject: [PATCH 1/2] Remove unneeded translation #341 --- config/locales/en.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 9748112ca..f75324218 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -280,7 +280,6 @@ en: system: 'System' settings: 'Settings' domains: 'Domains' - api_users: 'API users' registrars: 'Registrars' valid_to: 'Valid to' name: 'Name' From 3014a4f3ad342f19b2e7ffbc60b9ae04a8950599 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Thu, 19 Jan 2017 11:59:39 +0200 Subject: [PATCH 2/2] Add missing translations in admin area #341 --- app/views/admin/admin_users/show.haml | 2 +- app/views/admin/api_users/show.haml | 4 ++-- config/locales/admin/api_users.en.yml | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/views/admin/admin_users/show.haml b/app/views/admin/admin_users/show.haml index c7ae5b0df..e51eb5ff9 100644 --- a/app/views/admin/admin_users/show.haml +++ b/app/views/admin/admin_users/show.haml @@ -26,6 +26,6 @@ %dt= t(:role) - if @admin_user.roles - %dd= t(@admin_user.roles.first) + %dd= @admin_user.roles.first - else %dd diff --git a/app/views/admin/api_users/show.haml b/app/views/admin/api_users/show.haml index b410d784d..00e562c6d 100644 --- a/app/views/admin/api_users/show.haml +++ b/app/views/admin/api_users/show.haml @@ -29,7 +29,7 @@ %dt= t(:role) %dd= @api_user.roles.join(', ') - %dt= t(:active) + %dt= t('.active') %dd= @api_user.active .row .col-md-12 @@ -47,7 +47,7 @@ %table.table.table-hover.table-bordered.table-condensed %thead %tr - %th{class: 'col-xs-10'}= t(:subject) + %th{class: 'col-xs-10'}= t('.subject') %th{class: 'col-xs-2'}= t(:status) %tbody - @api_user.certificates.each do |x| diff --git a/config/locales/admin/api_users.en.yml b/config/locales/admin/api_users.en.yml index fb6e0dfce..89a31f081 100644 --- a/config/locales/admin/api_users.en.yml +++ b/config/locales/admin/api_users.en.yml @@ -6,6 +6,10 @@ en: title: API users active: Active + show: + active: Active + subject: Subject + new: title: New API user