From 9b27637d1e09439bccaf9e62bec7910d5688dfe3 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Mon, 14 Jun 2021 21:39:59 +0200
Subject: [PATCH] #622 - added empty macro for built-in icon tab + localized
headlines
---
src/main/resources/languages/base_de.properties | 2 ++
src/main/resources/languages/base_en.properties | 2 ++
src/main/resources/templates/helpers/imageSelect.ftl | 10 +++++++---
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/languages/base_de.properties b/src/main/resources/languages/base_de.properties
index ac5cf554d..8f98ba346 100644
--- a/src/main/resources/languages/base_de.properties
+++ b/src/main/resources/languages/base_de.properties
@@ -152,6 +152,8 @@ delete.image.success=Erfolgreich gelöscht
delete.image.error.not.existing=Fehler: Bild mit ID {0} existiert nicht
upload.image.headline=Bild hochladen
available.images=Verfügbare Bilder
+icons.images=Eigene Bilder
+icons.builtin=Mitgelieferte Icons
notification.transaction.add.warning=Konto mit Sichtbarkeit "{0}" erlaubt keine neuen Buchungen!
diff --git a/src/main/resources/languages/base_en.properties b/src/main/resources/languages/base_en.properties
index 7613b905a..4c7f5f0a7 100644
--- a/src/main/resources/languages/base_en.properties
+++ b/src/main/resources/languages/base_en.properties
@@ -153,6 +153,8 @@ delete.image.success=Successfully deleted
delete.image.error.not.existing=Error: Image with ID {0} does not exist
upload.image.headline=Upload image
available.images=Available Images
+icons.images=Custom Images
+icons.builtin=Built-in Icons
notification.transaction.add.warning=Account with visibility "{0}" does not allow new transactions!
diff --git a/src/main/resources/templates/helpers/imageSelect.ftl b/src/main/resources/templates/helpers/imageSelect.ftl
index 8fed58958..a678f8067 100644
--- a/src/main/resources/templates/helpers/imageSelect.ftl
+++ b/src/main/resources/templates/helpers/imageSelect.ftl
@@ -27,12 +27,12 @@
<div class="row">
<div class="col s12">
<ul class="tabs">
- <li class="tab col s6"><a class="text-blue valign-wrapper active" href="#tabImages"><i class="fas fa-image"></i> Custom Images</a></li>
- <li class="tab col s6"><a class="text-blue valign-wrapper" href="#tabBuiltinIcons"><i class="fas fa-icons"></i> Built-in Icons</a></li>
+ <li class="tab col s6"><a class="text-blue valign-wrapper active" href="#tabImages"><i class="fas fa-image"></i> ${locale.getString(("icons.images"))}</a></li>
+ <li class="tab col s6"><a class="text-blue valign-wrapper" href="#tabBuiltinIcons"><i class="fas fa-icons"></i> ${locale.getString(("icons.builtin"))}</a></li>
</ul>
</div>
<div id="tabImages" class="col s12"><@tabImages/></div>
- <div id="tabBuiltinIcons" class="col s12">Built-in Icons</div>
+ <div id="tabBuiltinIcons" class="col s12"><@tabBuiltinIcons/></div>
</div>
</div>
<div class="modal-footer background-color">
@@ -65,6 +65,10 @@
</div>
</#macro>
+<#macro tabBuiltinIcons>
+
+</#macro>
+
<#macro uploadImageForm>
<form id="form-upload-image" method="post" action="<@s.url '/media/uploadImage'/>" enctype="multipart/form-data">
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
--
GitLab