fix issues in merge

microsoft · Jan 28, 2021 · 5123752 · 5123752
1 parent 7416fa4
commit 5123752
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/classes/page/ajax.php b/classes/page/ajax.php
@@ -514,7 +514,7 @@ public function mode_checkteamsmoodlesetup() {
             $data->info[] = get_string('settings_notice_restalreadyenabled', 'local_o365');
         }
 
-        // Enable Office 365 Webservices.
+        // Enable Microsoft 365 Webservices.
         $webservicemanager = new \webservice();
         $o365service = $webservicemanager->get_external_service_by_shortname('o365_webservices');
         if (!$o365service->enabled) {

diff --git a/lang/en/local_o365.php b/lang/en/local_o365.php
@@ -431,8 +431,8 @@
 When disabled, Moodle will always try to create a class Team from a synced course. Team creation will be skipped until a suitable Team owner is enrolled in the course.
 
 A suitable Team owner is a user having "Team owner" capability (local/o365:teamowner) in the course.';
-$string['settings_o365china'] = 'Office&nbsp;365 for China';
-$string['settings_o365china_details'] = 'Check this if you are using Office&nbsp;365 for China.';
+$string['settings_o365china'] = 'Microsoft 365 for China';
+$string['settings_o365china_details'] = 'Check this if you are using Microsoft 365 for China.';
 $string['settings_debugmode'] = 'Record debug messages';
 $string['settings_debugmode_details'] = 'If enabled, information will be logged to the Moodle log that can help in identifying problems. <a href="{$a}">View recorded log messages.</a>';
 $string['settings_switchauthminupnsplit0'] = 'Minimum inexact username length to switch to Microsoft 365';