Skip to content

Commit c9c82ed

Browse files
authored
Merge pull request #668 from jrchamp/fix/calendar-string-again
lang: rename calendardescriptionurl to calendarjoinurl
2 parents cfd8253 + cdf92b9 commit c9c82ed

3 files changed

Lines changed: 2 additions & 26 deletions

File tree

db/upgrade.php

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,29 +1024,5 @@ function xmldb_zoom_upgrade($oldversion) {
10241024
upgrade_mod_savepoint(true, 2025050900, 'zoom');
10251025
}
10261026

1027-
if ($oldversion < 2025062600) {
1028-
// Define the SQL query to fix the inconsistent casing in the customlang stringid.
1029-
$sql = "UPDATE {tool_customlang} tc
1030-
SET stringid = :newstringid
1031-
WHERE tc.stringid = :oldstringid
1032-
AND tc.componentid IN (
1033-
SELECT tcc.id
1034-
FROM {tool_customlang_components} tcc
1035-
WHERE tcc.name = :componentname
1036-
)";
1037-
1038-
$params = [
1039-
'newstringid' => 'calendardescriptionurl',
1040-
'componentname' => 'mod_zoom',
1041-
'oldstringid' => 'calendardescriptionURL',
1042-
];
1043-
1044-
// Execute the query.
1045-
$DB->execute($sql, $params);
1046-
1047-
// Savepoint reached.
1048-
upgrade_mod_savepoint(true, 2025062600, 'zoom');
1049-
}
1050-
10511027
return true;
10521028
}

exportical.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969

7070
// Compute and add description property to event.
7171
$convertedtext = html_to_text($zoom->intro);
72-
$descriptiontext = get_string('calendardescriptionurl', 'mod_zoom', $CFG->wwwroot . '/mod/zoom/view.php?id=' . $cm->id);
72+
$descriptiontext = get_string('calendarjoinurl', 'mod_zoom', $CFG->wwwroot . '/mod/zoom/view.php?id=' . $cm->id);
7373
if (!empty($convertedtext)) {
7474
$descriptiontext .= get_string('calendardescriptionintro', 'mod_zoom', $convertedtext);
7575
}

lang/en/zoom.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@
7171
$string['cachedef_zoomid'] = 'Zoom user id mappings';
7272
$string['cachedef_zoommeetingsecurity'] = 'Zoom meeting security settings, including meeting password requirements of the account';
7373
$string['calendardescriptionintro'] = "\nDescription:\n{\$a}";
74-
$string['calendardescriptionurl'] = 'Meeting join URL: {$a}.';
7574
$string['calendariconalt'] = 'Calendar icon';
75+
$string['calendarjoinurl'] = 'Meeting join URL: {$a}.';
7676
$string['changehost'] = 'Change host';
7777
$string['clickjoin'] = 'Clicked join meeting button';
7878
$string['clientid'] = 'Zoom client ID';

0 commit comments

Comments
 (0)