From e1d2553ce78482e9133937b3bb725ea9500863d0 Mon Sep 17 00:00:00 2001
From: Dimitris Efstathiou <defstat@gmail.com>
Date: Wed, 8 Feb 2023 10:03:14 +0200
Subject: [PATCH] pkp/pkp-lib#8598 Code Base locale changes

---
 config.TEMPLATE.inc.php                                       | 2 +-
 dbscripts/xml/upgrade.xml                                     | 1 +
 plugins/importexport/pubmed/filter/ArticlePubMedXmlFilter.php | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/config.TEMPLATE.inc.php b/config.TEMPLATE.inc.php
index 6bdff27bf11..2918d44d235 100644
--- a/config.TEMPLATE.inc.php
+++ b/config.TEMPLATE.inc.php
@@ -204,7 +204,7 @@
 [i18n]
 
 ; Default locale
-locale = en_US
+locale = en
 
 ; Database connection character set
 connection_charset = utf8
diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index f4d91b7a48d..0e973d97711 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -191,6 +191,7 @@
 		<migration class="APP\migration\upgrade\v3_4_0\I6306_EnableCategories"/>
 		<migration class="PKP\migration\upgrade\v3_4_0\I8592_SiteNotificationSubscriptions"/>
 		<migration class="APP\migration\upgrade\v3_4_0\I6241_RequiredGenres"/>
+		<migration class="APP\migration\upgrade\v3_4_0\MergeLocalesMigration"/>
 		<data file="dbscripts/xml/upgrade/3.4.0_preupdate_email_templates.xml" />
 		<note file="docs/release-notes/README-3.4.0" />
 	</upgrade>
diff --git a/plugins/importexport/pubmed/filter/ArticlePubMedXmlFilter.php b/plugins/importexport/pubmed/filter/ArticlePubMedXmlFilter.php
index b3a90d700b8..153df78c87b 100644
--- a/plugins/importexport/pubmed/filter/ArticlePubMedXmlFilter.php
+++ b/plugins/importexport/pubmed/filter/ArticlePubMedXmlFilter.php
@@ -8,6 +8,7 @@
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * @class ArticlePubMedXmlFilter
+ *
  * @brief Class that converts a Article to a PubMed XML document.
  */
 
@@ -88,7 +89,7 @@ public function &process(&$submissions)
             $publication = $submission->getCurrentPublication();
 
             $locale = $publication->getData('locale');
-            if ($locale == 'en_US') {
+            if ($locale == 'en') {
                 $articleNode->appendChild($doc->createElement('ArticleTitle'))->appendChild($doc->createTextNode($publication->getLocalizedTitle($locale)));
             } else {
                 $articleNode->appendChild($doc->createElement('VernacularTitle'))->appendChild($doc->createTextNode($publication->getLocalizedTitle($locale)));