Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 01:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow translation files to be missing entries, and use the english version in place.

Browse Source
This commit is contained in:
Matthew Miller 2019-11-17 16:04:13 +10:00
parent 5d0335eea5
commit 625be46b30
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,12 +76,17 @@ public class TranslationManager {
this.defaultLocale = defaultLocale; this.defaultLocale = defaultLocale;
} }
private Map<String, String> filterTranslations(Map<String, String> translations) {
translations.entrySet().removeIf(entry -> entry.getValue().isEmpty());
return translations;
}
private Map<String, String> parseTranslationFile(File file) throws IOException { private Map<String, String> parseTranslationFile(File file) throws IOException {
return gson.fromJson(Files.toString(file, StandardCharsets.UTF_8), STRING_MAP_TYPE); return filterTranslations(gson.fromJson(Files.toString(file, StandardCharsets.UTF_8), STRING_MAP_TYPE));
} }
private Map<String, String> parseTranslationFile(URL file) throws IOException { private Map<String, String> parseTranslationFile(URL file) throws IOException {
return gson.fromJson(Resources.toString(file, StandardCharsets.UTF_8), STRING_MAP_TYPE); return filterTranslations(gson.fromJson(Resources.toString(file, StandardCharsets.UTF_8), STRING_MAP_TYPE));
} }
private Optional<Map<String, String>> loadTranslationFile(String filename) { private Optional<Map<String, String>> loadTranslationFile(String filename) {
@ -112,12 +117,18 @@ public class TranslationManager {
return false; return false;
} }
checkedLocales.add(locale); checkedLocales.add(locale);
// Make a copy of the default language file
Map<String, String> baseTranslations = new HashMap<>();
if (!locale.equals(defaultLocale)) {
baseTranslations.putAll(getTranslationMap(defaultLocale));
}
Optional<Map<String, String>> langData = loadTranslationFile(locale.getLanguage() + "-" + locale.getCountry() + "/strings.json"); Optional<Map<String, String>> langData = loadTranslationFile(locale.getLanguage() + "-" + locale.getCountry() + "/strings.json");
if (!langData.isPresent()) { if (!langData.isPresent()) {
langData = loadTranslationFile(locale.getLanguage() + "/strings.json"); langData = loadTranslationFile(locale.getLanguage() + "/strings.json");
} }
if (langData.isPresent()) { if (langData.isPresent()) {
translationMap.put(locale, langData.get()); baseTranslations.putAll(langData.get());
translationMap.put(locale, baseTranslations);
return true; return true;
} }
if (locale.equals(defaultLocale)) { if (locale.equals(defaultLocale)) {