refinerycms-i18n 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e568863fc1a251f2f3dba2c58ec772ad9c0d1b4
-  data.tar.gz: 023f5d1b6c909b7ce0052a60dd6b94fae0747d48
+  metadata.gz: ac37504ad8f7f3a48dd97a244f5a9d064c4eabb7
+  data.tar.gz: 68f1b485fa2104ed15c8adf58751e9310796130b
 SHA512:
-  metadata.gz: 40a9198618c4556c2cae7bbcf0c66c1de5d7e97008bbd72a7c5e7f4dcaedcbcdc4e84b965087af93d54dfe3cefb6c8e64f7b3b9dd0f13bc0ad99ba76b3db43bb
-  data.tar.gz: cb0205d835ce818d24690f468c9f363012c197a35d3f88f6bfc75d886f9ea8c45f482d75bb24e526d718a04c170a5d570402d8a92e3719dfbf6f654baec71221
+  metadata.gz: 709f5b24238d70b604c95a0ba690154aced4a66036d4a67b44ef6f6430eacbd9ab91ca829e4812d8bea34f7df37b6bdcba67085507bb683508cbb5ae4d7ba92e
+  data.tar.gz: b5baabbb16b7ad7dc288b098f258999cdf0b55873a3cf024f967bfcc8c41f4b849c603fbb1b37a543459c9c59a0d15bc746d218f0d4d8ae17071f8b49ce382cb

data/.travis.yml

@@ -26,6 +26,6 @@ env:
   - DB=postgresql
   - DB=mysql
 rvm:
+  - 2.4
+  - 2.3
   - 2.2
-  - 2.1
-  - 2.0.0

data/Gemfile

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec
 
-git "https://github.com/refinery/refinerycms", branch: "master" do
+git "https://github.com/refinery/refinerycms", branch: "3-0-stable" do
   gem "refinerycms"
 
   group :test do

data/lib/refinery/i18n/engine.rb

@@ -57,10 +57,10 @@ module Refinery
                 Globalize.locale = params[:switch_locale].to_sym
               elsif ::I18n.locale != ::Refinery::I18n.default_frontend_locale
                 Globalize.locale = ::Refinery::I18n.default_frontend_locale
+              else
+                Globalize.locale = ::I18n.locale
               end
             end
-
-            Globalize.locale = ::I18n.locale if Globalize.locale.nil?
           end
           # globalize! should be prepended first so that it runs after find_or_set_locale
           prepend_before_filter :globalize!, :find_or_set_locale

data/refinerycms-i18n.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-i18n}
-  s.version           = %q{3.0.1}
+  s.version           = %q{3.0.2}
   s.description       = %q{i18n logic extracted from Refinery CMS, for Refinery CMS.}
   s.summary           = %q{i18n logic for Refinery CMS.}
   s.email             = %q{info@refinerycms.com}

data/spec/controllers/refinery/admin/resources_controller_spec.rb

@@ -0,0 +1,36 @@
+require "spec_helper"
+
+module Refinery
+  module Admin
+    describe ResourcesController, type: :controller do
+      before do
+        Globalize.locale = :en
+        @resource = FactoryGirl.create(:resource, :resource_title => "My resource in English")
+
+        # Add a translation
+        Globalize.locale = :es
+        @resource.resource_title = 'Mi recurso en español'
+        @resource.save
+      end
+
+      it 'reset Globalize as expected' do
+        get :index
+        expect(Globalize.locale).to eql(:en)
+        expect(::I18n.locale).to eql(:en)
+        expect(assigns(:resources).first.resource_title).to eql('My resource in English')
+
+        # Switch globalized content to ES
+        get :index, switch_locale: :es
+        expect(Globalize.locale).to eql(:es)
+        expect(::I18n.locale).to eql(:en)
+        expect(assigns(:resources).first.resource_title).to eql('Mi recurso en español')
+
+        # Should return to default locale for globalized content on next request
+        get :index
+        expect(Globalize.locale).to eql(:en)
+        expect(::I18n.locale).to eql(:en)
+        expect(assigns(:resources).first.resource_title).to eql('My resource in English')
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-i18n
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Philip Arndt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2017-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: routing-filter
@@ -313,6 +313,7 @@ files:
 - lib/translate/storage.rb
 - refinerycms-i18n.gemspec
 - script/rails
+- spec/controllers/refinery/admin/resources_controller_spec.rb
 - spec/features/set_locale_spec.rb
 - spec/spec_helper.rb
 - spec/support/refinery/i18n/set_defaults.rb
@@ -338,11 +339,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: i18n logic for Refinery CMS.
 test_files:
+- spec/controllers/refinery/admin/resources_controller_spec.rb
 - spec/features/set_locale_spec.rb
 - spec/spec_helper.rb
 - spec/support/refinery/i18n/set_defaults.rb