Let Globalize use I18n locale

This is a mistake I made in commit f2ef27d3. Back then I thought we
needed to keep Globalize.locale and I18n.locale in sync, but the truth
is it automatically happens when setting Globalize.locale to nil.

So now we can use I18n.with_locale (at least in the tests) and forget
about Globalize, which will make it easier to switch to Mobility in the
future.

spec/features/admin/budget_investments_spec.rb

@@ -824,9 +824,7 @@ describe "Admin budget investments" do
 
     before do
       I18n.with_locale(:es) do
-        Globalize.with_locale(:es) do
+        create(:budget_investment, title: "Proyecto de inversión", budget: budget)
-          create(:budget_investment, title: "Proyecto de inversión", budget: budget)
-        end
       end
     end
 

spec/features/localization_spec.rb

@@ -3,7 +3,7 @@ require "rails_helper"
 describe "Localization" do
 
   scenario "Wrong locale" do
-    Globalize.with_locale(:es) do
+    I18n.with_locale(:es) do
       create(:widget_card, title: "Bienvenido a CONSUL",
                            description: "Software libre para la participación ciudadana.",
                            link_text: "Más información",

spec/models/budget/group_spec.rb

@@ -58,10 +58,10 @@ describe Budget::Group do
         budget = create(:budget, name: "Teams")
         charlie = create(:budget_group, budget: budget, name: "Charlie")
         delta = create(:budget_group, budget: budget, name: "Delta")
-        zulu = Globalize.with_locale(:es) do
+        zulu = I18n.with_locale(:es) do
           create(:budget_group, budget: budget, name: "Zulu", name_fr: "Alpha")
         end
-        bravo = Globalize.with_locale(:es) do
+        bravo = I18n.with_locale(:es) do
           create(:budget_group, budget: budget, name: "Bravo")
         end
 

spec/models/budget/investment_spec.rb

@@ -555,10 +555,8 @@ describe Budget::Investment do
 
       it "takes into consideration title fallbacks when there is no translation for current locale" do
         create(:budget_investment, title: "BBBB")
-        Globalize.with_locale(:es) do
+        I18n.with_locale(:es) do
-          I18n.with_locale(:es) do
+          create(:budget_investment, title: "AAAA")
-            create(:budget_investment, title: "AAAA")
-          end
         end
 
         expect(Budget::Investment.sort_by_title.map(&:title)).to eq %w[AAAA BBBB]
@@ -570,11 +568,9 @@ describe Budget::Investment do
 
       let!(:investment) do
         I18n.with_locale(:es) do
-          Globalize.with_locale(:es) do
+          create(:budget_investment,
-            create(:budget_investment,
+            title_es: "Título del proyecto de inversión",
-              title_es: "Título del proyecto de inversión",
+            description_es: "Descripción del proyecto de inversión")
-              description_es: "Descripción del proyecto de inversión")
-          end
         end
       end
 

spec/models/i18n_content_spec.rb

@@ -54,9 +54,7 @@ RSpec.describe I18nContent, type: :model do
     it "responds accordingly to the current locale" do
       expect(i18n_content.value).to eq("Text in english")
 
-      Globalize.locale = :es
+      I18n.with_locale(:es) { expect(i18n_content.value).to eq("Texto en español") }
-
-      expect(i18n_content.value).to eq("Texto en español")
     end
   end
 

spec/models/poll/poll_spec.rb

@@ -402,10 +402,10 @@ describe Poll do
         starts_at = Time.current + 1.day
         poll1 = create(:poll, starts_at: starts_at, name: "Charlie")
         poll2 = create(:poll, starts_at: starts_at, name: "Delta")
-        poll3 = Globalize.with_locale(:es) do
+        poll3 = I18n.with_locale(:es) do
           create(:poll, starts_at: starts_at, name: "Zzz...", name_fr: "Aaaah!")
         end
-        poll4 = Globalize.with_locale(:es) do
+        poll4 = I18n.with_locale(:es) do
           create(:poll, starts_at: starts_at, name: "Bravo")
         end
 

spec/models/poll/question_spec.rb

@@ -32,10 +32,7 @@ RSpec.describe Poll::Question, type: :model do
     end
 
     context "locale with non-underscored name" do
-      before do
+      before { I18n.locale = :"pt-BR" }
-        I18n.locale = :"pt-BR"
-        Globalize.locale = I18n.locale
-      end
 
       it "correctly creates a translation" do
         poll_question.copy_attributes_from_proposal(proposal)

spec/spec_helper.rb

@@ -44,7 +44,7 @@ RSpec.configure do |config|
   config.before do |example|
     DatabaseCleaner.strategy = :transaction
     I18n.locale = :en
-    Globalize.locale = I18n.locale
+    Globalize.locale = nil
     Globalize.set_fallbacks_to_all_available_locales
     load Rails.root.join("db", "seeds.rb").to_s
     Setting["feature.user.skip_verification"] = nil