use less conflicting namespace

opf · Feb 14, 2025 · e9e79b4 · e9e79b4
1 parent f46db86
commit e9e79b4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/app/models/queries/projects/filters/any_stage_or_gate_filter.rb b/app/models/queries/projects/filters/any_stage_or_gate_filter.rb
@@ -152,7 +152,7 @@ def today
   end
 
   def beginning_of_week
-    OpenProject::I18n::Date.time_at_beginning_of_week
+    OpenProject::Internationalization::Date.time_at_beginning_of_week
   end
 
   def end_of_week

diff --git a/lib/open_project/i18n/date.rb → ...open_project/internationalization/date.rb b/lib/open_project/i18n/date.rb → ...open_project/internationalization/date.rb
@@ -28,8 +28,11 @@
 # See COPYRIGHT and LICENSE files for more details.
 # ++
 
+# The module is not called I18n as that leads to tons of conflicts
+# where I18n is called within the OpenProject module and rails I18n is meant.
+
 module OpenProject
-  module I18n
+  module Internationalization
     module Date
       module_function
 

diff --git a/lib_static/redmine/i18n.rb b/lib_static/redmine/i18n.rb
@@ -27,7 +27,7 @@
 #++
 
 # This file is to be split up into smaller files in the OpenProject namespace.
-# A start has been made by splitting off OpenProject::I18n::Date into its own file.
+# A start has been made by splitting off OpenProject::Internationalization::Date into its own file.
 
 module Redmine
   module I18n

diff --git a/modules/meeting/app/controllers/meetings_controller.rb b/modules/meeting/app/controllers/meetings_controller.rb
@@ -369,7 +369,7 @@ def load_meetings
   end
 
   def group_meetings(all_meetings) # rubocop:disable Metrics/AbcSize
-    next_week = Time.current.next_occurring(OpenProject::I18n::Date.start_of_week)
+    next_week = Time.current.next_occurring(OpenProject::Internationalization::Date.start_of_week)
     groups = Hash.new { |h, k| h[k] = [] }
     groups[:later] = show_more_pagination(all_meetings
                                             .where(start_time: next_week..)

diff --git a/spec/lib/open_project/i18n/date_spec.rb → ...project/internationalization/date_spec.rb b/spec/lib/open_project/i18n/date_spec.rb → ...project/internationalization/date_spec.rb
@@ -30,7 +30,7 @@
 
 require "spec_helper"
 
-RSpec.describe OpenProject::I18n::Date do
+RSpec.describe OpenProject::Internationalization::Date do
   describe ".beginning_of_week" do
     context "when the first day of the week is Sunday", with_settings: { start_of_week: 7 } do
       it "returns :sunday" do