Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-01-06 16:37:58 +01:00
Code Issues Projects Releases Wiki Activity

Writing new locale now takes locale setting into account

Browse Source
This commit is contained in:
Rsl1122 2019-09-09 17:28:00 +03:00
parent 28153dd3e4
commit 6c4e241b4b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Plan/common/src/main/java/com/djrapitops/plan/settings/locale/LocaleSystem.java
View File

@ -105,7 +105,11 @@ public class LocaleSystem implements SubSystem {
private void writeNewDefaultLocale(File localeFile) { private void writeNewDefaultLocale(File localeFile) {
try { try {
new LocaleFileWriter(localeFile.exists() ? Locale.fromFile(localeFile) : locale).writeToFile(localeFile); Locale writing = loadSettingLocale().orElse(locale);
if (localeFile.exists()) {
writing.putAll(Locale.fromFile(localeFile));
}
new LocaleFileWriter(writing).writeToFile(localeFile);
} catch (IOException | IllegalStateException e) { } catch (IOException | IllegalStateException e) {
logger.error("Failed to write new Locale file at " + localeFile.getAbsolutePath()); logger.error("Failed to write new Locale file at " + localeFile.getAbsolutePath());
errorHandler.log(L.WARN, this.getClass(), e); errorHandler.log(L.WARN, this.getClass(), e);