diff --git a/classes/orcid/OrcidReview.php b/classes/orcid/OrcidReview.php index 88b88eb53e4..d79eb0c2337 100644 --- a/classes/orcid/OrcidReview.php +++ b/classes/orcid/OrcidReview.php @@ -103,7 +103,7 @@ private function build(): array $orcidReview['review-url'] = ['value' => $publicationUrl]; $orcidReview['subject-type'] = 'journal-article'; $orcidReview['subject-name'] = [ - 'title' => ['value' => $this->submission->getCurrentPublication()->getLocalizedData('title') ?? ''] + 'title' => ['value' => $this->submission->getCurrentPublication()->getLocalizedTitle($submissionLocale) ?? ''] ]; if (!empty($currentPublication->getDoi())) { @@ -125,7 +125,10 @@ private function build(): array $allTitles = $currentPublication->getData('title'); foreach ($allTitles as $locale => $title) { if ($locale !== $submissionLocale) { - $orcidReview['subject-name']['translated-title'] = ['value' => $title, 'language-code' => LocaleConversion::getIso1FromLocale($locale)]; + $iso1Locale = LocaleConversion::getIso1FromLocale($locale); + if ($iso1Locale) { + $orcidReview['subject-name']['translated-title'] = ['value' => $title, 'language-code' => $iso1Locale]; + } } } diff --git a/controllers/grid/articleGalleys/form/ArticleGalleyForm.php b/controllers/grid/articleGalleys/form/ArticleGalleyForm.php index a66ef7b4eba..ade999041f6 100644 --- a/controllers/grid/articleGalleys/form/ArticleGalleyForm.php +++ b/controllers/grid/articleGalleys/form/ArticleGalleyForm.php @@ -62,7 +62,7 @@ public function __construct($request, $submission, $publication, $articleGalley $this->addCheck(new \PKP\form\validation\FormValidatorCSRF($this)); // Ensure a locale is provided and valid - $locales = $submission->getPublicationLanguages($request->getJournal()->getSupportedSubmissionMetadataLocales(), $articleGalley?->getLanguages()); + $locales = $submission->getPublicationLanguages($request->getJournal()->getSupportedSubmissionLocales(), $articleGalley?->getLanguages()); $this->addCheck( new \PKP\form\validation\FormValidatorCustom( $this, @@ -92,7 +92,7 @@ public function fetch($request, $template = null, $display = false) ]); } - $supportedLocales = $request->getContext()->getSupportedSubmissionMetadataLocaleNames() + $this->_submission->getPublicationLanguageNames() + ($this->_articleGalley?->getLanguageNames() ?? []); + $supportedLocales = $request->getContext()->getSupportedSubmissionLocaleNames() + $this->_submission->getPublicationLanguageNames() + ($this->_articleGalley?->getLanguageNames() ?? []); ksort($supportedLocales); $templateMgr->assign([ diff --git a/cypress/tests/integration/SubmissionWizard.cy.js b/cypress/tests/integration/SubmissionWizard.cy.js index 2f018b4ad42..17f6609b6dc 100644 --- a/cypress/tests/integration/SubmissionWizard.cy.js +++ b/cypress/tests/integration/SubmissionWizard.cy.js @@ -231,7 +231,7 @@ describe('Submission Wizard', function() { cy.get('button:contains("Submit")').should('be.enabled'); }); - cy.changeLanguage('Français'); + cy.changeLanguage('français'); cy.get('button:contains("Continuer")').click(); cy.get('button:contains("Continuer")').click(); cy.get('button:contains("Continuer")').click(); diff --git a/cypress/tests/integration/Z_ArticleViewDCMetadata.cy.js b/cypress/tests/integration/Z_ArticleViewDCMetadata.cy.js index 1b84eb2fbd3..a06aef751ef 100644 --- a/cypress/tests/integration/Z_ArticleViewDCMetadata.cy.js +++ b/cypress/tests/integration/Z_ArticleViewDCMetadata.cy.js @@ -152,7 +152,7 @@ describe('Article View Metadata - DC Plugin', function() { ] }, { - locale: 'fr', + locale: 'fr-CA', contents: [ submission.localeMetadata .find(element => element.locale == 'fr_CA') @@ -173,7 +173,7 @@ describe('Article View Metadata - DC Plugin', function() { ] }, { - locale: 'fr', + locale: 'fr-CA', contents: [ submission.localeTitles.fr_CA.abstract ] @@ -184,7 +184,7 @@ describe('Article View Metadata - DC Plugin', function() { element: 'DC.Title.Alternative', values: [ { - locale: 'fr', + locale: 'fr-CA', contents: [ submission.localeTitles.fr_CA.prefix + ' ' + submission.localeTitles.fr_CA.title + ': ' + submission.localeTitles.fr_CA.subtitle ] @@ -207,7 +207,7 @@ describe('Article View Metadata - DC Plugin', function() { }, { - locale: 'fr', + locale: 'fr-CA', contents: [ submission.localeMetadata .find(element => element.locale == 'fr_CA') @@ -230,7 +230,7 @@ describe('Article View Metadata - DC Plugin', function() { .values }, { - locale: 'fr', + locale: 'fr-CA', contents: submission.localeMetadata .find(element => element.locale == 'fr_CA') .manyValues @@ -327,7 +327,7 @@ describe('Article View Metadata - DC Plugin', function() { }, { element: 'DC.Language', - scheme: 'ISO639-1', + scheme: 'rfc5646', content: 'en' }, { @@ -371,7 +371,7 @@ describe('Article View Metadata - DC Plugin', function() { cy.wait(500); // Enable dois - cy.checkDoiConfig(['publication', 'issue', 'representation']); + cy.checkDoiConfig(['publication', 'issue']); // After configuration, go to submissions cy.get('nav').contains('Dashboards').click(); diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml index 2f8d11c0096..7b8afb40e52 100644 --- a/dbscripts/xml/upgrade.xml +++ b/dbscripts/xml/upgrade.xml @@ -151,6 +151,7 @@ + diff --git a/lib/pkp b/lib/pkp index aca0fb1cc83..cd7b8e942a4 160000 --- a/lib/pkp +++ b/lib/pkp @@ -1 +1 @@ -Subproject commit aca0fb1cc83228c376e9e2bff4f329916113c7c9 +Subproject commit cd7b8e942a4de0453eb9b1e02f22c22ad481b991 diff --git a/lib/ui-library b/lib/ui-library index b182fadb831..f7bd0eef877 160000 --- a/lib/ui-library +++ b/lib/ui-library @@ -1 +1 @@ -Subproject commit b182fadb83174b4a69792d9366808f7fc62197ea +Subproject commit f7bd0eef877bf9b863c41cd8dcc01cb4622865db diff --git a/locale/be@cyrillic/admin.po b/locale/be/admin.po similarity index 100% rename from locale/be@cyrillic/admin.po rename to locale/be/admin.po diff --git a/locale/be@cyrillic/author.po b/locale/be/author.po similarity index 100% rename from locale/be@cyrillic/author.po rename to locale/be/author.po diff --git a/locale/be@cyrillic/default.po b/locale/be/default.po similarity index 100% rename from locale/be@cyrillic/default.po rename to locale/be/default.po diff --git a/locale/be@cyrillic/manager.po b/locale/be/manager.po similarity index 100% rename from locale/be@cyrillic/manager.po rename to locale/be/manager.po diff --git a/locale/be@cyrillic/submission.po b/locale/be/submission.po similarity index 100% rename from locale/be@cyrillic/submission.po rename to locale/be/submission.po diff --git a/locale/bs/admin.po b/locale/bs_Latn/admin.po similarity index 100% rename from locale/bs/admin.po rename to locale/bs_Latn/admin.po diff --git a/locale/bs/author.po b/locale/bs_Latn/author.po similarity index 100% rename from locale/bs/author.po rename to locale/bs_Latn/author.po diff --git a/locale/bs/default.po b/locale/bs_Latn/default.po similarity index 100% rename from locale/bs/default.po rename to locale/bs_Latn/default.po diff --git a/locale/bs/editor.po b/locale/bs_Latn/editor.po similarity index 100% rename from locale/bs/editor.po rename to locale/bs_Latn/editor.po diff --git a/locale/bs/emails.po b/locale/bs_Latn/emails.po similarity index 100% rename from locale/bs/emails.po rename to locale/bs_Latn/emails.po diff --git a/locale/bs/locale.po b/locale/bs_Latn/locale.po similarity index 100% rename from locale/bs/locale.po rename to locale/bs_Latn/locale.po diff --git a/locale/bs/manager.po b/locale/bs_Latn/manager.po similarity index 100% rename from locale/bs/manager.po rename to locale/bs_Latn/manager.po diff --git a/locale/bs/submission.po b/locale/bs_Latn/submission.po similarity index 100% rename from locale/bs/submission.po rename to locale/bs_Latn/submission.po diff --git a/locale/fr_FR/admin.po b/locale/fr/admin.po similarity index 100% rename from locale/fr_FR/admin.po rename to locale/fr/admin.po diff --git a/locale/fr_FR/api.po b/locale/fr/api.po similarity index 100% rename from locale/fr_FR/api.po rename to locale/fr/api.po diff --git a/locale/fr_FR/author.po b/locale/fr/author.po similarity index 100% rename from locale/fr_FR/author.po rename to locale/fr/author.po diff --git a/locale/fr_FR/default.po b/locale/fr/default.po similarity index 100% rename from locale/fr_FR/default.po rename to locale/fr/default.po diff --git a/locale/fr_FR/editor.po b/locale/fr/editor.po similarity index 100% rename from locale/fr_FR/editor.po rename to locale/fr/editor.po diff --git a/locale/fr_FR/emails.po b/locale/fr/emails.po similarity index 100% rename from locale/fr_FR/emails.po rename to locale/fr/emails.po diff --git a/locale/fr_FR/locale.po b/locale/fr/locale.po similarity index 100% rename from locale/fr_FR/locale.po rename to locale/fr/locale.po diff --git a/locale/fr_FR/manager.po b/locale/fr/manager.po similarity index 100% rename from locale/fr_FR/manager.po rename to locale/fr/manager.po diff --git a/locale/fr_FR/submission.po b/locale/fr/submission.po similarity index 100% rename from locale/fr_FR/submission.po rename to locale/fr/submission.po diff --git a/locale/nb/admin.po b/locale/nb_NO/admin.po similarity index 100% rename from locale/nb/admin.po rename to locale/nb_NO/admin.po diff --git a/locale/nb/api.po b/locale/nb_NO/api.po similarity index 100% rename from locale/nb/api.po rename to locale/nb_NO/api.po diff --git a/locale/nb/author.po b/locale/nb_NO/author.po similarity index 100% rename from locale/nb/author.po rename to locale/nb_NO/author.po diff --git a/locale/nb/default.po b/locale/nb_NO/default.po similarity index 100% rename from locale/nb/default.po rename to locale/nb_NO/default.po diff --git a/locale/nb/editor.po b/locale/nb_NO/editor.po similarity index 100% rename from locale/nb/editor.po rename to locale/nb_NO/editor.po diff --git a/locale/nb/emails.po b/locale/nb_NO/emails.po similarity index 100% rename from locale/nb/emails.po rename to locale/nb_NO/emails.po diff --git a/locale/nb/locale.po b/locale/nb_NO/locale.po similarity index 100% rename from locale/nb/locale.po rename to locale/nb_NO/locale.po diff --git a/locale/nb/manager.po b/locale/nb_NO/manager.po similarity index 100% rename from locale/nb/manager.po rename to locale/nb_NO/manager.po diff --git a/locale/nb/submission.po b/locale/nb_NO/submission.po similarity index 100% rename from locale/nb/submission.po rename to locale/nb_NO/submission.po diff --git a/locale/pt_PT/admin.po b/locale/pt/admin.po similarity index 100% rename from locale/pt_PT/admin.po rename to locale/pt/admin.po diff --git a/locale/pt_PT/api.po b/locale/pt/api.po similarity index 100% rename from locale/pt_PT/api.po rename to locale/pt/api.po diff --git a/locale/pt_PT/author.po b/locale/pt/author.po similarity index 100% rename from locale/pt_PT/author.po rename to locale/pt/author.po diff --git a/locale/pt_PT/default.po b/locale/pt/default.po similarity index 100% rename from locale/pt_PT/default.po rename to locale/pt/default.po diff --git a/locale/pt_PT/editor.po b/locale/pt/editor.po similarity index 100% rename from locale/pt_PT/editor.po rename to locale/pt/editor.po diff --git a/locale/pt_PT/emails.po b/locale/pt/emails.po similarity index 100% rename from locale/pt_PT/emails.po rename to locale/pt/emails.po diff --git a/locale/pt_PT/locale.po b/locale/pt/locale.po similarity index 100% rename from locale/pt_PT/locale.po rename to locale/pt/locale.po diff --git a/locale/pt_PT/manager.po b/locale/pt/manager.po similarity index 100% rename from locale/pt_PT/manager.po rename to locale/pt/manager.po diff --git a/locale/pt_PT/submission.po b/locale/pt/submission.po similarity index 100% rename from locale/pt_PT/submission.po rename to locale/pt/submission.po diff --git a/locale/sr@cyrillic/admin.po b/locale/sr_Cyrl/admin.po similarity index 100% rename from locale/sr@cyrillic/admin.po rename to locale/sr_Cyrl/admin.po diff --git a/locale/sr@cyrillic/author.po b/locale/sr_Cyrl/author.po similarity index 100% rename from locale/sr@cyrillic/author.po rename to locale/sr_Cyrl/author.po diff --git a/locale/sr@cyrillic/default.po b/locale/sr_Cyrl/default.po similarity index 100% rename from locale/sr@cyrillic/default.po rename to locale/sr_Cyrl/default.po diff --git a/locale/sr@cyrillic/editor.po b/locale/sr_Cyrl/editor.po similarity index 100% rename from locale/sr@cyrillic/editor.po rename to locale/sr_Cyrl/editor.po diff --git a/locale/sr@cyrillic/emails.po b/locale/sr_Cyrl/emails.po similarity index 100% rename from locale/sr@cyrillic/emails.po rename to locale/sr_Cyrl/emails.po diff --git a/locale/sr@cyrillic/locale.po b/locale/sr_Cyrl/locale.po similarity index 100% rename from locale/sr@cyrillic/locale.po rename to locale/sr_Cyrl/locale.po diff --git a/locale/sr@cyrillic/manager.po b/locale/sr_Cyrl/manager.po similarity index 100% rename from locale/sr@cyrillic/manager.po rename to locale/sr_Cyrl/manager.po diff --git a/locale/sr@cyrillic/submission.po b/locale/sr_Cyrl/submission.po similarity index 100% rename from locale/sr@cyrillic/submission.po rename to locale/sr_Cyrl/submission.po diff --git a/locale/sr@latin/admin.po b/locale/sr_Latn/admin.po similarity index 100% rename from locale/sr@latin/admin.po rename to locale/sr_Latn/admin.po diff --git a/locale/sr@latin/author.po b/locale/sr_Latn/author.po similarity index 100% rename from locale/sr@latin/author.po rename to locale/sr_Latn/author.po diff --git a/locale/sr@latin/default.po b/locale/sr_Latn/default.po similarity index 100% rename from locale/sr@latin/default.po rename to locale/sr_Latn/default.po diff --git a/locale/sr@latin/editor.po b/locale/sr_Latn/editor.po similarity index 100% rename from locale/sr@latin/editor.po rename to locale/sr_Latn/editor.po diff --git a/locale/sr@latin/emails.po b/locale/sr_Latn/emails.po similarity index 100% rename from locale/sr@latin/emails.po rename to locale/sr_Latn/emails.po diff --git a/locale/sr@latin/locale.po b/locale/sr_Latn/locale.po similarity index 100% rename from locale/sr@latin/locale.po rename to locale/sr_Latn/locale.po diff --git a/locale/sr@latin/manager.po b/locale/sr_Latn/manager.po similarity index 100% rename from locale/sr@latin/manager.po rename to locale/sr_Latn/manager.po diff --git a/locale/sr@latin/submission.po b/locale/sr_Latn/submission.po similarity index 100% rename from locale/sr@latin/submission.po rename to locale/sr_Latn/submission.po diff --git a/locale/uz@cyrillic/admin.po b/locale/uz/admin.po similarity index 100% rename from locale/uz@cyrillic/admin.po rename to locale/uz/admin.po diff --git a/locale/uz@cyrillic/api.po b/locale/uz/api.po similarity index 100% rename from locale/uz@cyrillic/api.po rename to locale/uz/api.po diff --git a/locale/uz@cyrillic/author.po b/locale/uz/author.po similarity index 100% rename from locale/uz@cyrillic/author.po rename to locale/uz/author.po diff --git a/locale/uz@cyrillic/default.po b/locale/uz/default.po similarity index 100% rename from locale/uz@cyrillic/default.po rename to locale/uz/default.po diff --git a/locale/uz@cyrillic/editor.po b/locale/uz/editor.po similarity index 100% rename from locale/uz@cyrillic/editor.po rename to locale/uz/editor.po diff --git a/locale/uz@cyrillic/emails.po b/locale/uz/emails.po similarity index 100% rename from locale/uz@cyrillic/emails.po rename to locale/uz/emails.po diff --git a/locale/uz@cyrillic/locale.po b/locale/uz/locale.po similarity index 100% rename from locale/uz@cyrillic/locale.po rename to locale/uz/locale.po diff --git a/locale/uz@cyrillic/manager.po b/locale/uz/manager.po similarity index 100% rename from locale/uz@cyrillic/manager.po rename to locale/uz/manager.po diff --git a/locale/uz@cyrillic/submission.po b/locale/uz/submission.po similarity index 100% rename from locale/uz@cyrillic/submission.po rename to locale/uz/submission.po diff --git a/locale/uz@latin/admin.po b/locale/uz_Latn/admin.po similarity index 100% rename from locale/uz@latin/admin.po rename to locale/uz_Latn/admin.po diff --git a/locale/uz@latin/api.po b/locale/uz_Latn/api.po similarity index 100% rename from locale/uz@latin/api.po rename to locale/uz_Latn/api.po diff --git a/locale/uz@latin/author.po b/locale/uz_Latn/author.po similarity index 100% rename from locale/uz@latin/author.po rename to locale/uz_Latn/author.po diff --git a/locale/uz@latin/default.po b/locale/uz_Latn/default.po similarity index 100% rename from locale/uz@latin/default.po rename to locale/uz_Latn/default.po diff --git a/locale/uz@latin/editor.po b/locale/uz_Latn/editor.po similarity index 100% rename from locale/uz@latin/editor.po rename to locale/uz_Latn/editor.po diff --git a/locale/uz@latin/emails.po b/locale/uz_Latn/emails.po similarity index 100% rename from locale/uz@latin/emails.po rename to locale/uz_Latn/emails.po diff --git a/locale/uz@latin/locale.po b/locale/uz_Latn/locale.po similarity index 100% rename from locale/uz@latin/locale.po rename to locale/uz_Latn/locale.po diff --git a/locale/uz@latin/manager.po b/locale/uz_Latn/manager.po similarity index 100% rename from locale/uz@latin/manager.po rename to locale/uz_Latn/manager.po diff --git a/locale/uz@latin/submission.po b/locale/uz_Latn/submission.po similarity index 100% rename from locale/uz@latin/submission.po rename to locale/uz_Latn/submission.po diff --git a/locale/zh_CN/admin.po b/locale/zh_Hans/admin.po similarity index 100% rename from locale/zh_CN/admin.po rename to locale/zh_Hans/admin.po diff --git a/locale/zh_CN/api.po b/locale/zh_Hans/api.po similarity index 100% rename from locale/zh_CN/api.po rename to locale/zh_Hans/api.po diff --git a/locale/zh_CN/author.po b/locale/zh_Hans/author.po similarity index 100% rename from locale/zh_CN/author.po rename to locale/zh_Hans/author.po diff --git a/locale/zh_CN/default.po b/locale/zh_Hans/default.po similarity index 100% rename from locale/zh_CN/default.po rename to locale/zh_Hans/default.po diff --git a/locale/zh_CN/editor.po b/locale/zh_Hans/editor.po similarity index 100% rename from locale/zh_CN/editor.po rename to locale/zh_Hans/editor.po diff --git a/locale/zh_CN/emails.po b/locale/zh_Hans/emails.po similarity index 100% rename from locale/zh_CN/emails.po rename to locale/zh_Hans/emails.po diff --git a/locale/zh_CN/locale.po b/locale/zh_Hans/locale.po similarity index 100% rename from locale/zh_CN/locale.po rename to locale/zh_Hans/locale.po diff --git a/locale/zh_CN/manager.po b/locale/zh_Hans/manager.po similarity index 100% rename from locale/zh_CN/manager.po rename to locale/zh_Hans/manager.po diff --git a/locale/zh_CN/submission.po b/locale/zh_Hans/submission.po similarity index 100% rename from locale/zh_CN/submission.po rename to locale/zh_Hans/submission.po diff --git a/plugins/blocks/browse b/plugins/blocks/browse index 3c918b5bec2..856dea64c1e 160000 --- a/plugins/blocks/browse +++ b/plugins/blocks/browse @@ -1 +1 @@ -Subproject commit 3c918b5bec24896c2016a3611ea4730038701cd3 +Subproject commit 856dea64c1ec1d9c6d8da17f99aca6ac2ece618b diff --git a/plugins/blocks/developedBy/locale/bs/locale.po b/plugins/blocks/developedBy/locale/bs_Latn/locale.po similarity index 100% rename from plugins/blocks/developedBy/locale/bs/locale.po rename to plugins/blocks/developedBy/locale/bs_Latn/locale.po diff --git a/plugins/blocks/developedBy/locale/fr_FR/locale.po b/plugins/blocks/developedBy/locale/fr/locale.po similarity index 100% rename from plugins/blocks/developedBy/locale/fr_FR/locale.po rename to plugins/blocks/developedBy/locale/fr/locale.po diff --git a/plugins/blocks/developedBy/locale/nb/locale.po b/plugins/blocks/developedBy/locale/nb_NO/locale.po similarity index 100% rename from plugins/blocks/developedBy/locale/nb/locale.po rename to plugins/blocks/developedBy/locale/nb_NO/locale.po diff --git a/plugins/blocks/developedBy/locale/pt_PT/locale.po b/plugins/blocks/developedBy/locale/pt/locale.po similarity index 100% rename from plugins/blocks/developedBy/locale/pt_PT/locale.po rename to plugins/blocks/developedBy/locale/pt/locale.po diff --git a/plugins/blocks/developedBy/locale/sr@latin/locale.po b/plugins/blocks/developedBy/locale/sr_Latn/locale.po similarity index 100% rename from plugins/blocks/developedBy/locale/sr@latin/locale.po rename to plugins/blocks/developedBy/locale/sr_Latn/locale.po diff --git a/plugins/blocks/developedBy/locale/uz@cyrillic/locale.po b/plugins/blocks/developedBy/locale/uz/locale.po similarity index 100% rename from plugins/blocks/developedBy/locale/uz@cyrillic/locale.po rename to plugins/blocks/developedBy/locale/uz/locale.po diff --git a/plugins/blocks/developedBy/locale/uz@latin/locale.po b/plugins/blocks/developedBy/locale/uz_Latn/locale.po similarity index 100% rename from plugins/blocks/developedBy/locale/uz@latin/locale.po rename to plugins/blocks/developedBy/locale/uz_Latn/locale.po diff --git a/plugins/blocks/information/locale/bs/locale.po b/plugins/blocks/information/locale/bs_Latn/locale.po similarity index 100% rename from plugins/blocks/information/locale/bs/locale.po rename to plugins/blocks/information/locale/bs_Latn/locale.po diff --git a/plugins/blocks/information/locale/fr_FR/locale.po b/plugins/blocks/information/locale/fr/locale.po similarity index 100% rename from plugins/blocks/information/locale/fr_FR/locale.po rename to plugins/blocks/information/locale/fr/locale.po diff --git a/plugins/blocks/information/locale/nb/locale.po b/plugins/blocks/information/locale/nb_NO/locale.po similarity index 100% rename from plugins/blocks/information/locale/nb/locale.po rename to plugins/blocks/information/locale/nb_NO/locale.po diff --git a/plugins/blocks/information/locale/pt_PT/locale.po b/plugins/blocks/information/locale/pt/locale.po similarity index 100% rename from plugins/blocks/information/locale/pt_PT/locale.po rename to plugins/blocks/information/locale/pt/locale.po diff --git a/plugins/blocks/information/locale/sr@latin/locale.po b/plugins/blocks/information/locale/sr_Latn/locale.po similarity index 100% rename from plugins/blocks/information/locale/sr@latin/locale.po rename to plugins/blocks/information/locale/sr_Latn/locale.po diff --git a/plugins/blocks/information/locale/uz@cyrillic/locale.po b/plugins/blocks/information/locale/uz/locale.po similarity index 100% rename from plugins/blocks/information/locale/uz@cyrillic/locale.po rename to plugins/blocks/information/locale/uz/locale.po diff --git a/plugins/blocks/information/locale/uz@latin/locale.po b/plugins/blocks/information/locale/uz_Latn/locale.po similarity index 100% rename from plugins/blocks/information/locale/uz@latin/locale.po rename to plugins/blocks/information/locale/uz_Latn/locale.po diff --git a/plugins/blocks/information/locale/zh_CN/locale.po b/plugins/blocks/information/locale/zh_Hans/locale.po similarity index 100% rename from plugins/blocks/information/locale/zh_CN/locale.po rename to plugins/blocks/information/locale/zh_Hans/locale.po diff --git a/plugins/blocks/languageToggle/locale/bs/locale.po b/plugins/blocks/languageToggle/locale/bs_Latn/locale.po similarity index 100% rename from plugins/blocks/languageToggle/locale/bs/locale.po rename to plugins/blocks/languageToggle/locale/bs_Latn/locale.po diff --git a/plugins/blocks/languageToggle/locale/fr_FR/locale.po b/plugins/blocks/languageToggle/locale/fr/locale.po similarity index 100% rename from plugins/blocks/languageToggle/locale/fr_FR/locale.po rename to plugins/blocks/languageToggle/locale/fr/locale.po diff --git a/plugins/blocks/languageToggle/locale/nb/locale.po b/plugins/blocks/languageToggle/locale/nb_NO/locale.po similarity index 100% rename from plugins/blocks/languageToggle/locale/nb/locale.po rename to plugins/blocks/languageToggle/locale/nb_NO/locale.po diff --git a/plugins/blocks/languageToggle/locale/pt_PT/locale.po b/plugins/blocks/languageToggle/locale/pt/locale.po similarity index 100% rename from plugins/blocks/languageToggle/locale/pt_PT/locale.po rename to plugins/blocks/languageToggle/locale/pt/locale.po diff --git a/plugins/blocks/languageToggle/locale/sr@latin/locale.po b/plugins/blocks/languageToggle/locale/sr_Latn/locale.po similarity index 100% rename from plugins/blocks/languageToggle/locale/sr@latin/locale.po rename to plugins/blocks/languageToggle/locale/sr_Latn/locale.po diff --git a/plugins/blocks/languageToggle/locale/uz@cyrillic/locale.po b/plugins/blocks/languageToggle/locale/uz/locale.po similarity index 100% rename from plugins/blocks/languageToggle/locale/uz@cyrillic/locale.po rename to plugins/blocks/languageToggle/locale/uz/locale.po diff --git a/plugins/blocks/languageToggle/locale/uz@latin/locale.po b/plugins/blocks/languageToggle/locale/uz_Latn/locale.po similarity index 100% rename from plugins/blocks/languageToggle/locale/uz@latin/locale.po rename to plugins/blocks/languageToggle/locale/uz_Latn/locale.po diff --git a/plugins/blocks/languageToggle/locale/zh_CN/locale.po b/plugins/blocks/languageToggle/locale/zh_Hans/locale.po similarity index 100% rename from plugins/blocks/languageToggle/locale/zh_CN/locale.po rename to plugins/blocks/languageToggle/locale/zh_Hans/locale.po diff --git a/plugins/blocks/makeSubmission b/plugins/blocks/makeSubmission index b6c2e1117a8..72b68a562aa 160000 --- a/plugins/blocks/makeSubmission +++ b/plugins/blocks/makeSubmission @@ -1 +1 @@ -Subproject commit b6c2e1117a8478ac8bbf6e49dd5813247145a856 +Subproject commit 72b68a562aa3044173f11cb29595004ba0de5baf diff --git a/plugins/blocks/subscription/locale/fr_FR/locale.po b/plugins/blocks/subscription/locale/fr/locale.po similarity index 100% rename from plugins/blocks/subscription/locale/fr_FR/locale.po rename to plugins/blocks/subscription/locale/fr/locale.po diff --git a/plugins/blocks/subscription/locale/nb/locale.po b/plugins/blocks/subscription/locale/nb_NO/locale.po similarity index 100% rename from plugins/blocks/subscription/locale/nb/locale.po rename to plugins/blocks/subscription/locale/nb_NO/locale.po diff --git a/plugins/blocks/subscription/locale/pt_PT/locale.po b/plugins/blocks/subscription/locale/pt/locale.po similarity index 100% rename from plugins/blocks/subscription/locale/pt_PT/locale.po rename to plugins/blocks/subscription/locale/pt/locale.po diff --git a/plugins/blocks/subscription/locale/sr@latin/locale.po b/plugins/blocks/subscription/locale/sr_Latn/locale.po similarity index 100% rename from plugins/blocks/subscription/locale/sr@latin/locale.po rename to plugins/blocks/subscription/locale/sr_Latn/locale.po diff --git a/plugins/blocks/subscription/locale/uz@cyrillic/locale.po b/plugins/blocks/subscription/locale/uz/locale.po similarity index 100% rename from plugins/blocks/subscription/locale/uz@cyrillic/locale.po rename to plugins/blocks/subscription/locale/uz/locale.po diff --git a/plugins/blocks/subscription/locale/uz@latin/locale.po b/plugins/blocks/subscription/locale/uz_Latn/locale.po similarity index 100% rename from plugins/blocks/subscription/locale/uz@latin/locale.po rename to plugins/blocks/subscription/locale/uz_Latn/locale.po diff --git a/plugins/blocks/subscription/locale/zh_CN/locale.po b/plugins/blocks/subscription/locale/zh_Hans/locale.po similarity index 100% rename from plugins/blocks/subscription/locale/zh_CN/locale.po rename to plugins/blocks/subscription/locale/zh_Hans/locale.po diff --git a/plugins/gateways/resolver/locale/bs/locale.po b/plugins/gateways/resolver/locale/bs_Latn/locale.po similarity index 100% rename from plugins/gateways/resolver/locale/bs/locale.po rename to plugins/gateways/resolver/locale/bs_Latn/locale.po diff --git a/plugins/gateways/resolver/locale/fr_FR/locale.po b/plugins/gateways/resolver/locale/fr/locale.po similarity index 100% rename from plugins/gateways/resolver/locale/fr_FR/locale.po rename to plugins/gateways/resolver/locale/fr/locale.po diff --git a/plugins/gateways/resolver/locale/nb/locale.po b/plugins/gateways/resolver/locale/nb_NO/locale.po similarity index 100% rename from plugins/gateways/resolver/locale/nb/locale.po rename to plugins/gateways/resolver/locale/nb_NO/locale.po diff --git a/plugins/gateways/resolver/locale/pt_PT/locale.po b/plugins/gateways/resolver/locale/pt/locale.po similarity index 100% rename from plugins/gateways/resolver/locale/pt_PT/locale.po rename to plugins/gateways/resolver/locale/pt/locale.po diff --git a/plugins/gateways/resolver/locale/uz@cyrillic/locale.po b/plugins/gateways/resolver/locale/uz/locale.po similarity index 100% rename from plugins/gateways/resolver/locale/uz@cyrillic/locale.po rename to plugins/gateways/resolver/locale/uz/locale.po diff --git a/plugins/gateways/resolver/locale/uz@latin/locale.po b/plugins/gateways/resolver/locale/uz_Latn/locale.po similarity index 100% rename from plugins/gateways/resolver/locale/uz@latin/locale.po rename to plugins/gateways/resolver/locale/uz_Latn/locale.po diff --git a/plugins/gateways/resolver/locale/zh_CN/locale.po b/plugins/gateways/resolver/locale/zh_Hans/locale.po similarity index 100% rename from plugins/gateways/resolver/locale/zh_CN/locale.po rename to plugins/gateways/resolver/locale/zh_Hans/locale.po diff --git a/plugins/generic/announcementFeed/locale/fr_FR/locale.po b/plugins/generic/announcementFeed/locale/fr/locale.po similarity index 100% rename from plugins/generic/announcementFeed/locale/fr_FR/locale.po rename to plugins/generic/announcementFeed/locale/fr/locale.po diff --git a/plugins/generic/announcementFeed/locale/nb/locale.po b/plugins/generic/announcementFeed/locale/nb_NO/locale.po similarity index 100% rename from plugins/generic/announcementFeed/locale/nb/locale.po rename to plugins/generic/announcementFeed/locale/nb_NO/locale.po diff --git a/plugins/generic/announcementFeed/locale/pt_PT/locale.po b/plugins/generic/announcementFeed/locale/pt/locale.po similarity index 100% rename from plugins/generic/announcementFeed/locale/pt_PT/locale.po rename to plugins/generic/announcementFeed/locale/pt/locale.po diff --git a/plugins/generic/announcementFeed/locale/sr@latin/locale.po b/plugins/generic/announcementFeed/locale/sr_Latn/locale.po similarity index 100% rename from plugins/generic/announcementFeed/locale/sr@latin/locale.po rename to plugins/generic/announcementFeed/locale/sr_Latn/locale.po diff --git a/plugins/generic/announcementFeed/locale/uz@cyrillic/locale.po b/plugins/generic/announcementFeed/locale/uz/locale.po similarity index 100% rename from plugins/generic/announcementFeed/locale/uz@cyrillic/locale.po rename to plugins/generic/announcementFeed/locale/uz/locale.po diff --git a/plugins/generic/announcementFeed/locale/uz@latin/locale.po b/plugins/generic/announcementFeed/locale/uz_Latn/locale.po similarity index 100% rename from plugins/generic/announcementFeed/locale/uz@latin/locale.po rename to plugins/generic/announcementFeed/locale/uz_Latn/locale.po diff --git a/plugins/generic/announcementFeed/locale/zh_CN/locale.po b/plugins/generic/announcementFeed/locale/zh_Hans/locale.po similarity index 100% rename from plugins/generic/announcementFeed/locale/zh_CN/locale.po rename to plugins/generic/announcementFeed/locale/zh_Hans/locale.po diff --git a/plugins/generic/citationStyleLanguage b/plugins/generic/citationStyleLanguage index 90ea703be70..e2d5a1f17d8 160000 --- a/plugins/generic/citationStyleLanguage +++ b/plugins/generic/citationStyleLanguage @@ -1 +1 @@ -Subproject commit 90ea703be706dd5ca6f86993bdb4e6d7be1de53b +Subproject commit e2d5a1f17d8b854de35ca96d747c17bc3ca69a61 diff --git a/plugins/generic/crossref b/plugins/generic/crossref index 7fa9bbd8552..8bbf7cabf35 160000 --- a/plugins/generic/crossref +++ b/plugins/generic/crossref @@ -1 +1 @@ -Subproject commit 7fa9bbd855254836299478c92b5b98394369cb12 +Subproject commit 8bbf7cabf3523d7b042dde5a5aaea0d352204e7e diff --git a/plugins/generic/customBlockManager b/plugins/generic/customBlockManager index dd8c68d3355..5b1aee711c0 160000 --- a/plugins/generic/customBlockManager +++ b/plugins/generic/customBlockManager @@ -1 +1 @@ -Subproject commit dd8c68d33551b37429aa79210d1ec40517f30f63 +Subproject commit 5b1aee711c0cd1e221eb6671c86168c53e4ca846 diff --git a/plugins/generic/datacite/filter/DataciteXmlFilter.php b/plugins/generic/datacite/filter/DataciteXmlFilter.php index 976a5b51c5e..101ae301ce7 100644 --- a/plugins/generic/datacite/filter/DataciteXmlFilter.php +++ b/plugins/generic/datacite/filter/DataciteXmlFilter.php @@ -210,7 +210,7 @@ public function &process(&$pubObject) // Dates $rootNode->appendChild($this->createDatesNode($doc, $issue, $article, $publication, $galley, $galleyFile, $publicationDate)); // Language - $rootNode->appendChild($node = $doc->createElementNS($deployment->getNamespace(), 'language', LocaleConversion::getIso1FromLocale($objectLocalePrecedence[0]))); + $rootNode->appendChild($node = $doc->createElementNS($deployment->getNamespace(), 'language', str_replace(['_', '@'], '-', $objectLocalePrecedence[0]))); // Resource Type $resourceTypeNode = $this->createResourceTypeNode($doc, $issue, $article, $galley, $galleyFile); if ($resourceTypeNode) { @@ -920,6 +920,8 @@ public function getObjectLocalePrecedence($context, $article, $publication, $gal * * @return string|null An OJS locale or null if no matching * locale could be found. + * + * @deprecated 3.5 */ public function translateLanguageToLocale($language) { diff --git a/plugins/generic/datacite/locale/fr_FR/locale.po b/plugins/generic/datacite/locale/fr/locale.po similarity index 100% rename from plugins/generic/datacite/locale/fr_FR/locale.po rename to plugins/generic/datacite/locale/fr/locale.po diff --git a/plugins/generic/datacite/locale/nb/locale.po b/plugins/generic/datacite/locale/nb_NO/locale.po similarity index 100% rename from plugins/generic/datacite/locale/nb/locale.po rename to plugins/generic/datacite/locale/nb_NO/locale.po diff --git a/plugins/generic/datacite/locale/pt_PT/locale.po b/plugins/generic/datacite/locale/pt/locale.po similarity index 100% rename from plugins/generic/datacite/locale/pt_PT/locale.po rename to plugins/generic/datacite/locale/pt/locale.po diff --git a/plugins/generic/datacite/locale/sr@latin/locale.po b/plugins/generic/datacite/locale/sr_Latn/locale.po similarity index 100% rename from plugins/generic/datacite/locale/sr@latin/locale.po rename to plugins/generic/datacite/locale/sr_Latn/locale.po diff --git a/plugins/generic/datacite/locale/uz@cyrillic/locale.po b/plugins/generic/datacite/locale/uz/locale.po similarity index 100% rename from plugins/generic/datacite/locale/uz@cyrillic/locale.po rename to plugins/generic/datacite/locale/uz/locale.po diff --git a/plugins/generic/datacite/locale/uz@latin/locale.po b/plugins/generic/datacite/locale/uz_Latn/locale.po similarity index 100% rename from plugins/generic/datacite/locale/uz@latin/locale.po rename to plugins/generic/datacite/locale/uz_Latn/locale.po diff --git a/plugins/generic/datacite/locale/zh_CN/locale.po b/plugins/generic/datacite/locale/zh_Hans/locale.po similarity index 100% rename from plugins/generic/datacite/locale/zh_CN/locale.po rename to plugins/generic/datacite/locale/zh_Hans/locale.po diff --git a/plugins/generic/driver/locale/fr_FR/locale.po b/plugins/generic/driver/locale/fr/locale.po similarity index 100% rename from plugins/generic/driver/locale/fr_FR/locale.po rename to plugins/generic/driver/locale/fr/locale.po diff --git a/plugins/generic/driver/locale/nb/locale.po b/plugins/generic/driver/locale/nb_NO/locale.po similarity index 100% rename from plugins/generic/driver/locale/nb/locale.po rename to plugins/generic/driver/locale/nb_NO/locale.po diff --git a/plugins/generic/driver/locale/pt_PT/locale.po b/plugins/generic/driver/locale/pt/locale.po similarity index 100% rename from plugins/generic/driver/locale/pt_PT/locale.po rename to plugins/generic/driver/locale/pt/locale.po diff --git a/plugins/generic/driver/locale/sr@latin/locale.po b/plugins/generic/driver/locale/sr_Latn/locale.po similarity index 100% rename from plugins/generic/driver/locale/sr@latin/locale.po rename to plugins/generic/driver/locale/sr_Latn/locale.po diff --git a/plugins/generic/driver/locale/uz@cyrillic/locale.po b/plugins/generic/driver/locale/uz/locale.po similarity index 100% rename from plugins/generic/driver/locale/uz@cyrillic/locale.po rename to plugins/generic/driver/locale/uz/locale.po diff --git a/plugins/generic/driver/locale/uz@latin/locale.po b/plugins/generic/driver/locale/uz_Latn/locale.po similarity index 100% rename from plugins/generic/driver/locale/uz@latin/locale.po rename to plugins/generic/driver/locale/uz_Latn/locale.po diff --git a/plugins/generic/dublinCoreMeta/DublinCoreMetaPlugin.php b/plugins/generic/dublinCoreMeta/DublinCoreMetaPlugin.php index 2dc03987ac8..49a75b2092e 100644 --- a/plugins/generic/dublinCoreMeta/DublinCoreMetaPlugin.php +++ b/plugins/generic/dublinCoreMeta/DublinCoreMetaPlugin.php @@ -83,7 +83,7 @@ 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++, ''); + $templateMgr->addHeader('dublinCoreSponsor' . $locale . $i++, ''); } } } @@ -91,7 +91,7 @@ public function articleView($hookName, $args) if ($coverages = $publication->getData('coverage')) { foreach ($coverages as $locale => $coverage) { if ($coverage != '') { - $templateMgr->addHeader('dublinCoreCoverage' . $locale, ''); + $templateMgr->addHeader('dublinCoreCoverage' . $locale, ''); } } } @@ -115,7 +115,7 @@ public function articleView($hookName, $args) $abstracts = $publication->getData('abstract') ?: []; foreach ($abstracts as $locale => $abstract) { if ($abstract != '') { - $templateMgr->addHeader('dublinCoreAbstract' . $locale, ''); + $templateMgr->addHeader('dublinCoreAbstract' . $locale, ''); } } @@ -146,7 +146,7 @@ public function articleView($hookName, $args) $templateMgr->addHeader('dublinCoreUri', ''); - $templateMgr->addHeader('dublinCoreLanguage', ''); + $templateMgr->addHeader('dublinCoreLanguage', ''); if (($copyrightHolder = $publication->getData('copyrightHolder', $publicationLocale)) && ($copyrightYear = $publication->getData('copyrightYear'))) { $templateMgr->addHeader('dublinCoreCopyright', ''); @@ -172,14 +172,14 @@ 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++, ''); + $templateMgr->addHeader('dublinCoreSubject' . $locale . $i++, ''); } } } if ($keywords = $publication->getData('keywords')) { foreach ($keywords as $locale => $localeKeywords) { foreach ($localeKeywords as $i => $keyword) { - $templateMgr->addHeader('dublinCoreKeyword' . $locale . $i++, ''); + $templateMgr->addHeader('dublinCoreKeyword' . $locale . $i++, ''); } } } @@ -187,7 +187,7 @@ public function articleView($hookName, $args) $templateMgr->addHeader('dublinCoreTitle', ''); foreach ($publication->getFullTitles() as $locale => $title) { if ($title != '' && $locale != $publicationLocale) { - $templateMgr->addHeader('dublinCoreAltTitle' . $locale, ''); + $templateMgr->addHeader('dublinCoreAltTitle' . $locale, ''); } } @@ -195,7 +195,7 @@ public function articleView($hookName, $args) if ($types = $publication->getData('type')) { foreach ($types as $locale => $type) { if ($type != '') { - $templateMgr->addHeader('dublinCoreType' . $locale, ''); + $templateMgr->addHeader('dublinCoreType' . $locale, ''); } } } diff --git a/plugins/generic/dublinCoreMeta/locale/fr_FR/locale.po b/plugins/generic/dublinCoreMeta/locale/fr/locale.po similarity index 100% rename from plugins/generic/dublinCoreMeta/locale/fr_FR/locale.po rename to plugins/generic/dublinCoreMeta/locale/fr/locale.po diff --git a/plugins/generic/dublinCoreMeta/locale/nb/locale.po b/plugins/generic/dublinCoreMeta/locale/nb_NO/locale.po similarity index 100% rename from plugins/generic/dublinCoreMeta/locale/nb/locale.po rename to plugins/generic/dublinCoreMeta/locale/nb_NO/locale.po diff --git a/plugins/generic/dublinCoreMeta/locale/pt_PT/locale.po b/plugins/generic/dublinCoreMeta/locale/pt/locale.po similarity index 100% rename from plugins/generic/dublinCoreMeta/locale/pt_PT/locale.po rename to plugins/generic/dublinCoreMeta/locale/pt/locale.po diff --git a/plugins/generic/dublinCoreMeta/locale/uz@cyrillic/locale.po b/plugins/generic/dublinCoreMeta/locale/uz/locale.po similarity index 100% rename from plugins/generic/dublinCoreMeta/locale/uz@cyrillic/locale.po rename to plugins/generic/dublinCoreMeta/locale/uz/locale.po diff --git a/plugins/generic/dublinCoreMeta/locale/uz@latin/locale.po b/plugins/generic/dublinCoreMeta/locale/uz_Latn/locale.po similarity index 100% rename from plugins/generic/dublinCoreMeta/locale/uz@latin/locale.po rename to plugins/generic/dublinCoreMeta/locale/uz_Latn/locale.po diff --git a/plugins/generic/dublinCoreMeta/locale/zh_CN/locale.po b/plugins/generic/dublinCoreMeta/locale/zh_Hans/locale.po similarity index 100% rename from plugins/generic/dublinCoreMeta/locale/zh_CN/locale.po rename to plugins/generic/dublinCoreMeta/locale/zh_Hans/locale.po diff --git a/plugins/generic/googleAnalytics b/plugins/generic/googleAnalytics index c1dab4c182e..b6412db3ce5 160000 --- a/plugins/generic/googleAnalytics +++ b/plugins/generic/googleAnalytics @@ -1 +1 @@ -Subproject commit c1dab4c182eecfd1c2ba1ae594d2f96df503aa2c +Subproject commit b6412db3ce517c7652a9906ac94485d3c6158378 diff --git a/plugins/generic/googleScholar b/plugins/generic/googleScholar index 0068d63c873..3eb77560d01 160000 --- a/plugins/generic/googleScholar +++ b/plugins/generic/googleScholar @@ -1 +1 @@ -Subproject commit 0068d63c87323edc4e36cb9482b7bffac291132d +Subproject commit 3eb77560d01d97cd5f1dfba10b2bcd1b0bc4905a diff --git a/plugins/generic/htmlArticleGalley/locale/fr_FR/locale.po b/plugins/generic/htmlArticleGalley/locale/fr/locale.po similarity index 100% rename from plugins/generic/htmlArticleGalley/locale/fr_FR/locale.po rename to plugins/generic/htmlArticleGalley/locale/fr/locale.po diff --git a/plugins/generic/htmlArticleGalley/locale/nb/locale.po b/plugins/generic/htmlArticleGalley/locale/nb_NO/locale.po similarity index 100% rename from plugins/generic/htmlArticleGalley/locale/nb/locale.po rename to plugins/generic/htmlArticleGalley/locale/nb_NO/locale.po diff --git a/plugins/generic/htmlArticleGalley/locale/pt_PT/locale.po b/plugins/generic/htmlArticleGalley/locale/pt/locale.po similarity index 100% rename from plugins/generic/htmlArticleGalley/locale/pt_PT/locale.po rename to plugins/generic/htmlArticleGalley/locale/pt/locale.po diff --git a/plugins/generic/htmlArticleGalley/locale/sr@latin/locale.po b/plugins/generic/htmlArticleGalley/locale/sr_Latn/locale.po similarity index 100% rename from plugins/generic/htmlArticleGalley/locale/sr@latin/locale.po rename to plugins/generic/htmlArticleGalley/locale/sr_Latn/locale.po diff --git a/plugins/generic/htmlArticleGalley/locale/uz@cyrillic/locale.po b/plugins/generic/htmlArticleGalley/locale/uz/locale.po similarity index 100% rename from plugins/generic/htmlArticleGalley/locale/uz@cyrillic/locale.po rename to plugins/generic/htmlArticleGalley/locale/uz/locale.po diff --git a/plugins/generic/htmlArticleGalley/locale/uz@latin/locale.po b/plugins/generic/htmlArticleGalley/locale/uz_Latn/locale.po similarity index 100% rename from plugins/generic/htmlArticleGalley/locale/uz@latin/locale.po rename to plugins/generic/htmlArticleGalley/locale/uz_Latn/locale.po diff --git a/plugins/generic/jatsTemplate b/plugins/generic/jatsTemplate index 76b8fcf534a..a0d1335677f 160000 --- a/plugins/generic/jatsTemplate +++ b/plugins/generic/jatsTemplate @@ -1 +1 @@ -Subproject commit 76b8fcf534addf68ab78aef917846fc9d91b59d8 +Subproject commit a0d1335677f0ef5fdb3a7f9a3440af1fba2a7551 diff --git a/plugins/generic/lensGalley b/plugins/generic/lensGalley index 6c6a9e6df17..f35d857d748 160000 --- a/plugins/generic/lensGalley +++ b/plugins/generic/lensGalley @@ -1 +1 @@ -Subproject commit 6c6a9e6df17b2b2575284f359875657e24f9e49f +Subproject commit f35d857d748638251dbbd73e9e2c1692072b5e8a diff --git a/plugins/generic/pdfJsViewer b/plugins/generic/pdfJsViewer index 0e37f591af2..6e1de5c7eb8 160000 --- a/plugins/generic/pdfJsViewer +++ b/plugins/generic/pdfJsViewer @@ -1 +1 @@ -Subproject commit 0e37f591af2d3865966b28a13b0c56f4c2cc12d7 +Subproject commit 6e1de5c7eb88bc17efd5d00b44093e7457250918 diff --git a/plugins/generic/recommendByAuthor/locale/fr_FR/locale.po b/plugins/generic/recommendByAuthor/locale/fr/locale.po similarity index 100% rename from plugins/generic/recommendByAuthor/locale/fr_FR/locale.po rename to plugins/generic/recommendByAuthor/locale/fr/locale.po diff --git a/plugins/generic/recommendByAuthor/locale/nb/locale.po b/plugins/generic/recommendByAuthor/locale/nb_NO/locale.po similarity index 100% rename from plugins/generic/recommendByAuthor/locale/nb/locale.po rename to plugins/generic/recommendByAuthor/locale/nb_NO/locale.po diff --git a/plugins/generic/recommendByAuthor/locale/pt_PT/locale.po b/plugins/generic/recommendByAuthor/locale/pt/locale.po similarity index 100% rename from plugins/generic/recommendByAuthor/locale/pt_PT/locale.po rename to plugins/generic/recommendByAuthor/locale/pt/locale.po diff --git a/plugins/generic/recommendByAuthor/locale/sr@latin/locale.po b/plugins/generic/recommendByAuthor/locale/sr_Latn/locale.po similarity index 100% rename from plugins/generic/recommendByAuthor/locale/sr@latin/locale.po rename to plugins/generic/recommendByAuthor/locale/sr_Latn/locale.po diff --git a/plugins/generic/recommendByAuthor/locale/uz@cyrillic/locale.po b/plugins/generic/recommendByAuthor/locale/uz/locale.po similarity index 100% rename from plugins/generic/recommendByAuthor/locale/uz@cyrillic/locale.po rename to plugins/generic/recommendByAuthor/locale/uz/locale.po diff --git a/plugins/generic/recommendByAuthor/locale/uz@latin/locale.po b/plugins/generic/recommendByAuthor/locale/uz_Latn/locale.po similarity index 100% rename from plugins/generic/recommendByAuthor/locale/uz@latin/locale.po rename to plugins/generic/recommendByAuthor/locale/uz_Latn/locale.po diff --git a/plugins/generic/recommendBySimilarity/locale/fr_FR/locale.po b/plugins/generic/recommendBySimilarity/locale/fr/locale.po similarity index 100% rename from plugins/generic/recommendBySimilarity/locale/fr_FR/locale.po rename to plugins/generic/recommendBySimilarity/locale/fr/locale.po diff --git a/plugins/generic/recommendBySimilarity/locale/nb/locale.po b/plugins/generic/recommendBySimilarity/locale/nb_NO/locale.po similarity index 100% rename from plugins/generic/recommendBySimilarity/locale/nb/locale.po rename to plugins/generic/recommendBySimilarity/locale/nb_NO/locale.po diff --git a/plugins/generic/recommendBySimilarity/locale/pt_PT/locale.po b/plugins/generic/recommendBySimilarity/locale/pt/locale.po similarity index 100% rename from plugins/generic/recommendBySimilarity/locale/pt_PT/locale.po rename to plugins/generic/recommendBySimilarity/locale/pt/locale.po diff --git a/plugins/generic/recommendBySimilarity/locale/uz@cyrillic/locale.po b/plugins/generic/recommendBySimilarity/locale/uz/locale.po similarity index 100% rename from plugins/generic/recommendBySimilarity/locale/uz@cyrillic/locale.po rename to plugins/generic/recommendBySimilarity/locale/uz/locale.po diff --git a/plugins/generic/recommendBySimilarity/locale/uz@latin/locale.po b/plugins/generic/recommendBySimilarity/locale/uz_Latn/locale.po similarity index 100% rename from plugins/generic/recommendBySimilarity/locale/uz@latin/locale.po rename to plugins/generic/recommendBySimilarity/locale/uz_Latn/locale.po diff --git a/plugins/generic/staticPages b/plugins/generic/staticPages index a66ed2b5193..93800ae0048 160000 --- a/plugins/generic/staticPages +++ b/plugins/generic/staticPages @@ -1 +1 @@ -Subproject commit a66ed2b519328179f39306b79fcd5423776d5aba +Subproject commit 93800ae004876efa0680f8d43a4447df3e6de6cf diff --git a/plugins/generic/tinymce b/plugins/generic/tinymce index bcd3e5d8f74..7f33417450b 160000 --- a/plugins/generic/tinymce +++ b/plugins/generic/tinymce @@ -1 +1 @@ -Subproject commit bcd3e5d8f746e03fa58c0eaac6b688a609da469d +Subproject commit 7f33417450b56fc63a4049e089facb4f64c2cbce diff --git a/plugins/generic/usageEvent/locale/fr_FR/locale.po b/plugins/generic/usageEvent/locale/fr/locale.po similarity index 100% rename from plugins/generic/usageEvent/locale/fr_FR/locale.po rename to plugins/generic/usageEvent/locale/fr/locale.po diff --git a/plugins/generic/usageEvent/locale/nb/locale.po b/plugins/generic/usageEvent/locale/nb_NO/locale.po similarity index 100% rename from plugins/generic/usageEvent/locale/nb/locale.po rename to plugins/generic/usageEvent/locale/nb_NO/locale.po diff --git a/plugins/generic/usageEvent/locale/pt_PT/locale.po b/plugins/generic/usageEvent/locale/pt/locale.po similarity index 100% rename from plugins/generic/usageEvent/locale/pt_PT/locale.po rename to plugins/generic/usageEvent/locale/pt/locale.po diff --git a/plugins/generic/usageEvent/locale/sr@latin/locale.po b/plugins/generic/usageEvent/locale/sr_Latn/locale.po similarity index 100% rename from plugins/generic/usageEvent/locale/sr@latin/locale.po rename to plugins/generic/usageEvent/locale/sr_Latn/locale.po diff --git a/plugins/generic/usageEvent/locale/uz@cyrillic/locale.po b/plugins/generic/usageEvent/locale/uz/locale.po similarity index 100% rename from plugins/generic/usageEvent/locale/uz@cyrillic/locale.po rename to plugins/generic/usageEvent/locale/uz/locale.po diff --git a/plugins/generic/usageEvent/locale/uz@latin/locale.po b/plugins/generic/usageEvent/locale/uz_Latn/locale.po similarity index 100% rename from plugins/generic/usageEvent/locale/uz@latin/locale.po rename to plugins/generic/usageEvent/locale/uz_Latn/locale.po diff --git a/plugins/generic/webFeed b/plugins/generic/webFeed index 12c9e93d53e..7e99fa5c1dc 160000 --- a/plugins/generic/webFeed +++ b/plugins/generic/webFeed @@ -1 +1 @@ -Subproject commit 12c9e93d53ead5f22c3ad6979667f3affe1fb80f +Subproject commit 7e99fa5c1dc42c1b1e6f3588e5c894cdb9d92dff diff --git a/plugins/importexport/doaj/locale/fr_FR/locale.po b/plugins/importexport/doaj/locale/fr/locale.po similarity index 100% rename from plugins/importexport/doaj/locale/fr_FR/locale.po rename to plugins/importexport/doaj/locale/fr/locale.po diff --git a/plugins/importexport/doaj/locale/nb/locale.po b/plugins/importexport/doaj/locale/nb_NO/locale.po similarity index 100% rename from plugins/importexport/doaj/locale/nb/locale.po rename to plugins/importexport/doaj/locale/nb_NO/locale.po diff --git a/plugins/importexport/doaj/locale/pt_PT/locale.po b/plugins/importexport/doaj/locale/pt/locale.po similarity index 100% rename from plugins/importexport/doaj/locale/pt_PT/locale.po rename to plugins/importexport/doaj/locale/pt/locale.po diff --git a/plugins/importexport/doaj/locale/sr@latin/locale.po b/plugins/importexport/doaj/locale/sr_Latn/locale.po similarity index 100% rename from plugins/importexport/doaj/locale/sr@latin/locale.po rename to plugins/importexport/doaj/locale/sr_Latn/locale.po diff --git a/plugins/importexport/doaj/locale/uz@cyrillic/locale.po b/plugins/importexport/doaj/locale/uz/locale.po similarity index 100% rename from plugins/importexport/doaj/locale/uz@cyrillic/locale.po rename to plugins/importexport/doaj/locale/uz/locale.po diff --git a/plugins/importexport/doaj/locale/uz@latin/locale.po b/plugins/importexport/doaj/locale/uz_Latn/locale.po similarity index 100% rename from plugins/importexport/doaj/locale/uz@latin/locale.po rename to plugins/importexport/doaj/locale/uz_Latn/locale.po diff --git a/plugins/importexport/doaj/locale/zh_CN/locale.po b/plugins/importexport/doaj/locale/zh_Hans/locale.po similarity index 100% rename from plugins/importexport/doaj/locale/zh_CN/locale.po rename to plugins/importexport/doaj/locale/zh_Hans/locale.po diff --git a/plugins/importexport/native/locale/fr_FR/locale.po b/plugins/importexport/native/locale/fr/locale.po similarity index 100% rename from plugins/importexport/native/locale/fr_FR/locale.po rename to plugins/importexport/native/locale/fr/locale.po diff --git a/plugins/importexport/native/locale/nb/locale.po b/plugins/importexport/native/locale/nb_NO/locale.po similarity index 100% rename from plugins/importexport/native/locale/nb/locale.po rename to plugins/importexport/native/locale/nb_NO/locale.po diff --git a/plugins/importexport/native/locale/pt_PT/locale.po b/plugins/importexport/native/locale/pt/locale.po similarity index 100% rename from plugins/importexport/native/locale/pt_PT/locale.po rename to plugins/importexport/native/locale/pt/locale.po diff --git a/plugins/importexport/native/locale/sr@latin/locale.po b/plugins/importexport/native/locale/sr_Latn/locale.po similarity index 100% rename from plugins/importexport/native/locale/sr@latin/locale.po rename to plugins/importexport/native/locale/sr_Latn/locale.po diff --git a/plugins/importexport/native/locale/uz@cyrillic/locale.po b/plugins/importexport/native/locale/uz/locale.po similarity index 100% rename from plugins/importexport/native/locale/uz@cyrillic/locale.po rename to plugins/importexport/native/locale/uz/locale.po diff --git a/plugins/importexport/native/locale/uz@latin/locale.po b/plugins/importexport/native/locale/uz_Latn/locale.po similarity index 100% rename from plugins/importexport/native/locale/uz@latin/locale.po rename to plugins/importexport/native/locale/uz_Latn/locale.po diff --git a/plugins/importexport/pubmed/filter/ArticlePubMedXmlFilter.php b/plugins/importexport/pubmed/filter/ArticlePubMedXmlFilter.php index ecea2032dab..e0bc58289df 100644 --- 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/plugins/importexport/pubmed/locale/fr_FR/locale.po b/plugins/importexport/pubmed/locale/fr/locale.po similarity index 100% rename from plugins/importexport/pubmed/locale/fr_FR/locale.po rename to plugins/importexport/pubmed/locale/fr/locale.po diff --git a/plugins/importexport/pubmed/locale/nb/locale.po b/plugins/importexport/pubmed/locale/nb_NO/locale.po similarity index 100% rename from plugins/importexport/pubmed/locale/nb/locale.po rename to plugins/importexport/pubmed/locale/nb_NO/locale.po diff --git a/plugins/importexport/pubmed/locale/pt_PT/locale.po b/plugins/importexport/pubmed/locale/pt/locale.po similarity index 100% rename from plugins/importexport/pubmed/locale/pt_PT/locale.po rename to plugins/importexport/pubmed/locale/pt/locale.po diff --git a/plugins/importexport/pubmed/locale/sr@latin/locale.po b/plugins/importexport/pubmed/locale/sr_Latn/locale.po similarity index 100% rename from plugins/importexport/pubmed/locale/sr@latin/locale.po rename to plugins/importexport/pubmed/locale/sr_Latn/locale.po diff --git a/plugins/importexport/pubmed/locale/uz@cyrillic/locale.po b/plugins/importexport/pubmed/locale/uz/locale.po similarity index 100% rename from plugins/importexport/pubmed/locale/uz@cyrillic/locale.po rename to plugins/importexport/pubmed/locale/uz/locale.po diff --git a/plugins/importexport/pubmed/locale/uz@latin/locale.po b/plugins/importexport/pubmed/locale/uz_Latn/locale.po similarity index 100% rename from plugins/importexport/pubmed/locale/uz@latin/locale.po rename to plugins/importexport/pubmed/locale/uz_Latn/locale.po diff --git a/plugins/importexport/pubmed/locale/zh_CN/locale.po b/plugins/importexport/pubmed/locale/zh_Hans/locale.po similarity index 100% rename from plugins/importexport/pubmed/locale/zh_CN/locale.po rename to plugins/importexport/pubmed/locale/zh_Hans/locale.po diff --git a/plugins/importexport/users/locale/fr_FR/locale.po b/plugins/importexport/users/locale/fr/locale.po similarity index 100% rename from plugins/importexport/users/locale/fr_FR/locale.po rename to plugins/importexport/users/locale/fr/locale.po diff --git a/plugins/importexport/users/locale/nb/locale.po b/plugins/importexport/users/locale/nb_NO/locale.po similarity index 100% rename from plugins/importexport/users/locale/nb/locale.po rename to plugins/importexport/users/locale/nb_NO/locale.po diff --git a/plugins/importexport/users/locale/pt_PT/locale.po b/plugins/importexport/users/locale/pt/locale.po similarity index 100% rename from plugins/importexport/users/locale/pt_PT/locale.po rename to plugins/importexport/users/locale/pt/locale.po diff --git a/plugins/importexport/users/locale/sr@latin/locale.po b/plugins/importexport/users/locale/sr_Latn/locale.po similarity index 100% rename from plugins/importexport/users/locale/sr@latin/locale.po rename to plugins/importexport/users/locale/sr_Latn/locale.po diff --git a/plugins/importexport/users/locale/uz@cyrillic/locale.po b/plugins/importexport/users/locale/uz/locale.po similarity index 100% rename from plugins/importexport/users/locale/uz@cyrillic/locale.po rename to plugins/importexport/users/locale/uz/locale.po diff --git a/plugins/importexport/users/locale/uz@latin/locale.po b/plugins/importexport/users/locale/uz_Latn/locale.po similarity index 100% rename from plugins/importexport/users/locale/uz@latin/locale.po rename to plugins/importexport/users/locale/uz_Latn/locale.po diff --git a/plugins/oaiMetadataFormats/marc/locale/fr_FR/locale.po b/plugins/oaiMetadataFormats/marc/locale/fr/locale.po similarity index 100% rename from plugins/oaiMetadataFormats/marc/locale/fr_FR/locale.po rename to plugins/oaiMetadataFormats/marc/locale/fr/locale.po diff --git a/plugins/oaiMetadataFormats/marc/locale/nb/locale.po b/plugins/oaiMetadataFormats/marc/locale/nb_NO/locale.po similarity index 100% rename from plugins/oaiMetadataFormats/marc/locale/nb/locale.po rename to plugins/oaiMetadataFormats/marc/locale/nb_NO/locale.po diff --git a/plugins/oaiMetadataFormats/marc/locale/pt_PT/locale.po b/plugins/oaiMetadataFormats/marc/locale/pt/locale.po similarity index 100% rename from plugins/oaiMetadataFormats/marc/locale/pt_PT/locale.po rename to plugins/oaiMetadataFormats/marc/locale/pt/locale.po diff --git a/plugins/oaiMetadataFormats/marc/locale/sr@latin/locale.po b/plugins/oaiMetadataFormats/marc/locale/sr_Latn/locale.po similarity index 100% rename from plugins/oaiMetadataFormats/marc/locale/sr@latin/locale.po rename to plugins/oaiMetadataFormats/marc/locale/sr_Latn/locale.po diff --git a/plugins/oaiMetadataFormats/marc/locale/uz@cyrillic/locale.po b/plugins/oaiMetadataFormats/marc/locale/uz/locale.po similarity index 100% rename from plugins/oaiMetadataFormats/marc/locale/uz@cyrillic/locale.po rename to plugins/oaiMetadataFormats/marc/locale/uz/locale.po diff --git a/plugins/oaiMetadataFormats/marc/locale/uz@latin/locale.po b/plugins/oaiMetadataFormats/marc/locale/uz_Latn/locale.po similarity index 100% rename from plugins/oaiMetadataFormats/marc/locale/uz@latin/locale.po rename to plugins/oaiMetadataFormats/marc/locale/uz_Latn/locale.po diff --git a/plugins/oaiMetadataFormats/marc/locale/zh_CN/locale.po b/plugins/oaiMetadataFormats/marc/locale/zh_Hans/locale.po similarity index 100% rename from plugins/oaiMetadataFormats/marc/locale/zh_CN/locale.po rename to plugins/oaiMetadataFormats/marc/locale/zh_Hans/locale.po diff --git a/plugins/oaiMetadataFormats/marcxml/locale/fr_FR/locale.po b/plugins/oaiMetadataFormats/marcxml/locale/fr/locale.po similarity index 100% rename from plugins/oaiMetadataFormats/marcxml/locale/fr_FR/locale.po rename to plugins/oaiMetadataFormats/marcxml/locale/fr/locale.po diff --git a/plugins/oaiMetadataFormats/marcxml/locale/nb/locale.po b/plugins/oaiMetadataFormats/marcxml/locale/nb_NO/locale.po similarity index 100% rename from plugins/oaiMetadataFormats/marcxml/locale/nb/locale.po rename to plugins/oaiMetadataFormats/marcxml/locale/nb_NO/locale.po diff --git a/plugins/oaiMetadataFormats/marcxml/locale/pt_PT/locale.po b/plugins/oaiMetadataFormats/marcxml/locale/pt/locale.po similarity index 100% rename from plugins/oaiMetadataFormats/marcxml/locale/pt_PT/locale.po rename to plugins/oaiMetadataFormats/marcxml/locale/pt/locale.po diff --git a/plugins/oaiMetadataFormats/marcxml/locale/sr@latin/locale.po b/plugins/oaiMetadataFormats/marcxml/locale/sr_Latn/locale.po similarity index 100% rename from plugins/oaiMetadataFormats/marcxml/locale/sr@latin/locale.po rename to plugins/oaiMetadataFormats/marcxml/locale/sr_Latn/locale.po diff --git a/plugins/oaiMetadataFormats/marcxml/locale/uz@cyrillic/locale.po b/plugins/oaiMetadataFormats/marcxml/locale/uz/locale.po similarity index 100% rename from plugins/oaiMetadataFormats/marcxml/locale/uz@cyrillic/locale.po rename to plugins/oaiMetadataFormats/marcxml/locale/uz/locale.po diff --git a/plugins/oaiMetadataFormats/marcxml/locale/uz@latin/locale.po b/plugins/oaiMetadataFormats/marcxml/locale/uz_Latn/locale.po similarity index 100% rename from plugins/oaiMetadataFormats/marcxml/locale/uz@latin/locale.po rename to plugins/oaiMetadataFormats/marcxml/locale/uz_Latn/locale.po diff --git a/plugins/oaiMetadataFormats/marcxml/locale/zh_CN/locale.po b/plugins/oaiMetadataFormats/marcxml/locale/zh_Hans/locale.po similarity index 100% rename from plugins/oaiMetadataFormats/marcxml/locale/zh_CN/locale.po rename to plugins/oaiMetadataFormats/marcxml/locale/zh_Hans/locale.po diff --git a/plugins/oaiMetadataFormats/oaiJats b/plugins/oaiMetadataFormats/oaiJats index f33d2021c76..7699c0a9a77 160000 --- a/plugins/oaiMetadataFormats/oaiJats +++ b/plugins/oaiMetadataFormats/oaiJats @@ -1 +1 @@ -Subproject commit f33d2021c76197421d460b6d9a05e233f180ae42 +Subproject commit 7699c0a9a774f1e82775beb27cf718e2fb403601 diff --git a/plugins/oaiMetadataFormats/rfc1807/locale/fr_FR/locale.po b/plugins/oaiMetadataFormats/rfc1807/locale/fr/locale.po similarity index 100% rename from plugins/oaiMetadataFormats/rfc1807/locale/fr_FR/locale.po rename to plugins/oaiMetadataFormats/rfc1807/locale/fr/locale.po diff --git a/plugins/oaiMetadataFormats/rfc1807/locale/nb/locale.po b/plugins/oaiMetadataFormats/rfc1807/locale/nb_NO/locale.po similarity index 100% rename from plugins/oaiMetadataFormats/rfc1807/locale/nb/locale.po rename to plugins/oaiMetadataFormats/rfc1807/locale/nb_NO/locale.po diff --git a/plugins/oaiMetadataFormats/rfc1807/locale/pt_PT/locale.po b/plugins/oaiMetadataFormats/rfc1807/locale/pt/locale.po similarity index 100% rename from plugins/oaiMetadataFormats/rfc1807/locale/pt_PT/locale.po rename to plugins/oaiMetadataFormats/rfc1807/locale/pt/locale.po diff --git a/plugins/oaiMetadataFormats/rfc1807/locale/sr@latin/locale.po b/plugins/oaiMetadataFormats/rfc1807/locale/sr_Latn/locale.po similarity index 100% rename from plugins/oaiMetadataFormats/rfc1807/locale/sr@latin/locale.po rename to plugins/oaiMetadataFormats/rfc1807/locale/sr_Latn/locale.po diff --git a/plugins/oaiMetadataFormats/rfc1807/locale/uz@cyrillic/locale.po b/plugins/oaiMetadataFormats/rfc1807/locale/uz/locale.po similarity index 100% rename from plugins/oaiMetadataFormats/rfc1807/locale/uz@cyrillic/locale.po rename to plugins/oaiMetadataFormats/rfc1807/locale/uz/locale.po diff --git a/plugins/oaiMetadataFormats/rfc1807/locale/uz@latin/locale.po b/plugins/oaiMetadataFormats/rfc1807/locale/uz_Latn/locale.po similarity index 100% rename from plugins/oaiMetadataFormats/rfc1807/locale/uz@latin/locale.po rename to plugins/oaiMetadataFormats/rfc1807/locale/uz_Latn/locale.po diff --git a/plugins/oaiMetadataFormats/rfc1807/locale/zh_CN/locale.po b/plugins/oaiMetadataFormats/rfc1807/locale/zh_Hans/locale.po similarity index 100% rename from plugins/oaiMetadataFormats/rfc1807/locale/zh_CN/locale.po rename to plugins/oaiMetadataFormats/rfc1807/locale/zh_Hans/locale.po diff --git a/plugins/paymethod/manual/locale/fr_FR/emails.po b/plugins/paymethod/manual/locale/fr/emails.po similarity index 100% rename from plugins/paymethod/manual/locale/fr_FR/emails.po rename to plugins/paymethod/manual/locale/fr/emails.po diff --git a/plugins/paymethod/manual/locale/fr_FR/locale.po b/plugins/paymethod/manual/locale/fr/locale.po similarity index 100% rename from plugins/paymethod/manual/locale/fr_FR/locale.po rename to plugins/paymethod/manual/locale/fr/locale.po diff --git a/plugins/paymethod/manual/locale/nb/emails.po b/plugins/paymethod/manual/locale/nb_NO/emails.po similarity index 100% rename from plugins/paymethod/manual/locale/nb/emails.po rename to plugins/paymethod/manual/locale/nb_NO/emails.po diff --git a/plugins/paymethod/manual/locale/nb/locale.po b/plugins/paymethod/manual/locale/nb_NO/locale.po similarity index 100% rename from plugins/paymethod/manual/locale/nb/locale.po rename to plugins/paymethod/manual/locale/nb_NO/locale.po diff --git a/plugins/paymethod/manual/locale/pt_PT/emails.po b/plugins/paymethod/manual/locale/pt/emails.po similarity index 100% rename from plugins/paymethod/manual/locale/pt_PT/emails.po rename to plugins/paymethod/manual/locale/pt/emails.po diff --git a/plugins/paymethod/manual/locale/pt_PT/locale.po b/plugins/paymethod/manual/locale/pt/locale.po similarity index 100% rename from plugins/paymethod/manual/locale/pt_PT/locale.po rename to plugins/paymethod/manual/locale/pt/locale.po diff --git a/plugins/paymethod/manual/locale/sr@latin/locale.po b/plugins/paymethod/manual/locale/sr_Latn/locale.po similarity index 100% rename from plugins/paymethod/manual/locale/sr@latin/locale.po rename to plugins/paymethod/manual/locale/sr_Latn/locale.po diff --git a/plugins/paymethod/manual/locale/uz@cyrillic/emails.po b/plugins/paymethod/manual/locale/uz/emails.po similarity index 100% rename from plugins/paymethod/manual/locale/uz@cyrillic/emails.po rename to plugins/paymethod/manual/locale/uz/emails.po diff --git a/plugins/paymethod/manual/locale/uz@cyrillic/locale.po b/plugins/paymethod/manual/locale/uz/locale.po similarity index 100% rename from plugins/paymethod/manual/locale/uz@cyrillic/locale.po rename to plugins/paymethod/manual/locale/uz/locale.po diff --git a/plugins/paymethod/manual/locale/uz@latin/emails.po b/plugins/paymethod/manual/locale/uz_Latn/emails.po similarity index 100% rename from plugins/paymethod/manual/locale/uz@latin/emails.po rename to plugins/paymethod/manual/locale/uz_Latn/emails.po diff --git a/plugins/paymethod/manual/locale/uz@latin/locale.po b/plugins/paymethod/manual/locale/uz_Latn/locale.po similarity index 100% rename from plugins/paymethod/manual/locale/uz@latin/locale.po rename to plugins/paymethod/manual/locale/uz_Latn/locale.po diff --git a/plugins/paymethod/manual/locale/zh_CN/emails.po b/plugins/paymethod/manual/locale/zh_Hans/emails.po similarity index 100% rename from plugins/paymethod/manual/locale/zh_CN/emails.po rename to plugins/paymethod/manual/locale/zh_Hans/emails.po diff --git a/plugins/paymethod/manual/locale/zh_CN/locale.po b/plugins/paymethod/manual/locale/zh_Hans/locale.po similarity index 100% rename from plugins/paymethod/manual/locale/zh_CN/locale.po rename to plugins/paymethod/manual/locale/zh_Hans/locale.po diff --git a/plugins/paymethod/paypal/locale/fr_FR/locale.po b/plugins/paymethod/paypal/locale/fr/locale.po similarity index 100% rename from plugins/paymethod/paypal/locale/fr_FR/locale.po rename to plugins/paymethod/paypal/locale/fr/locale.po diff --git a/plugins/paymethod/paypal/locale/nb/locale.po b/plugins/paymethod/paypal/locale/nb_NO/locale.po similarity index 100% rename from plugins/paymethod/paypal/locale/nb/locale.po rename to plugins/paymethod/paypal/locale/nb_NO/locale.po diff --git a/plugins/paymethod/paypal/locale/pt_PT/locale.po b/plugins/paymethod/paypal/locale/pt/locale.po similarity index 100% rename from plugins/paymethod/paypal/locale/pt_PT/locale.po rename to plugins/paymethod/paypal/locale/pt/locale.po diff --git a/plugins/paymethod/paypal/locale/uz@cyrillic/locale.po b/plugins/paymethod/paypal/locale/uz/locale.po similarity index 100% rename from plugins/paymethod/paypal/locale/uz@cyrillic/locale.po rename to plugins/paymethod/paypal/locale/uz/locale.po diff --git a/plugins/paymethod/paypal/locale/uz@latin/locale.po b/plugins/paymethod/paypal/locale/uz_Latn/locale.po similarity index 100% rename from plugins/paymethod/paypal/locale/uz@latin/locale.po rename to plugins/paymethod/paypal/locale/uz_Latn/locale.po diff --git a/plugins/pubIds/urn/locale/bs/locale.po b/plugins/pubIds/urn/locale/bs_Latn/locale.po similarity index 100% rename from plugins/pubIds/urn/locale/bs/locale.po rename to plugins/pubIds/urn/locale/bs_Latn/locale.po diff --git a/plugins/pubIds/urn/locale/fr_FR/locale.po b/plugins/pubIds/urn/locale/fr/locale.po similarity index 100% rename from plugins/pubIds/urn/locale/fr_FR/locale.po rename to plugins/pubIds/urn/locale/fr/locale.po diff --git a/plugins/pubIds/urn/locale/nb/locale.po b/plugins/pubIds/urn/locale/nb_NO/locale.po similarity index 100% rename from plugins/pubIds/urn/locale/nb/locale.po rename to plugins/pubIds/urn/locale/nb_NO/locale.po diff --git a/plugins/pubIds/urn/locale/pt_PT/locale.po b/plugins/pubIds/urn/locale/pt/locale.po similarity index 100% rename from plugins/pubIds/urn/locale/pt_PT/locale.po rename to plugins/pubIds/urn/locale/pt/locale.po diff --git a/plugins/pubIds/urn/locale/sr@latin/locale.po b/plugins/pubIds/urn/locale/sr_Latn/locale.po similarity index 100% rename from plugins/pubIds/urn/locale/sr@latin/locale.po rename to plugins/pubIds/urn/locale/sr_Latn/locale.po diff --git a/plugins/pubIds/urn/locale/uz@cyrillic/locale.po b/plugins/pubIds/urn/locale/uz/locale.po similarity index 100% rename from plugins/pubIds/urn/locale/uz@cyrillic/locale.po rename to plugins/pubIds/urn/locale/uz/locale.po diff --git a/plugins/pubIds/urn/locale/uz@latin/locale.po b/plugins/pubIds/urn/locale/uz_Latn/locale.po similarity index 100% rename from plugins/pubIds/urn/locale/uz@latin/locale.po rename to plugins/pubIds/urn/locale/uz_Latn/locale.po diff --git a/plugins/reports/articles/locale/fr_FR/locale.po b/plugins/reports/articles/locale/fr/locale.po similarity index 100% rename from plugins/reports/articles/locale/fr_FR/locale.po rename to plugins/reports/articles/locale/fr/locale.po diff --git a/plugins/reports/articles/locale/nb/locale.po b/plugins/reports/articles/locale/nb_NO/locale.po similarity index 100% rename from plugins/reports/articles/locale/nb/locale.po rename to plugins/reports/articles/locale/nb_NO/locale.po diff --git a/plugins/reports/articles/locale/pt_PT/locale.po b/plugins/reports/articles/locale/pt/locale.po similarity index 100% rename from plugins/reports/articles/locale/pt_PT/locale.po rename to plugins/reports/articles/locale/pt/locale.po diff --git a/plugins/reports/articles/locale/sr@latin/locale.po b/plugins/reports/articles/locale/sr_Latn/locale.po similarity index 100% rename from plugins/reports/articles/locale/sr@latin/locale.po rename to plugins/reports/articles/locale/sr_Latn/locale.po diff --git a/plugins/reports/articles/locale/uz@cyrillic/locale.po b/plugins/reports/articles/locale/uz/locale.po similarity index 100% rename from plugins/reports/articles/locale/uz@cyrillic/locale.po rename to plugins/reports/articles/locale/uz/locale.po diff --git a/plugins/reports/articles/locale/uz@latin/locale.po b/plugins/reports/articles/locale/uz_Latn/locale.po similarity index 100% rename from plugins/reports/articles/locale/uz@latin/locale.po rename to plugins/reports/articles/locale/uz_Latn/locale.po diff --git a/plugins/reports/articles/locale/zh_CN/locale.po b/plugins/reports/articles/locale/zh_Hans/locale.po similarity index 100% rename from plugins/reports/articles/locale/zh_CN/locale.po rename to plugins/reports/articles/locale/zh_Hans/locale.po diff --git a/plugins/reports/counter/locale/fr_FR/locale.po b/plugins/reports/counter/locale/fr/locale.po similarity index 100% rename from plugins/reports/counter/locale/fr_FR/locale.po rename to plugins/reports/counter/locale/fr/locale.po diff --git a/plugins/reports/counter/locale/nb/locale.po b/plugins/reports/counter/locale/nb_NO/locale.po similarity index 100% rename from plugins/reports/counter/locale/nb/locale.po rename to plugins/reports/counter/locale/nb_NO/locale.po diff --git a/plugins/reports/counter/locale/pt_PT/locale.po b/plugins/reports/counter/locale/pt/locale.po similarity index 100% rename from plugins/reports/counter/locale/pt_PT/locale.po rename to plugins/reports/counter/locale/pt/locale.po diff --git a/plugins/reports/counter/locale/sr@latin/locale.po b/plugins/reports/counter/locale/sr_Latn/locale.po similarity index 100% rename from plugins/reports/counter/locale/sr@latin/locale.po rename to plugins/reports/counter/locale/sr_Latn/locale.po diff --git a/plugins/reports/counter/locale/uz@cyrillic/locale.po b/plugins/reports/counter/locale/uz/locale.po similarity index 100% rename from plugins/reports/counter/locale/uz@cyrillic/locale.po rename to plugins/reports/counter/locale/uz/locale.po diff --git a/plugins/reports/counter/locale/uz@latin/locale.po b/plugins/reports/counter/locale/uz_Latn/locale.po similarity index 100% rename from plugins/reports/counter/locale/uz@latin/locale.po rename to plugins/reports/counter/locale/uz_Latn/locale.po diff --git a/plugins/reports/counter/locale/zh_CN/locale.po b/plugins/reports/counter/locale/zh_Hans/locale.po similarity index 100% rename from plugins/reports/counter/locale/zh_CN/locale.po rename to plugins/reports/counter/locale/zh_Hans/locale.po diff --git a/plugins/reports/reviewReport b/plugins/reports/reviewReport index 19a412086aa..fc1e170deb2 160000 --- a/plugins/reports/reviewReport +++ b/plugins/reports/reviewReport @@ -1 +1 @@ -Subproject commit 19a412086aaf3a5a34aaba58032c5a78376415e8 +Subproject commit fc1e170deb2636cf1598c199a857e13ab426c4c1 diff --git a/plugins/reports/subscriptions/locale/bs/locale.po b/plugins/reports/subscriptions/locale/bs_Latn/locale.po similarity index 100% rename from plugins/reports/subscriptions/locale/bs/locale.po rename to plugins/reports/subscriptions/locale/bs_Latn/locale.po diff --git a/plugins/reports/subscriptions/locale/fr_FR/locale.po b/plugins/reports/subscriptions/locale/fr/locale.po similarity index 100% rename from plugins/reports/subscriptions/locale/fr_FR/locale.po rename to plugins/reports/subscriptions/locale/fr/locale.po diff --git a/plugins/reports/subscriptions/locale/nb/locale.po b/plugins/reports/subscriptions/locale/nb_NO/locale.po similarity index 100% rename from plugins/reports/subscriptions/locale/nb/locale.po rename to plugins/reports/subscriptions/locale/nb_NO/locale.po diff --git a/plugins/reports/subscriptions/locale/pt_PT/locale.po b/plugins/reports/subscriptions/locale/pt/locale.po similarity index 100% rename from plugins/reports/subscriptions/locale/pt_PT/locale.po rename to plugins/reports/subscriptions/locale/pt/locale.po diff --git a/plugins/reports/subscriptions/locale/sr@latin/locale.po b/plugins/reports/subscriptions/locale/sr_Latn/locale.po similarity index 100% rename from plugins/reports/subscriptions/locale/sr@latin/locale.po rename to plugins/reports/subscriptions/locale/sr_Latn/locale.po diff --git a/plugins/reports/subscriptions/locale/uz@cyrillic/locale.po b/plugins/reports/subscriptions/locale/uz/locale.po similarity index 100% rename from plugins/reports/subscriptions/locale/uz@cyrillic/locale.po rename to plugins/reports/subscriptions/locale/uz/locale.po diff --git a/plugins/reports/subscriptions/locale/uz@latin/locale.po b/plugins/reports/subscriptions/locale/uz_Latn/locale.po similarity index 100% rename from plugins/reports/subscriptions/locale/uz@latin/locale.po rename to plugins/reports/subscriptions/locale/uz_Latn/locale.po diff --git a/plugins/themes/default/locale/bs/locale.po b/plugins/themes/default/locale/bs_Latn/locale.po similarity index 100% rename from plugins/themes/default/locale/bs/locale.po rename to plugins/themes/default/locale/bs_Latn/locale.po diff --git a/plugins/themes/default/locale/fr_FR/locale.po b/plugins/themes/default/locale/fr/locale.po similarity index 100% rename from plugins/themes/default/locale/fr_FR/locale.po rename to plugins/themes/default/locale/fr/locale.po diff --git a/plugins/themes/default/locale/nb/locale.po b/plugins/themes/default/locale/nb_NO/locale.po similarity index 100% rename from plugins/themes/default/locale/nb/locale.po rename to plugins/themes/default/locale/nb_NO/locale.po diff --git a/plugins/themes/default/locale/pt_PT/locale.po b/plugins/themes/default/locale/pt/locale.po similarity index 100% rename from plugins/themes/default/locale/pt_PT/locale.po rename to plugins/themes/default/locale/pt/locale.po diff --git a/plugins/themes/default/locale/sr@latin/locale.po b/plugins/themes/default/locale/sr_Latn/locale.po similarity index 100% rename from plugins/themes/default/locale/sr@latin/locale.po rename to plugins/themes/default/locale/sr_Latn/locale.po diff --git a/plugins/themes/default/locale/uz@cyrillic/locale.po b/plugins/themes/default/locale/uz/locale.po similarity index 100% rename from plugins/themes/default/locale/uz@cyrillic/locale.po rename to plugins/themes/default/locale/uz/locale.po diff --git a/plugins/themes/default/locale/uz@latin/locale.po b/plugins/themes/default/locale/uz_Latn/locale.po similarity index 100% rename from plugins/themes/default/locale/uz@latin/locale.po rename to plugins/themes/default/locale/uz_Latn/locale.po diff --git a/plugins/themes/default/locale/zh_CN/locale.po b/plugins/themes/default/locale/zh_Hans/locale.po similarity index 100% rename from plugins/themes/default/locale/zh_CN/locale.po rename to plugins/themes/default/locale/zh_Hans/locale.po