diff --git a/src/main/resources/templates/about.ftl b/src/main/resources/templates/about.ftl index a0608e80e52d17d10d9a8665aee7cc1a721b7b61..657d884d4baab40b51f7831e266eda71aa396a8d 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 42eb98dc5d3dbbcd471db9ef50d76b47e91044d9..3352bae6b96757ae15c446e59b4626f12829c1c0 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 f7163afb9cbb87846928bff843d9c597b6dbc4c5..ca1bec06ebcf2e57f1dde4fbeee677681b531fb2 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 b0f735776cbefb47c119d86a35772e0e1cebbeca..0612bfa614268f19ad24218c24a05eeaac347756 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 cbfaddc6329d95c6b694d691a52f715cfeaef7e6..53b1bbd0a7b6b85c05845ad8ae1fac41f0a370a9 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 0724e80ef6d39c20e2b4dd1f4419f7b399f7950d..b960460d6c717eedf81379811b9e213f25d512a0 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 7ccc7abc31d7ad21938da435d71111bfa3707640..2743060b08a6bca1efb49b95713f2f989b498c31 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 8e2974fc120ebd8ad88738ff9d403daee5a6840e..134cc2a1650f2d136e072f2fbdcf8da8624b08a5 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 fbf7d336a7a47e17af154cf8f3c5af852bd8abd9..70065b24567480cd82f1610996544e60f86df138 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 93bec7d37b6b83be342056a5815340a393d3d9ee..df20e2a2f55a06474339c999f7fdc92fae7d39d4 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 b6b2945d3c2180704dad1c26e00eb55e501c5151..6539b8331c9be43388317731fb96760109427a6e 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 76a1d9936d9c755b2648aaea37c299fb0e1fbe48..963eaf055c369cc779e6af25f0430c9d96726294 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 d36bd1fea633dd85f68d8d6140415db0bde01009..a88d8e7b8d784aa7c546425cfe316af57592db3a 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 1b47507ea014877ade3457e111e8ee5fcd650a5b..86a22cd628c3048683514b508a0719660dd3b9d5 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 9e69c909b8acc98944619985b52cafd0775ae809..4fdfe094d6951eafd2a4dbd0b0f55c26eca20244 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 ddf35ad3aa7a8b2483360b4f3d4d50ae0ac38954..4b5407cee0965703eeb45cdf7a9d9751a4fafd51 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 107f51bc52730e968e022cf608fa52f0a5e200a2..0922f412b50cda491ff3b29c4cf292552eb0812c 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 2dbd3e71e6ed49c91ffd7363b44f1691749ae518..30957c600ec87da4b85853541afc287367f5e6d5 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 8ec4f91901439c56a28a6c5ea1334b9db1f6a290..66ef661101e9348600fe0c84140272d31a073731 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>