diff --git a/src/de/deadlocker8/budgetmaster/logic/utils/Strings.java b/src/de/deadlocker8/budgetmaster/logic/utils/Strings.java
index f5544a5f8e089271d1081839b37a9e943052e796..faf2fe9f3b324cf05b46f6a474531e12500954ef 100644
--- a/src/de/deadlocker8/budgetmaster/logic/utils/Strings.java
+++ b/src/de/deadlocker8/budgetmaster/logic/utils/Strings.java
@@ -37,6 +37,10 @@ public class Strings
public static final String CATEGORIES_PLACEHOLDER = "categories.placeholder";
public static final String CHART_CATEGORIES_TITLE_INCOMES = "chart.categories.title.incomes";
public static final String CHART_CATEGORIES_TITLE_PAYMENTS = "chart.categories.title.payments";
+ public static final String OK = "ok";
+ public static final String CANCEL = "cancel";
+ public static final String HOME_PLACEHOLDER = "home.placeholder";
+ public static final String HOME_BUDGET = "home.budget";
//REPORT
public static final String REPORT_POSITION = "report.position";
@@ -68,7 +72,10 @@ public class Strings
public static final String MONTH_SEPTEMBER ="month.september";
public static final String MONTH_OCTOBER ="month.october";
public static final String MONTH_NOVEMBER ="month.november";
- public static final String MONTH_DECEMBER ="month.december";
+ public static final String MONTH_DECEMBER ="month.december";
+
+ //NOTIFICATION
+ public static final String NOTIFICATION_CHART_EXPORT = "notification.chart.export";
//INFO
public static final String INFO_TITLE_CATEGORY_DELETE = "info.title.category.delete";
@@ -78,11 +85,27 @@ public class Strings
public static final String INFO_TEXT_PAYMENT_REPEATING_DELETE = "info.text.payment.repeating.delete";
public static final String INFO_TEXT_PAYMENT_REPEATING_DELETE_ALL = "info.text.payment.repeating.delete.all";
public static final String INFO_TEXT_PAYMENT_REPEATING_DELETE_FUTURES = "info.text.payment.repeating.delete.futures";
- public static final String INFO_TEXT_PAYMENT_REPEATING_DELETE_CANCEL = "info.text.payment.repeating.delete.cancel";
public static final String INFO_FIRST_START = "info.first.start";
+ public static final String INFO_TITLE_CHART_EXPORT = "info.title.chart.export";
+ public static final String INFO_TEXT_CHART_EXPORT = "info.text.chart.export";
+ public static final String INFO_TEXT_CHART_EXPORT_OPEN_FOLDER = "info.text.chart.export.open.folder";
+ public static final String INFO_TEXT_CHART_EXPORT_OPEN_CHART = "info.text.chart.export.open.chart";
//WARNING
public static final String WARNING_ENDDATE_BEFORE_STARTDATE = "warning.enddate.before.startdate";
+ public static final String WARNING_EMPTY_WIDTH_IN_PIXELS = "warning.empty.width.in.pixels";
+ public static final String WARNING_INTEGER_WIDTH_IN_PIXELS = "warning.integer.width.in.pixels";
+ public static final String WARNING_EMPTY_HEIGHT_IN_PIXELS = "warning.empty.height.in.pixels";
+ public static final String WARNING_INTEGER_HEIGHT_IN_PIXELS = "warning.integer.height.in.pixels";
+ public static final String WARNING_EMPTY_SAVEPATH_CHART = "warning.empty.savepath.chart";
+ public static final String WARNING_EMPTY_CATEGORY_NAME = "warning.empty.category.name";
+ public static final String WARNING_EMPTY_PAYMENT_NAME = "warning.empty.payment.name";
+ public static final String WARNING_NAME_CHARACTER_LIMIT_REACHED_45 = "warning.name.character.limit.reached.45";
+ public static final String WARNING_NAME_CHARACTER_LIMIT_REACHED_150 = "warning.name.character.limit.reached.150";
+ public static final String WARNING_DESCRIPTION_CHARACTER_LIMIT_REACHED_150 = "warning.description.character.limit.reached.150";
+ public static final String WARNING_PAYMENT_AMOUNT = "warning.payment.amount";
+ public static final String WARNING_EMPTY_PAYMENT_DATE = "warning.empty.payment.date";
+ public static final String WARNING_PAYMENT_REPEATING = "warning.payment.repeating";
//ERROR
public static final String ERROR_UNKNOWN_HOST = "error.unknown.host";
@@ -95,4 +118,7 @@ public class Strings
public static final String ERROR_CREATE_UI = "error.create.ui";
public static final String ERROR_SERVER_CONNECTION = "error.server.connection";
public static final String ERROR_SERVER_CONNECTION_WITH_DETAILS = "error.server.connection.with.details";
+ public static final String ERROR_OPEN_FOLDER = "error.open.folder";
+ public static final String ERROR_OPEN_CHART = "error.open.chart";
+ public static final String ERROR_CHART_EXPORT = "error.chart.export";
}
\ No newline at end of file
diff --git a/src/de/deadlocker8/budgetmaster/main/_de.properties b/src/de/deadlocker8/budgetmaster/main/_de.properties
index 00b7f4f6f5bed322b11e808b1842507187441837..f332edaef0b1e127350524a17b491000c6d03f8f 100644
--- a/src/de/deadlocker8/budgetmaster/main/_de.properties
+++ b/src/de/deadlocker8/budgetmaster/main/_de.properties
@@ -35,6 +35,10 @@ chart.month.line.sum=Summe in {0}
categories.placeholder=Keine Kategorien verf�gbar
chart.categories.title.incomes=Einnahmen nach Kategorien
chart.categories.title.payments=Ausgaben nach Kategorien
+ok=OK
+cancel=Abbrechen
+home.placeholder=Keine Daten verf�gbar
+home.budget=von {0} verbleibend
# REPORT
report.position=Nr.
@@ -68,6 +72,9 @@ month.october=Oktober
month.november=November
month.december=Dezember
+# NOTIFICATION
+notification.chart.export=Diagramm erfolgreich exportiert.
+
# INFO
info.title.category.delete=Kategorie l�schen
info.text.category.delete=M�chtest du diese Kategorie wirklich unwiderruflich l�schen?
@@ -76,11 +83,27 @@ info.text.payment.delete=M
info.text.payment.repeating.delete=Es handelt sich um eine wiederkehrende Zahlung. Welche Zahlungen sollen gel�scht werden?
info.text.payment.repeating.delete.all=Alle
info.text.payment.repeating.delete.futures=Alle zuk�nftigen
-info.text.payment.repeating.delete.cancel=Abbrechen
info.first.start=Vor der ersten Benutzung musst du deine Serverdaten eingeben.
+info.title.chart.export=Erfolgreich erstellt
+info.text.chart.export=Das Diagramm wurde erfolgreich exportiert.
+info.text.chart.export.open.folder=Ordner �ffnen
+info.text.chart.export.open.chart=Diagramm �ffnen
# WARNING
-warning.enddate.before.startdate=Das Enddatum darf nicht vor dem Startdatum liegen.
+warning.enddate.before.startdate=Das Enddatum darf zeitlich nicht vor dem Startdatum liegen.
+warning.empty.width.in.pixels=Bitte gib eine Breite in Pixeln an.
+warning.integer.width.in.pixels=Nur ganzahlige Werte sind f�r das Feld Breite erlaubt.
+warning.empty.height.in.pixels=Bitte gib eine H�he in Pixeln an.
+warning.integer.height.in.pixels=Nur ganzahlige Werte sind f�r das Feld H�he erlaubt.
+warning.empty.savepath.chart=W�hle einen Speicherort f�r das Diagramm aus.
+warning.empty.category.name=Das Feld f�r den Namen darf nicht leer sein.
+warning.empty.payment.name=Das Feld f�r den Namen darf nicht leer sein.
+warning.name.character.limit.reached.45=Der Name darf maximal 45 Zeichen lang sein.
+warning.name.character.limit.reached.150=Der Name darf maximal 150 Zeichen lang sein.
+warning.description.character.limit.reached.150=Die Notiz darf maximal 150 Zeichen lang sein.
+warning.payment.amount=Gib eine g�ltige Zahl f�r den Betrag ein.
+warning.empty.payment.date=Bitte w�hle ein Datum aus.
+warning.payment.repeating=Wenn Wiederholung aktiviert ist d�rfen nicht beide Eingabefelder 0 sein.\n(Zur Deaktivierung der Wiederholung einfach die Checkbox abw�hlen)
# ERROR
error.unknown.host=Es konnte keine Verbindung mit dem Internet hergestellt werden.
@@ -93,3 +116,6 @@ error.500=Beim Ausf
error.create.ui=Beim Erstellen der Benutzeroberfl�che ist ein Fehler aufgetreten.
error.server.connection=Beim Herstellen der Verbindung zum Server ist ein Fehler aufgetreten. Bitte �berpr�fe deine Einstellungen.
error.server.connection.with.details=Beim Herstellen der Verbindung zum Server ist ein Fehler aufgetreten. Bitte �berpr�fe deine Einstellungen.\n\nFehlerdetails:\n{0}
+error.open.folder=Der Ordner konnte nicht ge�ffnet werden.\n\n{0}
+error.open.chart=Das Diagramm konnte nicht ge�ffnet werden.\n\n{0}
+error.chart.export=Beim Exportieren des Diagramms ist ein Fehler aufgetreten:\n\n{0}
diff --git a/src/de/deadlocker8/budgetmaster/ui/cells/PaymentCell.java b/src/de/deadlocker8/budgetmaster/ui/cells/PaymentCell.java
index 71e3b3e09828bc12d62c0ae0d5143827f4f71354..2ec8d494e3ebc17738df5d1ccb8d2ca297fc2f55 100644
--- a/src/de/deadlocker8/budgetmaster/ui/cells/PaymentCell.java
+++ b/src/de/deadlocker8/budgetmaster/ui/cells/PaymentCell.java
@@ -153,7 +153,7 @@ public class PaymentCell extends ListCell<Payment>
ButtonType buttonTypeOne = new ButtonType(Localization.getString(Strings.INFO_TEXT_PAYMENT_REPEATING_DELETE_ALL));
ButtonType buttonTypeTwo = new ButtonType(Localization.getString(Strings.INFO_TEXT_PAYMENT_REPEATING_DELETE_FUTURES));
- ButtonType buttonTypeCancel = new ButtonType(Localization.getString(Strings.INFO_TEXT_PAYMENT_REPEATING_DELETE_CANCEL), ButtonData.CANCEL_CLOSE);
+ ButtonType buttonTypeCancel = new ButtonType(Localization.getString(Strings.CANCEL), ButtonData.CANCEL_CLOSE);
alert.getButtonTypes().setAll(buttonTypeOne, buttonTypeTwo, buttonTypeCancel);
diff --git a/src/de/deadlocker8/budgetmaster/ui/controller/ExportChartController.java b/src/de/deadlocker8/budgetmaster/ui/controller/ExportChartController.java
index bae56d216d165f68fffd1c51d985cbb3c4d9b708..7fccd8c7d477058f3d1287c9d4278db31112821f 100644
--- a/src/de/deadlocker8/budgetmaster/ui/controller/ExportChartController.java
+++ b/src/de/deadlocker8/budgetmaster/ui/controller/ExportChartController.java
@@ -129,7 +129,14 @@ public class ExportChartController
String widthText = textFieldWidth.getText();
if(widthText == null || widthText.equals(""))
{
- AlertGenerator.showAlert(AlertType.WARNING, Localization.getString(Strings.TITLE_WARNING), "", "Bitte gib eine Breite in Pixeln an.", controller.getControlle().getIcon(), stage, null, false);
+ AlertGenerator.showAlert(AlertType.WARNING,
+ Localization.getString(Strings.TITLE_WARNING),
+ "",
+ Localization.getString(Strings.WARNING_EMPTY_WIDTH_IN_PIXELS),
+ controller.getControlle().getIcon(),
+ stage,
+ null,
+ false);
return;
}
@@ -140,14 +147,28 @@ public class ExportChartController
}
catch(Exception e)
{
- AlertGenerator.showAlert(AlertType.WARNING, Localization.getString(Strings.TITLE_WARNING), "", "Nur ganzahlige Werte sind für das Feld Breite erlaubt.", controller.getControlle().getIcon(), stage, null, false);
+ AlertGenerator.showAlert(AlertType.WARNING,
+ Localization.getString(Strings.TITLE_WARNING),
+ "",
+ Localization.getString(Strings.WARNING_INTEGER_WIDTH_IN_PIXELS),
+ controller.getControlle().getIcon(),
+ stage,
+ null,
+ false);
return;
}
String heightText = textFieldHeight.getText();
if(heightText == null || heightText.equals(""))
{
- AlertGenerator.showAlert(AlertType.WARNING, Localization.getString(Strings.TITLE_WARNING), "", "Bitte gib eine Höhe in Pixeln an.", controller.getControlle().getIcon(), stage, null, false);
+ AlertGenerator.showAlert(AlertType.WARNING,
+ Localization.getString(Strings.TITLE_WARNING),
+ "",
+ Localization.getString(Strings.WARNING_EMPTY_HEIGHT_IN_PIXELS),
+ controller.getControlle().getIcon(),
+ stage,
+ null,
+ false);
return;
}
@@ -158,13 +179,27 @@ public class ExportChartController
}
catch(Exception e)
{
- AlertGenerator.showAlert(AlertType.WARNING, Localization.getString(Strings.TITLE_WARNING), "", "Nur ganzahlige Werte sind für das Feld Höhe erlaubt.", controller.getControlle().getIcon(), stage, null, false);
+ AlertGenerator.showAlert(AlertType.WARNING,
+ Localization.getString(Strings.TITLE_WARNING),
+ "",
+ Localization.getString(Strings.WARNING_INTEGER_HEIGHT_IN_PIXELS),
+ controller.getControlle().getIcon(),
+ stage,
+ null,
+ false);
return;
}
if(savePath == null)
{
- AlertGenerator.showAlert(AlertType.WARNING, Localization.getString(Strings.TITLE_WARNING), "", "Wähle einen Speicherort für das Diagramm aus.", controller.getControlle().getIcon(), stage, null, false);
+ AlertGenerator.showAlert(AlertType.WARNING,
+ Localization.getString(Strings.TITLE_WARNING),
+ "",
+ Localization.getString(Strings.WARNING_EMPTY_SAVEPATH_CHART),
+ controller.getControlle().getIcon(),
+ stage,
+ null,
+ false);
return;
}
@@ -173,20 +208,20 @@ public class ExportChartController
try
{
ImageIO.write(SwingFXUtils.fromFXImage(image, null), "png", savePath);
- controller.getControlle().showNotification("Diagramm erfolgreich exportiert");
+ controller.getControlle().showNotification(Localization.getString(Strings.NOTIFICATION_CHART_EXPORT));
stage.close();
Alert alert = new Alert(AlertType.INFORMATION);
- alert.setTitle("Erfolgreich erstellt");
+ alert.setTitle(Localization.getString(Strings.INFO_TITLE_CHART_EXPORT));
alert.setHeaderText("");
- alert.setContentText("Das Diagramm wurde erfolgreich exportiert");
+ alert.setContentText(Localization.getString(Strings.INFO_TEXT_CHART_EXPORT));
Stage dialogStage = (Stage)alert.getDialogPane().getScene().getWindow();
dialogStage.getIcons().add(controller.getControlle().getIcon());
- ButtonType buttonTypeOne = new ButtonType("Ordner öffnen");
- ButtonType buttonTypeTwo = new ButtonType("Diagramm öffnen");
- ButtonType buttonTypeThree = new ButtonType("OK");
+ ButtonType buttonTypeOne = new ButtonType(Localization.getString(Strings.INFO_TEXT_CHART_EXPORT_OPEN_FOLDER));
+ ButtonType buttonTypeTwo = new ButtonType(Localization.getString(Strings.INFO_TEXT_CHART_EXPORT_OPEN_CHART));
+ ButtonType buttonTypeThree = new ButtonType(Localization.getString(Strings.OK));
alert.getButtonTypes().setAll(buttonTypeOne, buttonTypeTwo, buttonTypeThree);
Optional<ButtonType> result = alert.showAndWait();
@@ -199,7 +234,14 @@ public class ExportChartController
catch(IOException e1)
{
Logger.error(e1);
- AlertGenerator.showAlert(AlertType.ERROR, Localization.getString(Strings.TITLE_ERROR), "", "Der Ordner konnte nicht geöffnet werden\n\n" + e1.getMessage(), controller.getControlle().getIcon(), stage, null, false);
+ AlertGenerator.showAlert(AlertType.ERROR,
+ Localization.getString(Strings.TITLE_ERROR),
+ "",
+ Localization.getString(Strings.ERROR_OPEN_FOLDER, e1.getMessage()),
+ controller.getControlle().getIcon(),
+ stage,
+ null,
+ false);
}
}
else if (result.get() == buttonTypeTwo)
@@ -211,7 +253,14 @@ public class ExportChartController
catch(IOException e1)
{
Logger.error(e1);
- AlertGenerator.showAlert(AlertType.ERROR, Localization.getString(Strings.TITLE_ERROR), "", "Das Diagramm konnte nicht geöffnet werden\n\n" + e1.getMessage(), controller.getControlle().getIcon(), stage, null, false);
+ AlertGenerator.showAlert(AlertType.ERROR,
+ Localization.getString(Strings.TITLE_ERROR),
+ "",
+ Localization.getString(Strings.ERROR_OPEN_CHART, e1.getMessage()),
+ controller.getControlle().getIcon(),
+ stage,
+ null,
+ false);
}
}
else
@@ -222,7 +271,14 @@ public class ExportChartController
catch(IOException e)
{
Logger.error(e);
- AlertGenerator.showAlert(AlertType.ERROR, Localization.getString(Strings.TITLE_ERROR), "", "Beim Exportieren des Diagramms ist ein Fehler aufgetreten:\n\n" + e.getMessage(), controller.getControlle().getIcon(), stage, null, false);
+ AlertGenerator.showAlert(AlertType.ERROR,
+ Localization.getString(Strings.TITLE_ERROR),
+ "",
+ Localization.getString(Strings.ERROR_CHART_EXPORT, e.getMessage()),
+ controller.getControlle().getIcon(),
+ stage,
+ null,
+ false);
}
stage.close();
diff --git a/src/de/deadlocker8/budgetmaster/ui/controller/HomeController.java b/src/de/deadlocker8/budgetmaster/ui/controller/HomeController.java
index d87127aa2134f285417cef77284105918d09a8bf..24e807b0151109759ade30da8b5fc15f195ee1a8 100644
--- a/src/de/deadlocker8/budgetmaster/ui/controller/HomeController.java
+++ b/src/de/deadlocker8/budgetmaster/ui/controller/HomeController.java
@@ -6,6 +6,7 @@ import de.deadlocker8.budgetmaster.logic.Budget;
import de.deadlocker8.budgetmaster.logic.CategoryBudget;
import de.deadlocker8.budgetmaster.logic.utils.Colors;
import de.deadlocker8.budgetmaster.logic.utils.Helpers;
+import de.deadlocker8.budgetmaster.logic.utils.Strings;
import de.deadlocker8.budgetmaster.ui.Refreshable;
import de.deadlocker8.budgetmaster.ui.cells.CategoryBudgetCell;
import javafx.application.Platform;
@@ -19,6 +20,7 @@ import javafx.scene.control.ProgressBar;
import javafx.scene.layout.AnchorPane;
import javafx.util.Callback;
import tools.ConvertTo;
+import tools.Localization;
public class HomeController implements Refreshable
{
@@ -44,7 +46,7 @@ public class HomeController implements Refreshable
}
});
- Label labelPlaceholder = new Label("Keine Daten verfügbar");
+ Label labelPlaceholder = new Label(Localization.getString(Strings.HOME_PLACEHOLDER));
labelPlaceholder.setStyle("-fx-font-size: 16");
listView.setPlaceholder(labelPlaceholder);
@@ -98,7 +100,7 @@ public class HomeController implements Refreshable
{
labelBudget.setStyle("-fx-text-fill: " + ConvertTo.toRGBHexWithoutOpacity(Colors.TEXT));
}
- labelStartBudget.setText("von " + Helpers.getCurrencyString(budget.getIncomeSum(), currency) + " verbleibend");
+ labelStartBudget.setText(Localization.getString(Strings.HOME_BUDGET, Helpers.getCurrencyString(budget.getIncomeSum(), currency)));
double factor = remaining / budget.getIncomeSum();
if(factor < 0)
diff --git a/src/de/deadlocker8/budgetmaster/ui/controller/NewCategoryController.java b/src/de/deadlocker8/budgetmaster/ui/controller/NewCategoryController.java
index ad09a8290937bfaa8cc6337eb4f6db178b0af8d3..ba9e770d2d857844c25095c1d2581bf4181b638d 100644
--- a/src/de/deadlocker8/budgetmaster/ui/controller/NewCategoryController.java
+++ b/src/de/deadlocker8/budgetmaster/ui/controller/NewCategoryController.java
@@ -10,6 +10,7 @@ import de.deadlocker8.budgetmaster.logic.serverconnection.ExceptionHandler;
import de.deadlocker8.budgetmaster.logic.serverconnection.ServerConnection;
import de.deadlocker8.budgetmaster.logic.utils.Colors;
import de.deadlocker8.budgetmaster.logic.utils.Helpers;
+import de.deadlocker8.budgetmaster.logic.utils.Strings;
import de.deadlocker8.budgetmaster.ui.colorPick.ColorView;
import fontAwesome.FontIconType;
import javafx.fxml.FXML;
@@ -21,6 +22,7 @@ import javafx.stage.Stage;
import javafx.util.Duration;
import tools.AlertGenerator;
import tools.ConvertTo;
+import tools.Localization;
public class NewCategoryController
{
@@ -112,13 +114,27 @@ public class NewCategoryController
String name = textFieldName.getText();
if(name == null || name.equals(""))
{
- AlertGenerator.showAlert(AlertType.WARNING, "Warnung", "", "Das Feld für den Namen darf nicht leer sein.", controller.getIcon(), controller.getStage(), null, false);
+ AlertGenerator.showAlert(AlertType.WARNING,
+ Localization.getString(Strings.TITLE_WARNING),
+ "",
+ Localization.getString(Strings.WARNING_EMPTY_CATEGORY_NAME),
+ controller.getIcon(),
+ controller.getStage(),
+ null,
+ false);
return;
}
if(name.length() > 45)
{
- AlertGenerator.showAlert(AlertType.WARNING, "Warnung", "", "Der Name darf maximal 45 Zeichen lang sein.", controller.getIcon(), controller.getStage(), null, false);
+ AlertGenerator.showAlert(AlertType.WARNING,
+ Localization.getString(Strings.TITLE_WARNING),
+ "",
+ Localization.getString(Strings.WARNING_NAME_CHARACTER_LIMIT_REACHED_45),
+ controller.getIcon(),
+ controller.getStage(),
+ null,
+ false);
return;
}
diff --git a/src/de/deadlocker8/budgetmaster/ui/controller/NewPaymentController.java b/src/de/deadlocker8/budgetmaster/ui/controller/NewPaymentController.java
index b0b4d51f13def5ba7d8cb0aea65907eb7cd768e3..a4c3b8276c431fce6f48cdc1bbe157c03b103496 100644
--- a/src/de/deadlocker8/budgetmaster/ui/controller/NewPaymentController.java
+++ b/src/de/deadlocker8/budgetmaster/ui/controller/NewPaymentController.java
@@ -14,6 +14,7 @@ import de.deadlocker8.budgetmaster.logic.serverconnection.ExceptionHandler;
import de.deadlocker8.budgetmaster.logic.serverconnection.ServerConnection;
import de.deadlocker8.budgetmaster.logic.utils.Colors;
import de.deadlocker8.budgetmaster.logic.utils.Helpers;
+import de.deadlocker8.budgetmaster.logic.utils.Strings;
import de.deadlocker8.budgetmaster.ui.cells.ButtonCategoryCell;
import de.deadlocker8.budgetmaster.ui.cells.RepeatingDayCell;
import de.deadlocker8.budgetmaster.ui.cells.SmallCategoryCell;
@@ -37,6 +38,7 @@ import javafx.stage.Stage;
import logger.Logger;
import tools.AlertGenerator;
import tools.ConvertTo;
+import tools.Localization;
public class NewPaymentController
{
@@ -241,27 +243,55 @@ public class NewPaymentController
String name = textFieldName.getText();
if(name == null || name.equals(""))
{
- AlertGenerator.showAlert(AlertType.WARNING, "Warnung", "", "Das Feld für den Namen darf nicht leer sein.", controller.getIcon(), controller.getStage(), null, false);
+ AlertGenerator.showAlert(AlertType.WARNING,
+ Localization.getString(Strings.TITLE_WARNING),
+ "",
+ Localization.getString(Strings.WARNING_EMPTY_PAYMENT_NAME),
+ controller.getIcon(),
+ controller.getStage(),
+ null,
+ false);
return;
}
if(name.length() > 150)
{
- AlertGenerator.showAlert(AlertType.WARNING, "Warnung", "", "Der Name darf maximal 150 Zeichen lang sein.", controller.getIcon(), controller.getStage(), null, false);
+ AlertGenerator.showAlert(AlertType.WARNING,
+ Localization.getString(Strings.TITLE_WARNING),
+ "",
+ Localization.getString(Strings.WARNING_NAME_CHARACTER_LIMIT_REACHED_150),
+ controller.getIcon(),
+ controller.getStage(),
+ null,
+ false);
return;
}
String amountText = textFieldAmount.getText();
if(!amountText.matches("^-?\\d+(,\\d+)*(\\.\\d+(e\\d+)?)?$"))
{
- AlertGenerator.showAlert(AlertType.WARNING, "Warnung", "", "Gib eine gültige Zahl für den Betrag ein.", controller.getIcon(), controller.getStage(), null, false);
+ AlertGenerator.showAlert(AlertType.WARNING,
+ Localization.getString(Strings.TITLE_WARNING),
+ "",
+ Localization.getString(Strings.WARNING_PAYMENT_AMOUNT),
+ controller.getIcon(),
+ controller.getStage(),
+ null,
+ false);
return;
}
LocalDate date = datePicker.getValue();
if(date == null)
{
- AlertGenerator.showAlert(AlertType.WARNING, "Warnung", "", "Bitte wähle ein Datum aus.", controller.getIcon(), controller.getStage(), null, false);
+ AlertGenerator.showAlert(AlertType.WARNING,
+ Localization.getString(Strings.TITLE_WARNING),
+ "",
+ Localization.getString(Strings.WARNING_EMPTY_PAYMENT_DATE),
+ controller.getIcon(),
+ controller.getStage(),
+ null,
+ false);
return;
}
@@ -277,7 +307,14 @@ public class NewPaymentController
{
if(description.length() > 150)
{
- AlertGenerator.showAlert(AlertType.WARNING, "Warnung", "", "Die Notiz darf maximal 150 Zeichen lang sein.", controller.getIcon(), controller.getStage(), null, false);
+ AlertGenerator.showAlert(AlertType.WARNING,
+ Localization.getString(Strings.TITLE_WARNING),
+ "",
+ Localization.getString(Strings.WARNING_DESCRIPTION_CHARACTER_LIMIT_REACHED_150),
+ controller.getIcon(),
+ controller.getStage(),
+ null,
+ false);
return;
}
}
@@ -301,13 +338,27 @@ public class NewPaymentController
if(repeatingInterval == 0 && repeatingDay == 0)
{
- AlertGenerator.showAlert(AlertType.WARNING, "Warnung", "", "Wenn Wiederholung aktiviert ist dürfen nicht beide Eingabefelder 0 sein.\n(Zur Deaktivierung der Wiederholung einfach die Checkbox enthaken)", controller.getIcon(), controller.getStage(), null, false);
+ AlertGenerator.showAlert(AlertType.WARNING,
+ Localization.getString(Strings.TITLE_WARNING),
+ "",
+ Localization.getString(Strings.WARNING_PAYMENT_REPEATING),
+ controller.getIcon(),
+ controller.getStage(),
+ null,
+ false);
return;
}
if(datePickerEnddate.getValue() != null && datePickerEnddate.getValue().isBefore(date))
{
- AlertGenerator.showAlert(AlertType.WARNING, "Warnung", "", "Das Enddatum darf zeitlich nicht vor dem Datum der Zahlung liegen.", controller.getIcon(), controller.getStage(), null, false);
+ AlertGenerator.showAlert(AlertType.WARNING,
+ Localization.getString(Strings.TITLE_WARNING),
+ "",
+ Localization.getString(Strings.WARNING_ENDDATE_BEFORE_STARTDATE),
+ controller.getIcon(),
+ controller.getStage(),
+ null,
+ false);
return;
}