Update language strings (MDL-80461)

Author: james-cnz

classes/output/courseformat/content/addsection.php

@@ -76,11 +76,9 @@ protected function get_add_section_data(\renderer_base $output, int $lastsection
         $course = $format->get_course();
         $data = parent::get_add_section_data($output, $lastsection, $maxsections);
 
-        if (get_string_manager()->string_exists('addsectiontopic', 'format_' . $course->format)) {
-            $addstring = get_string('addsectiontopic', 'format_' . $course->format);
-        } else {
-            $addstring = get_string('addsections');
-        }
+        $addstring = get_string_manager()->string_exists('addsectiontopic', 'format_' . $course->format) ?
+                    get_string('addsectiontopic', 'format_' . $course->format)
+                    : get_string('addsection', 'core_courseformat');
 
         $params = [
             'courseid' => $course->id, // CHANGED.

classes/output/courseformat/contenttabs/tabtreecontainer.php

@@ -194,7 +194,8 @@ public function export_tab_for_template(
             preg_match('/^add(\d+)$/', $sectionextra, $matches);
             $parentid = $matches[1];
             $straddsection = get_string_manager()->string_exists('addsectionpage', 'format_' . $course->format) ?
-                                get_string('addsectionpage', 'format_' . $course->format) : get_string('addsections');
+                                get_string('addsectionpage', 'format_' . $course->format)
+                                : get_string('addsection', 'core_courseformat');
             $params = [
                 'courseid' => $course->id,
                 'increase' => true,

lang/en/format_multitopic.php

@@ -25,6 +25,9 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+// The following language strings are used from core, which need consistent translations here:
+// editsectionname, hiddensections, newsectionname, sectionoutline, topic, numweeks, week.
+
 $string['addsectionpage'] = 'Add page';
 $string['addsectiontopic'] = 'Add topic';
 
@@ -43,7 +46,7 @@
 $string['collapsibleoverride_help'] = 'Whether this topic is collapsible.
  (Not applicable to pages.)';
 
-$string['currentsection'] = 'This section';
+$string['currentsection'] = 'Current section';
 
 $string['image'] = 'Image';
 $string['image_by'] = 'by';
@@ -74,13 +77,10 @@
 
 $string['plugin_description'] = 'Topics are displayed in tabbed pages,
  with multiple collapsible topics available on each page.';
-$string['pluginname'] = 'Multitopic format';
+$string['pluginname'] = 'Multitopic';
 $string['privacy:metadata'] = 'The Multitopic format plugin does not store any personal data.';
-$string['section0name'] = 'General';
 $string['sectionname'] = 'Section';
 
-$string['sectionoutline'] = 'Section outline';
-
 $string['weeks_abbreviation'] = 'W';
 $string['weeks_capitalised'] = 'Weeks';
 $string['weeks_mindays'] = 'First week minimum days of year';
@@ -100,3 +100,7 @@
 $string['move_to_next_page'] = 'Move to next page';
 $string['move_to_prev_page'] = 'Move to previous page';
 $string['showfromothers'] = 'Show';
+
+// Deprecated since Multitopic v5.1.
+$string['section0name'] = 'General';
+$string['sectionoutline'] = 'Section outline';

lib.php

@@ -150,8 +150,7 @@ public function get_max_sections(): int {
      * @return string the page title
      */
     public function page_title(): string {
-        return get_string_manager()->string_exists('sectionoutline', 'format_multitopic') ?
-                get_string('sectionoutline', 'format_multitopic') : get_string('topicoutline');
+        return get_string('sectionoutline');
     }
 
     /**
@@ -536,7 +535,7 @@ public function get_section_short_name($section): string {
     public function get_default_section_name($section): string {
         if ($section->section == 0) {
             // Return the general section.
-            return get_string('section0name', 'format_multitopic');
+            return get_string('section0name', 'format_topics');
         } else {
             // Use course_format::get_default_section_name implementation which
             // will display the section name in "Section n" format.
@@ -571,6 +570,15 @@ public function get_section_subtitle($section): string {
     }
     // END ADDED.
 
+    /**
+     * Returns the name for the highlighted section.
+     *
+     * @return string The name for the highlighted section based on the given course format.
+     */
+    public function get_section_highlighted_name(): string {
+        return get_string('currentsection', 'format_multitopic');
+    }
+
     /**
      * Set if the current format instance will show all pages or an individual one.
      *
@@ -1405,16 +1413,7 @@ public function inplace_editable_render_section_name(
         $edithint = null,
         $editlabel = null
     ): \core\output\inplace_editable {
-        if (empty($edithint)) {
-            $edithint = new lang_string('editsectionname');                     // CHANGED.
-        }
-        if (empty($editlabel)) {
-            $title = get_section_name($section->course, $section);
-            $editlabel = new lang_string('newsectionname', '', $title);         // CHANGED.
-        }
-
-        // REMOVED function call.
-        // INCLUDED instead /course/format/classes/base.php function inplace_editable_render_section_name body.
+        // INCLUDED /course/format/classes/base.php function inplace_editable_render_section_name body.
         global $USER, $CFG;
         require_once($CFG->dirroot . '/course/lib.php');