From ad93af9bb60e156b963280b783a05e4fbc49871a Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Thu, 16 Jun 2022 23:01:38 +0200
Subject: [PATCH] #696 - improved personalization settings layout
---
.../src/main/resources/languages/base_de.properties | 5 ++---
.../src/main/resources/languages/base_en.properties | 5 ++---
.../settings/containers/settingsPersonalization.ftl | 4 ----
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/BudgetMasterServer/src/main/resources/languages/base_de.properties b/BudgetMasterServer/src/main/resources/languages/base_de.properties
index 64a24ebe1..cff7dd408 100644
--- a/BudgetMasterServer/src/main/resources/languages/base_de.properties
+++ b/BudgetMasterServer/src/main/resources/languages/base_de.properties
@@ -269,9 +269,8 @@ 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=Design
-settings.darkTheme.deactivated=Hell
-settings.darkTheme.activated=Dunkel
-settings.darkTheme.description=Das BudgetMaster Design
+settings.darkTheme.deactivated=Helles Design
+settings.darkTheme.activated=Dunkles Design
settings.backupReminder=Backuperinnerung
settings.backupReminder.description=Erinnert pro Monat an die Erstellung eines manuellen Backups
settings.backupReminder.deactivated=Aus
diff --git a/BudgetMasterServer/src/main/resources/languages/base_en.properties b/BudgetMasterServer/src/main/resources/languages/base_en.properties
index 83ebe7d75..1787b68bb 100644
--- a/BudgetMasterServer/src/main/resources/languages/base_en.properties
+++ b/BudgetMasterServer/src/main/resources/languages/base_en.properties
@@ -270,9 +270,8 @@ 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.darkTheme.deactivated=Light Theme
+settings.darkTheme.activated=Dark Theme
settings.backupReminder=Backup reminder
settings.backupReminder.description=Automatically remind you once per month to perform a manual backup
settings.backupReminder.deactivated=Off
diff --git a/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsPersonalization.ftl b/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsPersonalization.ftl
index bd79e9ed2..111ad5ce4 100644
--- a/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsPersonalization.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsPersonalization.ftl
@@ -36,10 +36,6 @@
<!-- theme -->
<div class="row center-align">
- <div class="col col s12 m12 l8 offset-l2">
- <div class="headline-small">${locale.getString("settings.darkTheme")}</div>
- </div>
-
<div class="col col s6 m6 l4 offset-l2">
<div>${locale.getString("settings.darkTheme.deactivated")}</div>
<img class="responsive-img settings-preview-image <#if !settings.isUseDarkTheme()>settings-preview-image-selected</#if>" src="<@s.url '/images/settings/themeLight.png'/>" data-use-dark-theme="false"/>
--
GitLab