From 50d28a0ad8dcf5d9fe697278b6ea05aa00f8fb87 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 5 Nov 2019 18:01:37 +0100 Subject: [baseconfig] Overhaul hook system This enables us to finally properly show the inheritance flow of all the config variables when editing the baseconfig for a certain location or machine. --- modules-available/baseconfig/lang/de/module.json | 4 +++- modules-available/baseconfig/lang/de/template-tags.json | 3 +-- modules-available/baseconfig/lang/en/module.json | 4 +++- modules-available/baseconfig/lang/en/template-tags.json | 3 +-- 4 files changed, 8 insertions(+), 6 deletions(-) (limited to 'modules-available/baseconfig/lang') diff --git a/modules-available/baseconfig/lang/de/module.json b/modules-available/baseconfig/lang/de/module.json index 44b51ec3..f7dbf53a 100644 --- a/modules-available/baseconfig/lang/de/module.json +++ b/modules-available/baseconfig/lang/de/module.json @@ -1,3 +1,5 @@ { - "module_name": "Konfigurationsvariablen" + "module_name": "Konfigurationsvariablen", + "source-default": "Auslieferungszustand", + "source-global": "Global" } \ No newline at end of file diff --git a/modules-available/baseconfig/lang/de/template-tags.json b/modules-available/baseconfig/lang/de/template-tags.json index dfaecc96..1ce62c87 100644 --- a/modules-available/baseconfig/lang/de/template-tags.json +++ b/modules-available/baseconfig/lang/de/template-tags.json @@ -1,8 +1,7 @@ { "lang_basicConfiguration": "Basiskonfiguration", "lang_clientRelatedConfig": "Die Optionen auf dieser Seite beziehen sich auf das Verhalten der bwLehrpool-Clients.", - "lang_defaultValue": "Standard", "lang_editOverrideNotice": "Sie bearbeiten die Einstellungen f\u00fcr einen Unterbereich", "lang_enableOverride": "\u00dcberschreiben", - "lang_inheritSource": "Geerbt von" + "lang_showParents": "Geerbte Werte" } \ No newline at end of file diff --git a/modules-available/baseconfig/lang/en/module.json b/modules-available/baseconfig/lang/en/module.json index 9ad9d10f..97e19f92 100644 --- a/modules-available/baseconfig/lang/en/module.json +++ b/modules-available/baseconfig/lang/en/module.json @@ -1,3 +1,5 @@ { - "module_name": "Config Variables" + "module_name": "Config Variables", + "source-default": "Factory default", + "source-global": "Global" } \ No newline at end of file diff --git a/modules-available/baseconfig/lang/en/template-tags.json b/modules-available/baseconfig/lang/en/template-tags.json index 471fef35..9ac578e7 100644 --- a/modules-available/baseconfig/lang/en/template-tags.json +++ b/modules-available/baseconfig/lang/en/template-tags.json @@ -1,8 +1,7 @@ { "lang_basicConfiguration": "Basic Configuration", "lang_clientRelatedConfig": "The options on this page are related to the bwLehrpool client machines.", - "lang_defaultValue": "Default", "lang_editOverrideNotice": "You're editing the settings of a sub-section", "lang_enableOverride": "Override", - "lang_inheritSource": "Inherited from" + "lang_showParents": "Inherited values" } \ No newline at end of file -- cgit v1.2.3-55-g7522