这是indexloc提供的服务，不要输入任何密码
Skip to content

Replace Globalize by Mobility #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
May 24, 2018
Merged

Replace Globalize by Mobility #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
70314f9
Replace Globalize by Mobility
bricesanchez Mar 24, 2018
ad13ed3
Temp use feature/mobility branch of refinerycms
bricesanchez Mar 24, 2018
0e50b4d
Lock mysql2 gem to '~> 0.4.10'
bricesanchez Mar 27, 2018
c64436a
Add dependency to mobility
bricesanchez Apr 11, 2018
9bb0bca
Update mobility gem version to 0.6.0
bricesanchez Apr 28, 2018
b7b0bc4
Bump version to 5.0.0
bricesanchez May 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ end
if !ENV["TRAVIS"] || ENV["DB"] == "mysql"
gem "activerecord-jdbcmysql-adapter", :platform => :jruby
gem "jdbc-mysql", "= 5.1.13", :platform => :jruby
gem "mysql2", :platform => :ruby
gem 'mysql2', '~> 0.4.10', :platform => :ruby
end

if !ENV["TRAVIS"] || ENV["DB"] == "postgresql"
Expand Down
4 changes: 2 additions & 2 deletions lib/refinery/i18n.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ def built_in_locales
end

def current_frontend_locale
if Globalize.locale.present? && Globalize.locale.to_s != config.default_frontend_locale.to_s
Globalize.locale
if Mobility.locale.present? && Mobility.locale.to_s != config.default_frontend_locale.to_s
Mobility.locale
elsif config.default_frontend_locale.present?
config.default_frontend_locale
else
Expand Down
8 changes: 4 additions & 4 deletions lib/refinery/i18n/engine.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def find_or_set_locale
else
::I18n.locale = ::Refinery::I18n.default_frontend_locale
end
Globalize.locale = ::I18n.locale
Mobility.locale = ::I18n.locale
end

prepend_before_action :find_or_set_locale
Expand All @@ -52,11 +52,11 @@ def find_or_set_locale
def globalize!
if ::Refinery::I18n.frontend_locales.any?
if params[:switch_locale]
Globalize.locale = params[:switch_locale].to_sym
Mobility.locale = params[:switch_locale].to_sym
elsif ::I18n.locale != ::Refinery::I18n.default_frontend_locale
Globalize.locale = ::Refinery::I18n.default_frontend_locale
Mobility.locale = ::Refinery::I18n.default_frontend_locale
else
Globalize.locale = ::I18n.locale
Mobility.locale = ::I18n.locale
end
end
end
Expand Down
3 changes: 2 additions & 1 deletion refinerycms-i18n.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Gem::Specification.new do |s|
s.name = %q{refinerycms-i18n}
s.version = %q{4.0.2}
s.version = %q{5.0.0}
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}
Expand All @@ -18,4 +18,5 @@ Gem::Specification.new do |s|

s.add_dependency 'routing-filter', '>= 0.4.0'
s.add_dependency 'rails-i18n', '~> 5.0.0'
s.add_dependency 'mobility', '~> 0.6.0'
end
12 changes: 6 additions & 6 deletions spec/controllers/refinery/admin/resources_controller_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,30 @@ module Refinery
module Admin
describe ResourcesController, type: :controller do
before do
Globalize.locale = :en
Mobility.locale = :en
@resource = FactoryBot.create(:resource, :resource_title => "My resource in English")

# Add a translation
Globalize.locale = :es
Mobility.locale = :es
@resource.resource_title = 'Mi recurso en español'
@resource.save
end

it 'reset Globalize as expected' do
it 'reset Mobility as expected' do
get :index
expect(Globalize.locale).to eql(:en)
expect(Mobility.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, params: { switch_locale: :es }
expect(Globalize.locale).to eql(:es)
expect(Mobility.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(Mobility.locale).to eql(:en)
expect(::I18n.locale).to eql(:en)
expect(assigns(:resources).first.resource_title).to eql('My resource in English')
end
Expand Down