Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-03 15:40:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always use UTF-8 for loading translations

Browse Source 
(cherry picked from commit 624b3a449b5746cee84557992b9b217ac135cf50)
This commit is contained in:
Octavia Togami 2020-01-29 04:31:09 -08:00 committed by MattBDev
parent f4d03291c5
commit d5828861de
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
worldedit-core/src/main/java/com/sk89q/worldedit/util/translation/TranslationManager.java
View File

@ -33,7 +33,9 @@ import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.Reader;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.nio.charset.StandardCharsets;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.HashSet; import java.util.HashSet;
import java.util.Locale; import java.util.Locale;
@ -85,15 +87,17 @@ public class TranslationManager {
.collect(toMap(Map.Entry::getKey, Map.Entry::getValue)); .collect(toMap(Map.Entry::getKey, Map.Entry::getValue));
} }
private Map<String, String> parseTranslationFile(InputStream inputStream) { private Map<String, String> parseTranslationFile(InputStream inputStream) throws IOException {
return filterTranslations(gson.fromJson(new InputStreamReader(inputStream), STRING_MAP_TYPE)); try (Reader reader = new InputStreamReader(inputStream, StandardCharsets.UTF_8)) {
return filterTranslations(gson.fromJson(reader, STRING_MAP_TYPE));
}
} }
private Optional<Map<String, String>> loadTranslationFile(String filename) { private Optional<Map<String, String>> loadTranslationFile(String filename) {
Map<String, String> baseTranslations; Map<String, String> baseTranslations;
try { try (InputStream stream = ResourceLoader.getResourceRoot("lang/" + filename).openStream()) {
baseTranslations = parseTranslationFile(ResourceLoader.getResourceRoot("lang/" + filename).openStream()); baseTranslations = parseTranslationFile(stream);
} catch (IOException e) { } catch (IOException e) {
// Seem to be missing base. If the user has provided a file use that. // Seem to be missing base. If the user has provided a file use that.
baseTranslations = new ConcurrentHashMap<>(); baseTranslations = new ConcurrentHashMap<>();
@ -101,8 +105,8 @@ public class TranslationManager {
File localFile = worldEdit.getWorkingDirectoryFile("lang/" + filename); File localFile = worldEdit.getWorkingDirectoryFile("lang/" + filename);
if (localFile.exists()) { if (localFile.exists()) {
try { try (InputStream stream = new FileInputStream(localFile)) {
baseTranslations.putAll(parseTranslationFile(new FileInputStream(localFile))); baseTranslations.putAll(parseTranslationFile(stream));
} catch (IOException e) { } catch (IOException e) {
// Failed to parse custom language file. Worth printing. // Failed to parse custom language file. Worth printing.
e.printStackTrace(); e.printStackTrace();