From 6bfa272533f8d3ffdcc06c6a1eb3e1efc17918bc Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 1 Jul 2018 11:54:27 +0200
Subject: [PATCH] refactoring
---
src/main/resources/templates/about.ftl | 1 -
src/main/resources/templates/accounts/accounts.ftl | 1 -
src/main/resources/templates/accounts/newAccount.ftl | 1 -
src/main/resources/templates/categories/categories.ftl | 1 -
src/main/resources/templates/categories/newCategory.ftl | 1 -
src/main/resources/templates/datePicker.ftl | 2 --
src/main/resources/templates/emptyPage.ftl | 1 -
src/main/resources/templates/error/403.ftl | 2 --
src/main/resources/templates/error/404.ftl | 1 -
src/main/resources/templates/error/418.ftl | 1 -
src/main/resources/templates/error/500.ftl | 1 -
src/main/resources/templates/header.ftl | 1 +
src/main/resources/templates/index.ftl | 1 -
src/main/resources/templates/login.ftl | 1 -
src/main/resources/templates/navbar.ftl | 1 -
src/main/resources/templates/payments/newPayment.ftl | 2 --
src/main/resources/templates/payments/payments.ftl | 1 -
src/main/resources/templates/settings.ftl | 1 -
src/main/resources/templates/validation.ftl | 1 -
19 files changed, 1 insertion(+), 21 deletions(-)
diff --git a/src/main/resources/templates/about.ftl b/src/main/resources/templates/about.ftl
index a0608e80e..657d884d4 100644
--- a/src/main/resources/templates/about.ftl
+++ b/src/main/resources/templates/about.ftl
@@ -2,7 +2,6 @@
<head>
<#import "header.ftl" as header>
<@header.header "BudgetMaster"/>
- <#assign locale = static["tools.Localization"]>
</head>
<body class="budgetmaster-blue-light">
<#import "navbar.ftl" as navbar>
diff --git a/src/main/resources/templates/accounts/accounts.ftl b/src/main/resources/templates/accounts/accounts.ftl
index 42eb98dc5..3352bae6b 100644
--- a/src/main/resources/templates/accounts/accounts.ftl
+++ b/src/main/resources/templates/accounts/accounts.ftl
@@ -2,7 +2,6 @@
<head>
<#import "../header.ftl" as header>
<@header.header "BudgetMaster"/>
- <#assign locale = static["tools.Localization"]>
</head>
<body class="budgetmaster-blue-light">
<#import "../navbar.ftl" as navbar>
diff --git a/src/main/resources/templates/accounts/newAccount.ftl b/src/main/resources/templates/accounts/newAccount.ftl
index f7163afb9..ca1bec06e 100644
--- a/src/main/resources/templates/accounts/newAccount.ftl
+++ b/src/main/resources/templates/accounts/newAccount.ftl
@@ -2,7 +2,6 @@
<head>
<#import "../header.ftl" as header>
<@header.header "BudgetMaster"/>
- <#assign locale = static["tools.Localization"]>
</head>
<body class="budgetmaster-blue-light">
<#import "../navbar.ftl" as navbar>
diff --git a/src/main/resources/templates/categories/categories.ftl b/src/main/resources/templates/categories/categories.ftl
index b0f735776..0612bfa61 100644
--- a/src/main/resources/templates/categories/categories.ftl
+++ b/src/main/resources/templates/categories/categories.ftl
@@ -3,7 +3,6 @@
<#import "../header.ftl" as header>
<@header.header "BudgetMaster"/>
<@header.style "categories"/>
- <#assign locale = static["tools.Localization"]>
</head>
<body class="budgetmaster-blue-light">
<#import "../navbar.ftl" as navbar>
diff --git a/src/main/resources/templates/categories/newCategory.ftl b/src/main/resources/templates/categories/newCategory.ftl
index cbfaddc63..53b1bbd0a 100644
--- a/src/main/resources/templates/categories/newCategory.ftl
+++ b/src/main/resources/templates/categories/newCategory.ftl
@@ -4,7 +4,6 @@
<@header.header "BudgetMaster"/>
<@header.style "spectrum"/>
<@header.style "categories"/>
- <#assign locale = static["tools.Localization"]>
</head>
<body class="budgetmaster-blue-light">
<#import "../navbar.ftl" as navbar>
diff --git a/src/main/resources/templates/datePicker.ftl b/src/main/resources/templates/datePicker.ftl
index 0724e80ef..b960460d6 100644
--- a/src/main/resources/templates/datePicker.ftl
+++ b/src/main/resources/templates/datePicker.ftl
@@ -1,5 +1,4 @@
<#macro datePicker fullDate target>
- <#assign locale = static["tools.Localization"]>
<div class="container">
<div class="section center-align">
<a href="/previousMonth?target=${target}" class="waves-effect text-color"><i class="material-icons icon-chevron">chevron_left</i></a>
@@ -37,7 +36,6 @@
</#macro>
<#macro datePickerLocalization>
- <#assign locale = static["tools.Localization"]>
<#-- localization for scripts -->
<script>
<#assign monthNames = "">
diff --git a/src/main/resources/templates/emptyPage.ftl b/src/main/resources/templates/emptyPage.ftl
index 7ccc7abc3..2743060b0 100644
--- a/src/main/resources/templates/emptyPage.ftl
+++ b/src/main/resources/templates/emptyPage.ftl
@@ -2,7 +2,6 @@
<head>
<#import "header.ftl" as header>
<@header.header "BudgetMaster"/>
- <#assign locale = static["tools.Localization"]>
</head>
<body class="budgetmaster-blue-light">
<#import "navbar.ftl" as navbar>
diff --git a/src/main/resources/templates/error/403.ftl b/src/main/resources/templates/error/403.ftl
index 8e2974fc1..134cc2a16 100644
--- a/src/main/resources/templates/error/403.ftl
+++ b/src/main/resources/templates/error/403.ftl
@@ -3,8 +3,6 @@
<#import "../header.ftl" as header>
<@header.header "BudgetMaster - 403"/>
<@header.style "login"/>
-
- <#assign locale = static["tools.Localization"]>
</head>
<body class="budgetmaster-blue-light">
<main>
diff --git a/src/main/resources/templates/error/404.ftl b/src/main/resources/templates/error/404.ftl
index fbf7d336a..70065b245 100644
--- a/src/main/resources/templates/error/404.ftl
+++ b/src/main/resources/templates/error/404.ftl
@@ -3,7 +3,6 @@
<#import "../header.ftl" as header>
<@header.header "BudgetMaster - 404"/>
<@header.style "login"/>
- <#assign locale = static["tools.Localization"]>
</head>
<body class="budgetmaster-blue-light">
<main>
diff --git a/src/main/resources/templates/error/418.ftl b/src/main/resources/templates/error/418.ftl
index 93bec7d37..df20e2a2f 100644
--- a/src/main/resources/templates/error/418.ftl
+++ b/src/main/resources/templates/error/418.ftl
@@ -3,7 +3,6 @@
<#import "../header.ftl" as header>
<@header.header "BudgetMaster - 418">
<@header.style "login"/>
- <#assign locale = static["tools.Localization"]>
</head>
<body class="budgetmaster-blue-light">
<main>
diff --git a/src/main/resources/templates/error/500.ftl b/src/main/resources/templates/error/500.ftl
index b6b2945d3..6539b8331 100644
--- a/src/main/resources/templates/error/500.ftl
+++ b/src/main/resources/templates/error/500.ftl
@@ -3,7 +3,6 @@
<#import "../header.ftl" as header>
<@header.header "BudgetMaster - 500"/>
<@header.style "login"/>
- <#assign locale = static["tools.Localization"]>
</head>
<body class="budgetmaster-blue-light">
<main>
diff --git a/src/main/resources/templates/header.ftl b/src/main/resources/templates/header.ftl
index 76a1d9936..963eaf055 100644
--- a/src/main/resources/templates/header.ftl
+++ b/src/main/resources/templates/header.ftl
@@ -14,6 +14,7 @@
<link rel="stylesheet" href="/materialize-0.100.2/css/materialize.min.css">
<@style "style"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+ <#global locale = static["tools.Localization"]>
<#if helpers.getSettings().isUseDarkTheme()>
<#global greenTextColor="text-green"/>
diff --git a/src/main/resources/templates/index.ftl b/src/main/resources/templates/index.ftl
index d36bd1fea..a88d8e7b8 100644
--- a/src/main/resources/templates/index.ftl
+++ b/src/main/resources/templates/index.ftl
@@ -2,7 +2,6 @@
<head>
<#import "header.ftl" as header>
<@header.header "BudgetMaster"/>
- <#assign locale = static["tools.Localization"]>
</head>
<body class="budgetmaster-blue-light">
<#import "navbar.ftl" as navbar>
diff --git a/src/main/resources/templates/login.ftl b/src/main/resources/templates/login.ftl
index 1b47507ea..86a22cd62 100644
--- a/src/main/resources/templates/login.ftl
+++ b/src/main/resources/templates/login.ftl
@@ -3,7 +3,6 @@
<#import "header.ftl" as header>
<@header.header "BudgetMaster"/>
<@header.style "login"/>
- <#assign locale = static["tools.Localization"]>
</head>
<body class="budgetmaster-blue-light">
<main>
diff --git a/src/main/resources/templates/navbar.ftl b/src/main/resources/templates/navbar.ftl
index 9e69c909b..4fdfe094d 100644
--- a/src/main/resources/templates/navbar.ftl
+++ b/src/main/resources/templates/navbar.ftl
@@ -1,5 +1,4 @@
<#macro navbar activeID>
- <#assign locale = static["tools.Localization"]>
<ul id="slide-out" class="side-nav fixed">
<@itemLogo/>
<@itemDivider/>
diff --git a/src/main/resources/templates/payments/newPayment.ftl b/src/main/resources/templates/payments/newPayment.ftl
index ddf35ad3a..4b5407cee 100644
--- a/src/main/resources/templates/payments/newPayment.ftl
+++ b/src/main/resources/templates/payments/newPayment.ftl
@@ -4,8 +4,6 @@
<@header.header "BudgetMaster"/>
<@header.style "payments"/>
<@header.style "datepicker"/>
-
- <#assign locale = static["tools.Localization"]>
</head>
<body class="budgetmaster-blue-light">
<#import "../navbar.ftl" as navbar>
diff --git a/src/main/resources/templates/payments/payments.ftl b/src/main/resources/templates/payments/payments.ftl
index 107f51bc5..0922f412b 100644
--- a/src/main/resources/templates/payments/payments.ftl
+++ b/src/main/resources/templates/payments/payments.ftl
@@ -3,7 +3,6 @@
<#import "../header.ftl" as header>
<@header.header "BudgetMaster"/>
<@header.style "categories"/>
- <#assign locale = static["tools.Localization"]>
</head>
<body class="budgetmaster-blue-light">
<#import "../navbar.ftl" as navbar>
diff --git a/src/main/resources/templates/settings.ftl b/src/main/resources/templates/settings.ftl
index 2dbd3e71e..30957c600 100644
--- a/src/main/resources/templates/settings.ftl
+++ b/src/main/resources/templates/settings.ftl
@@ -2,7 +2,6 @@
<head>
<#import "header.ftl" as header>
<@header.header "BudgetMaster"/>
- <#assign locale = static["tools.Localization"]>
</head>
<body class="budgetmaster-blue-light">
<#import "navbar.ftl" as navbar>
diff --git a/src/main/resources/templates/validation.ftl b/src/main/resources/templates/validation.ftl
index 8ec4f9190..66ef66110 100644
--- a/src/main/resources/templates/validation.ftl
+++ b/src/main/resources/templates/validation.ftl
@@ -1,5 +1,4 @@
<#macro validation fieldName classes="">
- <#assign locale = static["tools.Localization"]>
<#if error?? && error.hasFieldErrors(fieldName)>
class="tooltipped invalid ${classes}" data-position="bottom" data-delay="50" data-tooltip="${locale.getString(error.getFieldError(fieldName).getCode())}"
<#else>
--
GitLab