Merge pull request #8199 from 4teamwork/TI-3173-fix-i18n-loading

Fix loading of i18n overrides

Author: buchi

changes/TI-3173.bugfix

@@ -0,0 +1 @@
+Fix loading of i18n overrides in Docker image. [buchi]

docker/core/etc/site.zcml

@@ -9,6 +9,10 @@
   <include package="Products.Five" />
   <meta:redefinePermission from="zope2.Public" to="zope.Public" />
 
+  <!-- Load i18n overrides as early as possible -->
+  <include package="opengever.base" file="locales.zcml" />
+  <include package="opengever.core" file="locales.zcml" />
+
   <!-- Load patches as early as possible -->
   <include package="opengever.base.monkey" />
 

opengever/base/configure.zcml

@@ -33,7 +33,7 @@
   <include file="schema.zcml" />
   <include file="widgets.zcml" />
 
-  <i18n:registerTranslations directory="locales" />
+  <include file="locales.zcml" />
 
   <genericsetup:registerProfile
       name="default"

opengever/base/locales.zcml

@@ -0,0 +1,8 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:i18n="http://namespaces.zope.org/i18n"
+    i18n_domain="opengever.base">
+
+  <i18n:registerTranslations directory="locales" />
+
+</configure>

opengever/core/configure.zcml

@@ -36,6 +36,6 @@
       handler=".hooks.avoid_profile_reinstallation"
       />
 
-  <i18n:registerTranslations directory="locales" />
+  <include file="locales.zcml" />
 
 </configure>

opengever/core/locales.zcml

@@ -0,0 +1,8 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:i18n="http://namespaces.zope.org/i18n"
+    i18n_domain="opengever.core">
+
+  <i18n:registerTranslations directory="locales" />
+
+</configure>