pkp · bozana · Sep 3, 2024 · Oct 28, 2024 · Oct 28, 2024 · Oct 29, 2024
diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
@@ -149,6 +149,7 @@
 		<migration class="PKP\migration\upgrade\v3_5_0\I10041_UserGroupsAndUserUserGroupsMastheadValues"/>
         <migration class="PKP\migration\upgrade\v3_5_0\I9771_OrcidMigration"/>
 		<migration class="APP\migration\upgrade\v3_5_0\I5885_RenameReviewReminderSettingsName"/>
+		<migration class="PKP\migration\upgrade\v3_5_0\I9707_WeblateUILocales"/>
 	</upgrade>
 
 	<!-- update plugin configuration - should be done as the final upgrade task -->

diff --git a/lib/pkp b/lib/pkp
diff --git a/lib/ui-library b/lib/ui-library
diff --git a/locale/be@cyrillic/admin.po → locale/be/admin.po b/locale/be@cyrillic/admin.po → locale/be/admin.po
diff --git a/locale/be@cyrillic/author.po → locale/be/author.po b/locale/be@cyrillic/author.po → locale/be/author.po
diff --git a/locale/be@cyrillic/default.po → locale/be/default.po b/locale/be@cyrillic/default.po → locale/be/default.po
diff --git a/locale/be@cyrillic/manager.po → locale/be/manager.po b/locale/be@cyrillic/manager.po → locale/be/manager.po
diff --git a/locale/be@cyrillic/submission.po → locale/be/submission.po b/locale/be@cyrillic/submission.po → locale/be/submission.po
diff --git a/locale/bs/admin.po → locale/bs_Latn/admin.po b/locale/bs/admin.po → locale/bs_Latn/admin.po
diff --git a/locale/bs/author.po → locale/bs_Latn/author.po b/locale/bs/author.po → locale/bs_Latn/author.po
diff --git a/locale/bs/default.po → locale/bs_Latn/default.po b/locale/bs/default.po → locale/bs_Latn/default.po
diff --git a/locale/bs/editor.po → locale/bs_Latn/editor.po b/locale/bs/editor.po → locale/bs_Latn/editor.po
diff --git a/locale/bs/emails.po → locale/bs_Latn/emails.po b/locale/bs/emails.po → locale/bs_Latn/emails.po
diff --git a/locale/bs/locale.po → locale/bs_Latn/locale.po b/locale/bs/locale.po → locale/bs_Latn/locale.po
diff --git a/locale/bs/manager.po → locale/bs_Latn/manager.po b/locale/bs/manager.po → locale/bs_Latn/manager.po
diff --git a/locale/bs/submission.po → locale/bs_Latn/submission.po b/locale/bs/submission.po → locale/bs_Latn/submission.po
diff --git a/locale/fr_FR/admin.po → locale/fr/admin.po b/locale/fr_FR/admin.po → locale/fr/admin.po
diff --git a/locale/fr_FR/api.po → locale/fr/api.po b/locale/fr_FR/api.po → locale/fr/api.po
diff --git a/locale/fr_FR/author.po → locale/fr/author.po b/locale/fr_FR/author.po → locale/fr/author.po
diff --git a/locale/fr_FR/default.po → locale/fr/default.po b/locale/fr_FR/default.po → locale/fr/default.po
diff --git a/locale/fr_FR/editor.po → locale/fr/editor.po b/locale/fr_FR/editor.po → locale/fr/editor.po
diff --git a/locale/fr_FR/emails.po → locale/fr/emails.po b/locale/fr_FR/emails.po → locale/fr/emails.po
diff --git a/locale/fr_FR/locale.po → locale/fr/locale.po b/locale/fr_FR/locale.po → locale/fr/locale.po
diff --git a/locale/fr_FR/manager.po → locale/fr/manager.po b/locale/fr_FR/manager.po → locale/fr/manager.po
diff --git a/locale/fr_FR/submission.po → locale/fr/submission.po b/locale/fr_FR/submission.po → locale/fr/submission.po
diff --git a/locale/nb/admin.po → locale/nb_NO/admin.po b/locale/nb/admin.po → locale/nb_NO/admin.po
diff --git a/locale/nb/api.po → locale/nb_NO/api.po b/locale/nb/api.po → locale/nb_NO/api.po
diff --git a/locale/nb/author.po → locale/nb_NO/author.po b/locale/nb/author.po → locale/nb_NO/author.po
diff --git a/locale/nb/default.po → locale/nb_NO/default.po b/locale/nb/default.po → locale/nb_NO/default.po
diff --git a/locale/nb/editor.po → locale/nb_NO/editor.po b/locale/nb/editor.po → locale/nb_NO/editor.po
diff --git a/locale/nb/emails.po → locale/nb_NO/emails.po b/locale/nb/emails.po → locale/nb_NO/emails.po
diff --git a/locale/nb/locale.po → locale/nb_NO/locale.po b/locale/nb/locale.po → locale/nb_NO/locale.po
diff --git a/locale/nb/manager.po → locale/nb_NO/manager.po b/locale/nb/manager.po → locale/nb_NO/manager.po
diff --git a/locale/nb/submission.po → locale/nb_NO/submission.po b/locale/nb/submission.po → locale/nb_NO/submission.po
diff --git a/locale/sr@cyrillic/admin.po → locale/sr_Cyrl/admin.po b/locale/sr@cyrillic/admin.po → locale/sr_Cyrl/admin.po
diff --git a/locale/sr@cyrillic/author.po → locale/sr_Cyrl/author.po b/locale/sr@cyrillic/author.po → locale/sr_Cyrl/author.po
diff --git a/locale/sr@cyrillic/default.po → locale/sr_Cyrl/default.po b/locale/sr@cyrillic/default.po → locale/sr_Cyrl/default.po
diff --git a/locale/sr@cyrillic/editor.po → locale/sr_Cyrl/editor.po b/locale/sr@cyrillic/editor.po → locale/sr_Cyrl/editor.po
diff --git a/locale/sr@cyrillic/emails.po → locale/sr_Cyrl/emails.po b/locale/sr@cyrillic/emails.po → locale/sr_Cyrl/emails.po
diff --git a/locale/sr@cyrillic/locale.po → locale/sr_Cyrl/locale.po b/locale/sr@cyrillic/locale.po → locale/sr_Cyrl/locale.po
diff --git a/locale/sr@cyrillic/manager.po → locale/sr_Cyrl/manager.po b/locale/sr@cyrillic/manager.po → locale/sr_Cyrl/manager.po
diff --git a/locale/sr@cyrillic/submission.po → locale/sr_Cyrl/submission.po b/locale/sr@cyrillic/submission.po → locale/sr_Cyrl/submission.po
diff --git a/locale/sr@latin/admin.po → locale/sr_Latn/admin.po b/locale/sr@latin/admin.po → locale/sr_Latn/admin.po
diff --git a/locale/sr@latin/author.po → locale/sr_Latn/author.po b/locale/sr@latin/author.po → locale/sr_Latn/author.po
diff --git a/locale/sr@latin/default.po → locale/sr_Latn/default.po b/locale/sr@latin/default.po → locale/sr_Latn/default.po
diff --git a/locale/sr@latin/editor.po → locale/sr_Latn/editor.po b/locale/sr@latin/editor.po → locale/sr_Latn/editor.po
diff --git a/locale/sr@latin/emails.po → locale/sr_Latn/emails.po b/locale/sr@latin/emails.po → locale/sr_Latn/emails.po
diff --git a/locale/sr@latin/locale.po → locale/sr_Latn/locale.po b/locale/sr@latin/locale.po → locale/sr_Latn/locale.po
diff --git a/locale/sr@latin/manager.po → locale/sr_Latn/manager.po b/locale/sr@latin/manager.po → locale/sr_Latn/manager.po
diff --git a/locale/sr@latin/submission.po → locale/sr_Latn/submission.po b/locale/sr@latin/submission.po → locale/sr_Latn/submission.po
diff --git a/locale/uz@cyrillic/admin.po → locale/uz/admin.po b/locale/uz@cyrillic/admin.po → locale/uz/admin.po
diff --git a/locale/uz@cyrillic/api.po → locale/uz/api.po b/locale/uz@cyrillic/api.po → locale/uz/api.po
diff --git a/locale/uz@cyrillic/author.po → locale/uz/author.po b/locale/uz@cyrillic/author.po → locale/uz/author.po
diff --git a/locale/uz@cyrillic/default.po → locale/uz/default.po b/locale/uz@cyrillic/default.po → locale/uz/default.po
diff --git a/locale/uz@cyrillic/editor.po → locale/uz/editor.po b/locale/uz@cyrillic/editor.po → locale/uz/editor.po
diff --git a/locale/uz@cyrillic/emails.po → locale/uz/emails.po b/locale/uz@cyrillic/emails.po → locale/uz/emails.po
diff --git a/locale/uz@cyrillic/locale.po → locale/uz/locale.po b/locale/uz@cyrillic/locale.po → locale/uz/locale.po
diff --git a/locale/uz@cyrillic/manager.po → locale/uz/manager.po b/locale/uz@cyrillic/manager.po → locale/uz/manager.po
diff --git a/locale/uz@cyrillic/submission.po → locale/uz/submission.po b/locale/uz@cyrillic/submission.po → locale/uz/submission.po
diff --git a/locale/uz@latin/admin.po → locale/uz_Latn/admin.po b/locale/uz@latin/admin.po → locale/uz_Latn/admin.po
diff --git a/locale/uz@latin/api.po → locale/uz_Latn/api.po b/locale/uz@latin/api.po → locale/uz_Latn/api.po
diff --git a/locale/uz@latin/author.po → locale/uz_Latn/author.po b/locale/uz@latin/author.po → locale/uz_Latn/author.po
diff --git a/locale/uz@latin/default.po → locale/uz_Latn/default.po b/locale/uz@latin/default.po → locale/uz_Latn/default.po
diff --git a/locale/uz@latin/editor.po → locale/uz_Latn/editor.po b/locale/uz@latin/editor.po → locale/uz_Latn/editor.po
diff --git a/locale/uz@latin/emails.po → locale/uz_Latn/emails.po b/locale/uz@latin/emails.po → locale/uz_Latn/emails.po
diff --git a/locale/uz@latin/locale.po → locale/uz_Latn/locale.po b/locale/uz@latin/locale.po → locale/uz_Latn/locale.po
diff --git a/locale/uz@latin/manager.po → locale/uz_Latn/manager.po b/locale/uz@latin/manager.po → locale/uz_Latn/manager.po
diff --git a/locale/uz@latin/submission.po → locale/uz_Latn/submission.po b/locale/uz@latin/submission.po → locale/uz_Latn/submission.po
diff --git a/locale/zh_CN/admin.po → locale/zh_Hans/admin.po b/locale/zh_CN/admin.po → locale/zh_Hans/admin.po
diff --git a/locale/zh_CN/api.po → locale/zh_Hans/api.po b/locale/zh_CN/api.po → locale/zh_Hans/api.po
diff --git a/locale/zh_CN/author.po → locale/zh_Hans/author.po b/locale/zh_CN/author.po → locale/zh_Hans/author.po
diff --git a/locale/zh_CN/default.po → locale/zh_Hans/default.po b/locale/zh_CN/default.po → locale/zh_Hans/default.po
diff --git a/locale/zh_CN/editor.po → locale/zh_Hans/editor.po b/locale/zh_CN/editor.po → locale/zh_Hans/editor.po
diff --git a/locale/zh_CN/emails.po → locale/zh_Hans/emails.po b/locale/zh_CN/emails.po → locale/zh_Hans/emails.po
diff --git a/locale/zh_CN/locale.po → locale/zh_Hans/locale.po b/locale/zh_CN/locale.po → locale/zh_Hans/locale.po
diff --git a/locale/zh_CN/manager.po → locale/zh_Hans/manager.po b/locale/zh_CN/manager.po → locale/zh_Hans/manager.po
diff --git a/locale/zh_CN/submission.po → locale/zh_Hans/submission.po b/locale/zh_CN/submission.po → locale/zh_Hans/submission.po
diff --git a/plugins/blocks/browse b/plugins/blocks/browse
diff --git a/...ns/blocks/developedBy/locale/bs/locale.po → ...ocks/developedBy/locale/bs_Latn/locale.po b/...ns/blocks/developedBy/locale/bs/locale.po → ...ocks/developedBy/locale/bs_Latn/locale.po
diff --git a/...blocks/developedBy/locale/fr_FR/locale.po → ...ns/blocks/developedBy/locale/fr/locale.po b/...blocks/developedBy/locale/fr_FR/locale.po → ...ns/blocks/developedBy/locale/fr/locale.po
diff --git a/...ns/blocks/developedBy/locale/nb/locale.po → ...blocks/developedBy/locale/nb_NO/locale.po b/...ns/blocks/developedBy/locale/nb/locale.po → ...blocks/developedBy/locale/nb_NO/locale.po
diff --git a/...cks/developedBy/locale/sr@latin/locale.po → ...ocks/developedBy/locale/sr_Latn/locale.po b/...cks/developedBy/locale/sr@latin/locale.po → ...ocks/developedBy/locale/sr_Latn/locale.po
diff --git a/.../developedBy/locale/uz@cyrillic/locale.po → ...ns/blocks/developedBy/locale/uz/locale.po b/.../developedBy/locale/uz@cyrillic/locale.po → ...ns/blocks/developedBy/locale/uz/locale.po
diff --git a/...cks/developedBy/locale/uz@latin/locale.po → ...ocks/developedBy/locale/uz_Latn/locale.po b/...cks/developedBy/locale/uz@latin/locale.po → ...ocks/developedBy/locale/uz_Latn/locale.po
diff --git a/...ns/blocks/information/locale/bs/locale.po → ...ocks/information/locale/bs_Latn/locale.po b/...ns/blocks/information/locale/bs/locale.po → ...ocks/information/locale/bs_Latn/locale.po
diff --git a/...blocks/information/locale/fr_FR/locale.po → ...ns/blocks/information/locale/fr/locale.po b/...blocks/information/locale/fr_FR/locale.po → ...ns/blocks/information/locale/fr/locale.po
diff --git a/...ns/blocks/information/locale/nb/locale.po → ...blocks/information/locale/nb_NO/locale.po b/...ns/blocks/information/locale/nb/locale.po → ...blocks/information/locale/nb_NO/locale.po
diff --git a/...cks/information/locale/sr@latin/locale.po → ...ocks/information/locale/sr_Latn/locale.po b/...cks/information/locale/sr@latin/locale.po → ...ocks/information/locale/sr_Latn/locale.po
diff --git a/.../information/locale/uz@cyrillic/locale.po → ...ns/blocks/information/locale/uz/locale.po b/.../information/locale/uz@cyrillic/locale.po → ...ns/blocks/information/locale/uz/locale.po
diff --git a/...cks/information/locale/uz@latin/locale.po → ...ocks/information/locale/uz_Latn/locale.po b/...cks/information/locale/uz@latin/locale.po → ...ocks/information/locale/uz_Latn/locale.po
diff --git a/...blocks/information/locale/zh_CN/locale.po → ...ocks/information/locale/zh_Hans/locale.po b/...blocks/information/locale/zh_CN/locale.po → ...ocks/information/locale/zh_Hans/locale.po
diff --git a/...blocks/languageToggle/locale/bs/locale.po → ...s/languageToggle/locale/bs_Latn/locale.po b/...blocks/languageToggle/locale/bs/locale.po → ...s/languageToggle/locale/bs_Latn/locale.po
diff --git a/...cks/languageToggle/locale/fr_FR/locale.po → ...blocks/languageToggle/locale/fr/locale.po b/...cks/languageToggle/locale/fr_FR/locale.po → ...blocks/languageToggle/locale/fr/locale.po
diff --git a/...blocks/languageToggle/locale/nb/locale.po → ...cks/languageToggle/locale/nb_NO/locale.po b/...blocks/languageToggle/locale/nb/locale.po → ...cks/languageToggle/locale/nb_NO/locale.po
diff --git a/.../languageToggle/locale/sr@latin/locale.po → ...s/languageToggle/locale/sr_Latn/locale.po b/.../languageToggle/locale/sr@latin/locale.po → ...s/languageToggle/locale/sr_Latn/locale.po
diff --git a/...nguageToggle/locale/uz@cyrillic/locale.po → ...blocks/languageToggle/locale/uz/locale.po b/...nguageToggle/locale/uz@cyrillic/locale.po → ...blocks/languageToggle/locale/uz/locale.po
diff --git a/.../languageToggle/locale/uz@latin/locale.po → ...s/languageToggle/locale/uz_Latn/locale.po b/.../languageToggle/locale/uz@latin/locale.po → ...s/languageToggle/locale/uz_Latn/locale.po
diff --git a/...cks/languageToggle/locale/zh_CN/locale.po → ...s/languageToggle/locale/zh_Hans/locale.po b/...cks/languageToggle/locale/zh_CN/locale.po → ...s/languageToggle/locale/zh_Hans/locale.po
diff --git a/plugins/blocks/makeSubmission b/plugins/blocks/makeSubmission
diff --git a/...locks/subscription/locale/fr_FR/locale.po → ...s/blocks/subscription/locale/fr/locale.po b/...locks/subscription/locale/fr_FR/locale.po → ...s/blocks/subscription/locale/fr/locale.po
diff --git a/...s/blocks/subscription/locale/nb/locale.po → ...locks/subscription/locale/nb_NO/locale.po b/...s/blocks/subscription/locale/nb/locale.po → ...locks/subscription/locale/nb_NO/locale.po
diff --git a/...ks/subscription/locale/sr@latin/locale.po → ...cks/subscription/locale/sr_Latn/locale.po b/...ks/subscription/locale/sr@latin/locale.po → ...cks/subscription/locale/sr_Latn/locale.po
diff --git a/...subscription/locale/uz@cyrillic/locale.po → ...s/blocks/subscription/locale/uz/locale.po b/...subscription/locale/uz@cyrillic/locale.po → ...s/blocks/subscription/locale/uz/locale.po
diff --git a/...ks/subscription/locale/uz@latin/locale.po → ...cks/subscription/locale/uz_Latn/locale.po b/...ks/subscription/locale/uz@latin/locale.po → ...cks/subscription/locale/uz_Latn/locale.po
diff --git a/...locks/subscription/locale/zh_CN/locale.po → ...cks/subscription/locale/zh_Hans/locale.po b/...locks/subscription/locale/zh_CN/locale.po → ...cks/subscription/locale/zh_Hans/locale.po
diff --git a/...ins/gateways/resolver/locale/bs/locale.po → ...ateways/resolver/locale/bs_Latn/locale.po b/...ins/gateways/resolver/locale/bs/locale.po → ...ateways/resolver/locale/bs_Latn/locale.po
diff --git a/.../gateways/resolver/locale/fr_FR/locale.po → ...ins/gateways/resolver/locale/fr/locale.po b/.../gateways/resolver/locale/fr_FR/locale.po → ...ins/gateways/resolver/locale/fr/locale.po
diff --git a/...ins/gateways/resolver/locale/nb/locale.po → .../gateways/resolver/locale/nb_NO/locale.po b/...ins/gateways/resolver/locale/nb/locale.po → .../gateways/resolver/locale/nb_NO/locale.po
diff --git a/...ays/resolver/locale/uz@cyrillic/locale.po → ...ins/gateways/resolver/locale/uz/locale.po b/...ays/resolver/locale/uz@cyrillic/locale.po → ...ins/gateways/resolver/locale/uz/locale.po
diff --git a/...teways/resolver/locale/uz@latin/locale.po → ...ateways/resolver/locale/uz_Latn/locale.po b/...teways/resolver/locale/uz@latin/locale.po → ...ateways/resolver/locale/uz_Latn/locale.po
diff --git a/.../gateways/resolver/locale/zh_CN/locale.po → ...ateways/resolver/locale/zh_Hans/locale.po b/.../gateways/resolver/locale/zh_CN/locale.po → ...ateways/resolver/locale/zh_Hans/locale.po
diff --git a/...c/announcementFeed/locale/fr_FR/locale.po → ...eric/announcementFeed/locale/fr/locale.po b/...c/announcementFeed/locale/fr_FR/locale.po → ...eric/announcementFeed/locale/fr/locale.po
diff --git a/...eric/announcementFeed/locale/nb/locale.po → ...c/announcementFeed/locale/nb_NO/locale.po b/...eric/announcementFeed/locale/nb/locale.po → ...c/announcementFeed/locale/nb_NO/locale.po
diff --git a/...nnouncementFeed/locale/sr@latin/locale.po → ...announcementFeed/locale/sr_Latn/locale.po b/...nnouncementFeed/locale/sr@latin/locale.po → ...announcementFeed/locale/sr_Latn/locale.po
diff --git a/...uncementFeed/locale/uz@cyrillic/locale.po → ...eric/announcementFeed/locale/uz/locale.po b/...uncementFeed/locale/uz@cyrillic/locale.po → ...eric/announcementFeed/locale/uz/locale.po
diff --git a/...nnouncementFeed/locale/uz@latin/locale.po → ...announcementFeed/locale/uz_Latn/locale.po b/...nnouncementFeed/locale/uz@latin/locale.po → ...announcementFeed/locale/uz_Latn/locale.po
diff --git a/...c/announcementFeed/locale/zh_CN/locale.po → ...announcementFeed/locale/zh_Hans/locale.po b/...c/announcementFeed/locale/zh_CN/locale.po → ...announcementFeed/locale/zh_Hans/locale.po
diff --git a/plugins/generic/citationStyleLanguage b/plugins/generic/citationStyleLanguage
diff --git a/plugins/generic/crossref b/plugins/generic/crossref
diff --git a/plugins/generic/customBlockManager b/plugins/generic/customBlockManager
diff --git a/plugins/generic/datacite/filter/DataciteXmlFilter.php b/plugins/generic/datacite/filter/DataciteXmlFilter.php
@@ -913,29 +913,6 @@ public function getObjectLocalePrecedence($context, $article, $publication, $gal
         return $locales;
     }
 
-    /**
-     * Try to translate an ISO language code to an OJS locale.
-     *
-     * @param string $language 2- or 3-letter ISO language code
-     *
-     * @return string|null An OJS locale or null if no matching
-     *  locale could be found.
-     */
-    public function translateLanguageToLocale($language)
-    {
-        $locale = null;
-        if (strlen($language) == 2) {
-            $language = LocaleConversion::get3LetterFrom2LetterIsoLanguage($language);
-        }
-        if (strlen($language) == 3) {
-            $language = LocaleConversion::getLocaleFrom3LetterIso($language);
-        }
-        if (Locale::isLocaleValid($language)) {
-            $locale = $language;
-        }
-        return $locale;
-    }
-
     /**
      * Identify the primary translation from an array of
      * localized data.

diff --git a/...s/generic/datacite/locale/fr_FR/locale.po → plugins/generic/datacite/locale/fr/locale.po b/...s/generic/datacite/locale/fr_FR/locale.po → plugins/generic/datacite/locale/fr/locale.po
diff --git a/plugins/generic/datacite/locale/nb/locale.po → ...s/generic/datacite/locale/nb_NO/locale.po b/plugins/generic/datacite/locale/nb/locale.po → ...s/generic/datacite/locale/nb_NO/locale.po
diff --git a/...eneric/datacite/locale/sr@latin/locale.po → ...generic/datacite/locale/sr_Latn/locale.po b/...eneric/datacite/locale/sr@latin/locale.po → ...generic/datacite/locale/sr_Latn/locale.po
diff --git a/...ric/datacite/locale/uz@cyrillic/locale.po → plugins/generic/datacite/locale/uz/locale.po b/...ric/datacite/locale/uz@cyrillic/locale.po → plugins/generic/datacite/locale/uz/locale.po
diff --git a/...eneric/datacite/locale/uz@latin/locale.po → ...generic/datacite/locale/uz_Latn/locale.po b/...eneric/datacite/locale/uz@latin/locale.po → ...generic/datacite/locale/uz_Latn/locale.po
diff --git a/...s/generic/datacite/locale/zh_CN/locale.po → ...generic/datacite/locale/zh_Hans/locale.po b/...s/generic/datacite/locale/zh_CN/locale.po → ...generic/datacite/locale/zh_Hans/locale.po
diff --git a/...ins/generic/driver/locale/fr_FR/locale.po → plugins/generic/driver/locale/fr/locale.po b/...ins/generic/driver/locale/fr_FR/locale.po → plugins/generic/driver/locale/fr/locale.po
diff --git a/plugins/generic/driver/locale/nb/locale.po → ...ins/generic/driver/locale/nb_NO/locale.po b/plugins/generic/driver/locale/nb/locale.po → ...ins/generic/driver/locale/nb_NO/locale.po
diff --git a/.../generic/driver/locale/sr@latin/locale.po → ...s/generic/driver/locale/sr_Latn/locale.po b/.../generic/driver/locale/sr@latin/locale.po → ...s/generic/driver/locale/sr_Latn/locale.po
diff --git a/...neric/driver/locale/uz@cyrillic/locale.po → plugins/generic/driver/locale/uz/locale.po b/...neric/driver/locale/uz@cyrillic/locale.po → plugins/generic/driver/locale/uz/locale.po
diff --git a/.../generic/driver/locale/uz@latin/locale.po → ...s/generic/driver/locale/uz_Latn/locale.po b/.../generic/driver/locale/uz@latin/locale.po → ...s/generic/driver/locale/uz_Latn/locale.po
diff --git a/plugins/generic/dublinCoreMeta/DublinCoreMetaPlugin.php b/plugins/generic/dublinCoreMeta/DublinCoreMetaPlugin.php
@@ -17,6 +17,7 @@
 use APP\facades\Repo;
 use APP\template\TemplateManager;
 use PKP\core\PKPApplication;
+use PKP\i18n\LocaleConversion;
 use PKP\plugins\GenericPlugin;
 use PKP\plugins\Hook;
 
@@ -83,15 +84,15 @@ public function articleView($hookName, $args)
         if ($supportingAgencies = $publication->getData('supportingAgencies')) {
             foreach ($supportingAgencies as $locale => $localeSupportingAgencies) {
                 foreach ($localeSupportingAgencies as $i => $supportingAgency) {
-                    $templateMgr->addHeader('dublinCoreSponsor' . $locale . $i++, '<meta name="DC.Contributor.Sponsor" xml:lang="' . htmlspecialchars(substr($locale, 0, 2)) . '" content="' . htmlspecialchars($supportingAgency) . '"/>');
+                    $templateMgr->addHeader('dublinCoreSponsor' . $locale . $i++, '<meta name="DC.Contributor.Sponsor" xml:lang="' . htmlspecialchars(LocaleConversion::getIso1FromLocale($locale)) . '" content="' . htmlspecialchars($supportingAgency) . '"/>');
                 }
             }
         }
 
         if ($coverages = $publication->getData('coverage')) {
             foreach ($coverages as $locale => $coverage) {
                 if ($coverage != '') {
-                    $templateMgr->addHeader('dublinCoreCoverage' . $locale, '<meta name="DC.Coverage" xml:lang="' . htmlspecialchars(substr($locale, 0, 2)) . '" content="' . htmlspecialchars(strip_tags($coverage)) . '"/>');
+                    $templateMgr->addHeader('dublinCoreCoverage' . $locale, '<meta name="DC.Coverage" xml:lang="' . htmlspecialchars(LocaleConversion::getIso1FromLocale($locale)) . '" content="' . htmlspecialchars(strip_tags($coverage)) . '"/>');
                 }
             }
         }
@@ -115,7 +116,7 @@ public function articleView($hookName, $args)
         $abstracts = $publication->getData('abstract') ?: [];
         foreach ($abstracts as $locale => $abstract) {
             if ($abstract != '') {
-                $templateMgr->addHeader('dublinCoreAbstract' . $locale, '<meta name="DC.Description" xml:lang="' . htmlspecialchars(substr($locale, 0, 2)) . '" content="' . htmlspecialchars(strip_tags($abstract)) . '"/>');
+                $templateMgr->addHeader('dublinCoreAbstract' . $locale, '<meta name="DC.Description" xml:lang="' . htmlspecialchars(LocaleConversion::getIso1FromLocale($locale)) . '" content="' . htmlspecialchars(strip_tags($abstract)) . '"/>');
             }
         }
 
@@ -172,30 +173,30 @@ public function articleView($hookName, $args)
         if ($subjects = $publication->getData('subjects')) {
             foreach ($subjects as $locale => $localeSubjects) {
                 foreach ($localeSubjects as $i => $subject) {
-                    $templateMgr->addHeader('dublinCoreSubject' . $locale . $i++, '<meta name="DC.Subject" xml:lang="' . htmlspecialchars(substr($locale, 0, 2)) . '" content="' . htmlspecialchars($subject) . '"/>');
+                    $templateMgr->addHeader('dublinCoreSubject' . $locale . $i++, '<meta name="DC.Subject" xml:lang="' . htmlspecialchars(LocaleConversion::getIso1FromLocale($locale)) . '" content="' . htmlspecialchars($subject) . '"/>');
                 }
             }
         }
         if ($keywords = $publication->getData('keywords')) {
             foreach ($keywords as $locale => $localeKeywords) {
                 foreach ($localeKeywords as $i => $keyword) {
-                    $templateMgr->addHeader('dublinCoreKeyword' . $locale . $i++, '<meta name="DC.Subject" xml:lang="' . htmlspecialchars(substr($locale, 0, 2)) . '" content="' . htmlspecialchars($keyword) . '"/>');
+                    $templateMgr->addHeader('dublinCoreKeyword' . $locale . $i++, '<meta name="DC.Subject" xml:lang="' . htmlspecialchars(LocaleConversion::getIso1FromLocale($locale)) . '" content="' . htmlspecialchars($keyword) . '"/>');
                 }
             }
         }
 
         $templateMgr->addHeader('dublinCoreTitle', '<meta name="DC.Title" content="' . htmlspecialchars($publication->getLocalizedFullTitle($publicationLocale)) . '"/>');
         foreach ($publication->getFullTitles() as $locale => $title) {
             if ($title != '' && $locale != $publicationLocale) {
-                $templateMgr->addHeader('dublinCoreAltTitle' . $locale, '<meta name="DC.Title.Alternative" xml:lang="' . htmlspecialchars(substr($locale, 0, 2)) . '" content="' . htmlspecialchars($title) . '"/>');
+                $templateMgr->addHeader('dublinCoreAltTitle' . $locale, '<meta name="DC.Title.Alternative" xml:lang="' . htmlspecialchars(LocaleConversion::getIso1FromLocale($locale)) . '" content="' . htmlspecialchars($title) . '"/>');
             }
         }
 
         $templateMgr->addHeader('dublinCoreType', '<meta name="DC.Type" content="Text.Serial.Journal"/>');
         if ($types = $publication->getData('type')) {
             foreach ($types as $locale => $type) {
                 if ($type != '') {
-                    $templateMgr->addHeader('dublinCoreType' . $locale, '<meta name="DC.Type" xml:lang="' . htmlspecialchars(substr($locale, 0, 2)) . '" content="' . htmlspecialchars(strip_tags($type)) . '"/>');
+                    $templateMgr->addHeader('dublinCoreType' . $locale, '<meta name="DC.Type" xml:lang="' . htmlspecialchars(LocaleConversion::getIso1FromLocale($locale)) . '" content="' . htmlspecialchars(strip_tags($type)) . '"/>');
                 }
             }
         }

diff --git a/...ric/dublinCoreMeta/locale/fr_FR/locale.po → ...eneric/dublinCoreMeta/locale/fr/locale.po b/...ric/dublinCoreMeta/locale/fr_FR/locale.po → ...eneric/dublinCoreMeta/locale/fr/locale.po
diff --git a/...eneric/dublinCoreMeta/locale/nb/locale.po → ...ric/dublinCoreMeta/locale/nb_NO/locale.po b/...eneric/dublinCoreMeta/locale/nb/locale.po → ...ric/dublinCoreMeta/locale/nb_NO/locale.po
diff --git a/...blinCoreMeta/locale/uz@cyrillic/locale.po → ...eneric/dublinCoreMeta/locale/uz/locale.po b/...blinCoreMeta/locale/uz@cyrillic/locale.po → ...eneric/dublinCoreMeta/locale/uz/locale.po
diff --git a/.../dublinCoreMeta/locale/uz@latin/locale.po → ...c/dublinCoreMeta/locale/uz_Latn/locale.po b/.../dublinCoreMeta/locale/uz@latin/locale.po → ...c/dublinCoreMeta/locale/uz_Latn/locale.po
diff --git a/...ric/dublinCoreMeta/locale/zh_CN/locale.po → ...c/dublinCoreMeta/locale/zh_Hans/locale.po b/...ric/dublinCoreMeta/locale/zh_CN/locale.po → ...c/dublinCoreMeta/locale/zh_Hans/locale.po
diff --git a/plugins/generic/googleAnalytics b/plugins/generic/googleAnalytics
diff --git a/plugins/generic/googleScholar b/plugins/generic/googleScholar
diff --git a/.../htmlArticleGalley/locale/fr_FR/locale.po → ...ric/htmlArticleGalley/locale/fr/locale.po b/.../htmlArticleGalley/locale/fr_FR/locale.po → ...ric/htmlArticleGalley/locale/fr/locale.po
diff --git a/...ric/htmlArticleGalley/locale/nb/locale.po → .../htmlArticleGalley/locale/nb_NO/locale.po b/...ric/htmlArticleGalley/locale/nb/locale.po → .../htmlArticleGalley/locale/nb_NO/locale.po
diff --git a/...mlArticleGalley/locale/sr@latin/locale.po → ...tmlArticleGalley/locale/sr_Latn/locale.po b/...mlArticleGalley/locale/sr@latin/locale.po → ...tmlArticleGalley/locale/sr_Latn/locale.po
diff --git a/...rticleGalley/locale/uz@cyrillic/locale.po → ...ric/htmlArticleGalley/locale/uz/locale.po b/...rticleGalley/locale/uz@cyrillic/locale.po → ...ric/htmlArticleGalley/locale/uz/locale.po
diff --git a/...mlArticleGalley/locale/uz@latin/locale.po → ...tmlArticleGalley/locale/uz_Latn/locale.po b/...mlArticleGalley/locale/uz@latin/locale.po → ...tmlArticleGalley/locale/uz_Latn/locale.po
diff --git a/plugins/generic/lensGalley b/plugins/generic/lensGalley
diff --git a/plugins/generic/pdfJsViewer b/plugins/generic/pdfJsViewer
diff --git a/.../recommendByAuthor/locale/fr_FR/locale.po → ...ric/recommendByAuthor/locale/fr/locale.po b/.../recommendByAuthor/locale/fr_FR/locale.po → ...ric/recommendByAuthor/locale/fr/locale.po
diff --git a/...ric/recommendByAuthor/locale/nb/locale.po → .../recommendByAuthor/locale/nb_NO/locale.po b/...ric/recommendByAuthor/locale/nb/locale.po → .../recommendByAuthor/locale/nb_NO/locale.po
diff --git a/...commendByAuthor/locale/sr@latin/locale.po → ...ecommendByAuthor/locale/sr_Latn/locale.po b/...commendByAuthor/locale/sr@latin/locale.po → ...ecommendByAuthor/locale/sr_Latn/locale.po
diff --git a/...mendByAuthor/locale/uz@cyrillic/locale.po → ...ric/recommendByAuthor/locale/uz/locale.po b/...mendByAuthor/locale/uz@cyrillic/locale.po → ...ric/recommendByAuthor/locale/uz/locale.po
diff --git a/...commendByAuthor/locale/uz@latin/locale.po → ...ecommendByAuthor/locale/uz_Latn/locale.po b/...commendByAuthor/locale/uz@latin/locale.po → ...ecommendByAuthor/locale/uz_Latn/locale.po
diff --git a/...ommendBySimilarity/locale/fr_FR/locale.po → ...recommendBySimilarity/locale/fr/locale.po b/...ommendBySimilarity/locale/fr_FR/locale.po → ...recommendBySimilarity/locale/fr/locale.po
diff --git a/...recommendBySimilarity/locale/nb/locale.po → ...ommendBySimilarity/locale/nb_NO/locale.po b/...recommendBySimilarity/locale/nb/locale.po → ...ommendBySimilarity/locale/nb_NO/locale.po
diff --git a/...BySimilarity/locale/uz@cyrillic/locale.po → ...recommendBySimilarity/locale/uz/locale.po b/...BySimilarity/locale/uz@cyrillic/locale.po → ...recommendBySimilarity/locale/uz/locale.po
diff --git a/...endBySimilarity/locale/uz@latin/locale.po → ...mendBySimilarity/locale/uz_Latn/locale.po b/...endBySimilarity/locale/uz@latin/locale.po → ...mendBySimilarity/locale/uz_Latn/locale.po
diff --git a/plugins/generic/staticPages b/plugins/generic/staticPages
diff --git a/plugins/generic/tinymce b/plugins/generic/tinymce
diff --git a/...generic/usageEvent/locale/fr_FR/locale.po → ...ns/generic/usageEvent/locale/fr/locale.po b/...generic/usageEvent/locale/fr_FR/locale.po → ...ns/generic/usageEvent/locale/fr/locale.po
diff --git a/...ns/generic/usageEvent/locale/nb/locale.po → ...generic/usageEvent/locale/nb_NO/locale.po b/...ns/generic/usageEvent/locale/nb/locale.po → ...generic/usageEvent/locale/nb_NO/locale.po
diff --git a/...eric/usageEvent/locale/sr@latin/locale.po → ...neric/usageEvent/locale/sr_Latn/locale.po b/...eric/usageEvent/locale/sr@latin/locale.po → ...neric/usageEvent/locale/sr_Latn/locale.po
diff --git a/...c/usageEvent/locale/uz@cyrillic/locale.po → ...ns/generic/usageEvent/locale/uz/locale.po b/...c/usageEvent/locale/uz@cyrillic/locale.po → ...ns/generic/usageEvent/locale/uz/locale.po
diff --git a/...eric/usageEvent/locale/uz@latin/locale.po → ...neric/usageEvent/locale/uz_Latn/locale.po b/...eric/usageEvent/locale/uz@latin/locale.po → ...neric/usageEvent/locale/uz_Latn/locale.po
diff --git a/plugins/generic/webFeed b/plugins/generic/webFeed
diff --git a/.../importexport/doaj/locale/fr_FR/locale.po → ...ins/importexport/doaj/locale/fr/locale.po b/.../importexport/doaj/locale/fr_FR/locale.po → ...ins/importexport/doaj/locale/fr/locale.po
diff --git a/...ins/importexport/doaj/locale/nb/locale.po → .../importexport/doaj/locale/nb_NO/locale.po b/...ins/importexport/doaj/locale/nb/locale.po → .../importexport/doaj/locale/nb_NO/locale.po
diff --git a/...portexport/doaj/locale/sr@latin/locale.po → ...mportexport/doaj/locale/sr_Latn/locale.po b/...portexport/doaj/locale/sr@latin/locale.po → ...mportexport/doaj/locale/sr_Latn/locale.po
diff --git a/...texport/doaj/locale/uz@cyrillic/locale.po → ...ins/importexport/doaj/locale/uz/locale.po b/...texport/doaj/locale/uz@cyrillic/locale.po → ...ins/importexport/doaj/locale/uz/locale.po
diff --git a/...portexport/doaj/locale/uz@latin/locale.po → ...mportexport/doaj/locale/uz_Latn/locale.po b/...portexport/doaj/locale/uz@latin/locale.po → ...mportexport/doaj/locale/uz_Latn/locale.po
diff --git a/.../importexport/doaj/locale/zh_CN/locale.po → ...mportexport/doaj/locale/zh_Hans/locale.po b/.../importexport/doaj/locale/zh_CN/locale.po → ...mportexport/doaj/locale/zh_Hans/locale.po
diff --git a/...mportexport/native/locale/fr_FR/locale.po → ...s/importexport/native/locale/fr/locale.po b/...mportexport/native/locale/fr_FR/locale.po → ...s/importexport/native/locale/fr/locale.po
diff --git a/...s/importexport/native/locale/nb/locale.po → ...mportexport/native/locale/nb_NO/locale.po b/...s/importexport/native/locale/nb/locale.po → ...mportexport/native/locale/nb_NO/locale.po
diff --git a/...rtexport/native/locale/sr@latin/locale.po → ...ortexport/native/locale/sr_Latn/locale.po b/...rtexport/native/locale/sr@latin/locale.po → ...ortexport/native/locale/sr_Latn/locale.po
diff --git a/...xport/native/locale/uz@cyrillic/locale.po → ...s/importexport/native/locale/uz/locale.po b/...xport/native/locale/uz@cyrillic/locale.po → ...s/importexport/native/locale/uz/locale.po
diff --git a/...rtexport/native/locale/uz@latin/locale.po → ...ortexport/native/locale/uz_Latn/locale.po b/...rtexport/native/locale/uz@latin/locale.po → ...ortexport/native/locale/uz_Latn/locale.po
diff --git a/plugins/importexport/pubmed/filter/ArticlePubMedXmlFilter.php b/plugins/importexport/pubmed/filter/ArticlePubMedXmlFilter.php
@@ -99,7 +99,7 @@ public function &process(&$submissions)
                 $articleNode->appendChild($doiNode);
             }
 
-            $articleNode->appendChild($doc->createElement('Language'))->appendChild($doc->createTextNode(LocaleConversion::get3LetterFrom2LetterIsoLanguage(substr($locale, 0, 2))));
+            $articleNode->appendChild($doc->createElement('Language'))->appendChild($doc->createTextNode(LocaleConversion::get3LetterIsoFromLocale($locale)));
 
             $authorListNode = $doc->createElement('AuthorList');
             foreach ($publication->getData('authors') ?? [] as $author) {

diff --git a/...mportexport/pubmed/locale/fr_FR/locale.po → ...s/importexport/pubmed/locale/fr/locale.po b/...mportexport/pubmed/locale/fr_FR/locale.po → ...s/importexport/pubmed/locale/fr/locale.po
diff --git a/...s/importexport/pubmed/locale/nb/locale.po → ...mportexport/pubmed/locale/nb_NO/locale.po b/...s/importexport/pubmed/locale/nb/locale.po → ...mportexport/pubmed/locale/nb_NO/locale.po
diff --git a/...rtexport/pubmed/locale/sr@latin/locale.po → ...ortexport/pubmed/locale/sr_Latn/locale.po b/...rtexport/pubmed/locale/sr@latin/locale.po → ...ortexport/pubmed/locale/sr_Latn/locale.po
diff --git a/...xport/pubmed/locale/uz@cyrillic/locale.po → ...s/importexport/pubmed/locale/uz/locale.po b/...xport/pubmed/locale/uz@cyrillic/locale.po → ...s/importexport/pubmed/locale/uz/locale.po
diff --git a/...rtexport/pubmed/locale/uz@latin/locale.po → ...ortexport/pubmed/locale/uz_Latn/locale.po b/...rtexport/pubmed/locale/uz@latin/locale.po → ...ortexport/pubmed/locale/uz_Latn/locale.po
diff --git a/...mportexport/pubmed/locale/zh_CN/locale.po → ...ortexport/pubmed/locale/zh_Hans/locale.po b/...mportexport/pubmed/locale/zh_CN/locale.po → ...ortexport/pubmed/locale/zh_Hans/locale.po
diff --git a/...importexport/users/locale/fr_FR/locale.po → ...ns/importexport/users/locale/fr/locale.po b/...importexport/users/locale/fr_FR/locale.po → ...ns/importexport/users/locale/fr/locale.po
diff --git a/...ns/importexport/users/locale/nb/locale.po → ...importexport/users/locale/nb_NO/locale.po b/...ns/importexport/users/locale/nb/locale.po → ...importexport/users/locale/nb_NO/locale.po
diff --git a/...ortexport/users/locale/sr@latin/locale.po → ...portexport/users/locale/sr_Latn/locale.po b/...ortexport/users/locale/sr@latin/locale.po → ...portexport/users/locale/sr_Latn/locale.po
diff --git a/...export/users/locale/uz@cyrillic/locale.po → ...ns/importexport/users/locale/uz/locale.po b/...export/users/locale/uz@cyrillic/locale.po → ...ns/importexport/users/locale/uz/locale.po
diff --git a/...ortexport/users/locale/uz@latin/locale.po → ...portexport/users/locale/uz_Latn/locale.po b/...ortexport/users/locale/uz@latin/locale.po → ...portexport/users/locale/uz_Latn/locale.po
diff --git a/...tadataFormats/marc/locale/fr_FR/locale.po → ...iMetadataFormats/marc/locale/fr/locale.po b/...tadataFormats/marc/locale/fr_FR/locale.po → ...iMetadataFormats/marc/locale/fr/locale.po
diff --git a/...iMetadataFormats/marc/locale/nb/locale.po → ...tadataFormats/marc/locale/nb_NO/locale.po b/...iMetadataFormats/marc/locale/nb/locale.po → ...tadataFormats/marc/locale/nb_NO/locale.po
diff --git a/...ataFormats/marc/locale/sr@latin/locale.po → ...dataFormats/marc/locale/sr_Latn/locale.po b/...ataFormats/marc/locale/sr@latin/locale.po → ...dataFormats/marc/locale/sr_Latn/locale.po
diff --git a/...Formats/marc/locale/uz@cyrillic/locale.po → ...iMetadataFormats/marc/locale/uz/locale.po b/...Formats/marc/locale/uz@cyrillic/locale.po → ...iMetadataFormats/marc/locale/uz/locale.po
diff --git a/...ataFormats/marc/locale/uz@latin/locale.po → ...dataFormats/marc/locale/uz_Latn/locale.po b/...ataFormats/marc/locale/uz@latin/locale.po → ...dataFormats/marc/locale/uz_Latn/locale.po
diff --git a/...tadataFormats/marc/locale/zh_CN/locale.po → ...dataFormats/marc/locale/zh_Hans/locale.po b/...tadataFormats/marc/locale/zh_CN/locale.po → ...dataFormats/marc/locale/zh_Hans/locale.po
diff --git a/...ataFormats/marcxml/locale/fr_FR/locale.po → ...tadataFormats/marcxml/locale/fr/locale.po b/...ataFormats/marcxml/locale/fr_FR/locale.po → ...tadataFormats/marcxml/locale/fr/locale.po
diff --git a/...tadataFormats/marcxml/locale/nb/locale.po → ...ataFormats/marcxml/locale/nb_NO/locale.po b/...tadataFormats/marcxml/locale/nb/locale.po → ...ataFormats/marcxml/locale/nb_NO/locale.po
diff --git a/...Formats/marcxml/locale/sr@latin/locale.po → ...aFormats/marcxml/locale/sr_Latn/locale.po b/...Formats/marcxml/locale/sr@latin/locale.po → ...aFormats/marcxml/locale/sr_Latn/locale.po
diff --git a/...mats/marcxml/locale/uz@cyrillic/locale.po → ...tadataFormats/marcxml/locale/uz/locale.po b/...mats/marcxml/locale/uz@cyrillic/locale.po → ...tadataFormats/marcxml/locale/uz/locale.po
diff --git a/...Formats/marcxml/locale/uz@latin/locale.po → ...aFormats/marcxml/locale/uz_Latn/locale.po b/...Formats/marcxml/locale/uz@latin/locale.po → ...aFormats/marcxml/locale/uz_Latn/locale.po
diff --git a/...ataFormats/marcxml/locale/zh_CN/locale.po → ...aFormats/marcxml/locale/zh_Hans/locale.po b/...ataFormats/marcxml/locale/zh_CN/locale.po → ...aFormats/marcxml/locale/zh_Hans/locale.po
diff --git a/...ataFormats/rfc1807/locale/fr_FR/locale.po → ...tadataFormats/rfc1807/locale/fr/locale.po b/...ataFormats/rfc1807/locale/fr_FR/locale.po → ...tadataFormats/rfc1807/locale/fr/locale.po
diff --git a/...tadataFormats/rfc1807/locale/nb/locale.po → ...ataFormats/rfc1807/locale/nb_NO/locale.po b/...tadataFormats/rfc1807/locale/nb/locale.po → ...ataFormats/rfc1807/locale/nb_NO/locale.po
diff --git a/...Formats/rfc1807/locale/sr@latin/locale.po → ...aFormats/rfc1807/locale/sr_Latn/locale.po b/...Formats/rfc1807/locale/sr@latin/locale.po → ...aFormats/rfc1807/locale/sr_Latn/locale.po
diff --git a/...mats/rfc1807/locale/uz@cyrillic/locale.po → ...tadataFormats/rfc1807/locale/uz/locale.po b/...mats/rfc1807/locale/uz@cyrillic/locale.po → ...tadataFormats/rfc1807/locale/uz/locale.po
diff --git a/...Formats/rfc1807/locale/uz@latin/locale.po → ...aFormats/rfc1807/locale/uz_Latn/locale.po b/...Formats/rfc1807/locale/uz@latin/locale.po → ...aFormats/rfc1807/locale/uz_Latn/locale.po
diff --git a/...ataFormats/rfc1807/locale/zh_CN/locale.po → ...aFormats/rfc1807/locale/zh_Hans/locale.po b/...ataFormats/rfc1807/locale/zh_CN/locale.po → ...aFormats/rfc1807/locale/zh_Hans/locale.po
diff --git a/...s/paymethod/manual/locale/fr_FR/emails.po → plugins/paymethod/manual/locale/fr/emails.po b/...s/paymethod/manual/locale/fr_FR/emails.po → plugins/paymethod/manual/locale/fr/emails.po
diff --git a/...s/paymethod/manual/locale/fr_FR/locale.po → plugins/paymethod/manual/locale/fr/locale.po b/...s/paymethod/manual/locale/fr_FR/locale.po → plugins/paymethod/manual/locale/fr/locale.po
diff --git a/plugins/paymethod/manual/locale/nb/emails.po → ...s/paymethod/manual/locale/nb_NO/emails.po b/plugins/paymethod/manual/locale/nb/emails.po → ...s/paymethod/manual/locale/nb_NO/emails.po
diff --git a/plugins/paymethod/manual/locale/nb/locale.po → ...s/paymethod/manual/locale/nb_NO/locale.po b/plugins/paymethod/manual/locale/nb/locale.po → ...s/paymethod/manual/locale/nb_NO/locale.po
diff --git a/...aymethod/manual/locale/sr@latin/locale.po → ...paymethod/manual/locale/sr_Latn/locale.po b/...aymethod/manual/locale/sr@latin/locale.po → ...paymethod/manual/locale/sr_Latn/locale.po
diff --git a/...ethod/manual/locale/uz@cyrillic/emails.po → plugins/paymethod/manual/locale/uz/emails.po b/...ethod/manual/locale/uz@cyrillic/emails.po → plugins/paymethod/manual/locale/uz/emails.po
diff --git a/...ethod/manual/locale/uz@cyrillic/locale.po → plugins/paymethod/manual/locale/uz/locale.po b/...ethod/manual/locale/uz@cyrillic/locale.po → plugins/paymethod/manual/locale/uz/locale.po
diff --git a/...aymethod/manual/locale/uz@latin/emails.po → ...paymethod/manual/locale/uz_Latn/emails.po b/...aymethod/manual/locale/uz@latin/emails.po → ...paymethod/manual/locale/uz_Latn/emails.po
diff --git a/...aymethod/manual/locale/uz@latin/locale.po → ...paymethod/manual/locale/uz_Latn/locale.po b/...aymethod/manual/locale/uz@latin/locale.po → ...paymethod/manual/locale/uz_Latn/locale.po
diff --git a/...s/paymethod/manual/locale/zh_CN/emails.po → ...paymethod/manual/locale/zh_Hans/emails.po b/...s/paymethod/manual/locale/zh_CN/emails.po → ...paymethod/manual/locale/zh_Hans/emails.po
diff --git a/...s/paymethod/manual/locale/zh_CN/locale.po → ...paymethod/manual/locale/zh_Hans/locale.po b/...s/paymethod/manual/locale/zh_CN/locale.po → ...paymethod/manual/locale/zh_Hans/locale.po
diff --git a/...s/paymethod/paypal/locale/fr_FR/locale.po → plugins/paymethod/paypal/locale/fr/locale.po b/...s/paymethod/paypal/locale/fr_FR/locale.po → plugins/paymethod/paypal/locale/fr/locale.po
diff --git a/plugins/paymethod/paypal/locale/nb/locale.po → ...s/paymethod/paypal/locale/nb_NO/locale.po b/plugins/paymethod/paypal/locale/nb/locale.po → ...s/paymethod/paypal/locale/nb_NO/locale.po
diff --git a/...ethod/paypal/locale/uz@cyrillic/locale.po → plugins/paymethod/paypal/locale/uz/locale.po b/...ethod/paypal/locale/uz@cyrillic/locale.po → plugins/paymethod/paypal/locale/uz/locale.po
diff --git a/...aymethod/paypal/locale/uz@latin/locale.po → ...paymethod/paypal/locale/uz_Latn/locale.po b/...aymethod/paypal/locale/uz@latin/locale.po → ...paymethod/paypal/locale/uz_Latn/locale.po
diff --git a/plugins/pubIds/urn/locale/bs/locale.po → plugins/pubIds/urn/locale/bs_Latn/locale.po b/plugins/pubIds/urn/locale/bs/locale.po → plugins/pubIds/urn/locale/bs_Latn/locale.po
diff --git a/plugins/pubIds/urn/locale/fr_FR/locale.po → plugins/pubIds/urn/locale/fr/locale.po b/plugins/pubIds/urn/locale/fr_FR/locale.po → plugins/pubIds/urn/locale/fr/locale.po
diff --git a/plugins/pubIds/urn/locale/nb/locale.po → plugins/pubIds/urn/locale/nb_NO/locale.po b/plugins/pubIds/urn/locale/nb/locale.po → plugins/pubIds/urn/locale/nb_NO/locale.po
diff --git a/plugins/pubIds/urn/locale/sr@latin/locale.po → plugins/pubIds/urn/locale/sr_Latn/locale.po b/plugins/pubIds/urn/locale/sr@latin/locale.po → plugins/pubIds/urn/locale/sr_Latn/locale.po
diff --git a/...s/pubIds/urn/locale/uz@cyrillic/locale.po → plugins/pubIds/urn/locale/uz/locale.po b/...s/pubIds/urn/locale/uz@cyrillic/locale.po → plugins/pubIds/urn/locale/uz/locale.po
diff --git a/plugins/pubIds/urn/locale/uz@latin/locale.po → plugins/pubIds/urn/locale/uz_Latn/locale.po b/plugins/pubIds/urn/locale/uz@latin/locale.po → plugins/pubIds/urn/locale/uz_Latn/locale.po
diff --git a/...s/reports/articles/locale/fr_FR/locale.po → plugins/reports/articles/locale/fr/locale.po b/...s/reports/articles/locale/fr_FR/locale.po → plugins/reports/articles/locale/fr/locale.po
diff --git a/plugins/reports/articles/locale/nb/locale.po → ...s/reports/articles/locale/nb_NO/locale.po b/plugins/reports/articles/locale/nb/locale.po → ...s/reports/articles/locale/nb_NO/locale.po
diff --git a/...eports/articles/locale/sr@latin/locale.po → ...reports/articles/locale/sr_Latn/locale.po b/...eports/articles/locale/sr@latin/locale.po → ...reports/articles/locale/sr_Latn/locale.po
diff --git a/...rts/articles/locale/uz@cyrillic/locale.po → plugins/reports/articles/locale/uz/locale.po b/...rts/articles/locale/uz@cyrillic/locale.po → plugins/reports/articles/locale/uz/locale.po
diff --git a/...eports/articles/locale/uz@latin/locale.po → ...reports/articles/locale/uz_Latn/locale.po b/...eports/articles/locale/uz@latin/locale.po → ...reports/articles/locale/uz_Latn/locale.po
diff --git a/...s/reports/articles/locale/zh_CN/locale.po → ...reports/articles/locale/zh_Hans/locale.po b/...s/reports/articles/locale/zh_CN/locale.po → ...reports/articles/locale/zh_Hans/locale.po
diff --git a/...ns/reports/counter/locale/fr_FR/locale.po → plugins/reports/counter/locale/fr/locale.po b/...ns/reports/counter/locale/fr_FR/locale.po → plugins/reports/counter/locale/fr/locale.po
diff --git a/plugins/reports/counter/locale/nb/locale.po → ...ns/reports/counter/locale/nb_NO/locale.po b/plugins/reports/counter/locale/nb/locale.po → ...ns/reports/counter/locale/nb_NO/locale.po
diff --git a/...reports/counter/locale/sr@latin/locale.po → .../reports/counter/locale/sr_Latn/locale.po b/...reports/counter/locale/sr@latin/locale.po → .../reports/counter/locale/sr_Latn/locale.po
diff --git a/...orts/counter/locale/uz@cyrillic/locale.po → plugins/reports/counter/locale/uz/locale.po b/...orts/counter/locale/uz@cyrillic/locale.po → plugins/reports/counter/locale/uz/locale.po
diff --git a/...reports/counter/locale/uz@latin/locale.po → .../reports/counter/locale/uz_Latn/locale.po b/...reports/counter/locale/uz@latin/locale.po → .../reports/counter/locale/uz_Latn/locale.po
diff --git a/...ns/reports/counter/locale/zh_CN/locale.po → .../reports/counter/locale/zh_Hans/locale.po b/...ns/reports/counter/locale/zh_CN/locale.po → .../reports/counter/locale/zh_Hans/locale.po
diff --git a/plugins/reports/reviewReport b/plugins/reports/reviewReport
diff --git a/...reports/subscriptions/locale/bs/locale.po → ...ts/subscriptions/locale/bs_Latn/locale.po b/...reports/subscriptions/locale/bs/locale.po → ...ts/subscriptions/locale/bs_Latn/locale.po
diff --git a/...orts/subscriptions/locale/fr_FR/locale.po → ...reports/subscriptions/locale/fr/locale.po b/...orts/subscriptions/locale/fr_FR/locale.po → ...reports/subscriptions/locale/fr/locale.po
diff --git a/...reports/subscriptions/locale/nb/locale.po → ...orts/subscriptions/locale/nb_NO/locale.po b/...reports/subscriptions/locale/nb/locale.po → ...orts/subscriptions/locale/nb_NO/locale.po
diff --git a/...s/subscriptions/locale/sr@latin/locale.po → ...ts/subscriptions/locale/sr_Latn/locale.po b/...s/subscriptions/locale/sr@latin/locale.po → ...ts/subscriptions/locale/sr_Latn/locale.po
diff --git a/...ubscriptions/locale/uz@cyrillic/locale.po → ...reports/subscriptions/locale/uz/locale.po b/...ubscriptions/locale/uz@cyrillic/locale.po → ...reports/subscriptions/locale/uz/locale.po
diff --git a/...s/subscriptions/locale/uz@latin/locale.po → ...ts/subscriptions/locale/uz_Latn/locale.po b/...s/subscriptions/locale/uz@latin/locale.po → ...ts/subscriptions/locale/uz_Latn/locale.po
diff --git a/plugins/themes/default/locale/bs/locale.po → ...s/themes/default/locale/bs_Latn/locale.po b/plugins/themes/default/locale/bs/locale.po → ...s/themes/default/locale/bs_Latn/locale.po
diff --git a/...ins/themes/default/locale/fr_FR/locale.po → plugins/themes/default/locale/fr/locale.po b/...ins/themes/default/locale/fr_FR/locale.po → plugins/themes/default/locale/fr/locale.po
diff --git a/plugins/themes/default/locale/nb/locale.po → ...ins/themes/default/locale/nb_NO/locale.po b/plugins/themes/default/locale/nb/locale.po → ...ins/themes/default/locale/nb_NO/locale.po
diff --git a/.../themes/default/locale/sr@latin/locale.po → ...s/themes/default/locale/sr_Latn/locale.po b/.../themes/default/locale/sr@latin/locale.po → ...s/themes/default/locale/sr_Latn/locale.po
diff --git a/...emes/default/locale/uz@cyrillic/locale.po → plugins/themes/default/locale/uz/locale.po b/...emes/default/locale/uz@cyrillic/locale.po → plugins/themes/default/locale/uz/locale.po
diff --git a/.../themes/default/locale/uz@latin/locale.po → ...s/themes/default/locale/uz_Latn/locale.po b/.../themes/default/locale/uz@latin/locale.po → ...s/themes/default/locale/uz_Latn/locale.po
diff --git a/...ins/themes/default/locale/zh_CN/locale.po → ...s/themes/default/locale/zh_Hans/locale.po b/...ins/themes/default/locale/zh_CN/locale.po → ...s/themes/default/locale/zh_Hans/locale.po