Merge pull request #831 from bozana/10729

pkp/pkp-lib#10729 fix I9707_WeblateUILocales, consider locales in arrays and setting values
pkp · Jan 19, 2025 · b31e76e · b31e76e
2 parents 4442631 + cd4ce62
commit b31e76e
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 2 deletions.
diff --git a/classes/migration/upgrade/v3_5_0/I9707_WeblateUILocales.php b/classes/migration/upgrade/v3_5_0/I9707_WeblateUILocales.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * @file classes/migration/upgrade/v3_5_0/I9707_WeblateUILocales.php
+ *
+ * Copyright (c) 2025 Simon Fraser University
+ * Copyright (c) 2025 John Willinsky
+ * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
+ *
+ * @class I9707_WeblateUILocales
+ *
+ * @brief Map old UI locales to Weblate locales
+ */
+
+namespace APP\migration\upgrade\v3_5_0;
+
+class I9707_WeblateUILocales extends \PKP\migration\upgrade\v3_5_0\I9707_WeblateUILocales
+{
+    protected function getContextTable(): string
+    {
+        return 'servers';
+    }
+
+    protected function getContextSettingsTable(): string
+    {
+        return 'server_settings';
+    }
+
+    protected function getContextIdColumn(): string
+    {
+        return 'server_id';
+    }
+}
diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
@@ -133,14 +133,14 @@
 		<migration class="PKP\migration\upgrade\v3_5_0\I10041_UserGroupsAndUserUserGroupsMastheadValues"/>
 		<migration class="PKP\migration\upgrade\v3_5_0\I9771_OrcidMigration"/>
 		<migration class="PKP\migration\upgrade\v3_5_0\COA75_AddUserRoleEndEmail"/>
-		<migration class="PKP\migration\upgrade\v3_5_0\I9707_WeblateUILocales"/>
 		<migration class="PKP\migration\upgrade\v3_5_0\I10738_RemoveInvalidUserGroups"/>
 		<migration class="PKP\migration\upgrade\v3_5_0\I10362_EventLogEditorNames"/>
 		<migration class="PKP\migration\upgrade\v3_5_0\I10292_RemoveControlledVocabEntrySettingType"/>
 		<migration class="PKP\migration\upgrade\v3_5_0\I10292_UpdateControlledVocabAssocId"/>
 		<migration class="PKP\migration\upgrade\v3_5_0\I10292_UpdateControlledVocabEntrySettingName"/>
 		<migration class="PKP\migration\upgrade\v3_5_0\FilterClassNames"/>
 		<migration class="APP\migration\upgrade\v3_5_0\I10620_EditorialBoardMemberRole"/>
+		<migration class="APP\migration\upgrade\v3_5_0\I9707_WeblateUILocales"/>
 		<note file="docs/release-notes/README-3.5.0" />
 	</upgrade>
 

diff --git a/lib/pkp b/lib/pkp
+1 −1		classes/author/Author.php
+30 −65		classes/core/PKPPageRouter.php
+25 −71		classes/migration/upgrade/v3_5_0/I9425_SeparateUIAndSubmissionLocales.php
+99 −16		classes/migration/upgrade/v3_5_0/I9707_WeblateUILocales.php
+50 −10		classes/plugins/Hook.php
+50 −18		classes/plugins/PluginRegistry.php
+1 −1		schemas/author.json
+128 −0		tests/classes/plugins/PluginTest.php