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

gjb2048 · Feb 16, 2023 · 3eed2c7 · 3eed2c7
2 parents 5557480 + 6f4675e
commit 3eed2c7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/admin/tool/customlang/cli/export.php b/admin/tool/customlang/cli/export.php
@@ -88,7 +88,7 @@
 }
 
 foreach ($langs as $lang) {
-    $filename = $options['target'] . get_string('exportzipfilename', 'tool_customlang', ['lang' => $lang]);
+    $filename = $options['target'] . "customlang_{$lang}.zip";
     // If the file exists and we are not using the temp folder it requires an ovewrite.
     if ($options['target'] != $dafaulttarget && file_exists($filename) && !$options['overwrite']) {
         cli_problem(get_string('cliexportfileexists', 'tool_customlang', ['lang' => $lang]));

diff --git a/admin/tool/customlang/lang/en/deprecated.txt b/admin/tool/customlang/lang/en/deprecated.txt
@@ -0,0 +1 @@
+exportzipfilename,tool_customlang
diff --git a/admin/tool/customlang/lang/en/tool_customlang.php b/admin/tool/customlang/lang/en/tool_customlang.php
@@ -50,7 +50,6 @@
 $string['customlang:view'] = 'View local translation';
 $string['export'] = 'Export custom strings';
 $string['exportfilter'] = 'Select component(s) to export';
-$string['exportzipfilename'] = 'customlang-export-{$a->lang}.zip';
 $string['editlangpack'] = 'Edit language pack';
 $string['filter'] = 'Filter strings';
 $string['filtercomponent'] = 'Show strings of these components';
@@ -92,3 +91,6 @@
 $string['savecheckin'] = 'Save changes to the language pack';
 $string['savecontinue'] = 'Apply changes and continue editing';
 $string['privacy:metadata'] = 'The Language customisation plugin does not store any personal data.';
+
+// Deprecated since Moodle 4.2.
+$string['exportzipfilename'] = 'customlang-export-{$a->lang}.zip';