Merge branch 'MDL-74455' of https://github.com/paulholden/moodle

UniGe · Jun 13, 2022 · 0e853ae · 0e853ae
2 parents 7512a80 + 1cd65d6
commit 0e853ae
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/filter/multilang/lang/en/filter_multilang.php b/filter/multilang/lang/en/filter_multilang.php
@@ -24,4 +24,6 @@
  */
 
 $string['filtername'] = 'Multi-Language Content';
+$string['forceoldsyntax'] = 'Force old syntax';
+$string['forceoldsyntax_desc'] = 'Force old multilang syntax: &lt;span&gt; without the class="multilang" and &lt;lang&gt;';
 $string['privacy:metadata'] = 'The Multi-Language Content plugin does not store any personal data.';
diff --git a/filter/multilang/settings.php b/filter/multilang/settings.php
@@ -4,6 +4,10 @@
 
 if ($ADMIN->fulltree) {
 
-    $settings->add(new admin_setting_configcheckbox('filter_multilang_force_old', 'filter_multilang_force_old',
-                       get_string('multilangforceold', 'admin'), 0));
+    $settings->add(new admin_setting_configcheckbox(
+        'filter_multilang_force_old',
+        get_string('forceoldsyntax', 'filter_multilang'),
+        get_string('forceoldsyntax_desc', 'filter_multilang'),
+        0
+    ));
 }
diff --git a/lang/en/admin.php b/lang/en/admin.php
@@ -861,7 +861,6 @@
 $string['modeditdefaults'] = 'Default values for activity settings';
 $string['modsettings'] = 'Manage activities';
 $string['modulesecurity'] = 'Module security';
-$string['multilangforceold'] = 'Force old multilang syntax: &lt;span&gt; without the class="multilang" and &lt;lang&gt;';
 $string['mustenablestats'] = 'Statistics have not yet been enabled on this site.';
 $string['mycourses'] = 'My courses';
 $string['mycoursesperpage'] = 'Number of courses';
@@ -1563,3 +1562,6 @@
 $string['coursepage'] = 'Course page';
 $string['mediapluginswf'] = 'Enable .swf filter';
 $string['mediapluginswfnote'] = 'As a default security measure, normal users should not be allowed to embed swf flash files.';
+
+// Deprecated since Moodle 4.1.
+$string['multilangforceold'] = 'Force old multilang syntax: &lt;span&gt; without the class="multilang" and &lt;lang&gt;';
diff --git a/lang/en/deprecated.txt b/lang/en/deprecated.txt
@@ -81,3 +81,4 @@ sendingviawhen,core_message
 close,core_contentbank
 notflagged,core_question
 cannotswitcheditmodeon,core_error
+multilangforceold,core_admin