From 5782875e5363162a2fc0f480ed1a03facac79a12 Mon Sep 17 00:00:00 2001
From: iLTeoooD <matteopietro.dazzi@gmail.com>
Date: Wed, 15 Jul 2020 22:14:23 +0200
Subject: [PATCH] SimpleTranslator submap refactor

---
 CHANGELOG.md                     | 1 +
 lib/utils/simple_translator.dart | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index daef3ae..3527c0f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -175,3 +175,4 @@ Removed cache parameter from loadString method, resolve [issue/116](https://gith
 ## [0.17.0]
 
 RTL support.
+Test fix for [issue/115](https://github.com/ilteoood/flutter_i18n/issues/115)
diff --git a/lib/utils/simple_translator.dart b/lib/utils/simple_translator.dart
index 859cdfe..f1152d2 100644
--- a/lib/utils/simple_translator.dart
+++ b/lib/utils/simple_translator.dart
@@ -60,10 +60,8 @@ class SimpleTranslator {
         translationKey.split(KEY_SEPARATOR);
     translationKeySplitted.removeLast();
     Map<dynamic, dynamic> decodedSubMap = decodedMap;
-    translationKeySplitted.forEach((listKey) => decodedSubMap =
-        decodedSubMap != null && decodedSubMap[listKey] != null
-            ? decodedSubMap[listKey]
-            : Map());
+    translationKeySplitted.forEach((listKey) =>
+        decodedSubMap = (decodedSubMap ?? Map())[listKey] ?? Map());
     return decodedSubMap;
   }
 }