AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-12 00:47:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

manage account error: translate

Browse Source
This commit is contained in:
Bixilon 2020-10-25 13:42:42 +01:00
parent 066535be40
commit 723bcc3e55
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
5 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/de/bixilon/minosoft/data/locale/Strings.java
View File

@ -18,6 +18,7 @@ public enum Strings {
PASSWORD, PASSWORD,
OFFLINE, OFFLINE,
CONNECTING, CONNECTING,
ERROR,
ADD_SERVER_DIALOG_TITLE, ADD_SERVER_DIALOG_TITLE,
ADD_SERVER_DIALOG_HEADER, ADD_SERVER_DIALOG_HEADER,
@ -71,9 +72,15 @@ public enum Strings {
SETTINGS_GENERAL_LOG_LEVEL, SETTINGS_GENERAL_LOG_LEVEL,
SETTINGS_DOWNLOAD, SETTINGS_DOWNLOAD,
MANAGE_ACCOUNTS_TITLE,
MANAGE_ACCOUNTS_NO_ACCOUNT_ERROR_TITLE,
MANAGE_ACCOUNTS_NO_ACCOUNT_ERROR_HEADER,
MANAGE_ACCOUNTS_NO_ACCOUNT_ERROR_ERROR,
MANAGE_ACCOUNTS_NO_ACCOUNT_ERROR,
LOGIN_DIALOG_TITLE, LOGIN_DIALOG_TITLE,
LOGIN_DIALOG_HEADER, LOGIN_DIALOG_HEADER,
LOGIN_ERROR,
MINOSOFT_STILL_STARTING_TITLE, MINOSOFT_STILL_STARTING_TITLE,
MINOSOFT_STILL_STARTING_HEADER, MINOSOFT_STILL_STARTING_HEADER,

2
src/main/java/de/bixilon/minosoft/gui/main/AccountWindow.java
View File

@ -96,7 +96,7 @@ public class AccountWindow implements Initializable {
error.setStyle("-fx-text-fill: red"); error.setStyle("-fx-text-fill: red");
error.setText(attempt.getError()); error.setText(attempt.getError());
grid.add(new Label(LocaleManager.translate(Strings.LOGIN_ERROR)), 0, 2); grid.add(new Label(LocaleManager.translate(Strings.ERROR)), 0, 2);
grid.add(error, 1, 2); grid.add(error, 1, 2);
// ToDo resize window // ToDo resize window
}); });

8
src/main/java/de/bixilon/minosoft/gui/main/MainWindow.java
View File

@ -58,15 +58,15 @@ public class MainWindow implements Initializable {
Parent parent = new FXMLLoader(MainWindow.class.getResource("/layout/accounts.fxml")).load(); Parent parent = new FXMLLoader(MainWindow.class.getResource("/layout/accounts.fxml")).load();
Stage stage = new Stage(); Stage stage = new Stage();
stage.initModality(Modality.APPLICATION_MODAL); stage.initModality(Modality.APPLICATION_MODAL);
stage.setTitle("Manage accounts - Minosoft"); stage.setTitle(LocaleManager.translate(Strings.MANAGE_ACCOUNTS_NO_ACCOUNT_ERROR_TITLE));
stage.setScene(new Scene(parent)); stage.setScene(new Scene(parent));
Platform.setImplicitExit(false); Platform.setImplicitExit(false);
stage.setOnCloseRequest(event -> { stage.setOnCloseRequest(event -> {
if (Minosoft.getSelectedAccount() == null) { if (Minosoft.getSelectedAccount() == null) {
event.consume(); event.consume();
Alert alert = new Alert(Alert.AlertType.WARNING, "Error", ButtonType.CANCEL, ButtonType.OK); Alert alert = new Alert(Alert.AlertType.WARNING, LocaleManager.translate(Strings.ERROR), ButtonType.CANCEL, ButtonType.OK);
alert.setHeaderText("Are you sure?"); alert.setHeaderText(LocaleManager.translate(Strings.MANAGE_ACCOUNTS_NO_ACCOUNT_ERROR_HEADER));
alert.setContentText("No account selected, Minosoft will exit."); alert.setContentText(LocaleManager.translate(Strings.MANAGE_ACCOUNTS_NO_ACCOUNT_ERROR_ERROR));
alert.showAndWait().ifPresent((type) -> { alert.showAndWait().ifPresent((type) -> {
if (type == ButtonType.OK) { if (type == ButtonType.OK) {
System.exit(0); System.exit(0);

8
src/main/resources/assets/locale/de_DE.json
View File

@ -56,7 +56,11 @@
"SETTINGS_DOWNLOAD": "Download", "SETTINGS_DOWNLOAD": "Download",
"LOGIN_DIALOG_TITLE": "Anmelden - Minosoft", "LOGIN_DIALOG_TITLE": "Anmelden - Minosoft",
"LOGIN_DIALOG_HEADER": "Bitte gib deine Zugangsdaten ein um fortzufahren", "LOGIN_DIALOG_HEADER": "Bitte gib deine Zugangsdaten ein um fortzufahren",
"LOGIN_ERROR": "Fehler", "ERROR": "Fehler",
"MINOSOFT_STILL_STARTING_TITLE": "Bitte warten", "MINOSOFT_STILL_STARTING_TITLE": "Bitte warten",
"MINOSOFT_STILL_STARTING_HEADER": "Minosoft braucht noch um zu starten..." "MINOSOFT_STILL_STARTING_HEADER": "Minosoft braucht noch um zu starten...",
"MANAGE_ACCOUNTS_TITLE": "Nutzer verwalten",
"MANAGE_ACCOUNTS_NO_ACCOUNT_ERROR_TITLE": "Nutzer verwalten",
"MANAGE_ACCOUNTS_NO_ACCOUNT_ERROR_HEADER": "Bist du sicher?",
"MANAGE_ACCOUNTS_NO_ACCOUNT_ERROR_ERROR": "Du hast noch keinen Account ausgewählt. Minosoft wird beendet."
} }

8
src/main/resources/assets/locale/en_US.json
View File

@ -56,7 +56,11 @@
"SETTINGS_DOWNLOAD": "Download", "SETTINGS_DOWNLOAD": "Download",
"LOGIN_DIALOG_TITLE": "Login - Minosoft", "LOGIN_DIALOG_TITLE": "Login - Minosoft",
"LOGIN_DIALOG_HEADER": "Please login to your mojang account", "LOGIN_DIALOG_HEADER": "Please login to your mojang account",
"LOGIN_ERROR": "Error", "ERROR": "Error",
"MINOSOFT_STILL_STARTING_TITLE": "Please wait", "MINOSOFT_STILL_STARTING_TITLE": "Please wait",
"MINOSOFT_STILL_STARTING_HEADER": "Minosoft is still starting up..." "MINOSOFT_STILL_STARTING_HEADER": "Minosoft is still starting up...",
"MANAGE_ACCOUNTS_TITLE": "Manage accounts",
"MANAGE_ACCOUNTS_NO_ACCOUNT_ERROR_TITLE": "Manage accounts",
"MANAGE_ACCOUNTS_NO_ACCOUNT_ERROR_HEADER": "Are you sure?",
"MANAGE_ACCOUNTS_NO_ACCOUNT_ERROR_ERROR": "No account selected, Minosoft will exit."
} }