From c72c645e837e63d58361f86948f84b7b667eb6b2 Mon Sep 17 00:00:00 2001
From: Namics OSS CI <oss@namics.com>
Date: Wed, 23 Oct 2024 08:35:23 +0000
Subject: [PATCH 1/2] Release 1.3.2: set develop to next development version
 1.3.3-SNAPSHOT

---
 json2properties-generator/pom.xml | 2 +-
 magnolia-dictionary/pom.xml       | 2 +-
 pom.xml                           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/json2properties-generator/pom.xml b/json2properties-generator/pom.xml
index df428b8..50459c7 100644
--- 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-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>json2properties-generator</artifactId>
diff --git a/magnolia-dictionary/pom.xml b/magnolia-dictionary/pom.xml
index ff8070c..bd7cf0b 100644
--- 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-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>magnolia-dictionary</artifactId>
diff --git a/pom.xml b/pom.xml
index 04d9c58..ad263bf 100644
--- 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-SNAPSHOT</version>
+    <version>1.3.3-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>

From 00e892e1389f16408474663b5b7a4a742872c6cc Mon Sep 17 00:00:00 2001
From: eschleb <bjoern.eschle@merkle.com>
Date: Thu, 21 Nov 2024 14:01:36 +0100
Subject: [PATCH 2/2] Fix dependency issue

---
 .../i18nsystem/DictionaryTranslationServiceImpl.java       | 3 ++-
 .../resources/META-INF/magnolia/magnolia-dictionary.xml    | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/magnolia-dictionary/src/main/java/com/namics/oss/magnolia/dictionary/i18nsystem/DictionaryTranslationServiceImpl.java b/magnolia-dictionary/src/main/java/com/namics/oss/magnolia/dictionary/i18nsystem/DictionaryTranslationServiceImpl.java
index 942cc07..2bedcb0 100644
--- a/magnolia-dictionary/src/main/java/com/namics/oss/magnolia/dictionary/i18nsystem/DictionaryTranslationServiceImpl.java
+++ b/magnolia-dictionary/src/main/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
index 88a6ea4..f118ac9 100644
--- 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>