From 3d26fbc45028def519a1cf1ab4bf35c18ab3d0b1 Mon Sep 17 00:00:00 2001
From: glaszig <mail@glasz.org>
Date: Thu, 9 Nov 2023 17:43:52 -0300
Subject: [PATCH] fix I18n.load_path injection

ice_cube would inject its locale files at the end of `I18n.load_path` due to its `IceCube::I18n` module being `autoload`ed and thereby overwrite any customisation the user may have made in other locale files earlier in the load path.

i fix this by injecting ice cube locales at gem load time so that the user has a chance to modify locale keys later.

this also eliminates a bunch of delegation having a custom I18n module; `IceCube::I18n` is just the same as ::I18n if the i18n gem is available.

resolves #489, #432, #431
---
 CHANGELOG.md                  |  1 +
 lib/ice_cube.rb               |  3 ++-
 lib/ice_cube/i18n.rb          | 29 ++++++++---------------------
 spec/examples/to_s_en_spec.rb |  2 +-
 4 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0022b92..20110aab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - Removed use of `delegate` method added in [66f1d797](https://github.com/ice-cube-ruby/ice_cube/commit/66f1d797092734563bfabd2132c024c7d087f683) , reverting to previous implementation. ([#522](https://github.com/ice-cube-ruby/ice_cube/pull/522))  by [@pacso](https://github.com/pacso)
+- Fixed `I18n.load_path` injection ([#546](https://github.com/ice-cube-ruby/ice_cube/pull/546)) by [@glaszig](https://github.com/glaszig)
 
 ### Fixed
 - Fix for weekly interval results when requesting `occurrences_between` on a narrow range ([#487](https://github.com/seejohnrun/ice_cube/pull/487)) by [@jakebrady5](https://github.com/jakebrady5)
diff --git a/lib/ice_cube.rb b/lib/ice_cube.rb
index 3c283f53..eb301660 100644
--- a/lib/ice_cube.rb
+++ b/lib/ice_cube.rb
@@ -6,7 +6,8 @@ module IceCube
 
   autoload :TimeUtil, "ice_cube/time_util"
   autoload :FlexibleHash, "ice_cube/flexible_hash"
-  autoload :I18n, "ice_cube/i18n"
+
+  require "ice_cube/i18n"
 
   autoload :Rule, "ice_cube/rule"
   autoload :Schedule, "ice_cube/schedule"
diff --git a/lib/ice_cube/i18n.rb b/lib/ice_cube/i18n.rb
index 6f135026..8e0f5bd5 100644
--- a/lib/ice_cube/i18n.rb
+++ b/lib/ice_cube/i18n.rb
@@ -1,26 +1,13 @@
 require "ice_cube/null_i18n"
 
 module IceCube
-  module I18n
-    LOCALES_PATH = File.expand_path(File.join("..", "..", "..", "config", "locales"), __FILE__)
-
-    def self.t(*args, **kwargs)
-      backend.t(*args, **kwargs)
-    end
-
-    def self.l(*args, **kwargs)
-      backend.l(*args, **kwargs)
-    end
-
-    def self.backend
-      @backend ||= detect_backend!
-    end
-
-    def self.detect_backend!
-      ::I18n.load_path += Dir[File.join(LOCALES_PATH, "*.yml")]
-      ::I18n
-    rescue NameError
-      NullI18n
-    end
+  LOCALES_PATH = File.expand_path(File.join("..", "..", "..", "config", "locales"), __FILE__)
+
+  I18n = begin
+    require "i18n"
+    ::I18n.load_path += Dir[File.join(LOCALES_PATH, "*.yml")]
+    ::I18n
+  rescue LoadError
+    NullI18n
   end
 end
diff --git a/spec/examples/to_s_en_spec.rb b/spec/examples/to_s_en_spec.rb
index c3e38a86..8be73cd1 100644
--- a/spec/examples/to_s_en_spec.rb
+++ b/spec/examples/to_s_en_spec.rb
@@ -212,7 +212,7 @@
     before(:each) { I18n.locale = :en }
 
     it "uses I18n" do
-      expect(IceCube::I18n.backend).to eq(I18n)
+      expect(IceCube::I18n).to eq ::I18n
     end
 
     it_behaves_like "to_s in English"