[statistics_reporting] i18n: Move tags used in code to separate file, delete unused tags

5 files changed, 42 insertions, 52 deletions

diff --git a/modules-available/statistics_reporting/inc/queries.inc.php b/modules-available/statistics_reporting/inc/queries.inc.php
index 77deb4f8..2b2ebb13 100644
--- a/modules-available/statistics_reporting/inc/queries.inc.php
+++ b/modules-available/statistics_reporting/inc/queries.inc.php
@@ -6,7 +6,7 @@ class Queries
 
 	// Client Data: Name, Time Online, Median Time Online, Time Offline, last start, last logout, Last Time Booted, Number of Sessions > 60Sec, Number of Sessions < 60Sec, name of location, id of location (anonymized), machine uuid (anonymized)
 	public static function getClientStatistics($from, $to, $lowerTimeBound = 0, $upperTimeBound = 24, $excludeToday = false) {
-		$notassigned = Dictionary::translateFile('template-tags', 'lang_notassigned');
+		$notassigned = Dictionary::translate('notAssigned', true);
 		$res = Database::simpleQuery("SELECT t1.name AS clientName, timeSum, medianTime, offlineSum, lastStart, lastLogout, longSessions, shortSessions, locName, MD5(CONCAT(locId, :salt)) AS locHash, MD5(CONCAT(t1.uuid, :salt)) AS clientHash FROM (
 													SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(sessionTable.length AS UNSIGNED)) AS 'timeSum', GROUP_CONCAT(sessionTable.length) AS 'medianTime', SUM(sessionTable.length >= 60) AS 'longSessions', SUM(sessionTable.length < 60) AS 'shortSessions',MAX(sessionTable.dateline + sessionTable.data) AS 'lastLogout', IFNULL(location.locationname, '$notassigned') AS 'locName', location.locationid AS 'locId'
 													FROM ".self::getBoundedTableQueryString('~session-length', $from, $to, $lowerTimeBound, $upperTimeBound)." sessionTable
@@ -27,7 +27,7 @@ class Queries
 
 	// Location Data: Name, ID (anonymized), Time Online, Median Time Online, Time Offline, Number of Sessions > 60Sec, Number of Sessions < 60Sec
 	public static function getLocationStatistics($from, $to, $lowerTimeBound = 0, $upperTimeBound = 24, $excludeToday = false) {
-		$notassigned = Dictionary::translateFile('template-tags', 'lang_notassigned');
+		$notassigned = Dictionary::translate('notAssigned', true);
 		$res = Database::simpleQuery("SELECT t1.locName AS locName, MD5(CONCAT(locId, :salt)) AS locHash, timeSum, medianTime, offlineSum, longSessions, shortSessions FROM (
 													SELECT IFNULL(location.locationname, '$notassigned') AS 'locName', location.locationid AS 'locId', SUM(CAST(sessionTable.length AS UNSIGNED)) AS 'timeSum', GROUP_CONCAT(sessionTable.length) AS 'medianTime', SUM(sessionTable.length >= 60) AS 'longSessions', SUM(sessionTable.length < 60) AS 'shortSessions'
 													FROM ".self::getBoundedTableQueryString('~session-length', $from, $to, $lowerTimeBound, $upperTimeBound)." sessionTable
diff --git a/modules-available/statistics_reporting/lang/de/module.json b/modules-available/statistics_reporting/lang/de/module.json
index bdbfe4fd..86ed5f45 100644
--- a/modules-available/statistics_reporting/lang/de/module.json
+++ b/modules-available/statistics_reporting/lang/de/module.json
@@ -1,4 +1,5 @@
 {
     "module_name": "Statistik Auswertung",
+    "notAssigned": "Nicht zugewiesen",
     "page_title": "Statistik Auswertung"
 }
\ No newline at end of file
diff --git a/modules-available/statistics_reporting/lang/de/template-tags.json b/modules-available/statistics_reporting/lang/de/template-tags.json
index 73c39e1e..d4d7887a 100644
--- a/modules-available/statistics_reporting/lang/de/template-tags.json
+++ b/modules-available/statistics_reporting/lang/de/template-tags.json
@@ -1,34 +1,28 @@
 {
-    "lang_user": "Nutzer",
-    "lang_countLogins": "Anzahl Logins",
-    "lang_client": "Client",
-    "lang_vm": "VM",
-    "lang_sessions": "Sitzungen",
-    "lang_longSessions": "Sitzungen \u2265 60s",
-    "lang_shortSessions": "Sitzungen < 60s",
-    "lang_overallOfftime": "Insgesamte Zeit Offline",
-    "lang_totalOffTime": "Gesamtzeit Offline",
+    "lang_apply": "Anwenden",
     "lang_clientLogout": "Letzter VM Logout",
     "lang_clientStart": "Letzter Client Boot",
-    "lang_room": "Raum",
-    "lang_offTime": "Zeit seit Logout",
-    "lang_total": "Gesamt",
-    "lang_perlocation": "Pro Raum",
-    "lang_perclient": "Pro Client",
-    "lang_peruser": "Pro Benutzer",
-    "lang_pervm": "Pro VM",
     "lang_hostname": "Client Name",
-    "lang_location": "Raum",
-    "lang_medianSessionLength": "Mittlere Sitzungsdauer",
-    "lang_totalTime": "Gesamte Zeit",
     "lang_last1": "Heute",
-    "lang_last2": "Letzten 2 Tage",
-    "lang_last7": "Letzten 7 Tage",
     "lang_last14": "Letzten 14 Tage",
+    "lang_last2": "Letzten 2 Tage",
     "lang_last30": "Letzten 30 Tage",
+    "lang_last7": "Letzten 7 Tage",
     "lang_last90": "Letzten 90 Tage",
-    "lang_apply": "Anwenden",
-    "lang_save": "Speichern",
-    "lang_notassigned": "NICHT ZUGEWIESEN",
-    "lang_reportingDescription": "Helfen Sie uns bwLehrpool, durch das wöchentliche, automatische Verschicken eines anonymisierten Statistikberichts, zu verbessern."
+    "lang_location": "Raum",
+    "lang_longSessions": "Sitzungen \u2265 60s",
+    "lang_medianSessionLength": "Mittlere Sitzungsdauer",
+    "lang_overallOfftime": "Insgesamte Zeit Offline",
+    "lang_perclient": "Pro Client",
+    "lang_perlocation": "Pro Raum",
+    "lang_peruser": "Pro Benutzer",
+    "lang_pervm": "Pro VM",
+    "lang_reportingDescription": "Helfen Sie uns bwLehrpool, durch das w\u00f6chentliche, automatische Verschicken eines anonymisierten Statistikberichts, zu verbessern.",
+    "lang_sessions": "Sitzungen",
+    "lang_shortSessions": "Sitzungen < 60s",
+    "lang_total": "Gesamt",
+    "lang_totalOffTime": "Gesamtzeit Offline",
+    "lang_totalTime": "Gesamte Zeit",
+    "lang_user": "Nutzer",
+    "lang_vm": "VM"
 }
\ No newline at end of file
diff --git a/modules-available/statistics_reporting/lang/en/module.json b/modules-available/statistics_reporting/lang/en/module.json
index 6b3f98f6..5362fee2 100644
--- a/modules-available/statistics_reporting/lang/en/module.json
+++ b/modules-available/statistics_reporting/lang/en/module.json
@@ -1,4 +1,5 @@
 {
     "module_name": "Statistics Reporting",
+    "notAssigned": "Not assigned",
     "page_title": "Statistics Reporting"
 }
\ No newline at end of file
diff --git a/modules-available/statistics_reporting/lang/en/template-tags.json b/modules-available/statistics_reporting/lang/en/template-tags.json
index 90d59b38..0047c7a4 100644
--- a/modules-available/statistics_reporting/lang/en/template-tags.json
+++ b/modules-available/statistics_reporting/lang/en/template-tags.json
@@ -1,34 +1,28 @@
 {
-    "lang_user": "User",
-    "lang_countLogins": "Number of Logins",
-    "lang_client": "Client",
-    "lang_vm": "VM",
-    "lang_sessions": "Sessions",
-    "lang_longSessions": "Sessions \u2265 60s",
-    "lang_shortSessions": "Sessions < 60s",
-    "lang_overallOfftime": "Overall time offline",
-    "lang_totalOffTime": "Total Time Offline",
+    "lang_apply": "Apply",
     "lang_clientLogout": "Last VM Logout",
     "lang_clientStart": "Last Client Boot",
-    "lang_room": "Room",
-    "lang_offTime": "Time since offline",
-    "lang_total": "Total",
-    "lang_perlocation": "Per Location",
-    "lang_perclient": "Per Client",
-    "lang_peruser": "Per User",
-    "lang_pervm": "Per VM",
     "lang_hostname": "Client Name",
-    "lang_location": "Location",
-    "lang_medianSessionLength": "Median Session Length",
-    "lang_totalTime": "Total Time",
     "lang_last1": "Today",
-    "lang_last2": "Last 2 days",
-    "lang_last7": "Last 7 days",
     "lang_last14": "Last 14 days",
+    "lang_last2": "Last 2 days",
     "lang_last30": "Last 30 days",
+    "lang_last7": "Last 7 days",
     "lang_last90": "Last 90 days",
-    "lang_apply": "Apply",
-    "lang_save": "Save",
-    "lang_notassigned": "NOT ASSIGNED",
-    "lang_reportingDescription": "Help us improve bwLehrpool by automatically sending an anonymized statistics report once per week."
+    "lang_location": "Location",
+    "lang_longSessions": "Sessions \u2265 60s",
+    "lang_medianSessionLength": "Median Session Length",
+    "lang_overallOfftime": "Overall time offline",
+    "lang_perclient": "Per Client",
+    "lang_perlocation": "Per Location",
+    "lang_peruser": "Per User",
+    "lang_pervm": "Per VM",
+    "lang_reportingDescription": "Help us improve bwLehrpool by automatically sending an anonymized statistics report once per week.",
+    "lang_sessions": "Sessions",
+    "lang_shortSessions": "Sessions < 60s",
+    "lang_total": "Total",
+    "lang_totalOffTime": "Total Time Offline",
+    "lang_totalTime": "Total Time",
+    "lang_user": "User",
+    "lang_vm": "VM"
 }
\ No newline at end of file