From 863d40a1c1f6591ef1ee8594b12ae4b0942fe810 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 5 Mar 2020 22:17:08 +0000 Subject: Made Enigma gui translatable (#193) * made enigma gui translatable * key renamings * missed strings * string.format() & another missed string * cached content (thanks @liach) * added a dialog when changing language * better sentence * more %s * liach's requests * empty map * the last (?) missed strings * IT WORKS * French translation * Update fr_fr.json --- .../translation/mapping/serde/EnigmaMappingsReader.java | 7 ++++--- .../translation/mapping/serde/EnigmaMappingsWriter.java | 5 +++-- .../enigma/translation/mapping/serde/SrgMappingsWriter.java | 11 ++++++----- .../enigma/translation/mapping/serde/TinyMappingsReader.java | 3 ++- .../cuchaz/enigma/translation/mapping/serde/TinyV2Reader.java | 3 ++- 5 files changed, 17 insertions(+), 12 deletions(-) (limited to 'src/main/java/cuchaz/enigma/translation/mapping') diff --git a/src/main/java/cuchaz/enigma/translation/mapping/serde/EnigmaMappingsReader.java b/src/main/java/cuchaz/enigma/translation/mapping/serde/EnigmaMappingsReader.java index 5e49a2a..60ce587 100644 --- a/src/main/java/cuchaz/enigma/translation/mapping/serde/EnigmaMappingsReader.java +++ b/src/main/java/cuchaz/enigma/translation/mapping/serde/EnigmaMappingsReader.java @@ -12,6 +12,7 @@ import cuchaz.enigma.translation.mapping.tree.HashEntryTree; import cuchaz.enigma.translation.representation.MethodDescriptor; import cuchaz.enigma.translation.representation.TypeDescriptor; import cuchaz.enigma.translation.representation.entry.*; +import cuchaz.enigma.utils.I18n; import javax.annotation.Nullable; import java.io.IOException; @@ -28,12 +29,12 @@ public enum EnigmaMappingsReader implements MappingsReader { FILE { @Override public EntryTree read(Path path, ProgressListener progress, MappingSaveParameters saveParameters) throws IOException, MappingParseException { - progress.init(1, "Loading mapping file"); + progress.init(1, I18n.translate("progress.mappings.enigma_file.loading")); EntryTree mappings = new HashEntryTree<>(); readFile(path, mappings); - progress.step(1, "Done!"); + progress.step(1, I18n.translate("progress.mappings.enigma_file.done")); return mappings; } @@ -48,7 +49,7 @@ public enum EnigmaMappingsReader implements MappingsReader { .filter(f -> f.toString().endsWith(".mapping")) .collect(Collectors.toList()); - progress.init(files.size(), "Loading mapping files"); + progress.init(files.size(), I18n.translate("progress.mappings.enigma_directory.loading")); int step = 0; for (Path file : files) { diff --git a/src/main/java/cuchaz/enigma/translation/mapping/serde/EnigmaMappingsWriter.java b/src/main/java/cuchaz/enigma/translation/mapping/serde/EnigmaMappingsWriter.java index f490b1d..2ce1234 100644 --- a/src/main/java/cuchaz/enigma/translation/mapping/serde/EnigmaMappingsWriter.java +++ b/src/main/java/cuchaz/enigma/translation/mapping/serde/EnigmaMappingsWriter.java @@ -40,6 +40,7 @@ import cuchaz.enigma.translation.representation.entry.Entry; import cuchaz.enigma.translation.representation.entry.FieldEntry; import cuchaz.enigma.translation.representation.entry.LocalVariableEntry; import cuchaz.enigma.translation.representation.entry.MethodEntry; +import cuchaz.enigma.utils.I18n; import cuchaz.enigma.utils.LFPrintWriter; public enum EnigmaMappingsWriter implements MappingsWriter { @@ -51,7 +52,7 @@ public enum EnigmaMappingsWriter implements MappingsWriter { .map(entry -> (ClassEntry) entry) .collect(Collectors.toList()); - progress.init(classes.size(), "Writing classes"); + progress.init(classes.size(), I18n.translate("progress.mappings.enigma_file.writing")); int steps = 0; try (PrintWriter writer = new LFPrintWriter(Files.newBufferedWriter(path))) { @@ -74,7 +75,7 @@ public enum EnigmaMappingsWriter implements MappingsWriter { applyDeletions(path, changedClasses, mappings, delta.getBaseMappings(), saveParameters.getFileNameFormat()); - progress.init(changedClasses.size(), "Writing classes"); + progress.init(changedClasses.size(), I18n.translate("progress.mappings.enigma_directory.writing")); AtomicInteger steps = new AtomicInteger(); diff --git a/src/main/java/cuchaz/enigma/translation/mapping/serde/SrgMappingsWriter.java b/src/main/java/cuchaz/enigma/translation/mapping/serde/SrgMappingsWriter.java index 1270d51..f67f8fc 100644 --- a/src/main/java/cuchaz/enigma/translation/mapping/serde/SrgMappingsWriter.java +++ b/src/main/java/cuchaz/enigma/translation/mapping/serde/SrgMappingsWriter.java @@ -14,6 +14,7 @@ import cuchaz.enigma.translation.representation.entry.ClassEntry; import cuchaz.enigma.translation.representation.entry.Entry; import cuchaz.enigma.translation.representation.entry.FieldEntry; import cuchaz.enigma.translation.representation.entry.MethodEntry; +import cuchaz.enigma.utils.I18n; import cuchaz.enigma.utils.LFPrintWriter; import java.io.IOException; @@ -45,7 +46,7 @@ public enum SrgMappingsWriter implements MappingsWriter { Collection> rootEntries = Lists.newArrayList(mappings).stream() .map(EntryTreeNode::getEntry) .collect(Collectors.toList()); - progress.init(rootEntries.size(), "Generating mappings"); + progress.init(rootEntries.size(), I18n.translate("progress.mappings.srg_file.generating")); int steps = 0; for (Entry entry : sorted(rootEntries)) { @@ -53,13 +54,13 @@ public enum SrgMappingsWriter implements MappingsWriter { writeEntry(classLines, fieldLines, methodLines, mappings, entry); } - progress.init(3, "Writing mappings"); + progress.init(3, I18n.translate("progress.mappings.srg_file.writing")); try (PrintWriter writer = new LFPrintWriter(Files.newBufferedWriter(path))) { - progress.step(0, "Classes"); + progress.step(0, I18n.translate("type.classes")); classLines.forEach(writer::println); - progress.step(1, "Fields"); + progress.step(1, I18n.translate("type.fields")); fieldLines.forEach(writer::println); - progress.step(2, "Methods"); + progress.step(2, I18n.translate("type.methods")); methodLines.forEach(writer::println); } catch (IOException e) { e.printStackTrace(); diff --git a/src/main/java/cuchaz/enigma/translation/mapping/serde/TinyMappingsReader.java b/src/main/java/cuchaz/enigma/translation/mapping/serde/TinyMappingsReader.java index aceb02f..773c95e 100644 --- a/src/main/java/cuchaz/enigma/translation/mapping/serde/TinyMappingsReader.java +++ b/src/main/java/cuchaz/enigma/translation/mapping/serde/TinyMappingsReader.java @@ -14,6 +14,7 @@ import cuchaz.enigma.translation.representation.entry.ClassEntry; import cuchaz.enigma.translation.representation.entry.FieldEntry; import cuchaz.enigma.translation.representation.entry.LocalVariableEntry; import cuchaz.enigma.translation.representation.entry.MethodEntry; +import cuchaz.enigma.utils.I18n; import java.io.IOException; import java.nio.file.Files; @@ -32,7 +33,7 @@ public enum TinyMappingsReader implements MappingsReader { EntryTree mappings = new HashEntryTree<>(); lines.remove(0); - progress.init(lines.size(), "Loading mapping file"); + progress.init(lines.size(), I18n.translate("progress.mappings.tiny_file.loading")); for (int lineNumber = 0; lineNumber < lines.size(); lineNumber++) { progress.step(lineNumber, ""); diff --git a/src/main/java/cuchaz/enigma/translation/mapping/serde/TinyV2Reader.java b/src/main/java/cuchaz/enigma/translation/mapping/serde/TinyV2Reader.java index c0488e9..a47143a 100644 --- a/src/main/java/cuchaz/enigma/translation/mapping/serde/TinyV2Reader.java +++ b/src/main/java/cuchaz/enigma/translation/mapping/serde/TinyV2Reader.java @@ -14,6 +14,7 @@ import cuchaz.enigma.translation.representation.entry.Entry; import cuchaz.enigma.translation.representation.entry.FieldEntry; import cuchaz.enigma.translation.representation.entry.LocalVariableEntry; import cuchaz.enigma.translation.representation.entry.MethodEntry; +import cuchaz.enigma.utils.I18n; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -45,7 +46,7 @@ final class TinyV2Reader implements MappingsReader { private EntryTree read(Path path, List lines, ProgressListener progress) throws MappingParseException { EntryTree mappings = new HashEntryTree<>(); - progress.init(lines.size(), "Loading mapping file"); + progress.init(lines.size(), I18n.translate("progress.mappings.tiny_v2.loading")); BitSet state = new BitSet(STATE_SIZE); @SuppressWarnings({"unchecked", "rawtypes"}) -- cgit v1.2.3