From 1975ffef0cdc01874fa86b07e04814ab43cf748e Mon Sep 17 00:00:00 2001
From: AppleDash <derp@derpy.fr>
Date: Sat, 17 Dec 2016 11:37:06 -0500
Subject: [PATCH] Try and fix I18n

---
 .../org/appledash/saneeconomy/utils/I18n.java | 47 ++++++++++++-------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/utils/I18n.java b/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/utils/I18n.java
index adf6fdb..a894810 100644
--- a/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/utils/I18n.java
+++ b/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/utils/I18n.java
@@ -49,27 +49,16 @@ public class I18n {
                     finalKeys.add(jarObject);
                 } else {
                     String currentKey = String.valueOf(equivalentOnDisk.get("message"));
-                    String convertedKey = convertOldTranslations(currentKey);
-
-                    if (!currentKey.equals(convertedKey)) { // Key needs conversion
-                        String convertedValue = convertOldTranslations(String.valueOf(equivalentOnDisk.get("translation")));
-
-                        // Remove current key from map of things to go to the disk
-                        Iterator<Map<?, ?>> iter = finalKeys.iterator();
-
-                        while (iter.hasNext()) {
-                            if (String.valueOf(iter.next().get("message")).equals(equivalentOnDisk.get("message"))) {
-                                iter.remove();
-                            }
-                        }
-
-                        // Add the converted one.
-                        finalKeys.add(ImmutableMap.of("message", convertedKey, "translation", convertedValue));
-                    }
+                    String currentTranslation = String.valueOf(equivalentOnDisk.get("translation"));
+                    convertKey(finalKeys, currentKey, currentTranslation);
                 }
 
             }
 
+            for (Map diskObject : configDisk.getMapList("messages")) {
+                convertKey(finalKeys, String.valueOf(diskObject.get("message")), String.valueOf(diskObject.get("translation")));
+            }
+
             configDisk.set("messages", finalKeys);
 
             try {
@@ -91,6 +80,30 @@ public class I18n {
         });
     }
 
+    private void convertKey(List<Map<?, ?>> finalKeys, String currentKey, String currentTranslation) {
+        String convertedKey = convertOldTranslations(currentKey);
+
+        if (!currentKey.equals(convertedKey)) { // Key needs conversion
+            String convertedValue = convertOldTranslations(String.valueOf(currentTranslation));
+
+            // Remove current key from map of things to go to the disk
+            Iterator<Map<?, ?>> iter = finalKeys.iterator();
+
+            while (iter.hasNext()) {
+                if (String.valueOf(iter.next().get("message")).equals(currentKey)) {
+                    iter.remove();
+                }
+            }
+
+            // Add the converted one.
+            if (convertedValue.equals("null")) {
+                finalKeys.add(ImmutableMap.of("message", convertedKey));
+            } else {
+                finalKeys.add(ImmutableMap.of("message", convertedKey, "translation", convertedValue));
+            }
+        }
+    }
+
     private String convertOldTranslations(String input) {
         Matcher m = Pattern.compile("(%s)").matcher(input);
         StringBuffer converted = new StringBuffer();