stef_buwalda/pism
1
0
Fork 0
mirror of https://github.com/2OOP/pism.git synced 2026-02-04 10:54:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

broken merge

Browse Source
This commit is contained in:
ramollia
2025-10-05 17:18:33 +02:00
parent f780309572
commit a50c1a8d0d
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/resourceBundles.xml generated
View File

@@ -18,6 +18,7 @@
<file url="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/localization_ka.properties" /> <file url="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/localization_ka.properties" />
<file url="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/localization_ko.properties" /> <file url="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/localization_ko.properties" />
<file url="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/localization_nl.properties" /> <file url="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/localization_nl.properties" />
<file url="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/localization_ru.properties" />
<file url="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/localization_zh.properties" /> <file url="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/localization_zh.properties" />
<custom-resource-bundle> <custom-resource-bundle>
<file value="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/Localization_de.properties" /> <file value="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/Localization_de.properties" />

10
app/src/main/java/org/toop/app/layer/layers/OptionsLayer.java
View File

@@ -4,8 +4,6 @@ import org.toop.app.App;
import org.toop.app.layer.Container; import org.toop.app.layer.Container;
import org.toop.app.layer.Layer; import org.toop.app.layer.Layer;
import org.toop.app.layer.containers.VerticalContainer; import org.toop.app.layer.containers.VerticalContainer;
import org.toop.framework.asset.ResourceManager;
import org.toop.framework.asset.resources.LocalizationAsset;
import org.toop.framework.asset.resources.SettingsAsset; import org.toop.framework.asset.resources.SettingsAsset;
import org.toop.framework.audio.events.AudioEvents; import org.toop.framework.audio.events.AudioEvents;
import org.toop.framework.eventbus.EventFlow; import org.toop.framework.eventbus.EventFlow;
@@ -18,9 +16,6 @@ import org.toop.local.AppSettings;
import java.util.Locale; import java.util.Locale;
public final class OptionsLayer extends Layer { public final class OptionsLayer extends Layer {
private Locale currentLocale = AppContext.getLocale();
private LocalizationAsset locale = ResourceManager.get("localization");
AppSettings appSettings = new AppSettings(); AppSettings appSettings = new AppSettings();
SettingsAsset settings = appSettings.getPath(); SettingsAsset settings = appSettings.getPath();
@@ -69,10 +64,6 @@ public final class OptionsLayer extends Layer {
} }
AppContext.setLocale(locale); AppContext.setLocale(locale);
this.currentLocale = AppContext.getLocale();
this.locale = ResourceManager.get("localization");
App.reloadAll(); App.reloadAll();
}); });
@@ -93,7 +84,6 @@ public final class OptionsLayer extends Layer {
}); });
languageBox.setValue(AppContext.getLocale()); languageBox.setValue(AppContext.getLocale());
languageBox.setValue(currentLocale);
} }
private void addVolumeSlider(Container container) { private void addVolumeSlider(Container container) {