From 7aa0ccf4f34aaec9a45142649df64c50560483e2 Mon Sep 17 00:00:00 2001
From: sam marshall <s.marshall@open.ac.uk>
Date: Tue, 2 Jul 2024 16:03:06 +0100
Subject: [PATCH] MDL-82359 Install: Move lang strings for separate and
 connected

AMOS BEGIN
 MOV [postrating1,mod_forum],[separateandconnected1,core]
 MOV [postrating2,mod_forum],[separateandconnected2,core]
 MOV [postrating3,mod_forum],[separateandconnected3,core]
AMOS END
---
 lang/en/moodle.php          |  3 +++
 lib/db/upgradelib.php       | 11 ++++-------
 mod/forum/lang/en/forum.php |  3 ---
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index 7708e72e45f..0f286811222 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -2001,6 +2001,9 @@ $string['senddetails'] = 'Send my details via email';
 $string['sent'] = 'Sent';
 $string['separate'] = 'Separate';
 $string['separateandconnected'] = 'Separate and Connected ways of knowing';
+$string['separateandconnected1'] = 'Mostly separate knowing';
+$string['separateandconnected2'] = 'Separate and connected';
+$string['separateandconnected3'] = 'Mostly connected knowing';
 $string['separateandconnectedinfo'] = 'The scale based on the theory of separate and connected knowing. This theory describes two different ways that we can evaluate and learn about the things we see and hear.<ul><li><strong>Separate knowers</strong> remain as objective as possible without including feelings and emotions. In a discussion with other people, they like to defend their own ideas, using logic to find holes in opponent\'s ideas.</li><li><strong>Connected knowers</strong> are more sensitive to other people. They are skilled at empathy and tend to listen and ask questions until they feel they can connect and "understand things from their point of view". They learn by trying to share the experiences that led to the knowledge they find in other people.</li></ul>';
 $string['servererror'] = 'An error occurred whilst communicating with the server';
 $string['serverlocaltime'] = 'Server\'s local time';
diff --git a/lib/db/upgradelib.php b/lib/db/upgradelib.php
index 60a0f62573c..45d52142a71 100644
--- a/lib/db/upgradelib.php
+++ b/lib/db/upgradelib.php
@@ -270,10 +270,7 @@ function upgrade_calculated_grade_items($courseid = null) {
 
 /**
  * This function creates a default separated/connected scale
- * so there's something in the database.  The locations of
- * strings and files is a bit odd, but this is because we
- * need to maintain backward compatibility with many different
- * existing language translations and older sites.
+ * so there's something in the database.
  *
  * @global object
  * @return void
@@ -286,9 +283,9 @@ function make_default_scale() {
     $defaultscale->userid = 0;
     $defaultscale->name  = get_string('separateandconnected');
     $defaultscale->description = get_string('separateandconnectedinfo');
-    $defaultscale->scale = get_string('postrating1', 'forum').','.
-                           get_string('postrating2', 'forum').','.
-                           get_string('postrating3', 'forum');
+    $defaultscale->scale = get_string('separateandconnected1') . ',' .
+        get_string('separateandconnected2') . ',' .
+        get_string('separateandconnected3');
     $defaultscale->timemodified = time();
 
     $defaultscale->id = $DB->insert_record('scale', $defaultscale);
diff --git a/mod/forum/lang/en/forum.php b/mod/forum/lang/en/forum.php
index 61fd17bc0a2..4374f9bfa23 100644
--- a/mod/forum/lang/en/forum.php
+++ b/mod/forum/lang/en/forum.php
@@ -530,9 +530,6 @@ $string['postmailinfo'] = 'This is a copy of a message posted in {$a}.';
 $string['postmailnow'] = '<p>This post will be mailed out immediately to all forum subscribers.</p>';
 $string['postmailreply'] = 'To reply click on this link: {$a}';
 $string['postmailsubject'] = '{$a->courseshortname}: {$a->subject}';
-$string['postrating1'] = 'Mostly separate knowing';
-$string['postrating2'] = 'Separate and connected';
-$string['postrating3'] = 'Mostly connected knowing';
 $string['posts'] = 'Posts';
 $string['postsfrom'] = 'Posts from';
 $string['postsmadebyuser'] = 'Posts made by {$a}';