Merge branch 'develop'

merkle-open · Nov 21, 2024 · 0bdd376 · 0bdd376
2 parents 5d753ce + 00e892e
commit 0bdd376
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 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.2</version>
+        <version>1.3.3-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.2</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>magnolia-dictionary</artifactId>

diff --git a/.../java/com/namics/oss/magnolia/dictionary/i18nsystem/DictionaryTranslationServiceImpl.java b/.../java/com/namics/oss/magnolia/dictionary/i18nsystem/DictionaryTranslationServiceImpl.java
@@ -97,7 +97,8 @@ protected Optional<String> doGetMessage(final String[] keys, final Locale locale
                 .flatMap(properties ->
                         Arrays.stream(keys)
                                 .map(DictionaryUtils::getValidMessageNodeName)
-                                .map(properties::getProperty)
+                                .map(key -> Optional.ofNullable(properties.getProperty(key)))
+                                .flatMap(Optional::stream)
                 )
                 .findFirst();
     }

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
@@ -38,6 +38,13 @@
         </component>
     </components>
 
+    <dependencies>
+        <dependency>
+            <name>i18n</name>
+            <version>*/*</version>
+        </dependency>
+    </dependencies>
+
     <repositories>
         <repository>
             <name>magnolia</name>

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.2</version>
+    <version>1.3.3-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>