From dfda287c512f14cd83ee1e6244d18a21e61bc65a Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 10 Mar 2018 14:54:42 +0100
Subject: [PATCH] #286 - localized navbar
---
src/main/resources/languages/_de.properties | 27 ++++++++++++---------
src/main/resources/languages/_en.properties | 27 ++++++++++++---------
src/main/resources/templates/navbar.ftl | 27 +++++++++++----------
3 files changed, 46 insertions(+), 35 deletions(-)
diff --git a/src/main/resources/languages/_de.properties b/src/main/resources/languages/_de.properties
index d9d3cdd54..2e20b7dab 100644
--- a/src/main/resources/languages/_de.properties
+++ b/src/main/resources/languages/_de.properties
@@ -1,8 +1,8 @@
# DEFAULT
app.name=BudgetMaster
-version.code=13
-version.name=1.8.0
-version.date=17.12.17
+version.code=14
+version.name=2.0.0
+version.date=10.03.18
author=Robert Goldmann
credits=L�nderflaggen von Freepik auf https://www.flaticon.com\nVerwendete Schriftarten: OpenSans\nVerwendete Bibliotheken:\ngson 2.8.1\njoda-time 2.9.7\nitextpdf 5.0.6\nlaunch4j-maven-plugin 1.7.21\nspark-core 2.5.4\nslf4j 1.7.21\nmysql-connector 6.0.5\njunit 4.12\nsqlite-jdbc 3.21.0
@@ -269,14 +269,19 @@ search.by.tags=Tags
search.by.amount=Betrag eingrenzen
search.button.search=Suchen
-gui.tab.home=Startseite
-gui.tab.payments=Buchungen
-gui.tab.categories=Kategorien
-gui.tab.charts=Diagramme
-gui.tab.report=Monatsbericht
-gui.tab.settings=Einstellungen
-
-hometab.categorybudgets=Verbrauch nach Kategorien
+menu.home=Startseite
+menu.payments=Buchungen
+menu.categories=Kategorien
+menu.charts=Diagramme
+menu.charts.chartCategories=Eingaben/Ausgaben nach Kategorien
+menu.charts.chartMonth=Eingaben/Ausgaben pro Monat
+menu.charts.chartTags=Eingaben/Ausgaben nach Tags
+menu.charts.chartCategoryBudget=Verbrauch nach Kategorien
+menu.charts.chartHistogram=Histogramm
+menu.reports=Berichte
+menu.settings=Einstellungen
+menu.about=�ber
+menu.logout=Logout
category.new.label.name=Name
diff --git a/src/main/resources/languages/_en.properties b/src/main/resources/languages/_en.properties
index 3cbfdd148..46285c6a6 100644
--- a/src/main/resources/languages/_en.properties
+++ b/src/main/resources/languages/_en.properties
@@ -1,8 +1,8 @@
# DEFAULT
app.name=BudgetMaster
-version.code=13
-version.name=1.8.0
-version.date=17.12.17
+version.code=14
+version.name=2.0.0
+version.date=10.03.18
author=Robert Goldmann
credits=Flags by Freepik on https://www.flaticon.com\nFonts used: OpenSans\nLibraries used:\ngson 2.8.1\njoda-time 2.9.7\nitextpdf 5.0.6\nlaunch4j-maven-plugin 1.7.21\nspark-core 2.5.4\nslf4j 1.7.21\nmysql-connector 6.0.5\njunit 4.12\nsqlite-jdbc 3.21.0
@@ -269,14 +269,19 @@ search.by.category.name=Category Name
search.by.amount=Limit Amount
search.button.search=Search
-gui.tab.home=Home
-gui.tab.payments=Payments
-gui.tab.categories=Categories
-gui.tab.charts=Charts
-gui.tab.report=Month Report
-gui.tab.settings=Settings
-
-hometab.categorybudgets=Consumption by categories
+menu.home=Home
+menu.payments=Payments
+menu.categories=Categories
+menu.charts=Charts
+menu.charts.chartCategories=Income/Payments per Category
+menu.charts.chartMonth=Income/Payments per Month
+menu.charts.chartTags=Income/Payments per Tag
+menu.charts.chartCategoryBudget=Consumption by categories
+menu.charts.chartHistogram=Histogram
+menu.reports=Reports
+menu.settings=Settings
+menu.about=About
+menu.logout=Logout
category.new.label.name=Name
diff --git a/src/main/resources/templates/navbar.ftl b/src/main/resources/templates/navbar.ftl
index 38f8e8155..048081bf2 100644
--- a/src/main/resources/templates/navbar.ftl
+++ b/src/main/resources/templates/navbar.ftl
@@ -1,28 +1,29 @@
<#macro navbar activeID>
+ <#assign locale = localization["tools.Localization"]>
<ul id="slide-out" class="side-nav fixed">
<!-- TODO: deselect everything when selecting a sublist-->
<@itemLogo/>
<@itemDivider/>
- <@itemWithIcon "home", "/", "Startseite", "home", activeID/>
- <@itemWithIcon "payments", "", "Buchungen", "list", activeID/>
- <@subListStart "Diagramme", "show_chart"/>
- <@itemPlain "chartCategories", "", "Eingaben/Ausgaben nach Kategorien", activeID/>
- <@itemPlain "chartMonth", "", "Eingaben/Ausgaben pro Monat", activeID/>
- <@itemPlain "chartTags", "", "Eingaben/Ausgaben nach Tags", activeID/>
- <@itemPlain "chartCategoryBudget", "", "Verbrauch nach Kategorien", activeID/>
- <@itemPlain "chartHistogram", "", "Histogramm", activeID/>
+ <@itemWithIcon "home", "/", locale.getString("menu.home"), "home", activeID/>
+ <@itemWithIcon "payments", "", locale.getString("menu.payments"), "list", activeID/>
+ <@subListStart locale.getString("menu.charts"), "show_chart"/>
+ <@itemPlain "chartCategories", "", locale.getString("menu.charts.chartCategories"), activeID/>
+ <@itemPlain "chartMonth", "", locale.getString("menu.charts.chartMonth"), activeID/>
+ <@itemPlain "chartTags", "", locale.getString("menu.charts.chartTags"), activeID/>
+ <@itemPlain "chartCategoryBudget", "", locale.getString("menu.charts.chartCategoryBudget"), activeID/>
+ <@itemPlain "chartHistogram", "", locale.getString("menu.charts.chartHistogram"), activeID/>
<@subListEnd/>
- <@itemWithIcon "reports", "", "Berichte", "description", activeID/>
- <@itemWithIcon "categories", "/categories", "Kategorien", "label", activeID/>
- <@itemWithIcon "settings", "", "Einstellungen", "settings", activeID/>
+ <@itemWithIcon "reports", "", locale.getString("menu.reports"), "description", activeID/>
+ <@itemWithIcon "categories", "/categories", locale.getString("menu.categories"), "label", activeID/>
+ <@itemWithIcon "settings", "", locale.getString("menu.settings"), "settings", activeID/>
<@itemDivider/>
- <@itemWithIcon "about", "", "Über", "info", activeID/>
+ <@itemWithIcon "about", "", locale.getString("menu.about"), "info", activeID/>
<@itemDivider/>
- <@itemWithIcon "logout", "", "Logout", "lock", activeID/>
+ <@itemWithIcon "logout", "", locale.getString("menu.logout") "lock", activeID/>
</ul>
<a href="#" data-activates="slide-out" id="mobile-menu" class="mobile-menu"><i class="material-icons left mobile-menu-icon">menu</i>Menü</a>
<div class="hide-on-large-only"><br></div>
--
GitLab