shopify_app 7.2.7 → 7.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f713d95ff6dc0893127eb63073b613788d7754d3
-  data.tar.gz: 3558a5c9c95aa561c32ee4b67f04f05832a3a911
+  metadata.gz: da5334ef600cd3a2b85e2d563063c4971f9c4216
+  data.tar.gz: 80ff75561b661796dd57950ce1e1f2772d848bff
 SHA512:
-  metadata.gz: 02b5223eebfbcd825b025266a6a64847f8fe6246d3b27d3698ca7e8ffdc2e60df6432dcee05930ec938a0424daf5c590ef37ea69a734a18096a6a4d48e6b6ebd
-  data.tar.gz: b743970932f0672b161b152606cbe35a9660d34124fdcd51e14583a79cb01c79479a07569d190b0927c67aa9214311abf216e64e9f9a2675494edb9a7510eaa0
+  metadata.gz: 00b236462b953a09ebf7cf48a02d0124ff1b1e3d1baa08b2965119e114802a77794f945a3941d2910891f1fb4d93be615ea77c03b967da57de8bec589e33f66e
+  data.tar.gz: 35ef4a7b8a5a42b17160f7b275dbabce8e00f5ec79458c83bc90b9b147e8e378be987464e85140afb1de3c44b9148f2fe4cda6fd689cda9ec278d1762c746269

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+7.2.8
+-----
+* Add i18n locale param support
+  [[#409]](https://github.com/Shopify/shopify_app/pull/409)
+
+
 7.2.7
 -----
 * Require `shopify_app` `>= 4.3.2`. This version relaxes the ruby version requirement from `>= 2.3.0` to `>= 2.0`

data/app/controllers/shopify_app/authenticated_controller.rb

@@ -1,8 +1,12 @@
 module ShopifyApp
   class AuthenticatedController < ApplicationController
+    include ShopifyApp::Localization
     include ShopifyApp::LoginProtection
+
+    before_action :set_locale
     before_action :login_again_if_different_shop
     around_action :shopify_session
+
     layout ShopifyApp.configuration.embedded_app? ? 'embedded_app' : 'application'
   end
 end

data/config/locales/de.yml

@@ -0,0 +1,4 @@
+de:
+  logged_in: 'Eingeloggt'
+  logged_out: 'Erfolgreich ausgelogt'
+  could_not_log_in: 'Shopify Store Login fehlgeschlagen'

data/config/locales/ja.yml

@@ -0,0 +1,4 @@
+ja:
+  logged_in: 'ログイン'
+  logged_out: 'ログインに成功しました'
+  could_not_log_in: 'Shopifyストアにログインできませんでした'

data/lib/shopify_app.rb

@@ -18,6 +18,7 @@ require 'shopify_app/scripttags_manager_job'
 require 'shopify_app/shop'
 require 'shopify_app/session_storage'
 require 'shopify_app/sessions_concern'
+require 'shopify_app/localization'
 require 'shopify_app/login_protection'
 require 'shopify_app/webhooks_manager'
 require 'shopify_app/scripttags_manager'

data/lib/shopify_app/localization.rb

@@ -0,0 +1,16 @@
+module ShopifyApp
+  module Localization
+    extend ActiveSupport::Concern
+
+    def set_locale
+      if params[:locale]
+        session[:locale] = params[:locale]
+      else
+        session[:locale] ||= I18n.default_locale
+      end
+      I18n.locale = session[:locale]
+    rescue I18n::InvalidLocale
+      I18n.locale = I18n.default_locale
+    end
+  end
+end

data/lib/shopify_app/version.rb

@@ -1,3 +1,3 @@
 module ShopifyApp
-  VERSION = '7.2.7'
+  VERSION = '7.2.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify_app
 version: !ruby/object:Gem::Version
-  version: 7.2.7
+  version: 7.2.8
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -145,9 +145,11 @@ files:
 - app/controllers/shopify_app/sessions_controller.rb
 - app/controllers/shopify_app/webhooks_controller.rb
 - app/views/shopify_app/sessions/new.html.erb
+- config/locales/de.yml
 - config/locales/en.yml
 - config/locales/es.yml
 - config/locales/fr.yml
+- config/locales/ja.yml
 - config/routes.rb
 - images/app-proxy-screenshot.png
 - lib/generators/shopify_app/add_webhook/add_webhook_generator.rb
@@ -182,6 +184,7 @@ files:
 - lib/shopify_app/configuration.rb
 - lib/shopify_app/engine.rb
 - lib/shopify_app/in_memory_session_store.rb
+- lib/shopify_app/localization.rb
 - lib/shopify_app/login_protection.rb
 - lib/shopify_app/scripttags_manager.rb
 - lib/shopify_app/scripttags_manager_job.rb