Merge pull request #6848 from opf/fix/29049/i18n-start-of-week

[29049] Fix missing start-of-week without user_specific_includes

[ci skip]

app/helpers/application_helper.rb

@@ -422,26 +422,6 @@ module ApplicationHelper
     end
   end
 
-  # Returns the javascript tags that are included in the html layout head
-  def user_specific_javascript_includes
-    tags = ''
-    tags += nonced_javascript_tag do
-      %{
-      window.openProject = new OpenProject({
-        urlRoot : '#{OpenProject::Configuration.rails_relative_url_root}',
-        environment: '#{Rails.env}',
-        loginUrl: '#{url_for controller: '/account', action: 'login'}'
-      });
-      I18n.defaultLocale = "#{I18n.default_locale}";
-      I18n.locale = "#{I18n.locale}";
-      I18n.firstDayOfWeek = "#{locale_first_day_of_week}"
-
-      }.html_safe
-    end
-
-    tags.html_safe
-  end
-
   def calendar_for(*args)
     ActiveSupport::Deprecation.warn "calendar_for has been removed. Please add the class '-augmented-datepicker' instead.", caller
   end

app/views/layouts/base.html.erb

@@ -54,6 +54,7 @@ See docs/COPYRIGHT.rdoc for more details.
 
   <meta name="openproject_initializer"
         data-locale="<%= I18n.locale %>"
+        data-first-day-of-week="<%= locale_first_day_of_week %>"
         data-default-locale="<%= I18n.default_locale %>"
         data-environment="<%= Rails.env %>"/>
   <meta name="current_menu_item" content="<%= current_menu_item %>"/>

frontend/src/app/init-globals.ts

@@ -48,6 +48,7 @@ window.appBasePath = jQuery('meta[name=app_base_path]').attr('content') || '';
 const meta = jQuery('meta[name=openproject_initializer]');
 I18n.locale = meta.data('defaultLocale');
 I18n.locale = meta.data('locale');
+I18n.firstDayOfWeek = parseInt(meta.data('firstDayOfWeek'), 10);
 
 // Enable debug logging for reactive states
 whenDebugging(() => {

frontend/src/app/modules/common/i18n/i18n.service.ts

@@ -7,6 +7,7 @@ export interface GlobalI18n {
   t(translateId:string, parameters?:any):string;
   lookup(translateId:string):boolean | undefined;
   locale:string;
+  firstDayOfWeek:number;
 }
 
 @Injectable()

frontend/src/test/i18n-shim.ts

@@ -3,6 +3,7 @@ import {GlobalI18n} from "core-app/modules/common/i18n/i18n.service";
 export class I18nShim implements GlobalI18n {
 
   public defaultLocale = 'en';
+  public firstDayOfWeek = 1;
   public locale = 'en';
   public translations = {
     en: {}