Merge branch 'registry-341' into registry-268

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

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|

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
 

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'