From 648f412cebdaaf619ed8e8dc6ee6079b8ec0ce94 Mon Sep 17 00:00:00 2001 From: Michael Bianco Date: Tue, 1 May 2012 11:35:43 -0400 Subject: [PATCH] Resolving internationalization conflict with spree_essentials --- app/views/spree/admin/digitals/_form.html.erb | 2 +- config/locales/en.yml | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/views/spree/admin/digitals/_form.html.erb b/app/views/spree/admin/digitals/_form.html.erb index 09662da..e017113 100644 --- a/app/views/spree/admin/digitals/_form.html.erb +++ b/app/views/spree/admin/digitals/_form.html.erb @@ -25,7 +25,7 @@ <%= hidden_field_tag 'digital[variant_id]', variant.id %> - <%= button t("upload") %> + <%= button t('spree_digital.upload') %> <% end %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index 4fc0c04..17ed8bc 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,12 +1,11 @@ en: digital_versions: Digital Versions - current_file: Current File new_file: New File - upload: Upload delete_file: Delete this file broken_file: Warning! this file is broken delete_file_cofirmation: Are you sure you want to delete the file %{filename}? - digital_shipping: Delivery per email to %{email} - \ No newline at end of file + + spree_digital: + upload: Upload \ No newline at end of file