solidus_i18n 1.2.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfb020944a1343dc92cbd2b35fa80043d6b2055ff55806192f7c8b2529142bcb
-  data.tar.gz: a68b7f59d0c89f5795d22cff8224d7f40c97007aecbd2ef4989d1aa4cea7afab
+  metadata.gz: e81407d27ac8d4d865c858353136816de626274eb4b0ceaf1feababdd89dae18
+  data.tar.gz: a4a36c750eb435adaf4be6af1f8cd248c5f4a2658e9eea03d06dd942abdc71a4
 SHA512:
-  metadata.gz: 6cb6719bec0ffba480b8a39d5cf6822bf773bd7c87ad8fe1180ae09ea69053594c72171b47a1abca4bb3b9680543b1178f7bf8ec7e4247291c7ac37135f07a20
-  data.tar.gz: 7a42835eacaf1139b3394b0b1196bcb3cfcf0ca81029eb4e626b6f823bfa706e1b88c6eef14dea57ab89479c07baf57aba58dce8f5f30b8dda573ded08019c19
+  metadata.gz: 4dd88e9176dfa9d5a0b880c327796635282ce844183f57591aa587c3461a2e4becafa792a93a6ee036e8fb5c88aa3542ca72576169a9969e84f481099ab64dfd
+  data.tar.gz: 4c23b55f2cf650a14d3d26988bdb82e0f24bda27f858ceba812b2e0ff9c8482eccaeaf5082f06a3093f13eab1bdee536f7fda82710fa5f7daa60b271089e86b2

data/.circleci/config.yml

@@ -0,0 +1,35 @@
+version: 2.1
+
+orbs:
+  # Always take the latest version of the orb, this allows us to
+  # run specs against Solidus supported versions only without the need
+  # to change this configuration every time a Solidus version is released
+  # or goes EOL.
+  solidusio_extensions: solidusio/extensions@volatile
+
+jobs:
+  run-specs-with-postgres:
+    executor: solidusio_extensions/postgres
+    steps:
+      - solidusio_extensions/run-tests
+  run-specs-with-mysql:
+    executor: solidusio_extensions/mysql
+    steps:
+      - solidusio_extensions/run-tests
+
+workflows:
+  "Run specs on supported Solidus versions":
+    jobs:
+      - run-specs-with-postgres
+      - run-specs-with-mysql
+  "Weekly run specs against master":
+    triggers:
+      - schedule:
+          cron: "0 0 * * 4" # every Thursday
+          filters:
+            branches:
+              only:
+                - master
+    jobs:
+      - run-specs-with-postgres
+      - run-specs-with-mysql

data/.gem_release.yml

@@ -0,0 +1,5 @@
+bump:
+  recurse: false
+  file: 'lib/solidus_i18n/version.rb'
+  message: Bump SolidusI18n to %{version}
+  tag: true

data/.github/stale.yml

@@ -0,0 +1,17 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

data/.gitignore

@@ -1,20 +1,16 @@
+*.gem
 \#*
 *~
 .#*
 .DS_Store
 .idea
-.localeapp/locales
 .project
+.sass-cache
 coverage
-config/locales/en.yml
 Gemfile.lock
 tmp
 nbproject
 pkg
-*.sw?
+*.swp
 spec/dummy
-.rvmrc
-.sass-cache
-public/spree
-.ruby-version
-.ruby-gemset
+spec/examples.txt

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/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/.rubocop.yml

@@ -1,7 +1,4 @@
----
-inherit_from: .hound.yml
+require:
+  - solidus_dev_support/rubocop
 
-AllCops:
-  Exclude:
-    - spec/dummy/**/*
-    - bin/*
+inherit_from: .rubocop_todo.yml

data/.rubocop_todo.yml

@@ -0,0 +1,18 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2020-01-24 11:23:54 +0100 using RuboCop version 0.76.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+RSpec/DescribeClass:
+  Exclude:
+    - 'spec/solidus_i18n_spec.rb'
+
+# Offense count: 2
+# Configuration parameters: IgnoreSharedExamples.
+RSpec/NamedSubject:
+  Exclude:
+    - 'spec/solidus_i18n_spec.rb'

data/Gemfile

@@ -1,21 +1,31 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
-gem "solidus", github: "solidusio/solidus", branch: branch
+gem 'solidus', github: 'solidusio/solidus', branch: branch
+
+# Needed to help Bundler figure out how to resolve dependencies,
+# otherwise it takes forever to resolve them.
+# See https://github.com/bundler/bundler/issues/6677
+gem 'rails', '>0.a'
 
-if branch == 'master' || branch >= "v2.0"
-  gem "rails-controller-testing", group: :test
+case ENV['DB']
+when 'mysql'
+  gem 'mysql2'
+when 'postgresql'
+  gem 'pg'
 else
-  gem "rails_test_params_backport", group: :test
+  gem 'sqlite3'
 end
 
-gem 'pg', '~> 0.21'
-gem 'sqlite3'
-gem 'mysql2'
-
 group :development, :test do
-  gem "pry-rails"
   gem 'i18n-tasks', '~> 0.9' if branch == 'master'
 end
 
 gemspec
+
+# Use a local Gemfile to include development dependencies that might not be
+# relevant for the project or for other contributors, e.g.: `gem 'pry-debug'`.
+eval_gemfile 'Gemfile-local' if File.exist? 'Gemfile-local'

data/{LICENSE.md → LICENSE}

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2015 Spree Commerce Inc., and other contributors.
+Copyright (c) 2011-2015 Spree Commerce Inc. and other contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -9,7 +9,7 @@ are permitted provided that the following conditions are met:
     * Redistributions in binary form must reproduce the above copyright notice,
       this list of conditions and the following disclaimer in the documentation
       and/or other materials provided with the distribution.
-    * Neither the name Spree nor the names of its contributors may be used to
+    * Neither the name Solidus nor the names of its contributors may be used to
       endorse or promote products derived from this software without specific
       prior written permission.
 

data/README.md

@@ -1,61 +1,66 @@
 # Solidus Internationalization
 
-[![Build Status](https://travis-ci.org/solidusio-contrib/solidus_i18n.svg?branch=master)](https://travis-ci.org/solidusio-contrib/solidus_i18n)
-[![Code Climate](https://codeclimate.com/github/solidusio-contrib/solidus_i18n/badges/gpa.svg)](https://codeclimate.com/github/solidusio-contrib/solidus_i18n)
+[![CircleCI](https://circleci.com/gh/solidusio/solidus_i18n.svg?style=svg)](https://circleci.com/gh/solidusio/solidus_i18n)
+[![Code Climate](https://codeclimate.com/github/solidusio/solidus_i18n/badges/gpa.svg)](https://codeclimate.com/github/solidusio/solidus_i18n)
 [![Gem Version](https://badge.fury.io/rb/solidus_i18n.svg)](https://badge.fury.io/rb/solidus_i18n)
 
 This is the Internationalization project for [Solidus](https://solidus.io)
 
 ---
 
-## Supported languages
+## Changes in Version 2.0
 
-We currently support the [following locales](https://github.com/solidusio-contrib/solidus_i18n/tree/master/config/locales)
-by default. If you need a locale that is not in the list you can add a custom
-translation file into your application by following the
-[Rails translations guide](http://guides.rubyonrails.org/i18n.html#how-to-store-your-custom-translations).
+solidus_i18n Version 2.0+ only contains translation files.
+
+Previous versions of solidus_i18n included extra functionality like locale
+selectors and which is now built in to Solidus 2.6+. Configuration for
+`routing-filter` has also been removed and must be configured manually
+(See [Locale in URL](#locale-in-url)).
 
 ## Installation
 
 Add the following to your `Gemfile`:
 
 ```ruby
-gem 'solidus_i18n', github: 'solidusio-contrib/solidus_i18n', branch: 'master'
+gem 'solidus_i18n', '~> 2.0'
+gem 'rails-i18n', '~> 5.1'
+gem 'kaminari-i18n', '~> 0.5.0'
 ```
 
-Run `bundle install`
-
-You can use the generator to install migrations and append solidus_i18n assets to
-your app solidus manifest file.
-
-    bin/rails g solidus_i18n:install
+## Locale in URL
 
-This will insert these lines into your Spree assets manifests:
+Older versions of solidus_i18n included the routing-filter gem and configured routes to include the locale in the URL.
+This is still supported (maybe even recommended) but requires some additional configuration.
 
-In `vendor/assets/javascripts/spree/frontend/all.js`
+1. Add this gem to your `Gemfile`, then run `bundle install`
 
-```
-//= require spree/frontend/solidus_i18n
+``` ruby
+gem 'routing-filter', '~> 0.6.0'
 ```
 
-In `vendor/assets/javascripts/spree/backend/all.js`
+2. Add `filter :locale` to your `config/routes.rb`
 
-```
-//= require spree/backend/solidus_i18n
-```
+``` ruby
+Rails.application.routes.draw do
+  filter :locale
 
-## Set default locale
+  mount Spree::Core::Engine, at: '/'
+end
+```
 
-In `config/initializers/spree.rb` you will find the default locale settings
-for both frontend and backend. Just replace `'en'` with your default locale
-code.
+3. Configure routing-fitler in `config/initializers/locale_filter.rb` (optional)
 
-## Add more languages to the frontend locale toggle
+``` ruby
+# Do not include the default locale in the URL
+RoutingFilter::Locale.include_default_locale = false
+```
 
-Go to Admin -> General Settings -> Localization Setting and add the locales
-you want your users to be able to select from the locale toggle on the frontend.
+## Supported languages
 
----
+We currently support the [following locales](https://github.com/solidusio/solidus_i18n/tree/master/config/locales)
+by default. If you need a locale that is not in the list you can add a custom
+translation file into your application by following the
+[Rails translations guide](http://guides.rubyonrails.org/i18n.html#how-to-store-your-custom-translations).
 
 ## Updating Translations
 
@@ -69,8 +74,6 @@ Substitute <LOCALE> with your locale code (e.g: `it`).
 This will do a cleanup and prepare `<LOCALE>.yml` with all the missing keys.
 You can then write the translations and open a pull request.
 
----
-
 ## Model Translations
 
 We **removed** support for translating models into [a separate Gem](https://github.com/solidusio-contrib/solidus_globalize).
@@ -82,23 +85,21 @@ Please update your `Gemfile` if you still need the model translations.
 gem 'solidus_globalize', github: 'solidusio-contrib/solidus_globalize', branch: 'master'
 ```
 
----
+## Localizing country names
 
-## Upgrading
+You can translate country names by defining `spree.country_names` in your own locale files. For example, to have countries in Spanish do:
 
-**WARNING**: If you want to keep your model translations, be sure to add the `solidus_globalize` gem to your `Gemfile` **before** migrating the database. Otherwise **you will loose your translations**!
-
-### 1. Migrate your database
-
-    bin/rake solidus_i18n:upgrade
-    bin/rake db:migrate
-
-*Note:* The migration automatically skips the removal of the translations tables. So it's safe to run the migration without data loss. But be sure to have the `solidus_globalize` gem in your `Gemfile`, if you want to keep them.
-
-### 2. Remove Configuration
-
-Remove all occurrences of `SolidusI18n::Config.supported_locales` from your code.
+```yml
+es:
+  spree:
+    country_names:
+      US: Estados Unidos de América
+      UK: Reino Unido
+      CA: Canadá
+      # ...
+```
 
+Some supported languages already define localized country names. Take a look at this repo's `.yml` files for your locale to confirm if we already provide translations.
 
 Contributing
 ------------

data/Rakefile

@@ -1,38 +1,22 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
+# frozen_string_literal: true
 
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new
-
-task :default do
-  if Dir["spec/dummy"].empty?
-    Rake::Task[:test_app].invoke
-    Dir.chdir("../../")
-  end
-  Rake::Task[:spec].invoke
-end
-
-require 'spree/testing_support/common_rake'
-desc 'Generates a dummy app for testing'
-task :test_app do
-  ENV['LIB_NAME'] = 'solidus_i18n'
-  Rake::Task['common:test_app'].invoke
-end
+require 'solidus_dev_support/rake_tasks'
+SolidusDevSupport::RakeTasks.install
 
 require 'solidus_i18n'
 namespace :solidus_i18n do
   desc 'Update by retrieving the latest Solidus locale files'
-  task :update_default do
+  task update_default: :environment do
     require 'open-uri'
-    puts "Fetching latest Solidus locale file"
+    puts 'Fetching latest Solidus locale file'
     location = 'https://raw.github.com/solidusio/solidus/master/core/config/locales/en.yml'
 
-    open("#{locales_dir}/en.yml", 'wb') do |file|
-      file << open(location).read
-    end
+    File.write("#{locales_dir}/en.yml", URI.parse(location).read)
   end
 
   def locales_dir
     File.join File.dirname(__FILE__), 'config/locales'
   end
 end
+
+task default: 'extension:specs'

data/bin/console

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "solidus_i18n"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+$LOAD_PATH.unshift(*Dir["#{__dir__}/../app/*"])
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/rails

@@ -1,7 +1,15 @@
 #!/usr/bin/env ruby
 
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/solidus_i18n/engine', __FILE__)
+# frozen_string_literal: true
 
-require 'rails/all'
-require 'rails/engine/commands'
+app_root = 'spec/dummy'
+
+unless File.exist? "#{app_root}/bin/rails"
+  system "bin/rake", app_root or begin # rubocop:disable Style/AndOr
+    warn "Automatic creation of the dummy app failed"
+    exit 1
+  end
+end
+
+Dir.chdir app_root
+exec 'bin/rails', *ARGV

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+gem install bundler --conservative
+bundle update
+bundle exec rake clobber

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:
@@ -561,7 +515,7 @@ bg:
     date_picker:
       first_day: 0
       format: "%Y/%m/%d"
-      js_format: yy/mm/dd
+      js_format: Y/m/d
     date_range:
     default:
     default_refund_amount:

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:
@@ -562,10 +518,6 @@ ca:
       jirafe_settings_updated:
     date: Data
     date_completed:
-    date_picker:
-      first_day:
-      format:
-      js_format:
     date_range: Rang de Data
     default: Per omissió
     default_refund_amount:
@@ -1027,7 +979,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:

data/config/locales/cs.yml

@@ -303,53 +303,6 @@ cs:
         few: Zóny
         one: Zóna
         other: Zón
-  devise:
-    confirmations:
-      confirmed: Váš účet byl úspěšně potvrzen. Nyní jste přihlášen(a).
-      send_instructions: Za několik minut obdržíte email s instrukcemi k potvrzení vašeho účtu.
-    failure:
-      inactive: Váš účet ještě nebyl aktivován.
-      invalid: Neplatný email nebo heslo.
-      invalid_token: Neplatný ověřovací symbol.
-      locked: Váš účet je uzamčen.
-      timeout: Vaše relace vypršela, přihlaste se prosím znovu, pak můžete pokračovat.
-      unauthenticated: Musíte se přihlásit, pak můžete pokračovat.
-      unconfirmed: Musíte potvrdit svůj účet, pak můžete pokračovat.
-    mailer:
-      confirmation_instructions:
-        subject: Instrukce k potvrzení účtu
-      reset_password_instructions:
-        subject: Instrukce k nastavení nového hesla
-      unlock_instructions:
-        subject: Instrukce k odemčení účtu
-    oauth_callbacks:
-      failure: 'Není možné autorizovat z %{kind}, protože: %{reason}.'
-      success: "Úspěšná autorizace z účtu %{kind}."
-    unlocks:
-      send_instructions: Za několik minut obdržíte email s instrukcemi, jak odemknout svůj účet.
-      unlocked: Váš účet byl úspěšně odemknut. Nyní jste přihlášen(a).
-    user_passwords:
-      user:
-        cannot_be_blank: Heslo nemůže být prázdné.
-        send_instructions: Za několik minut obdržíte email s instrukcemi k nastavení nového hesla.
-        updated: Vaše heslo bylo úspěšně změněno. Nyní jste přihlášen(a).
-    user_registrations:
-      destroyed: Na shledanou! Váš účet byl úspěšně zrušen. Doufáme, že se brzy opět uvidíme.
-      inactive_signed_up: Registrace byla úspěšná. Nicméně se nemůžete přihlásit, protože Váš účet je %{reason}.
-      signed_up: Vítejte! Registrace byla úspěšná.
-      updated: Váš účet byl úspěšně aktualizován.
-    user_sessions:
-      signed_in: Přihlášení bylo úspěšné.
-      signed_out: Odhlášení bylo úspěšné.
-  errors:
-    messages:
-      already_confirmed: již byl potvrzen
-      not_found: nenalezen
-      not_locked: nebyl uzamčen
-      not_saved:
-        few: "%{count} chyby zabraňují uložení %{resource}:"
-        one: '1 chyba zabraňuje uložení %{resource}:'
-        other: "%{count} chyb zabraňuje uložení %{resource}:"
   spree:
     abbreviation: Zkratka
     accept: Přijmout
@@ -593,7 +546,7 @@ cs:
     date_picker:
       first_day: 1
       format: "%d.%m.%Y"
-      js_format: dd.mm.yy
+      js_format: d.m.Y
     date_range: Datum (od-do)
     default: Výchozí
     default_refund_amount: Výchozí částka refundace