[DEMAD-126] Correcciones de default globalize

AyuntamientoMadrid · May 17, 2021 · c26ffbc · c26ffbc
1 parent 4696736
commit c26ffbc
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 7 deletions.
diff --git a/app/controllers/admin/budget_groups_controller.rb b/app/controllers/admin/budget_groups_controller.rb
@@ -46,10 +46,14 @@ def destroy
 
     def load_budget
       @budget = Budget.find_by_slug_or_id! params[:budget_id]
+    rescue
+      @budget = nil
     end
 
     def load_group
       @group = @budget.groups.find_by_slug_or_id! params[:id]
+    rescue
+      @group = nil
     end
 
     def groups_index

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -46,7 +46,7 @@ def set_locale
         session[:locale] = params[:locale]
       end
 
-      session[:locale] ||= I18n.default_locale
+      session[:locale] ||= :es
 
       locale = session[:locale]
 

diff --git a/app/controllers/management/base_controller.rb b/app/controllers/management/base_controller.rb
@@ -42,7 +42,7 @@ def set_locale
         session[:locale] = params[:locale]
       end
 
-      session[:locale] ||= I18n.default_locale
+      session[:locale] ||= :es
 
       I18n.locale = session[:locale]
       Globalize.locale = I18n.locale

diff --git a/app/mailers/mailer.rb b/app/mailers/mailer.rb
@@ -73,7 +73,7 @@ def proposal_notification_digest(user, notifications)
   def user_invite(email)
     @email_to = email
 
-    I18n.with_locale(I18n.default_locale) do
+    I18n.with_locale(:es) do
       mail(to: @email_to, subject: t("mailers.user_invite.subject", org_name: Setting["org_name"]))
     end
   end

diff --git a/app/models/site_customization/content_block.rb b/app/models/site_customization/content_block.rb
@@ -5,7 +5,7 @@ class SiteCustomization::ContentBlock < ApplicationRecord
   validates :name, presence: true, uniqueness: { scope: :locale }, inclusion: { in: VALID_BLOCKS }
 
   def self.block_for(name, locale)
-    locale ||= I18n.default_locale
+    locale ||= :es
     find_by(name: name, locale: locale).try(:body)
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -392,7 +392,7 @@ def email_required?
   end
 
   def locale
-    self[:locale] ||= I18n.default_locale.to_s
+    self[:locale] ||= :es.to_s
   end
 
   def confirmation_required?

diff --git a/config/initializers/globalize.rb b/config/initializers/globalize.rb
@@ -4,9 +4,11 @@ module InstanceMethods
       def save(*)
         # Credit for this code belongs to Jack Tomaszewski:
         # https://github.com/globalize/globalize/pull/578
-        Globalize.with_locale(Globalize.locale || I18n.default_locale) do
+        Globalize.with_locale(Globalize.locale || :es) do
           super
         end
+      rescue
+        super
       end
     end
   end

diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
@@ -22,7 +22,7 @@
 require "selenium/webdriver"
 
 Rails.application.load_tasks if Rake::Task.tasks.empty?
-I18n.default_locale = :en
+I18n.default_locale = :es
 
 include Warden::Test::Helpers
 Warden.test_mode!