From c6676e87a398a4615a277fb771b143f683da8746 Mon Sep 17 00:00:00 2001 From: Ben Eggett Date: Fri, 4 May 2012 02:01:08 -0600 Subject: [PATCH] Corrected, added, and normalized missing translation for admin/users Fixes #1488 --- .../spree/admin/users_controller_decorator.rb | 4 ++-- api/app/views/spree/admin/users/_api_fields.html.erb | 12 ++++++------ api/config/locales/en.yml | 9 ++++++++- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/api/app/controllers/spree/admin/users_controller_decorator.rb b/api/app/controllers/spree/admin/users_controller_decorator.rb index 3b367a47e21..7e0cc9af88b 100644 --- a/api/app/controllers/spree/admin/users_controller_decorator.rb +++ b/api/app/controllers/spree/admin/users_controller_decorator.rb @@ -3,14 +3,14 @@ def generate_api_key if @user.generate_api_key! - flash.notice = t('api.key_generated') + flash.notice = t('key_generated', :scope => 'spree.api') end redirect_to edit_admin_user_path(@user) end def clear_api_key if @user.clear_api_key! - flash.notice = t('api.key_cleared') + flash.notice = t('key_cleared', :scope => 'spree.api') end redirect_to edit_admin_user_path(@user) end diff --git a/api/app/views/spree/admin/users/_api_fields.html.erb b/api/app/views/spree/admin/users/_api_fields.html.erb index 4f91380e2a3..6b1a71b53be 100644 --- a/api/app/views/spree/admin/users/_api_fields.html.erb +++ b/api/app/views/spree/admin/users/_api_fields.html.erb @@ -1,20 +1,20 @@ -

<%= t('api.access') %>

<%= t('access', :scope => 'spree.api') %>

<% if @user.authentication_token.present? %> -

<%= t('api.key') %> <%= @user.authentication_token %>

<%= t('key', :scope => 'spree.api') %> <%= @user.authentication_token %>

<%= form_tag spree.clear_api_key_admin_user_path(@user), :method => :put do %> - <%= button t('api.clear_key') %> + <%= button t('clear_key', :scope => 'spree.api') %> <% end %> <%= form_tag spree.generate_api_key_admin_user_path(@user), :method => :put do %> - <%= button t('api.regenerate_key') %> + <%= button t('regenerate_key', :scope => 'spree.api') %> <% end %> <% else %> -

<%= t('api.no_key') %>

<%= t('no_key', :scope => 'spree.api') %>

<%= form_tag spree.generate_api_key_admin_user_path(@user), :method => :put do %> - <%= button t('api.generate_key') %> + <%= button t('generate_key', :scope => 'spree.api') %> <% end %> <% end %> diff --git a/api/config/locales/en.yml b/api/config/locales/en.yml index 98893840938..036a7118025 100644 --- a/api/config/locales/en.yml +++ b/api/config/locales/en.yml @@ -8,7 +8,14 @@ en: resource_not_found: "The resource you were looking for could not be found." gateway_error: "There was a problem with the payment gateway: %{text}" credit_over_limit: "This payment can only be credited up to %{limit}. Please specify an amount less than or equal to this number." - + access: "API Access" + key: "Key" + clear_key: "Clear key" + regenerate_key: "Regenerate Key" + no_key: "No key" + generate_key: "Generate API key" + key_generated: "Key generated" + key_cleared: "Key cleared" order: could_not_transition: "The order could not be transitioned. Please fix the errors and try again." invalid_shipping_method: "Invalid shipping method specified."