From 2a368cb3e597e35b467a6aebbaf35d42747681f5 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 26 Apr 2017 15:34:58 +0200
Subject: [baseconfig] Display inherited value and source when editing module
 specific settings

This optionally requires a callback to find the inheritance source in
the module in question. The locations module was updated accordingly.
This implements #3120
---
 modules-available/baseconfig/lang/de/template-tags.json | 4 +++-
 modules-available/baseconfig/lang/en/template-tags.json | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'modules-available/baseconfig/lang')

diff --git a/modules-available/baseconfig/lang/de/template-tags.json b/modules-available/baseconfig/lang/de/template-tags.json
index cdd54f6a..7d6da790 100644
--- a/modules-available/baseconfig/lang/de/template-tags.json
+++ b/modules-available/baseconfig/lang/de/template-tags.json
@@ -1,7 +1,9 @@
 {
     "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_settingActive": "Einstellung aktiv"
+    "lang_inheritSource": "Geerbt von",
+    "lang_settingActive": "Einstellung aktivieren"
 }
\ 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 8e75e5ac..1a32cb0d 100644
--- a/modules-available/baseconfig/lang/en/template-tags.json
+++ b/modules-available/baseconfig/lang/en/template-tags.json
@@ -1,7 +1,9 @@
 {
     "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_settingActive": "Setting active"
+    "lang_inheritSource": "Inherited from",
+    "lang_settingActive": "Enable setting"
 }
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522