Skip to content
Snippets Groups Projects
Commit e63a2ae5 authored by Robert Goldmann's avatar Robert Goldmann
Browse files

Fixed #127 - Move properties files to resources package

parent f258eec2
No related branches found
No related tags found
1 merge request!160merge v1_4_0 into master
...@@ -54,6 +54,9 @@ public class Strings ...@@ -54,6 +54,9 @@ public class Strings
public static final String HOME_PLACEHOLDER = "home.placeholder"; public static final String HOME_PLACEHOLDER = "home.placeholder";
public static final String HOME_BUDGET = "home.budget"; public static final String HOME_BUDGET = "home.budget";
public static final String PAYMENTS_PLACEHOLDER = "payments.placeholder"; 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 //REPORT
public static final String REPORT_POSITION = "report.position"; public static final String REPORT_POSITION = "report.position";
......
...@@ -48,7 +48,7 @@ public class Main extends Application ...@@ -48,7 +48,7 @@ public class Main extends Application
@Override @Override
public void init() throws Exception public void init() throws Exception
{ {
Localization.init("de/deadlocker8/budgetmaster/main/"); Localization.init("de/deadlocker8/budgetmaster/resources/");
Localization.loadLanguage(Locale.GERMANY); Localization.loadLanguage(Locale.GERMANY);
Parameters params = getParameters(); Parameters params = getParameters();
......
...@@ -52,6 +52,9 @@ cancel=Abbrechen ...@@ -52,6 +52,9 @@ cancel=Abbrechen
home.placeholder=Keine Daten verfügbar home.placeholder=Keine Daten verfügbar
home.budget=von {0} verbleibend home.budget=von {0} verbleibend
payments.placeholder=Keine Daten verfügbar 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
report.position=Nr. report.position=Nr.
......
...@@ -91,10 +91,10 @@ public class SettingsController ...@@ -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;"); 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;"); 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;"); 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"); textFieldURL.setPromptText(Localization.getString(Strings.URL_PLACEHOLDER));
textFieldCurrency.setPromptText("z.B. €, CHF, $"); textFieldCurrency.setPromptText(Localization.getString(Strings.CURRENCY_PLACEHOLDER));
textAreaTrustedHosts.setPromptText("z.B. localhost"); textAreaTrustedHosts.setPromptText(Localization.getString(Strings.TRUSTED_HOSTS_PLACEHOLDER));
ToggleGroup toggleGroup = new ToggleGroup(); ToggleGroup toggleGroup = new ToggleGroup();
radioButtonRestActivated.setToggleGroup(toggleGroup); radioButtonRestActivated.setToggleGroup(toggleGroup);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment