From c5e296d557c411f0d84d2ba35005a8f395ecbe90 Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Wed, 29 Jul 2026 13:48:08 +0200
Subject: [PATCH 1/2] replacing language injectable with computed property

---
 public/js/components/filter/Filter.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 3d44b51da..229acd607 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -92,7 +92,6 @@ export const CoreFilterCmpt = {
 			default: true
 		},
 	},
-	inject: ["language"],
 	data: function() {
 		return {
 			uuid: 0,
@@ -240,6 +239,9 @@ export const CoreFilterCmpt = {
 				...{ title: filterTitles[el.name] },
 			}));
 		},
+		language() {
+			return this.$p.user_language;
+		},
 	},
 	watch: {
 		"language.value": {

From 36fe0a0f3c2658a8fa9f4f044b76321601788fe0 Mon Sep 17 00:00:00 2001
From: adisposkofh <ma1434@technikum-wien.at>
Date: Wed, 29 Jul 2026 15:26:07 +0200
Subject: [PATCH 2/2] including non-localized column title in column filter
 collapsible

---
 public/js/components/filter/Filter.js | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 229acd607..5bdfd8010 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -825,7 +825,23 @@ export const CoreFilterCmpt = {
 			if (!this.tableBuilt) {
 				return {};
 			} else if (this.tabulator.options.locale) {
-				return this.tabulator.getLang().columns;
+				let result = this.tabulator.getLang().columns;
+				const columnFieldTitlePairs = this.tabulator
+					.getColumns()
+					.map((column) => {
+						const definition = column.getDefinition();
+						return [definition.field, definition.title];
+					});
+				columnFieldTitlePairs.forEach((fieldTitlePair) => {
+					if (
+						fieldTitlePair[0]?.length &&
+						fieldTitlePair[1]?.length &&
+						!(fieldTitlePair[0] in result)
+					) {
+						result[fieldTitlePair[0]] = fieldTitlePair[1];
+					}
+				});
+				return result;
 			}
 			return this.tabulator.getColumns().reduce((res, col) => {
 				res[col.getField()] = col.getDefinition().title;