From 2fe2d9f895b7581b35c8f0a89b662e5deb3b55ce Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 26 Apr 2016 16:44:14 -0700 Subject: [PATCH] Remove escritoire note count localization requirement --- lang | 2 +- .../core/tiles/EscritoireTextSource.java | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lang b/lang index 9f956b050..a796b5ef3 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 9f956b050a9adc2f538f166e4deddd2907f94dc5 +Subproject commit a796b5ef386de3d5841951b191a59355e77eed23 diff --git a/src/main/java/forestry/core/tiles/EscritoireTextSource.java b/src/main/java/forestry/core/tiles/EscritoireTextSource.java index a34aede82..40867c260 100644 --- a/src/main/java/forestry/core/tiles/EscritoireTextSource.java +++ b/src/main/java/forestry/core/tiles/EscritoireTextSource.java @@ -17,7 +17,7 @@ import java.util.EnumSet; import java.util.List; import java.util.Random; -import forestry.core.utils.StringUtil; +import forestry.core.utils.Translator; public class EscritoireTextSource { @@ -32,13 +32,17 @@ public class EscritoireTextSource { researchNotes = ArrayListMultimap.create(); EnumSet multipleTranslationNoteLevels = EnumSet.of(Notes.level1, Notes.level2, Notes.level3, Notes.level4, Notes.success, Notes.failure); for (Notes notesLevel : multipleTranslationNoteLevels) { - int levelCount = Integer.valueOf(StringUtil.localize("gui.escritoire.notes." + notesLevel + ".count")); - for (int i = 1; i <= levelCount; i++) { - String note = StringUtil.localize("gui.escritoire.notes." + notesLevel + '.' + i); - researchNotes.put(notesLevel, note); + for (int i = 1; i <= 10; i++) { + String key = "for.gui.escritoire.notes." + notesLevel + '.' + i; + String note = Translator.translateToLocal(key); + if (key.equals(note)) { + break; + } else { + researchNotes.put(notesLevel, note); + } } } - researchNotes.put(Notes.empty, StringUtil.localize("gui.escritoire.instructions")); + researchNotes.put(Notes.empty, Translator.translateToLocal("for.gui.escritoire.instructions")); } private String researchNote;