solidus_i18n 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfb020944a1343dc92cbd2b35fa80043d6b2055ff55806192f7c8b2529142bcb
-  data.tar.gz: a68b7f59d0c89f5795d22cff8224d7f40c97007aecbd2ef4989d1aa4cea7afab
+  metadata.gz: 0de9177ef69dd299f196ad557a46b1bae3bed9cae5e7895355564802330c04eb
+  data.tar.gz: 9e3f5ff6b46eb825e22b85797025cbd63c4cc2b0b6a7b689bd11f06333c16df2
 SHA512:
-  metadata.gz: 6cb6719bec0ffba480b8a39d5cf6822bf773bd7c87ad8fe1180ae09ea69053594c72171b47a1abca4bb3b9680543b1178f7bf8ec7e4247291c7ac37135f07a20
-  data.tar.gz: 7a42835eacaf1139b3394b0b1196bcb3cfcf0ca81029eb4e626b6f823bfa706e1b88c6eef14dea57ab89479c07baf57aba58dce8f5f30b8dda573ded08019c19
+  metadata.gz: 4d200695f22be7bbc14d2b0cab0c97b589024b0ece7595e18a8c8ea2759a14791d76013810dbd93394c2dee5e5f63de3d6a284f6a60c7dfc3f7da5dc177f26eb
+  data.tar.gz: fa2f1672afdeb8be73d6b4e414ffba0d6bf21b69e3341a9743479171c524dd160833b2a5d5f8125c646f1c1e8f597b1e19fb8f73cd67a591f01d63095e605a03

data/.hound.yml

@@ -8,7 +8,7 @@ Style/Documentation:
   Enabled: false
 
 # Neatly aligned code is too swell.
-Style/SingleSpaceBeforeFirstArg:
+Layout/SpaceBeforeFirstArg:
   Enabled: false
 
 # Don't mess with RSpec DSL.

data/.travis.yml

@@ -1,11 +1,14 @@
-# Need to stay on precise until Travis fixes their MySQL problems
-# See: https://github.com/travis-ci/travis-ci/issues/8331
-dist: precise
-sudo: false
+dist: trusty
+sudo: required
+addons:
+  chrome: stable
 cache: bundler
 language: ruby
+before_install:
+  - gem update --system # https://github.com/travis-ci/travis-ci/issues/8978
+  - gem install bundler
 rvm:
-  - 2.3.1
+  - 2.5
 env:
   matrix:
     - SOLIDUS_BRANCH=v1.1 DB=postgres
@@ -17,6 +20,7 @@ env:
     - SOLIDUS_BRANCH=v2.2 DB=postgres
     - SOLIDUS_BRANCH=v2.3 DB=postgres
     - SOLIDUS_BRANCH=v2.4 DB=postgres
+    - SOLIDUS_BRANCH=v2.5 DB=postgres
     - SOLIDUS_BRANCH=master DB=postgres
     - SOLIDUS_BRANCH=v1.1 DB=mysql
     - SOLIDUS_BRANCH=v1.2 DB=mysql
@@ -27,4 +31,5 @@ env:
     - SOLIDUS_BRANCH=v2.2 DB=mysql
     - SOLIDUS_BRANCH=v2.3 DB=mysql
     - SOLIDUS_BRANCH=v2.4 DB=mysql
+    - SOLIDUS_BRANCH=v2.5 DB=mysql
     - SOLIDUS_BRANCH=master DB=mysql

data/Gemfile

@@ -9,9 +9,11 @@ else
   gem "rails_test_params_backport", group: :test
 end
 
+gem 'chromedriver-helper' if ENV['CI']
+
 gem 'pg', '~> 0.21'
 gem 'sqlite3'
-gem 'mysql2'
+gem 'mysql2', '~> 0.4.10'
 
 group :development, :test do
   gem "pry-rails"

data/app/assets/javascripts/spree/backend/edit_inline_locales.js.coffee.erb

@@ -0,0 +1,56 @@
+Spree.EditInlineLocales = Backbone.View.extend(
+  initialize: ->
+    @editing = false
+    @render()
+
+  events:
+    'click [data-action=edit]': 'onEdit'
+    'click [data-action=save]': 'onSave'
+    'click [data-action=cancel]': 'onCancel'
+
+  onEdit: (e) ->
+    return if @editing
+    @$el.addClass 'editing'
+    @editing = true
+    @render()
+
+  onCancel: (e) ->
+    e.preventDefault()
+    @$el.removeClass("editing")
+    @editing = false
+    @render()
+
+  onSave: (e) ->
+    e.preventDefault()
+    preferred_available_locales = $('#available-locales-store-' + @model.id)
+    Spree.ajax
+      type: 'PUT'
+      url: Spree.routes.available_locales_api + '/' + @model.id + '.json'
+      data:
+        store:
+          preferred_available_locales: preferred_available_locales.val()
+      success: (response) =>
+        @model = response.store
+        @editing = false
+        @$el.removeClass("editing")
+        @render()
+      error: (response) =>
+        show_flash 'error', response.responseJSON.error
+
+  render: ->
+    renderAttr =
+      availableLocales: <%= SolidusI18n::Locale.all.push(:en).to_json %>
+      availableLocalesPresentation: <%= Hash[(SolidusI18n::Locale.all + [:en]).map do |locale|
+                                          [locale, Spree.t(:'i18n.this_file_language', locale: locale)]
+                                        end].to_json %>
+      store: @model
+      editing: @editing
+    _.extend(renderAttr, @model.attributes)
+
+    @$el.html(HandlebarsTemplates['available_locales'](renderAttr))
+    $('.available-locales').select2({placeholder: Spree.translations['please_choose_language'], width: 'element'})
+
+    return @
+)
+
+Spree.routes.available_locales_api = Spree.pathFor('api/config/available_locales');

data/app/assets/javascripts/spree/backend/helpers.js.coffee.erb

@@ -0,0 +1,14 @@
+window.Handlebars.registerHelper 'locale-presentation', (locale, localePresentationHashmap, options) ->
+  localePresentationHashmap[locale]
+
+window.Handlebars.registerHelper 'selected', (locale, store, options) ->
+  for k of store.preferences.available_locales
+    value = store.preferences.available_locales[k]
+    return 'selected="selected"' if value == locale
+
+window.Handlebars.registerHelper 'store-available-locales', (store, options) ->
+  locales = for k of store.preferences.available_locales
+              locale = store.preferences.available_locales[k]
+              @availableLocalesPresentation[locale]
+
+  locales.join(',')

data/app/assets/javascripts/spree/backend/inline_table_locales.js.coffee

@@ -0,0 +1,16 @@
+Spree.InlineTableLocales = Backbone.View.extend(
+  initialize: ->
+    if @$el.length
+      Spree.ajax({
+        type: 'GET'
+        url: "/api/config/available_locales"
+        success: (collection) =>
+          for store in collection
+            row = $("<tr id='store-id-#{store.id}'/>")
+            @$el.append(row)
+            new Spree.EditInlineLocales({
+              el: row
+              model: store
+            });
+      })
+)

data/app/assets/javascripts/spree/backend/templates/available_locales.hbs.erb

@@ -0,0 +1,31 @@
+<td>
+  {{store.name}}
+  {{#if store.default}}
+    <span class="label label-default">default</span>
+  {{/if}}
+</td>
+<td>{{store.url}}</td>
+<td>
+  {{#if editing}}
+    <select id='available-locales-store-{{store.id}}' class='available-locales select2 fullwidth' name='store[preferred_available_locales][]' multiple='true'>
+      {{#each availableLocales}}
+        <option value="{{ this }}" {{#selected this ../store}}{{/selected}}>
+          {{#locale-presentation this ../availableLocalesPresentation}}{{/locale-presentation}}
+        </option>
+      {{/each}}
+    </select>
+  {{else}}
+    {{store-available-locales store availableLocales}}
+    {{#each store.preferences.available_locales}}
+      {{locale-presentation this}}
+    {{/each}}
+  {{/if}}
+</td>
+<td class="actions">
+  {{#if editing}}
+    <a class="fa fa-check icon_link with-tip no-text" data-action="save" data-id="{{id}}" href="#"></a>
+    <a class="fa fa-cancel icon_link with-tip no-text" data-action="cancel" data-id="{{id}}" href="#"></a>
+  {{else}}
+    <a class="fa fa-edit icon_link with-tip no-text" data-action="edit" data-id="{{id}}" href="#"></a>
+  {{/if}}
+</td>

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

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

data/app/controllers/spree/api/available_locales_controller.rb

@@ -0,0 +1,28 @@
+module Spree
+  module Api
+    class AvailableLocalesController < Spree::Api::BaseController
+      def index
+        respond_with Store.all
+      end
+
+      def update
+        authorize! :update, store
+        if store.update_attributes(store_params)
+          respond_with(store, status: 200, default_template: :show)
+        else
+          invalid_resource!(store)
+        end
+      end
+
+      private
+
+      def store_params
+        params.require(:store).permit(preferred_available_locales: [])
+      end
+
+      def store
+        @store ||= Store.find(params[:id])
+      end
+    end
+  end
+end

data/app/controllers/spree/locale_controller_decorator.rb

@@ -1,6 +1,5 @@
 Spree::LocaleController.class_eval do
-    def set
-      redirect_to root_path(locale: params[:switch_to_locale])
-    end
+  def set
+    redirect_to root_path(locale: params[:switch_to_locale])
+  end
 end
-

data/app/helpers/solidus_i18n/locale_helper.rb

@@ -1,21 +1,19 @@
 module SolidusI18n
   module LocaleHelper
-
-    def select_available_locales
-      select_tag('available_locales[]', options_for_select(
-        all_locales_options,
-        Config.available_locales
-      ), common_options)
+    def select_available_locales(store = nil)
+      select_tag('store[preferred_available_locales][]',
+                 options_for_select(
+                   all_locales_options,
+                   store.preferred_available_locales
+                 ), common_options)
     end
 
     def available_locales_options
-      Config.available_locales.map { |locale| locale_presentation(locale) }
+      current_store.preferred_available_locales.map { |locale| locale_presentation(locale) }
     end
 
-    # Need to manually add en to the array because the en.yml was moved from
-    # this project. solidusio/solidus now has those keys.
     def all_locales_options
-      SolidusI18n::Locale.all.map { |locale| locale_presentation(locale) }.push(['English (EN)', :en])
+      SolidusI18n::Locale.all.map { |locale| locale_presentation(locale) }
     end
 
     private

data/app/models/spree/store_decorator.rb

@@ -0,0 +1,13 @@
+module SolidusI18n
+  module AddAvailableLanguagesPreferenceToStore
+    def self.prepended(base)
+      base.preference :available_locales, :array, default: [:en]
+    end
+
+    def preferred_available_locales
+      super.map(&:to_sym)
+    end
+  end
+
+  Spree::Store.prepend AddAvailableLanguagesPreferenceToStore
+end

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

@@ -1,5 +1,5 @@
 <!-- insert_bottom '#main-nav-bar' -->
-<% if SolidusI18n::Config.available_locales.many? %>
+<% if current_store.preferred_available_locales.many? %>
   <li id="locale-select" data-hook>
     <%= form_tag spree.set_locale_path, class: 'navbar-form' do %>
       <div class="form-group">

data/app/views/spree/admin/locales/show.html.erb

@@ -1,27 +1,21 @@
 <%= render 'spree/admin/shared/configuration_menu' %>
 
-<%= form_tag admin_locale_path, method: :patch do %>
-  <div class="panel panel-default panel-localization">
-    <div class="panel-heading">
-      <h1 class="panel-title">
-        <%= Spree.t(:'i18n.localization_settings') %>
-      </h1>
-    </div>
+<table class="index locales-settings">
+  <thead>
+    <tr>
+      <th><%= Spree::Store.human_attribute_name(:name) %></th>
+      <th><%= Spree::Store.human_attribute_name(:url) %></th>
+      <th><%= Spree.t(:'i18n.locales_displayed_on_frontend_select_box') %></th>
+      <th class="actions"></th>
+    </tr>
+  </thead>
+  <tbody>
+    <%# Rendered by JS %>
+  </tbody>
+</table>
 
-    <div class="panel-body" data-hook="localization_settings_body">
-      <div class="form-group">
-        <label for="available_locales_">
-          <%= Spree.t(:'i18n.available_locales') %>
-        </label>
-        <%= select_available_locales %>
-        <p class="help-block">
-          <%= Spree.t(:'i18n.locales_displayed_on_frontend_select_box') %>
-        </p>
-      </div>
-    </div>
-  </div>
-
-  <div class="form-buttons filter-actions actions" data-hook="buttons">
-    <%= button Spree.t('actions.update') %>
-  </div>
-<% end %>
+<script>
+Spree.ready(function(){
+  new Spree.InlineTableLocales({ el: $("table.locales-settings > tbody") });
+})
+</script>

data/app/views/spree/api/available_locales/show.json.jbuilder

@@ -0,0 +1,8 @@
+json.store do
+  json.extract!(@store, :id, :name, :url, :meta_description, :meta_keywords,
+    :seo_title, :mail_from_address, :default_currency, :code, :default)
+
+  json.preferences do
+    json.available_locales @store.preferences[:available_locales]
+  end
+end

data/config/locales/bg.yml

@@ -275,52 +275,6 @@ bg:
       spree/zone:
         one: Zone Зона
         other: "Зони"
-  devise:
-    confirmations:
-      confirmed: "Вашият акаунт е потвърден. Вече сте вписан."
-      send_instructions: "До няколко минути ще получите съобщение с обяснение как да потвърдите своя акаунт."
-    failure:
-      inactive: "Вашият акаунт все още не е активен."
-      invalid: "Грешен имейл или парола"
-      invalid_token: Invalid authentication token.
-      locked: "Вашият акаунт е заключен."
-      timeout: "Вашата сесия е изтекла, моля влезте повторно."
-      unauthenticated: "Трябва да се впишете или регистрирате преди да продължите"
-      unconfirmed: "Трябва да потвърдите акаунта си преди да продължите."
-    mailer:
-      confirmation_instructions:
-        subject: "Инструкции за потвърждаване"
-      reset_password_instructions:
-        subject: Reset password instructions Инструкции за смяна на паролата
-      unlock_instructions:
-        subject: "Инструкции за отключване"
-    oauth_callbacks:
-      failure: Could not authorise you from %{kind} because %{reason}.
-      success: Successfully authorised from %{kind} account.
-    unlocks:
-      send_instructions: "До няколко минути ще получите имейл с инструкции как да отключите своя акаунт."
-      unlocked: "Вашият акаунт бе отключен успешно. Вече сте вписани."
-    user_passwords:
-      user:
-        cannot_be_blank: "Вашата парола не може бъде празна"
-        send_instructions: "До няколко минути ще получите имейл с инструкции как да промените паролата си."
-        updated: "Вашата парола бе променена успешко. Вече сте вписани."
-    user_registrations:
-      destroyed: "Вашият акаунт бе отменен успешно. Надяваме се да ви видим скоро."
-      inactive_signed_up: You have signed up successfully. However, we could not sign you in because your account is %{reason}.
-      signed_up: "Вие се регистрирахте успешно."
-      updated: "Успешно обновихте своя акаунт."
-    user_sessions:
-      signed_in: "Успешно влизане"
-      signed_out: "Успешно излизане"
-  errors:
-    messages:
-      already_confirmed: "Вече бе потвърден"
-      not_found: "не намерен"
-      not_locked: "не бе заключен"
-      not_saved:
-        one: "Една грешка предоотврати запазването на %{resource}"
-        other: "%{count} грешки предоотвратиха запазването на %{resource}"
   spree:
     abbreviation: "Абривиатура"
     accept:

data/config/locales/ca.yml

@@ -281,50 +281,6 @@ ca:
       spree/zone:
         one: Zona
         other:
-  devise:
-    confirmations:
-      confirmed:
-      send_instructions:
-    failure:
-      inactive: El seu compte no s'ha estat activat encara.
-      invalid: Correu electrònic o contrasenya no vàlids.
-      invalid_token: Token d'autenticació no vàlid.
-      locked: El seu compte està bloquejat.
-      timeout:
-      unauthenticated:
-      unconfirmed:
-    mailer:
-      confirmation_instructions:
-        subject:
-      reset_password_instructions:
-        subject:
-      unlock_instructions:
-        subject:
-    oauth_callbacks:
-      failure:
-      success:
-    unlocks:
-      send_instructions:
-      unlocked:
-    user_passwords:
-      user:
-        cannot_be_blank:
-        send_instructions:
-        updated:
-    user_registrations:
-      destroyed:
-      inactive_signed_up:
-      signed_up:
-      updated:
-    user_sessions:
-      signed_in:
-      signed_out:
-  errors:
-    messages:
-      already_confirmed:
-      not_found: no trobat
-      not_locked:
-      not_saved:
   spree:
     abbreviation: Abreviatura
     accept:
@@ -1027,7 +983,18 @@ ca:
     receive: rebre
     receive_stock:
     received: Rebut
-    reception_status:
+    reception_states:
+      awaiting: En espera
+      cancelled: Cancel·lat
+      expired: Expirat
+      given_to_customer: Entregat al client
+      in_transit: En trànsit
+      lost_in_transit: Perdut en trànsit
+      received: Rebut
+      shipped_wrong_item: Article incorrecte
+      short_shipped: No inclòs en l'enviament
+      unexchanged: Sense canvis
+    reception_status: Estat de recepció
     reference:
     refund: Retornar
     refund_amount_must_be_greater_than_zero: