From 1aee69c75e10a1f098ec3a93614cc36da407e22b Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 7 Feb 2017 14:06:27 +0100 Subject: [statistics_reporting] Unify translation handling --- .../statistics_reporting/lang/de/module.json | 9 +++++-- .../lang/de/template-tags.json | 30 ++++++++-------------- .../statistics_reporting/lang/en/module.json | 7 ++++- .../lang/en/template-tags.json | 22 +++++----------- .../statistics_reporting/page.inc.php | 15 +++-------- .../templates/table-client.html | 4 +-- .../templates/table-total.html | 2 +- 7 files changed, 37 insertions(+), 52 deletions(-) (limited to 'modules-available/statistics_reporting') diff --git a/modules-available/statistics_reporting/lang/de/module.json b/modules-available/statistics_reporting/lang/de/module.json index 86ed5f45..64003d47 100644 --- a/modules-available/statistics_reporting/lang/de/module.json +++ b/modules-available/statistics_reporting/lang/de/module.json @@ -1,5 +1,10 @@ { - "module_name": "Statistik Auswertung", + "module_name": "Statistikauswertung", "notAssigned": "Nicht zugewiesen", - "page_title": "Statistik Auswertung" + "page_title": "Statistikauswertung", + "table_client": "Nach Clients", + "table_location": "Nach Orten", + "table_total": "Gesamt", + "table_user": "Nach Benutzern", + "table_vm": "Nach Veranstaltungen" } \ 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 d4d7887a..379e2030 100644 --- a/modules-available/statistics_reporting/lang/de/template-tags.json +++ b/modules-available/statistics_reporting/lang/de/template-tags.json @@ -1,28 +1,20 @@ { "lang_apply": "Anwenden", - "lang_clientLogout": "Letzter VM Logout", - "lang_clientStart": "Letzter Client Boot", - "lang_hostname": "Client Name", - "lang_last1": "Heute", - "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_location": "Raum", + "lang_displayColumns": "Auswahl angezeigter Spalten", + "lang_displaySelection": "Anzeigemodus, Auswahl Zeitfenster", + "lang_export": "Exportieren", + "lang_hostname": "Hostname", + "lang_lastLogout": "Letzter Logout", + "lang_lastStart": "Letzter Boot", + "lang_location": "Ort", "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_medianSessionLength": "Sitzungsdauer Median", "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_totalOffTime": "Gesamtzeit offline", + "lang_totalTime": "Gesamtzeit", "lang_user": "Nutzer", - "lang_vm": "VM" + "lang_vm": "Veranstaltung" } \ 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 5362fee2..f5ed37d3 100644 --- a/modules-available/statistics_reporting/lang/en/module.json +++ b/modules-available/statistics_reporting/lang/en/module.json @@ -1,5 +1,10 @@ { "module_name": "Statistics Reporting", "notAssigned": "Not assigned", - "page_title": "Statistics Reporting" + "page_title": "Statistics Reporting", + "table_client": "By client", + "table_location": "By location", + "table_total": "Total", + "table_user": "By user", + "table_vm": "By lecture" } \ 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 0047c7a4..466a8530 100644 --- a/modules-available/statistics_reporting/lang/en/template-tags.json +++ b/modules-available/statistics_reporting/lang/en/template-tags.json @@ -1,22 +1,14 @@ { "lang_apply": "Apply", - "lang_clientLogout": "Last VM Logout", - "lang_clientStart": "Last Client Boot", - "lang_hostname": "Client Name", - "lang_last1": "Today", - "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_displayColumns": "Select columns to display", + "lang_displaySelection": "Select display mode and specify time span", + "lang_export": "Export", + "lang_hostname": "Hostname", + "lang_lastLogout": "Last logout", + "lang_lastStart": "Last boot", "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", @@ -24,5 +16,5 @@ "lang_totalOffTime": "Total Time Offline", "lang_totalTime": "Total Time", "lang_user": "User", - "lang_vm": "VM" + "lang_vm": "Lecture" } \ No newline at end of file diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php index 05a26c41..c5640d41 100644 --- a/modules-available/statistics_reporting/page.inc.php +++ b/modules-available/statistics_reporting/page.inc.php @@ -13,8 +13,8 @@ class Page_Statistics_Reporting extends Page /** * @var array Names of columns that are being used by the various tables */ - private $COLUMNS = array('col_lastlogout', 'col_laststart', 'col_location', 'col_longsessions', 'col_mediantime', - 'col_sessions', 'col_shortsessions', 'col_timeoffline', 'col_totaltime'); + private $COLUMNS = array('lastLogout', 'lastStart', 'location', 'longSessions', 'medianSessionLength', + 'sessions', 'shortSessions', 'totalOffTime', 'totalTime'); /** * @var array Names of the tables we can display @@ -66,15 +66,6 @@ class Page_Statistics_Reporting extends Page /* * Leave these here for the translate module - * Dictionary::translate('col_lastlogout'); - * Dictionary::translate('col_laststart'); - * Dictionary::translate('col_location'); - * Dictionary::translate('col_longsessions'); - * Dictionary::translate('col_mediantime'); - * Dictionary::translate('col_sessions'); - * Dictionary::translate('col_shortsessions'); - * Dictionary::translate('col_timeoffline'); - * Dictionary::translate('col_totaltime'); * Dictionary::translate('table_total'); * Dictionary::translate('table_location'); * Dictionary::translate('table_client'); @@ -91,7 +82,7 @@ class Page_Statistics_Reporting extends Page foreach ($this->COLUMNS as $column) { $data['columns'][] = array( 'id' => $column, - 'name' => Dictionary::translate($column, true), + 'name' => Dictionary::translateFile('template-tags', 'lang_' . $column, true), 'checked' => Request::get($column, 'on', 'string') === 'on' ? 'checked' : '', ); } diff --git a/modules-available/statistics_reporting/templates/table-client.html b/modules-available/statistics_reporting/templates/table-client.html index e4538da6..e53a49d6 100644 --- a/modules-available/statistics_reporting/templates/table-client.html +++ b/modules-available/statistics_reporting/templates/table-client.html @@ -8,8 +8,8 @@ {{lang_longSessions}} {{lang_shortSessions}} {{lang_totalOffTime}} - {{lang_clientLogout}} - {{lang_clientStart}} + {{lang_lastLogout}} + {{lang_lastStart}} diff --git a/modules-available/statistics_reporting/templates/table-total.html b/modules-available/statistics_reporting/templates/table-total.html index 8e24dc01..2e100ae5 100644 --- a/modules-available/statistics_reporting/templates/table-total.html +++ b/modules-available/statistics_reporting/templates/table-total.html @@ -6,7 +6,7 @@ {{lang_medianSessionLength}} {{lang_longSessions}} {{lang_shortSessions}} - {{lang_overallOfftime}} + {{lang_totalOffTime}} -- cgit v1.2.3-55-g7522