From 6859c5fdb99cbc589b451ced76b4545f9add5cc1 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 19 Dec 2020 13:39:25 +0100
Subject: [PATCH] Fixed #555 - added description for switches on settings page
---
src/main/resources/languages/base_de.properties | 3 +++
src/main/resources/languages/base_en.properties | 3 +++
.../resources/templates/settings/settingsMacros.ftl | 12 ++++++++++++
3 files changed, 18 insertions(+)
diff --git a/src/main/resources/languages/base_de.properties b/src/main/resources/languages/base_de.properties
index 229d7bb78..2b78f209d 100644
--- a/src/main/resources/languages/base_de.properties
+++ b/src/main/resources/languages/base_de.properties
@@ -173,9 +173,11 @@ settings.currency=Währung
settings.rest=Übertrag
settings.rest.deactivated=Aus
settings.rest.activated=An
+settings.rest.description=Zeigt die Summe aller Einnahmen und Ausgaben aller vorherigen Monate als erste Buchung des Monats an
settings.darkTheme=Oberfläche
settings.darkTheme.deactivated=Hell
settings.darkTheme.activated=Dunkel
+settings.darkTheme.description=Das BudgetMaster Design
settings.backupReminder=Backuperinnerung
settings.backupReminder.deactivated=Aus
settings.backupReminder.activated=An
@@ -184,6 +186,7 @@ settings.updates=Updates
settings.updates.automatic=Automatische Updatesuche
settings.updates.automatic.deactivated=Aus
settings.updates.automatic.activated=An
+settings.updates.automatic.description=Automatisch nach verfügbaren Updates im Hintergrund suchen
settings.updates.search=Suchen
settings.updates.current.version=Installiert:
settings.updates.latest.version=Verfügbar:
diff --git a/src/main/resources/languages/base_en.properties b/src/main/resources/languages/base_en.properties
index c8eb808b3..72410c19f 100644
--- a/src/main/resources/languages/base_en.properties
+++ b/src/main/resources/languages/base_en.properties
@@ -172,9 +172,11 @@ settings.currency=Currency
settings.rest=Rest
settings.rest.deactivated=Off
settings.rest.activated=On
+settings.rest.description=Show the sum of all incomes and expenditures of all previous months as first month transaction
settings.darkTheme=Theme
settings.darkTheme.deactivated=Light
settings.darkTheme.activated=Dark
+settings.darkTheme.description=Select the BudgetMaster base theme
settings.backupReminder=Backup reminder
settings.backupReminder.deactivated=Off
settings.backupReminder.activated=On
@@ -183,6 +185,7 @@ settings.updates=Updates
settings.updates.automatic=Automatic Update Search
settings.updates.automatic.deactivated=Off
settings.updates.automatic.activated=On
+settings.updates.automatic.description=Automatically search for available updates in the background
settings.updates.search=Search
settings.updates.current.version=Installed:
settings.updates.latest.version=Available:
diff --git a/src/main/resources/templates/settings/settingsMacros.ftl b/src/main/resources/templates/settings/settingsMacros.ftl
index ae2936357..b965e0e62 100644
--- a/src/main/resources/templates/settings/settingsMacros.ftl
+++ b/src/main/resources/templates/settings/settingsMacros.ftl
@@ -15,6 +15,18 @@
<@switch "darkTheme" "useDarkTheme" settings.isUseDarkTheme()/>
<@switch "updates.automatic" "autoUpdateCheckEnabled" settings.isAutoUpdateCheckEnabled()/>
</div>
+ <div class="table-cell table-cell-spacer"></div>
+ <div class="table-cell">
+ <div class="switch-cell-margin">
+ <a class="btn btn-flat tooltipped text-color" data-position="bottom" data-tooltip="${locale.getString("settings.rest.description")}"><i class="material-icons">help_outline</i></a>
+ </div>
+ <div class="switch-cell-margin">
+ <a class="btn btn-flat tooltipped text-color" data-position="bottom" data-tooltip="${locale.getString("settings.darkTheme.description")}"><i class="material-icons">help_outline</i></a>
+ </div>
+ <div class="switch-cell-margin">
+ <a class="btn btn-flat tooltipped text-color" data-position="bottom" data-tooltip="${locale.getString("settings.updates.automatic.description")}"><i class="material-icons">help_outline</i></a>
+ </div>
+ </div>
</div>
</div>
</div>
--
GitLab