Merge branch 'develop'

merkle-open · Nov 21, 2024 · 8fa7475 · 8fa7475
2 parents 28287e7 + 1439f82
commit 8fa7475
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 5 deletions.
diff --git a/json2properties-generator/pom.xml b/json2properties-generator/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.namics.oss.magnolia</groupId>
         <artifactId>magnolia-dictionary-parent</artifactId>
-        <version>1.3.3</version>
+        <version>1.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>json2properties-generator</artifactId>

diff --git a/magnolia-dictionary/pom.xml b/magnolia-dictionary/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.namics.oss.magnolia</groupId>
         <artifactId>magnolia-dictionary-parent</artifactId>
-        <version>1.3.3</version>
+        <version>1.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>magnolia-dictionary</artifactId>

diff --git a/magnolia-dictionary/src/main/java/com/namics/oss/magnolia/dictionary/DictionaryModule.java b/magnolia-dictionary/src/main/java/com/namics/oss/magnolia/dictionary/DictionaryModule.java
@@ -55,7 +55,6 @@ public void start(ModuleLifecycleContext moduleLifecycleContext) {
 			LOG.info("Start Dictionary module: Load labels to dictionary");
 			messagesInstaller.loadLabelsToDictionary();
 		}
-		dictionaryMessageBundlesLoader.reload();
 	}
 
 	@Override

diff --git a/...in/java/com/namics/oss/magnolia/dictionary/i18nsystem/DictionaryMessageBundlesLoader.java b/...in/java/com/namics/oss/magnolia/dictionary/i18nsystem/DictionaryMessageBundlesLoader.java
@@ -37,7 +37,7 @@
 public class DictionaryMessageBundlesLoader implements EventListener {
     private static final Logger LOG = LoggerFactory.getLogger(DictionaryMessageBundlesLoader.class);
     private final Provider<SystemContext> systemContextProvider;
-    private Map<Locale, Properties> messages = Collections.emptyMap();
+    private Map<Locale, Properties> messages;
 
     @Inject
     public DictionaryMessageBundlesLoader(final Provider<SystemContext> systemContextProvider) {
@@ -84,6 +84,9 @@ private Stream<Map.Entry<String, String>> streamMessages(final Locale locale, fi
     }
 
     public Map<Locale, Properties> getMessages() {
+        if(messages == null) {
+            reload();
+        }
         return messages;
     }
 

diff --git a/magnolia-dictionary/src/main/resources/META-INF/magnolia/magnolia-dictionary.xml b/magnolia-dictionary/src/main/resources/META-INF/magnolia/magnolia-dictionary.xml
@@ -43,6 +43,16 @@
             <name>i18n</name>
             <version>*/*</version>
         </dependency>
+        <dependency>
+            <name>site</name>
+            <version>*</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <name>multisite</name>
+            <version>*</version>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <repositories>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.namics.oss.magnolia</groupId>
     <artifactId>magnolia-dictionary-parent</artifactId>
-    <version>1.3.3</version>
+    <version>1.3.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>