From a39544f90c07a9e615abc3ed6053105cdb1697db Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Wed, 18 Dec 2024 11:38:53 +0100
Subject: [PATCH 1/2] pkp/pkp-lib#10729 fix I9707_WeblateUILocales, consider
 locales in arrays and setting values

---
 .../upgrade/v3_5_0/I9707_WeblateUILocales.php | 33 +++++++++++++++++++
 dbscripts/xml/upgrade.xml                     |  2 +-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 classes/migration/upgrade/v3_5_0/I9707_WeblateUILocales.php

diff --git a/classes/migration/upgrade/v3_5_0/I9707_WeblateUILocales.php b/classes/migration/upgrade/v3_5_0/I9707_WeblateUILocales.php
new file mode 100644
index 0000000000..8f5da1abd3
--- /dev/null
+++ 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
index 04d1c8959c..da9edbb91c 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -133,7 +133,6 @@
 		<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"/>
@@ -141,6 +140,7 @@
 		<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>
 

From cd4ce62dd281f67c27c6699aaa07357768ef0472 Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Sun, 19 Jan 2025 19:27:45 +0100
Subject: [PATCH 2/2] pkp/pkp-lib#10729 submodule update ##bozana/10729##

---
 lib/pkp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pkp b/lib/pkp
index c76f5d47bf..f50463790b 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit c76f5d47bf3c9e254989a3a126050e1eb04e3bd6
+Subproject commit f50463790b35216af4495257c9d9e06fc3be060d