diff --git a/src/de/deadlocker8/budgetmaster/logic/utils/Strings.java b/src/de/deadlocker8/budgetmaster/logic/utils/Strings.java index f47f7f041be749c5caf2299dc89042527d34d446..545c847ae46f9d07c1a2af8f8929700f78ec63b0 100644 --- a/src/de/deadlocker8/budgetmaster/logic/utils/Strings.java +++ b/src/de/deadlocker8/budgetmaster/logic/utils/Strings.java @@ -54,6 +54,9 @@ public class Strings public static final String HOME_PLACEHOLDER = "home.placeholder"; public static final String HOME_BUDGET = "home.budget"; public static final String PAYMENTS_PLACEHOLDER = "payments.placeholder"; + public static final String URL_PLACEHOLDER = "url.placeholder"; + public static final String CURRENCY_PLACEHOLDER = "currency.placeholder"; + public static final String TRUSTED_HOSTS_PLACEHOLDER = "trusted.hosts.placeholder"; //REPORT public static final String REPORT_POSITION = "report.position"; diff --git a/src/de/deadlocker8/budgetmaster/main/Main.java b/src/de/deadlocker8/budgetmaster/main/Main.java index f39eb711741b797a2c5dd2a9c4cc3c3fb0682a85..73c91eb6ac1c46defef78c913dd2ed899a148eed 100644 --- a/src/de/deadlocker8/budgetmaster/main/Main.java +++ b/src/de/deadlocker8/budgetmaster/main/Main.java @@ -48,7 +48,7 @@ public class Main extends Application @Override public void init() throws Exception { - Localization.init("de/deadlocker8/budgetmaster/main/"); + Localization.init("de/deadlocker8/budgetmaster/resources/"); Localization.loadLanguage(Locale.GERMANY); Parameters params = getParameters(); diff --git a/src/de/deadlocker8/budgetmaster/main/_de.properties b/src/de/deadlocker8/budgetmaster/resources/_de.properties similarity index 98% rename from src/de/deadlocker8/budgetmaster/main/_de.properties rename to src/de/deadlocker8/budgetmaster/resources/_de.properties index 86a43386e08ccdf2235d0a1eb69455877af74ec9..ac31dcf2c9bee063355263bc400670f7ce88c7b7 100644 --- a/src/de/deadlocker8/budgetmaster/main/_de.properties +++ b/src/de/deadlocker8/budgetmaster/resources/_de.properties @@ -52,6 +52,9 @@ cancel=Abbrechen home.placeholder=Keine Daten verf�gbar home.budget=von {0} verbleibend payments.placeholder=Keine Daten verf�gbar +url.placeholder=z.B. https://yourdomain.de +currency.placeholder=z.B. \u20AC, CHF, $ +trusted.hosts.placeholder=z.B. localhost # REPORT report.position=Nr. diff --git a/src/de/deadlocker8/budgetmaster/ui/controller/SettingsController.java b/src/de/deadlocker8/budgetmaster/ui/controller/SettingsController.java index 05c5f617e8020a56f3fd71f550c3873b7e305c32..82ae26746672aa2df805e55da07dcc52b80bffe8 100644 --- a/src/de/deadlocker8/budgetmaster/ui/controller/SettingsController.java +++ b/src/de/deadlocker8/budgetmaster/ui/controller/SettingsController.java @@ -91,10 +91,10 @@ public class SettingsController buttonExportDB.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(Colors.BACKGROUND_BUTTON_BLUE) + "; -fx-text-fill: white; -fx-font-weight: bold; -fx-font-size: 14;"); buttonImportDB.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(Colors.BACKGROUND_BUTTON_BLUE) + "; -fx-text-fill: white; -fx-font-weight: bold; -fx-font-size: 14;"); buttonDeleteDB.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(Colors.BACKGROUND_BUTTON_RED) + "; -fx-text-fill: white; -fx-font-weight: bold; -fx-font-size: 14;"); - //TODO - textFieldURL.setPromptText("z.B. https://yourdomain.de"); - textFieldCurrency.setPromptText("z.B. €, CHF, $"); - textAreaTrustedHosts.setPromptText("z.B. localhost"); + + textFieldURL.setPromptText(Localization.getString(Strings.URL_PLACEHOLDER)); + textFieldCurrency.setPromptText(Localization.getString(Strings.CURRENCY_PLACEHOLDER)); + textAreaTrustedHosts.setPromptText(Localization.getString(Strings.TRUSTED_HOSTS_PLACEHOLDER)); ToggleGroup toggleGroup = new ToggleGroup(); radioButtonRestActivated.setToggleGroup(toggleGroup);