Merge pull request #1 from spree-contrib/master

updating translations from master

app/assets/javascripts/spree/backend/translations.js.coffee

@@ -1,5 +1,5 @@
 _.extend Spree.translations,
-  please_choose_language: "<%= Spree.t(:choose_language, scope: 'i18n') %>"
+  please_choose_language: "<%= Spree.t(:'i18n.choose_language') %>"
 
 $ ->
   $('#available_locales_').select2({placeholder: Spree.translations['please_choose_language']})

app/helpers/spree_i18n/locale_helper.rb

@@ -21,7 +21,7 @@ def all_locales_options
     private
 
     def locale_presentation(locale)
-      [Spree.t(:this_file_language, scope: 'i18n', locale: locale), locale]
+      [Spree.t(:'i18n.this_file_language', locale: locale), locale]
     end
 
     def common_options

app/overrides/spree/admin/general_settings/edit/localization_settings.html.erb.deface

@@ -1,17 +1,19 @@
 <!-- insert_after '.row .security' -->
 <div class="panel panel-default panel-localization">
   <div class="panel-heading">
-    <h1 class="panel-title"><%= Spree.t(:localization_settings, scope: 'i18n') %></h1>
+    <h1 class="panel-title">
+      <%= Spree.t(:'i18n.localization_settings') %>
+    </h1>
   </div>
 
-  <div class="panel-body">
+  <div class="panel-body" data-hook="localization_settings_body">
     <div class="form-group">
       <label for="available_locales_">
-        <%= Spree.t(:available_locales, scope: 'i18n') %>
+        <%= Spree.t(:'i18n.available_locales') %>
       </label>
       <%= select_available_locales %>
       <p class="help-block">
-        <%= Spree.t(:locales_displayed_on_frontend_select_box, scope: 'i18n') %>
+        <%= Spree.t(:'i18n.locales_displayed_on_frontend_select_box') %>
       </p>
     </div>
   </div>

app/overrides/spree/shared/_main_nav_bar/locale_selector.html.erb.deface

@@ -4,7 +4,7 @@
     <%= form_tag spree.set_locale_path, class: 'navbar-form' do %>
       <div class="form-group">
         <label for="switch_to_locale" class="sr-only">
-          <%= Spree.t(:language, scope: 'i18n') %>
+          <%= Spree.t(:'i18n.language') %>
         </label>
         <%= select_tag(:switch_to_locale,
           options_for_select(available_locales_options, I18n.locale),

config/locales/bg.yml

@@ -424,6 +424,7 @@ bg:
     are_you_sure: "Сигурни ли сте"
     are_you_sure_delete: "Сигурни ли сте, че искате да изтриете този запис?"
     associated_adjustment_closed:
+    at_symbol: '@'
     authorization_failure:
     authorized:
     auto_capture:

config/locales/ca.yml

@@ -428,6 +428,7 @@ ca:
     are_you_sure: Està segur?
     are_you_sure_delete: Està segur que vol eliminar aquesta entrada?
     associated_adjustment_closed:
+    at_symbol: '@'
     authorization_failure: Fallada d'autorització
     authorized:
     auto_capture: