From 3fbc316a09aabf77098c34737ace4936a68ffc2b Mon Sep 17 00:00:00 2001
From: jyhein <124268211+jyhein@users.noreply.github.com>
Date: Thu, 21 Mar 2024 11:00:05 +0200
Subject: [PATCH] Make submission language selection and metadata forms
 independent from website language settings

---
 .../PKPSubmissionFileController.php           |  16 +-
 api/v1/vocabs/PKPVocabController.php          |   4 +-
 classes/author/Repository.php                 |   2 +-
 classes/author/maps/Schema.php                |   4 +-
 .../listPanels/ContributorsListPanel.php      |  14 +-
 classes/context/Context.php                   |  57 ++++++-
 classes/core/DataObject.php                   |  14 ++
 classes/dev/ComposerScript.php                |  40 +++++
 classes/galley/Galley.php                     |  31 +++-
 classes/galley/maps/Schema.php                |   4 +-
 classes/i18n/Locale.php                       |  71 ++++++++
 classes/i18n/interfaces/LocaleInterface.php   |   6 +
 .../install/AnnouncementsMigration.php        |   4 +-
 .../migration/install/CategoriesMigration.php |   2 +-
 classes/migration/install/CommonMigration.php |  12 +-
 .../install/ControlledVocabMigration.php      |   2 +-
 classes/migration/install/DoiMigration.php    |   2 +-
 classes/migration/install/GenresMigration.php |   2 +-
 .../migration/install/HighlightsMigration.php |   2 +-
 .../install/InstitutionsMigration.php         |   2 +-
 .../install/LibraryFilesMigration.php         |   2 +-
 classes/migration/install/LogMigration.php    |   2 +-
 .../migration/install/MetadataMigration.php   |   4 +-
 .../install/NavigationMenusMigration.php      |   4 +-
 .../install/ReviewFormsMigration.php          |   4 +-
 .../install/RolesAndUserGroupsMigration.php   |   2 +-
 .../install/SubmissionFilesMigration.php      |   2 +-
 .../install/SubmissionsMigration.php          |   8 +-
 .../migration/install/TombstoneMigration.php  |   2 +-
 .../I9425_SeparateUIAndSubmissionLocales.php  | 131 +++++++++++++++
 classes/publication/PKPPublication.php        |  40 +++++
 classes/publication/Repository.php            |   8 +-
 classes/services/PKPContextService.php        |  13 +-
 classes/submission/PKPSubmission.php          |  27 ++++
 classes/submission/Repository.php             |  10 +-
 classes/submissionFile/Repository.php         |  10 +-
 classes/submissionFile/SubmissionFile.php     |  28 ++++
 classes/submissionFile/maps/Schema.php        |   4 +-
 classes/template/PKPTemplateManager.php       |   3 +-
 composer.json                                 |   8 +-
 .../languages/AdminLanguageGridHandler.php    |   5 +-
 .../languages/LanguageGridCellProvider.php    |  21 +++
 .../grid/languages/LanguageGridHandler.php    | 138 ++++++++++------
 .../grid/languages/form/AddLanguageForm.php   | 131 +++++++++++++++
 .../languages/ManageLanguageGridHandler.php   |   5 +-
 .../SubmissionLanguageGridHandler.php         | 152 ++++++++++++++++++
 .../fileUpload/FileUploadWizardHandler.php    |   3 +-
 .../form/SubmissionFilesMetadataForm.php      |  11 +-
 locale/en/manager.po                          |  24 +++
 .../PKPAuthorDashboardHandler.php             |  44 ++++-
 pages/submission/PKPSubmissionHandler.php     |  52 +++---
 pages/workflow/PKPWorkflowHandler.php         |  47 ++++--
 schemas/context.json                          |  26 ++-
 schemas/submission.json                       |   2 +-
 templates/admin/contextSettings.tpl           |   2 +
 .../grid/languages/addLanguageForm.tpl        |  35 ++++
 templates/management/website.tpl              |   2 +
 57 files changed, 1130 insertions(+), 173 deletions(-)
 create mode 100644 classes/migration/upgrade/v3_5_0/I9425_SeparateUIAndSubmissionLocales.php
 create mode 100644 controllers/grid/languages/form/AddLanguageForm.php
 create mode 100644 controllers/grid/settings/languages/SubmissionLanguageGridHandler.php
 create mode 100644 templates/controllers/grid/languages/addLanguageForm.tpl

diff --git a/api/v1/submissions/PKPSubmissionFileController.php b/api/v1/submissions/PKPSubmissionFileController.php
index 7f264a4ec34..b3d2dc97791 100644
--- a/api/v1/submissions/PKPSubmissionFileController.php
+++ b/api/v1/submissions/PKPSubmissionFileController.php
@@ -320,12 +320,12 @@ public function add(Request $illuminateRequest): JsonResponse
         $params['submissionId'] = $submission->getId();
         $params['uploaderUserId'] = (int) $request->getUser()->getId();
 
-        $primaryLocale = $request->getContext()->getPrimaryLocale();
-        $allowedLocales = $request->getContext()->getData('supportedSubmissionLocales');
+        $submissionLocale = $submission->getData('locale');
+        $allowedLocales = $request->getContext()->getSupportedSubmissionMetadataLocales();
 
         // Set the name if not passed with the request
         if (empty($params['name'])) {
-            $params['name'][$primaryLocale] = $_FILES['file']['name'];
+            $params['name'][$submissionLocale] = $_FILES['file']['name'];
         }
 
         // If no genre has been set and there is only one genre possible, set it automatically
@@ -344,7 +344,7 @@ public function add(Request $illuminateRequest): JsonResponse
                 null,
                 $params,
                 $allowedLocales,
-                $primaryLocale
+                $submissionLocale
             );
 
         if (!empty($errors)) {
@@ -430,15 +430,15 @@ public function edit(Request $illuminateRequest): JsonResponse
             ], Response::HTTP_BAD_REQUEST);
         }
 
-        $primaryLocale = $request->getContext()->getPrimaryLocale();
-        $allowedLocales = $request->getContext()->getData('supportedSubmissionLocales');
+        $submissionLocale = $submission->getData('locale');
+        $allowedLocales = $request->getContext()->getSupportedSubmissionMetadataLocales();
 
         $errors = Repo::submissionFile()
             ->validate(
                 $submissionFile,
                 $params,
                 $allowedLocales,
-                $primaryLocale
+                $submissionLocale
             );
 
         if (!empty($errors)) {
@@ -466,7 +466,7 @@ public function edit(Request $illuminateRequest): JsonResponse
             $params['fileId'] = $fileId;
             $params['uploaderUserId'] = $request->getUser()->getId();
             if (empty($params['name'])) {
-                $params['name'][$primaryLocale] = $_FILES['file']['name'];
+                $params['name'][$submissionLocale] = $_FILES['file']['name'];
             }
         }
 
diff --git a/api/v1/vocabs/PKPVocabController.php b/api/v1/vocabs/PKPVocabController.php
index abbf1defdcc..a35e10927dd 100644
--- a/api/v1/vocabs/PKPVocabController.php
+++ b/api/v1/vocabs/PKPVocabController.php
@@ -18,6 +18,7 @@
 namespace PKP\API\v1\vocabs;
 
 use APP\core\Application;
+use APP\facades\Repo;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
@@ -104,8 +105,9 @@ public function getMany(Request $illuminateRequest): JsonResponse
         $vocab = $requestParams['vocab'] ?? '';
         $locale = $requestParams['locale'] ?? Locale::getLocale();
         $term = $requestParams['term'] ?? null;
+        $locales = array_merge($context->getSupportedSubmissionMetadataLocales(), isset($requestParams['submissionId']) ? Repo::submission()->get((int) $requestParams['submissionId'])?->getPublicationLanguages() ?? [] : []);
 
-        if (!in_array($locale, $context->getData('supportedSubmissionLocales'))) {
+        if (!in_array($locale, $locales)) {
             return response()->json([
                 'error' => __('api.vocabs.400.localeNotSupported', ['locale' => $locale]),
             ], Response::HTTP_BAD_REQUEST);
diff --git a/classes/author/Repository.php b/classes/author/Repository.php
index 5a2c97654e2..d44522acb9b 100644
--- a/classes/author/Repository.php
+++ b/classes/author/Repository.php
@@ -99,8 +99,8 @@ public function getSchemaMap(): maps\Schema
     public function validate($author, $props, Submission $submission, Context $context)
     {
         $schemaService = Services::get('schema');
-        $allowedLocales = $context->getSupportedSubmissionLocales();
         $primaryLocale = $submission->getData('locale');
+        $allowedLocales = $submission->getPublicationLanguages($context->getSupportedSubmissionMetadataLocales());
 
         $validator = ValidatorFactory::make(
             $props,
diff --git a/classes/author/maps/Schema.php b/classes/author/maps/Schema.php
index c670ce0112d..45bda26bee5 100644
--- a/classes/author/maps/Schema.php
+++ b/classes/author/maps/Schema.php
@@ -106,7 +106,9 @@ protected function mapByProperties(array $props, Author $item): array
             }
         }
 
-        $output = $this->schemaService->addMissingMultilingualValues($this->schema, $output, $this->context->getSupportedSubmissionLocales());
+        $locales = Repo::submission()->get(Repo::publication()->get($item->getData('publicationId'))->getData('submissionId'))->getPublicationLanguages($this->context->getSupportedSubmissionMetadataLocales());
+
+        $output = $this->schemaService->addMissingMultilingualValues($this->schema, $output, $locales);
 
         ksort($output);
 
diff --git a/classes/components/listPanels/ContributorsListPanel.php b/classes/components/listPanels/ContributorsListPanel.php
index ecea43b9c2a..6071e599d3b 100644
--- a/classes/components/listPanels/ContributorsListPanel.php
+++ b/classes/components/listPanels/ContributorsListPanel.php
@@ -107,8 +107,6 @@ protected function getPublicationUrlFormat(): string
      */
     protected function getLocalizedForm(): array
     {
-        uksort($this->locales, fn ($a, $b) => $a === $this->submission->getData('locale') ? -1 : 1);
-
         $apiUrl = Application::get()->getRequest()->getDispatcher()->url(
             Application::get()->getRequest(),
             Application::ROUTE_API,
@@ -116,11 +114,15 @@ protected function getLocalizedForm(): array
             'submissions/' . $this->submission->getId() . '/publications/__publicationId__/contributors'
         );
 
-        $form = $this->getForm($apiUrl);
+        $submissionLocale = $this->submission->getData('locale');
+        $data = $this->getForm($apiUrl)->getConfig();
 
-        $data = $form->getConfig();
-        $data['primaryLocale'] = $this->submission->getData('locale');
-        $data['visibleLocales'] = [$this->submission->getData('locale')];
+        $data['primaryLocale'] = $submissionLocale;
+        $data['visibleLocales'] = [$submissionLocale];
+        $data['supportedFormLocales'] = collect($this->locales)
+            ->sortBy([fn (array $a, array $b) => $b['key'] === $submissionLocale ? 1 : -1])
+            ->values()
+            ->toArray();
 
         return $data;
     }
diff --git a/classes/context/Context.php b/classes/context/Context.php
index 748f0ec8269..ae1548cd153 100644
--- a/classes/context/Context.php
+++ b/classes/context/Context.php
@@ -360,14 +360,10 @@ public function getSupportedSubmissionLocales()
     /**
      * Return associative array of all locales supported by submissions on the
      * context.
-     *
-     * @param  int  $langLocaleStatus The const value of one of LocaleMetadata:LANGUAGE_LOCALE_*
-     *
-     * @return array
      */
-    public function getSupportedSubmissionLocaleNames(int $langLocaleStatus = LocaleMetadata::LANGUAGE_LOCALE_WITHOUT)
+    public function getSupportedSubmissionLocaleNames(): array
     {
-        return $this->getData('supportedSubmissionLocaleNames') ?? Locale::getFormattedDisplayNames($this->getSupportedSubmissionLocales(), null, $langLocaleStatus);
+        return $this->getData('supportedSubmissionLocaleNames') ?? Locale::getSubmissionLocaleDisplayNames($this->getSupportedSubmissionLocales());
     }
 
     /**
@@ -393,6 +389,55 @@ public function getSupportedLocaleNames(int $langLocaleStatus = LocaleMetadata::
         return $this->getData('supportedLocaleNames') ?? Locale::getFormattedDisplayNames($this->getSupportedLocales(), null, $langLocaleStatus);
     }
 
+    /**
+     * Get the supported added submission locales.
+     */
+    public function getSupportedAddedSubmissionLocales(): array
+    {
+        return $this->getData('supportedAddedSubmissionLocales');
+    }
+
+    /**
+     * Return associative array of added locales supported by submissions on the
+     * context.
+     */
+    public function getSupportedAddedSubmissionLocaleNames(): array
+    {
+        return Locale::getSubmissionLocaleDisplayNames($this->getSupportedAddedSubmissionLocales());
+    }
+
+    /**
+     * Get the supported default submission locale.
+     */
+    public function getSupportedDefaultSubmissionLocale(): string
+    {
+        return $this->getData('supportedDefaultSubmissionLocale');
+    }
+
+    /**
+     * Return string default submission locale supported by the site.
+     */
+    public function getSupportedDefaultSubmissionLocaleName(): string
+    {
+        return Locale::getSubmissionLocaleDisplayNames([$l = $this->getSupportedDefaultSubmissionLocale()])[$l];
+    }
+
+    /**
+     * Get the supported metadata locales.
+     */
+    public function getSupportedSubmissionMetadataLocales(): array
+    {
+        return $this->getData('supportedSubmissionMetadataLocales');
+    }
+
+    /**
+     * Return associative array of all locales supported by submission metadata forms on the site.
+     */
+    public function getSupportedSubmissionMetadataLocaleNames(): array
+    {
+        return Locale::getSubmissionLocaleDisplayNames($this->getSupportedSubmissionMetadataLocales());
+    }
+
     /**
      * Return date or/and time formats available for forms, fallback to the default if not set
      *
diff --git a/classes/core/DataObject.php b/classes/core/DataObject.php
index 5a79b731fcd..2f0cdbfeb03 100644
--- a/classes/core/DataObject.php
+++ b/classes/core/DataObject.php
@@ -47,6 +47,19 @@ class DataObject
     /** @var bool whether injection adapters have already been loaded from the database */
     public $_injectionAdaptersLoaded = false;
 
+    /** @var array conversion table for locales */
+    public $_localesTable = [
+        "be@cyrillic" => "be",
+        "bs" => "bs_Latn",
+        "fr_FR" => "fr",
+        "nb" => "nb_NO",
+        "sr@cyrillic" => "sr_Cyrl",
+        "sr@latin" => "sr_Latn",
+        "uz@cyrillic" => "uz",
+        "uz@latin" => "uz_Latn",
+        "zh_CN" => "zh_Hans",
+    ];
+
     /**
      * Constructor
      */
@@ -101,6 +114,7 @@ public function getLocalePrecedence(string $preferredLocale = null): array
         return array_unique(
             array_filter([
                 $preferredLocale ?? Locale::getLocale(),
+                $this->_localesTable[$preferredLocale ?? Locale::getLocale()] ?? null,
                 $this->getDefaultLocale(),
                 $request->getContext()?->getPrimaryLocale(),
                 $request->getSite()->getPrimaryLocale(),
diff --git a/classes/dev/ComposerScript.php b/classes/dev/ComposerScript.php
index dd348ec0ae7..5d17e85fa6c 100644
--- a/classes/dev/ComposerScript.php
+++ b/classes/dev/ComposerScript.php
@@ -32,4 +32,44 @@ public static function isoFileCheck(): void
             throw new Exception("The ISO639-2b file {$iso6392bFile} does not exist.");
         }
     }
+
+    /**
+     * A post-install-cmd custom composer script that
+     * creates languages.json from downloaded Weblate languages.csv.
+     */
+    public static function weblateFilesDownload(): void
+    {
+        try {
+            $dirPath = dirname(__FILE__, 3) . "/lib/weblateLanguages";
+            $langFilePath = "$dirPath/languages.json";
+            $urlCsv = 'https://raw.githubusercontent.com/WeblateOrg/language-data/main/languages.csv';
+
+            if (!is_dir($dirPath)) {
+                mkdir($dirPath);
+            }
+
+            $streamContext = stream_context_create(['http' => ['method' => 'HEAD']]);
+            $languagesCsv = !preg_match('/200 OK/', get_headers($urlCsv, false, $streamContext)[0] ?? "") ?: file($urlCsv, FILE_SKIP_EMPTY_LINES);
+            if (!is_array($languagesCsv) || !$languagesCsv) {
+                throw new Exception(__METHOD__ . " : The Weblate file 'languages.csv' cannot be downloaded !");
+            }
+
+            array_shift($languagesCsv);
+            $languages = [];
+            foreach($languagesCsv as $languageCsv) {
+                $localeAndName = str_getcsv($languageCsv, ",");
+                if (isset($localeAndName[0], $localeAndName[1]) && preg_match('/^[\w@-]{2,50}$/', $localeAndName[0])) {
+                    $displayName = locale_get_display_name($localeAndName[0], 'en');
+                    $languages[$localeAndName[0]] = (($displayName && $displayName !== $localeAndName[0]) ? $displayName : $localeAndName[1]);
+                }
+            }
+
+            $languagesJson = json_encode($languages, JSON_THROW_ON_ERROR);
+            if (!$languagesJson || !file_put_contents($langFilePath, $languagesJson)) {
+                throw new Exception(__METHOD__ . " : Json file empty, or save unsuccessful: $langFilePath !");
+            }
+        } catch (Exception $e) {
+            error_log($e->getMessage());
+        }
+    }
 }
diff --git a/classes/galley/Galley.php b/classes/galley/Galley.php
index 268e0377898..2d9787aff0b 100644
--- a/classes/galley/Galley.php
+++ b/classes/galley/Galley.php
@@ -16,8 +16,11 @@
 
 namespace PKP\galley;
 
+use APP\core\Services;
 use APP\facades\Repo;
 use PKP\facades\Locale;
+use PKP\i18n\LocaleMetadata;
+use PKP\services\PKPSchemaService;
 use PKP\submission\Representation;
 use PKP\submissionFile\SubmissionFile;
 
@@ -127,8 +130,8 @@ public function isPdfGalley()
     public function getGalleyLabel()
     {
         $label = $this->getLabel();
-        if ($this->getLocale() && $this->getLocale() != Locale::getLocale()) {
-            $label .= ' (' . Locale::getMetadata($this->getLocale())->getDisplayName() . ')';
+        if ($this->getLocale() && $this->getLocale() !== Locale::getLocale()) {
+            $label .= ' (' . Locale::getSubmissionLocaleDisplayNames([$this->getLocale()])[$this->getLocale()] . ')';
         }
         return $label;
     }
@@ -183,6 +186,30 @@ public function setStoredPubId($pubIdType, $pubId)
             parent::setStoredPubId($pubIdType, $pubId);
         }
     }
+
+    /**
+     * Get metadata language names
+     */
+    public function getLanguageNames(): array
+    {
+        return Locale::getSubmissionLocaleDisplayNames($this->getLanguages());
+    }
+
+    /**
+     * Get metadata languages
+     */
+    public function getLanguages(): array
+    {
+        $props = Services::get('schema')->getMultilingualProps(PKPSchemaService::SCHEMA_GALLEY);
+        $locales = array_map(fn (string $prop): array => array_keys($this->getData($prop) ?? []), $props);
+        return collect([$this->getData('locale')])
+            ->concat($locales)
+            ->flatten()
+            ->filter()
+            ->unique()
+            ->values()
+            ->toArray();
+    }
 }
 
 if (!PKP_STRICT_MODE) {
diff --git a/classes/galley/maps/Schema.php b/classes/galley/maps/Schema.php
index c28ff66867b..026df6a0088 100644
--- a/classes/galley/maps/Schema.php
+++ b/classes/galley/maps/Schema.php
@@ -140,7 +140,9 @@ protected function mapByProperties(array $props, Galley $galley): array
             }
         }
 
-        $output = $this->schemaService->addMissingMultilingualValues($this->schema, $output, $this->context->getSupportedFormLocales());
+        $locales = $this->publication->getLanguages($this->context->getSupportedSubmissionMetadataLocales(), $galley->getLanguages());
+
+        $output = $this->schemaService->addMissingMultilingualValues($this->schema, $output, $locales);
 
         ksort($output);
 
diff --git a/classes/i18n/Locale.php b/classes/i18n/Locale.php
index b8831116ee1..c4665a989e6 100644
--- a/classes/i18n/Locale.php
+++ b/classes/i18n/Locale.php
@@ -29,6 +29,7 @@
 use Illuminate\Support\Facades\Cache;
 use InvalidArgumentException;
 use PKP\config\Config;
+use PKP\core\Core;
 use PKP\core\PKPRequest;
 use PKP\facades\Repo;
 use PKP\i18n\interfaces\LocaleInterface;
@@ -54,6 +55,9 @@ class Locale implements LocaleInterface
     /** Max lifetime for the locale metadata cache, the cache is built by scanning the provided paths */
     protected const MAX_CACHE_LIFETIME = '1 hour';
 
+    /** @var string Max lifetime for the submission locales cache. */
+    protected const MAX_SUBMISSION_LOCALES_CACHE_LIFETIME = '1 year';
+
     /**
      * @var callable Formatter for missing locale keys
      * Receives the locale key and must return a string
@@ -96,6 +100,9 @@ class Locale implements LocaleInterface
     /** Keeps cached data related only to the current locale */
     protected array $cache = [];
 
+    /** @var string[]|null Available submission locales cache, where key = locale and value = name */
+    protected ?array $submissionLocaleNames = null;
+
     /**
      * @copy \Illuminate\Contracts\Translation\Translator::get()
      *
@@ -202,6 +209,14 @@ public function isLocaleValid(?string $locale): bool
         return !empty($locale) && preg_match(LocaleInterface::LOCALE_EXPRESSION, $locale);
     }
 
+    /**
+     * @copy LocaleInterface::isSubmissionLocaleValid()
+     */
+    public function isSubmissionLocaleValid(?string $locale): bool
+    {
+        return !empty($locale) && preg_match(LocaleInterface::LOCALE_EXPRESSION_SUBMISSION, $locale);
+    }
+
     /**
      * @copy LocaleInterface::getMetadata()
      */
@@ -403,6 +418,37 @@ public function getUiTranslator(): UITranslator
         return new UITranslator($locale, $this->paths, $localeBundleCacheKey);
     }
 
+    /**
+     * Get appropriately localized display names for submission locales to array
+     * If $filterByLocales empty, return all languages.
+     * Adds '*' (= in English) to display name if no translation available
+     * 
+     * @param array $filterByLocales Optional list of locale codes/code-name-pairs to filter
+     * @param ?string $displayLocale Optional display locale
+     * 
+     * @return array The list of locales with formatted display name
+     */
+    public function getSubmissionLocaleDisplayNames(array $filterByLocales = [], ?string $displayLocale = null): array
+    {
+        $convDispLocale = $this->convertSubmissionLocaleCode($displayLocale ?: $this->getLocale());
+        return collect($this->_getSubmissionLocaleNames())
+            ->when($filterByLocales, fn ($sln) => $sln->intersectByKeys(array_is_list($filterByLocales) ? array_flip(array_filter($filterByLocales)) : $filterByLocales))
+            ->when($convDispLocale !== 'en', fn ($sln) => $sln->map(function ($nameEn, $l) use ($convDispLocale) {
+                $cl = $this->convertSubmissionLocaleCode($l);
+                $dn = locale_get_display_name($cl, $convDispLocale);
+                return ($dn && $dn !== $cl) ? $dn : "*$nameEn";
+            }))
+            ->toArray();
+    }
+
+    /**
+     * Convert submission locale code
+     */
+    public function convertSubmissionLocaleCode(string $locale): string
+    {
+        return str_replace(['@cyrillic', '@latin'], ['_Cyrl', '_Latn'], $locale);
+    }
+
     /**
      * Get the filtered locales by locale codes
      *
@@ -511,4 +557,29 @@ private function _getSupportedLocales(): array
             ?? array_map(fn (LocaleMetadata $locale) => $locale->locale, $this->getLocales());
         return $this->supportedLocales = array_combine($locales, $locales);
     }
+
+    /**
+     * Get Weblate submission languages to array
+     * Combine app's language names with weblate's in English.
+     * Weblate's names override app's if same locale key
+     * 
+     * @return string[]
+     */
+    private function _getSubmissionLocaleNames(): array
+    {
+        return $this->submissionLocaleNames ??= (function (): array {
+            $file = Core::getBaseDir() . '/' . PKP_LIB_PATH . '/lib/weblateLanguages/languages.json';
+            $key = __METHOD__ . self::MAX_SUBMISSION_LOCALES_CACHE_LIFETIME . filemtime($file);
+            $expiration = DateInterval::createFromDateString(self::MAX_SUBMISSION_LOCALES_CACHE_LIFETIME);
+            return Cache::remember($key, $expiration, fn (): array =>  collect($this->getLocales())
+                ->map(function (LocaleMetadata $lm, string $l): string {
+                    $cl = $this->convertSubmissionLocaleCode($l);
+                    $n = locale_get_display_name($cl, 'en');
+                    return ($n && $n !== $cl) ? $n : $lm->getDisplayName('en', true);
+                })
+                ->merge(json_decode(file_get_contents($file) ?: [], true) ?: [])
+                ->sortKeys()
+                ->toArray());
+        })();
+    }
 }
diff --git a/classes/i18n/interfaces/LocaleInterface.php b/classes/i18n/interfaces/LocaleInterface.php
index 3f9eed4b2f8..5782428a28a 100644
--- a/classes/i18n/interfaces/LocaleInterface.php
+++ b/classes/i18n/interfaces/LocaleInterface.php
@@ -38,6 +38,7 @@ interface LocaleInterface extends \Illuminate\Contracts\Translation\Translator
 
     /** Regular expression to validate and extract pieces of a locale code */
     public const LOCALE_EXPRESSION = '/^(?P<language>[a-z]{2})(?:_(?P<country>[A-Za-z]{2,4}))?(?:@(?P<script>[A-Za-z\d]{5,8}|\d[A-Za-z\d]{3}))?$/';
+    public const LOCALE_EXPRESSION_SUBMISSION = '/^(?P<language>[A-Za-z]{2,4})(?:[_-](?P<script>[A-Za-z]{4,5}|[0-9]{4}))?(?:[_-](?P<country>[A-Za-z]{2}|[0-9]{3}))?(?:@(?P<variant>[a-z]{2,30})(?:[_-](?P<variant_script>(?&script)))?)?$/';
 
     /**
      * Attempts to retrieve the primary locale for the current context, if not available, then for the site.
@@ -72,6 +73,11 @@ public function registerLoader(callable $fileLoader, int $priority = 0): void;
      */
     public function isLocaleValid(?string $locale): bool;
 
+    /**
+     * Check if the supplied submission locale is valid.
+     */
+    public function isSubmissionLocaleValid(?string $locale): bool;
+
     /**
      * Retrieves the metadata of a locale
      */
diff --git a/classes/migration/install/AnnouncementsMigration.php b/classes/migration/install/AnnouncementsMigration.php
index d12af608688..b92e5669a27 100644
--- a/classes/migration/install/AnnouncementsMigration.php
+++ b/classes/migration/install/AnnouncementsMigration.php
@@ -43,7 +43,7 @@ public function up(): void
             $table->foreign('type_id')->references('type_id')->on('announcement_types')->onDelete('cascade');
             $table->index(['type_id'], 'announcement_type_settings_type_id');
 
-            $table->string('locale', 14)->default('');
+            $table->string('locale', 28)->default('');
             $table->string('setting_name', 255);
             $table->mediumText('setting_value')->nullable();
             $table->string('setting_type', 6);
@@ -76,7 +76,7 @@ public function up(): void
             $table->foreign('announcement_id')->references('announcement_id')->on('announcements')->onDelete('cascade');
             $table->index(['announcement_id'], 'announcement_settings_announcement_id');
 
-            $table->string('locale', 14)->default('');
+            $table->string('locale', 28)->default('');
             $table->string('setting_name', 255);
             $table->mediumText('setting_value')->nullable();
 
diff --git a/classes/migration/install/CategoriesMigration.php b/classes/migration/install/CategoriesMigration.php
index 76ad09c8c5e..d4545c34c1e 100644
--- a/classes/migration/install/CategoriesMigration.php
+++ b/classes/migration/install/CategoriesMigration.php
@@ -55,7 +55,7 @@ public function up(): void
             $table->foreign('category_id')->references('category_id')->on('categories')->onDelete('cascade');
             $table->index(['category_id'], 'category_settings_category_id');
 
-            $table->string('locale', 14)->default('');
+            $table->string('locale', 28)->default('');
             $table->string('setting_name', 255);
             $table->mediumText('setting_value')->nullable();
 
diff --git a/classes/migration/install/CommonMigration.php b/classes/migration/install/CommonMigration.php
index 291d6f39f14..5d1472d948f 100644
--- a/classes/migration/install/CommonMigration.php
+++ b/classes/migration/install/CommonMigration.php
@@ -48,7 +48,7 @@ public function up(): void
             $table->comment('A singleton table describing basic information about the site.');
             $table->bigIncrements('site_id');
             $table->bigInteger('redirect')->default(0)->comment('If not 0, redirect to the specified journal/conference/... site.');
-            $table->string('primary_locale', 14)->comment('Primary locale for the site.');
+            $table->string('primary_locale', 28)->comment('Primary locale for the site.');
             $table->smallInteger('min_password_length')->default(6);
             $table->string('installed_locales', 1024)->default('en')->comment('Locales for which support has been installed.');
             $table->string('supported_locales', 1024)->comment('Locales supported by the site (for hosted journals/conferences/...).')->nullable();
@@ -60,7 +60,7 @@ public function up(): void
             $table->comment('More data about the site, including localized properties such as its name.');
             $table->bigIncrements('site_setting_id');
             $table->string('setting_name', 255);
-            $table->string('locale', 14)->default('');
+            $table->string('locale', 28)->default('');
             $table->mediumText('setting_value')->nullable();
             $table->unique(['setting_name', 'locale'], 'site_settings_unique');
         });
@@ -111,7 +111,7 @@ public function up(): void
             $table->foreign('user_id')->references('user_id')->on('users')->onDelete('cascade');
             $table->index(['user_id'], 'user_settings_user_id');
 
-            $table->string('locale', 14)->default('');
+            $table->string('locale', 28)->default('');
             $table->string('setting_name', 255);
             $table->mediumText('setting_value')->nullable();
 
@@ -171,7 +171,7 @@ public function up(): void
             $table->foreign('notification_id')->references('notification_id')->on('notifications')->onDelete('cascade');
             $table->index(['notification_id'], 'notification_settings_notification_id');
 
-            $table->string('locale', 14)->nullable();
+            $table->string('locale', 28)->nullable();
             $table->string('setting_name', 64);
             $table->mediumText('setting_value');
             $table->string('setting_type', 6)->comment('(bool|int|float|string|object)');
@@ -200,7 +200,7 @@ public function up(): void
             $table->comment('Default email templates created for every installed locale.');
             $table->bigIncrements('email_templates_default_data_id');
             $table->string('email_key', 255)->comment('Unique identifier for this email.');
-            $table->string('locale', 14)->default('en');
+            $table->string('locale', 28)->default('en');
             $table->string('name', 255);
             $table->string('subject', 255);
             $table->text('body')->nullable();
@@ -230,7 +230,7 @@ public function up(): void
             $table->foreign('email_id', 'email_templates_settings_email_id')->references('email_id')->on('email_templates')->onDelete('cascade');
             $table->index(['email_id'], 'email_templates_settings_email_id');
 
-            $table->string('locale', 14)->default('');
+            $table->string('locale', 28)->default('');
             $table->string('setting_name', 255);
             $table->mediumText('setting_value')->nullable();
 
diff --git a/classes/migration/install/ControlledVocabMigration.php b/classes/migration/install/ControlledVocabMigration.php
index 4b009ffef3e..a5fe646f618 100644
--- a/classes/migration/install/ControlledVocabMigration.php
+++ b/classes/migration/install/ControlledVocabMigration.php
@@ -55,7 +55,7 @@ public function up(): void
             $table->foreign('controlled_vocab_entry_id', 'c_v_e_s_entry_id')->references('controlled_vocab_entry_id')->on('controlled_vocab_entries')->onDelete('cascade');
             $table->index(['controlled_vocab_entry_id'], 'c_v_e_s_entry_id');
 
-            $table->string('locale', 14)->default('');
+            $table->string('locale', 28)->default('');
             $table->string('setting_name', 255);
             $table->mediumText('setting_value')->nullable();
             $table->string('setting_type', 6);
diff --git a/classes/migration/install/DoiMigration.php b/classes/migration/install/DoiMigration.php
index 945d8428245..6da8e31b55e 100644
--- a/classes/migration/install/DoiMigration.php
+++ b/classes/migration/install/DoiMigration.php
@@ -46,7 +46,7 @@ public function up(): void
             $table->comment('More data about DOIs, including the registration agency.');
             $table->bigIncrements('doi_setting_id');
             $table->bigInteger('doi_id');
-            $table->string('locale', 14)->default('');
+            $table->string('locale', 28)->default('');
             $table->string('setting_name', 255);
             $table->mediumText('setting_value')->nullable();
 
diff --git a/classes/migration/install/GenresMigration.php b/classes/migration/install/GenresMigration.php
index 07fb3815748..892464eb698 100644
--- a/classes/migration/install/GenresMigration.php
+++ b/classes/migration/install/GenresMigration.php
@@ -54,7 +54,7 @@ public function up(): void
             $table->foreign('genre_id')->references('genre_id')->on('genres')->onDelete('cascade');
             $table->index(['genre_id'], 'genre_settings_genre_id');
 
-            $table->string('locale', 14)->default('');
+            $table->string('locale', 28)->default('');
             $table->string('setting_name', 255);
             $table->mediumText('setting_value')->nullable();
             $table->string('setting_type', 6)->comment('(bool|int|float|string|object)');
diff --git a/classes/migration/install/HighlightsMigration.php b/classes/migration/install/HighlightsMigration.php
index 8bc9354df22..19dec2501d3 100644
--- a/classes/migration/install/HighlightsMigration.php
+++ b/classes/migration/install/HighlightsMigration.php
@@ -43,7 +43,7 @@ public function up(): void
             $table->foreign('highlight_id')->references('highlight_id')->on('highlights')->onDelete('cascade');
             $table->index(['highlight_id'], 'highlight_settings_highlight_id');
 
-            $table->string('locale', 14)->default('');
+            $table->string('locale', 28)->default('');
             $table->string('setting_name', 255);
             $table->mediumText('setting_value')->nullable();
 
diff --git a/classes/migration/install/InstitutionsMigration.php b/classes/migration/install/InstitutionsMigration.php
index 19bea16ab79..f77bfebe95d 100644
--- a/classes/migration/install/InstitutionsMigration.php
+++ b/classes/migration/install/InstitutionsMigration.php
@@ -45,7 +45,7 @@ public function up(): void
             $table->foreign('institution_id')->references('institution_id')->on('institutions')->onDelete('cascade');
             $table->index(['institution_id'], 'institution_settings_institution_id');
 
-            $table->string('locale', 14)->default('');
+            $table->string('locale', 28)->default('');
             $table->string('setting_name', 255);
             $table->mediumText('setting_value')->nullable();
 
diff --git a/classes/migration/install/LibraryFilesMigration.php b/classes/migration/install/LibraryFilesMigration.php
index 2fc533ed66f..7d53b642609 100644
--- a/classes/migration/install/LibraryFilesMigration.php
+++ b/classes/migration/install/LibraryFilesMigration.php
@@ -57,7 +57,7 @@ public function up(): void
             $table->foreign('file_id')->references('file_id')->on('library_files')->onDelete('cascade');
             $table->index(['file_id'], 'library_file_settings_file_id');
 
-            $table->string('locale', 14)->default('');
+            $table->string('locale', 28)->default('');
             $table->string('setting_name', 255);
             $table->mediumText('setting_value')->nullable();
             $table->string('setting_type', 6)->comment('(bool|int|float|string|object|date)');
diff --git a/classes/migration/install/LogMigration.php b/classes/migration/install/LogMigration.php
index 76442b67fbd..b891de5c67e 100644
--- a/classes/migration/install/LogMigration.php
+++ b/classes/migration/install/LogMigration.php
@@ -49,7 +49,7 @@ public function up(): void
             $table->foreign('log_id', 'event_log_settings_log_id')->references('log_id')->on('event_log')->onDelete('cascade');
             $table->index(['log_id'], 'event_log_settings_log_id');
 
-            $table->string('locale', 14)->default('');
+            $table->string('locale', 28)->default('');
             $table->string('setting_name', 255);
             $table->mediumText('setting_value')->nullable();
             $table->unique(['log_id', 'setting_name', 'locale'], 'event_log_settings_unique');
diff --git a/classes/migration/install/MetadataMigration.php b/classes/migration/install/MetadataMigration.php
index b70fd6d5669..0b015301d66 100644
--- a/classes/migration/install/MetadataMigration.php
+++ b/classes/migration/install/MetadataMigration.php
@@ -47,7 +47,7 @@ public function up(): void
             $table->foreign('citation_id', 'citation_settings_citation_id')->references('citation_id')->on('citations')->onDelete('cascade');
             $table->index(['citation_id'], 'citation_settings_citation_id');
 
-            $table->string('locale', 14)->default('');
+            $table->string('locale', 28)->default('');
             $table->string('setting_name', 255);
             $table->mediumText('setting_value')->nullable();
             $table->string('setting_type', 6);
@@ -92,7 +92,7 @@ public function up(): void
             $table->foreign('filter_id')->references('filter_id')->on('filters')->onDelete('cascade');
             $table->index(['filter_id'], 'filter_settings_id');
 
-            $table->string('locale', 14)->default('');
+            $table->string('locale', 28)->default('');
             $table->string('setting_name', 255);
             $table->mediumText('setting_value')->nullable();
             $table->string('setting_type', 6);
diff --git a/classes/migration/install/NavigationMenusMigration.php b/classes/migration/install/NavigationMenusMigration.php
index b27806ab4a2..a883501118b 100644
--- a/classes/migration/install/NavigationMenusMigration.php
+++ b/classes/migration/install/NavigationMenusMigration.php
@@ -50,7 +50,7 @@ public function up(): void
             $table->foreign('navigation_menu_item_id', 'navigation_menu_item_settings_navigation_menu_id')->references('navigation_menu_item_id')->on('navigation_menu_items')->onDelete('cascade');
             $table->index(['navigation_menu_item_id'], 'navigation_menu_item_settings_navigation_menu_item_id');
 
-            $table->string('locale', 14)->default('');
+            $table->string('locale', 28)->default('');
             $table->string('setting_name', 255);
             $table->longText('setting_value')->nullable();
             $table->string('setting_type', 6);
@@ -83,7 +83,7 @@ public function up(): void
             $table->foreign('navigation_menu_item_assignment_id', 'assignment_settings_navigation_menu_item_assignment_id')->references('navigation_menu_item_assignment_id')->on('navigation_menu_item_assignments')->onDelete('cascade');
             $table->index(['navigation_menu_item_assignment_id'], 'navigation_menu_item_assignment_settings_n_m_i_a_id');
 
-            $table->string('locale', 14)->default('');
+            $table->string('locale', 28)->default('');
             $table->string('setting_name', 255);
             $table->mediumText('setting_value')->nullable();
             $table->string('setting_type', 6);
diff --git a/classes/migration/install/ReviewFormsMigration.php b/classes/migration/install/ReviewFormsMigration.php
index dea03c165eb..90ab8fcbac3 100644
--- a/classes/migration/install/ReviewFormsMigration.php
+++ b/classes/migration/install/ReviewFormsMigration.php
@@ -45,7 +45,7 @@ public function up(): void
                 $table->foreign('review_form_id', 'review_form_settings_review_form_id')->references('review_form_id')->on('review_forms')->onDelete('cascade');
                 $table->index(['review_form_id'], 'review_form_settings_review_form_id');
 
-                $table->string('locale', 14)->default('');
+                $table->string('locale', 28)->default('');
                 $table->string('setting_name', 255);
                 $table->mediumText('setting_value')->nullable();
                 $table->string('setting_type', 6);
@@ -80,7 +80,7 @@ public function up(): void
                 $table->foreign('review_form_element_id', 'review_form_element_settings_review_form_element_id')->references('review_form_element_id')->on('review_form_elements')->onDelete('cascade');
                 $table->index(['review_form_element_id'], 'review_form_element_settings_review_form_element_id');
 
-                $table->string('locale', 14)->default('');
+                $table->string('locale', 28)->default('');
                 $table->string('setting_name', 255);
                 $table->mediumText('setting_value')->nullable();
                 $table->string('setting_type', 6);
diff --git a/classes/migration/install/RolesAndUserGroupsMigration.php b/classes/migration/install/RolesAndUserGroupsMigration.php
index b27dfe56ebf..477d9dad789 100644
--- a/classes/migration/install/RolesAndUserGroupsMigration.php
+++ b/classes/migration/install/RolesAndUserGroupsMigration.php
@@ -44,7 +44,7 @@ public function up(): void
             $table->comment('More data about user groups, including localized properties such as the name.');
             $table->bigIncrements('user_group_setting_id');
             $table->bigInteger('user_group_id');
-            $table->string('locale', 14)->default('');
+            $table->string('locale', 28)->default('');
             $table->string('setting_name', 255);
             $table->mediumText('setting_value')->nullable();
 
diff --git a/classes/migration/install/SubmissionFilesMigration.php b/classes/migration/install/SubmissionFilesMigration.php
index d143f6f6d3c..32cc4c44dc3 100644
--- a/classes/migration/install/SubmissionFilesMigration.php
+++ b/classes/migration/install/SubmissionFilesMigration.php
@@ -72,7 +72,7 @@ public function up(): void
             $table->foreign('submission_file_id')->references('submission_file_id')->on('submission_files')->onDelete('cascade');
             $table->index(['submission_file_id'], 'submission_file_settings_submission_file_id');
 
-            $table->string('locale', 14)->default('');
+            $table->string('locale', 28)->default('');
             $table->string('setting_name', 255);
             $table->mediumText('setting_value')->nullable();
 
diff --git a/classes/migration/install/SubmissionsMigration.php b/classes/migration/install/SubmissionsMigration.php
index 6d0ba8076ed..ce70e50ae9b 100644
--- a/classes/migration/install/SubmissionsMigration.php
+++ b/classes/migration/install/SubmissionsMigration.php
@@ -45,7 +45,7 @@ public function up(): void
             $table->datetime('date_submitted')->nullable();
             $table->datetime('last_modified')->nullable();
             $table->bigInteger('stage_id')->default($this->defaultStageId);
-            $table->string('locale', 14)->nullable();
+            $table->string('locale', 28)->nullable();
 
             $table->smallInteger('status')->default(PKPSubmission::STATUS_QUEUED);
 
@@ -66,7 +66,7 @@ public function up(): void
             $table->foreign('submission_id')->references('submission_id')->on('submissions')->onDelete('cascade');
             $table->index(['submission_id'], 'submission_settings_submission_id');
 
-            $table->string('locale', 14)->default('');
+            $table->string('locale', 28)->default('');
             $table->string('setting_name', 255);
             $table->mediumText('setting_value')->nullable();
 
@@ -81,7 +81,7 @@ public function up(): void
             // The foreign key relationship on this table is defined with the publications table.
             $table->bigInteger('publication_id');
 
-            $table->string('locale', 14)->default('');
+            $table->string('locale', 28)->default('');
             $table->string('setting_name', 255);
             $table->mediumText('setting_value')->nullable();
 
@@ -120,7 +120,7 @@ public function up(): void
             $table->foreign('author_id', 'author_settings_author_id')->references('author_id')->on('authors')->onDelete('cascade');
             $table->index(['author_id'], 'author_settings_author_id');
 
-            $table->string('locale', 14)->default('');
+            $table->string('locale', 28)->default('');
             $table->string('setting_name', 255);
             $table->mediumText('setting_value')->nullable();
 
diff --git a/classes/migration/install/TombstoneMigration.php b/classes/migration/install/TombstoneMigration.php
index 78880d0f300..b3e4f58b73b 100644
--- a/classes/migration/install/TombstoneMigration.php
+++ b/classes/migration/install/TombstoneMigration.php
@@ -44,7 +44,7 @@ public function up(): void
             $table->foreign('tombstone_id', 'data_object_tombstone_settings_tombstone_id')->references('tombstone_id')->on('data_object_tombstones')->onDelete('cascade');
             $table->index(['tombstone_id'], 'data_object_tombstone_settings_tombstone_id');
 
-            $table->string('locale', 14)->default('');
+            $table->string('locale', 28)->default('');
             $table->string('setting_name', 255);
             $table->mediumText('setting_value')->nullable();
             $table->string('setting_type', 6)->comment('(bool|int|float|string|object)');
diff --git a/classes/migration/upgrade/v3_5_0/I9425_SeparateUIAndSubmissionLocales.php b/classes/migration/upgrade/v3_5_0/I9425_SeparateUIAndSubmissionLocales.php
new file mode 100644
index 00000000000..da38c893f11
--- /dev/null
+++ b/classes/migration/upgrade/v3_5_0/I9425_SeparateUIAndSubmissionLocales.php
@@ -0,0 +1,131 @@
+<?php
+
+/**
+ * @file classes/migration/upgrade/v3_5_0/I9425_SeparateUIAndSubmissionLocales.php
+ *
+ * Copyright (c) 2024 Simon Fraser University
+ * Copyright (c) 2024 John Willinsky
+ * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
+ *
+ * @class I9425_SeparateUIAndSubmissionLocales
+ *
+ * @brief pkp/pkp-lib#9425 Make submission language selection and metadata forms independent from website language settings
+ */
+
+namespace PKP\migration\upgrade\v3_5_0;
+
+use Illuminate\Database\PostgresConnection;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+use APP\core\Application;
+use PKP\install\DowngradeNotSupportedException;
+use PKP\migration\Migration;
+
+abstract class I9425_SeparateUIAndSubmissionLocales extends Migration
+{
+    abstract protected function getContextTable(): string;
+    abstract protected function getContextSettingsTable(): string;
+    abstract protected function getContextIdColumn(): string;
+
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        /**
+         * Update/add locale arrays
+         */
+
+        $insert = function (object $localeId, string $settingName, string $settingValue): void {
+            DB::table($this->getContextSettingsTable())->insert(
+                [
+                    $this->getContextIdColumn() => $localeId->{$this->getContextIdColumn()},
+                    'locale' => '',
+                    'setting_name' => $settingName,
+                    'setting_value' => $settingValue,
+                ]
+            );
+        };
+        $update = function (object $localeId, string $settingName, string $settingValue): void {
+            DB::table($this->getContextSettingsTable())
+            ->where($this->getContextIdColumn(), '=', $localeId->{$this->getContextIdColumn()})
+            ->where('setting_name', '=', $settingName)
+            ->update(['setting_value' => $settingValue]);
+        };
+        $pluck = fn (object $localeId, string $settingName): array => json_decode(
+            DB::table($this->getContextSettingsTable())
+                ->where($this->getContextIdColumn(), '=', $localeId->{$this->getContextIdColumn()})
+                ->where('setting_name', '=', $settingName)
+                ->pluck('setting_value')[0]
+        );
+        $union = fn (array $a, array $b): string => collect($a)->concat($b)->unique()->sort()->values()->toJson();
+
+        foreach (DB::table($this->getContextTable())->select('primary_locale', $this->getContextIdColumn())->get() as $localeId) {
+            // Add primary locale to form locales
+            $formLocales = $union([$localeId->primary_locale], $pluck($localeId, 'supportedFormLocales'));
+            $update($localeId, 'supportedFormLocales', $formLocales);
+            // Add primary locale to submission locales
+            $submissionLocales = $union([$localeId->primary_locale], $pluck($localeId, 'supportedSubmissionLocales'));
+            $update($localeId, 'supportedSubmissionLocales', $submissionLocales);
+            // supportedDefaultSubmissionLocale from primary locale
+            $insert($localeId, 'supportedDefaultSubmissionLocale', $localeId->primary_locale);
+            // supportedAddedSubmissionLocales from supportedSubmissionLocales and supportedFormLocales
+            $submFormLocales = $union(json_decode($submissionLocales), json_decode($formLocales));
+            $insert($localeId, 'supportedAddedSubmissionLocales', $submFormLocales);
+            // supportedSubmissionMetadataLocales from supportedSubmissionLocales and supportedFormLocales
+            $insert($localeId, 'supportedSubmissionMetadataLocales', $submFormLocales);
+        }
+
+        /**
+         * Update locale character lengths
+         */
+
+        $schemaLocName = (DB::connection() instanceof PostgresConnection) ? 'TABLE_CATALOG' : 'TABLE_SCHEMA';
+        $updateLength = fn (string $l) => collect(DB::select("SELECT DISTINCT TABLE_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE COLUMN_NAME = ? AND $schemaLocName = ?", [$l, DB::connection()->getDatabaseName()]))
+            ->each(fn (\stdClass $sc) => Schema::table($sc->TABLE_NAME ?? $sc->table_name, fn (Blueprint $table) => $table->string($l, 28)->change()));
+
+        $updateLength('primary_locale');
+        $updateLength('locale');
+
+        /**
+         * Convert locales 
+         */
+
+        $localesTable = [
+            "be@cyrillic" => "be",
+            "bs" => "bs_Latn",
+            "fr_FR" => "fr",
+            "nb" => "nb_NO",
+            "sr@cyrillic" => "sr_Cyrl",
+            "sr@latin" => "sr_Latn",
+            "uz@cyrillic" => "uz",
+            "uz@latin" => "uz_Latn",
+            "zh_CN" => "zh_Hans",
+        ];
+        $tableNames = array_merge([
+            'author_settings',
+            'controlled_vocab_entry_settings',
+            'publication_settings',
+            'submission_file_settings',
+            'submission_settings',
+            'submissions',
+        ], Application::get()->getName() === 'omp'
+            ? ['publication_format_settings', 'submission_chapter_settings',]
+            : ['publication_galley_settings', 'publication_galleys',]
+        );
+        collect($tableNames)->each(fn (string $tn) => collect(DB::table($tn)->select('locale')->distinct()->get())->each(function (\stdClass $sc) use ($tn, $localesTable) {
+            if (isset($localesTable[$sc->locale])) {
+                DB::table($tn)->where('locale', '=', $sc->locale)->update(['locale' => $localesTable[$sc->locale]]);
+            }
+        }));
+    }
+
+    /**
+     * Reverse the downgrades
+     */
+    public function down(): void
+    {
+        throw new DowngradeNotSupportedException();
+    }
+}
diff --git a/classes/publication/PKPPublication.php b/classes/publication/PKPPublication.php
index 29493472246..1d0eb71c81e 100644
--- a/classes/publication/PKPPublication.php
+++ b/classes/publication/PKPPublication.php
@@ -19,9 +19,13 @@
 namespace PKP\publication;
 
 use APP\author\Author;
+use APP\core\Services;
 use APP\facades\Repo;
 use PKP\core\Core;
 use PKP\core\PKPString;
+use PKP\facades\Locale;
+use PKP\i18n\LocaleMetadata;
+use PKP\services\PKPSchemaService;
 use PKP\userGroup\UserGroup;
 
 class PKPPublication extends \PKP\core\DataObject
@@ -431,6 +435,42 @@ public function setStoredPubId($pubIdType, $pubId)
             $this->setData('pub-id::' . $pubIdType, $pubId);
         }
     }
+
+    /**
+     * Get metadata language names
+     */
+    public function getLanguageNames(): array
+    {
+        return Locale::getSubmissionLocaleDisplayNames($this->getLanguages());
+    }
+
+    /**
+     * Get languages from locale, metadata, and authors' props.
+     * Include optional additional languages.
+     * 
+     * Publication: locale, multilingual metadata props
+     * Authors: multilingual props
+     */
+    public function getLanguages(?array ...$additionalLocales): array
+    {
+        $getMProps = fn (string $schema): array => Services::get('schema')->getMultilingualProps($schema);
+        $metadataprops = $getMProps(PKPSchemaService::SCHEMA_PUBLICATION);
+        $authorProps = $getMProps(PKPSchemaService::SCHEMA_AUTHOR);
+
+        $getlocales = fn (array $props, object $item): array => array_map(fn (string $prop): array => array_keys($item->getData($prop) ?? []), $props);
+        $metadataLocales = $getlocales($metadataprops, $this);
+        $authorsLocales = $this->getData('authors')?->map(fn (Author $author): array => $getlocales($authorProps, $author)) ?? [];
+
+        return collect([$this->getData('locale')])
+            ->concat($metadataLocales)
+            ->concat($authorsLocales)
+            ->concat($additionalLocales)
+            ->flatten()
+            ->filter()
+            ->unique()
+            ->values()
+            ->toArray();
+    }
 }
 if (!PKP_STRICT_MODE) {
     class_alias('\PKP\publication\PKPPublication', '\PKPPublication');
diff --git a/classes/publication/Repository.php b/classes/publication/Repository.php
index a0febf221bb..b4a7bddb602 100644
--- a/classes/publication/Repository.php
+++ b/classes/publication/Repository.php
@@ -133,8 +133,8 @@ public function getDateBoundaries(Collector $query): object
      */
     public function validate(?Publication $publication, array $props, Submission $submission, Context $context): array
     {
-        $allowedLocales = $context->getSupportedSubmissionLocales();
         $primaryLocale = $submission->getData('locale');
+        $allowedLocales = $submission->getpublicationLanguages($context->getSupportedSubmissionMetadataLocales());
 
         $errors = [];
 
@@ -245,7 +245,7 @@ public function validate(?Publication $publication, array $props, Submission $su
      * wants to enforce particular publishing requirements, such as
      * requiring certain metadata or other information.
      *
-     * @param array $allowedLocales The context's supported submission locales
+     * @param array $allowedLocales The context's supported submission metadata locales
      * @param string $primaryLocale The submission's primary locale
      *
      * @hook Publication::validatePublish [[&$errors, $publication, $submission, $allowedLocales, $primaryLocale]]
@@ -286,7 +286,7 @@ public function add(Publication $publication): int
                 $submissionContext = Services::get('context')->get($submission->getData('contextId'));
             }
 
-            $supportedLocales = $submissionContext->getSupportedSubmissionLocales();
+            $supportedLocales = $submission->getPublicationLanguages($submissionContext->getSupportedSubmissionMetadataLocales());
             foreach ($supportedLocales as $localeKey) {
                 if (!array_key_exists($localeKey, $publication->getData('coverImage'))) {
                     continue;
@@ -394,7 +394,7 @@ public function edit(Publication $publication, array $params): Publication
                 $submissionContext = Services::get('context')->get($submission->getData('contextId'));
             }
 
-            $supportedLocales = $submissionContext->getSupportedSubmissionLocales();
+            $supportedLocales = $submission->getPublicationLanguages($submissionContext->getSupportedSubmissionMetadataLocales());
             foreach ($supportedLocales as $localeKey) {
                 if (!array_key_exists($localeKey, $params['coverImage'])) {
                     continue;
diff --git a/classes/services/PKPContextService.php b/classes/services/PKPContextService.php
index 3dbfbf9f266..0c7d9aa1624 100644
--- a/classes/services/PKPContextService.php
+++ b/classes/services/PKPContextService.php
@@ -276,9 +276,11 @@ public function validate($action, $props, $allowedLocales, $primaryLocale)
             [
                 'urlPath.regex' => __('admin.contexts.form.pathAlphaNumeric'),
                 'primaryLocale.regex' => __('validator.localeKey'),
+                'supportedDefaultSubmissionLocale.regex' => __('validator.localeKey'),
                 'supportedFormLocales.regex' => __('validator.localeKey'),
                 'supportedLocales.regex' => __('validator.localeKey'),
                 'supportedSubmissionLocales.*.regex' => __('validator.localeKey'),
+                'supportedSubmissionMetadataLocales.*.regex' => __('validator.localeKey'),
             ]
         );
 
@@ -501,8 +503,17 @@ public function add($context, $request)
         if (!$context->getData('supportedFormLocales')) {
             $context->setData('supportedFormLocales', [$context->getData('primaryLocale')]);
         }
+        if (!$context->getData('supportedDefaultSubmissionLocale')) {
+            $context->setData('supportedDefaultSubmissionLocale', $context->getData('primaryLocale'));
+        }
+        if (!$context->getData('supportedAddedSubmissionLocales')) {
+            $context->setData('supportedAddedSubmissionLocales', [$context->getData('supportedDefaultSubmissionLocale')]);
+        }
         if (!$context->getData('supportedSubmissionLocales')) {
-            $context->setData('supportedSubmissionLocales', [$context->getData('primaryLocale')]);
+            $context->setData('supportedSubmissionLocales', [$context->getData('supportedDefaultSubmissionLocale')]);
+        }
+        if (!$context->getData('supportedSubmissionMetadataLocales')) {
+            $context->setData('supportedSubmissionMetadataLocales', [$context->getData('supportedDefaultSubmissionLocale')]);
         }
 
         $contextDao->insertObject($context);
diff --git a/classes/submission/PKPSubmission.php b/classes/submission/PKPSubmission.php
index 88614144bdf..7c7985a38e3 100644
--- a/classes/submission/PKPSubmission.php
+++ b/classes/submission/PKPSubmission.php
@@ -32,6 +32,7 @@
 use Illuminate\Support\LazyCollection;
 use PKP\core\Core;
 use PKP\facades\Locale;
+use PKP\i18n\LocaleMetadata;
 
 /**
  * @extends \PKP\core\DataObject<DAO>
@@ -201,6 +202,32 @@ public function getDAO(): DAO
         return Repo::submission()->dao;
     }
 
+    /**
+     * Get metadata language names from publications
+     */
+    public function getPublicationLanguageNames(): array
+    {
+        return (($l = $this->getData('locale')) ? [$l => Locale::getSubmissionLocaleDisplayNames([$l])[$l]] : [])
+            + collect($this->getData('publications'))
+                ->flatMap(fn (Publication $p): array => $p->getLanguageNames())
+                ->toArray();
+    }
+
+    /**
+     * Get metadata languages from publications
+     */
+    public function getPublicationLanguages(?array ...$additionalLanguages): array
+    {
+        return collect([$this->getData('locale')])
+            ->concat($this->getData('publications')->map(fn (Publication $p): array => $p->getLanguages()))
+            ->concat($additionalLanguages)
+            ->flatten()
+            ->filter()
+            ->unique()
+            ->values()
+            ->toArray();
+    }
+
     //
     // Abstract methods.
     //
diff --git a/classes/submission/Repository.php b/classes/submission/Repository.php
index c785fa28d37..493d73df3f9 100644
--- a/classes/submission/Repository.php
+++ b/classes/submission/Repository.php
@@ -262,8 +262,12 @@ public function getWorkflowUrlByUserRoles(Submission $submission, ?int $userId =
      */
     public function validate(?Submission $submission, array $props, Context $context): array
     {
-        $primaryLocale = $props['locale'] ?? $submission?->getData('locale') ?? $context->getPrimaryLocale();
+        $primaryLocale = $props['locale'] ?? $submission?->getData('locale') ?? $context->getSupportedDefaultSubmissionLocale();
         $allowedLocales = $context->getSupportedSubmissionLocales();
+        
+        if (!in_array($primaryLocale, $allowedLocales) ) {
+            $allowedLocales[] = $primaryLocale;
+        }
 
         $errors = [];
 
@@ -382,7 +386,7 @@ public function validateSubmit(Submission $submission, Context $context): array
                 if (!isset($errors['contributors'])) {
                     $errors['contributors'] = [];
                 }
-                $errors['contributors'][] = __('submission.wizard.missingContributorLanguage', ['language' => Locale::getMetadata($locale)->getDisplayName()]);
+                $errors['contributors'][] = __('submission.wizard.missingContributorLanguage', ['language' => Locale::getSubmissionLocaleDisplayNames([$locale])[$locale]]);
                 break;
             }
         }
@@ -555,7 +559,7 @@ public function add(Submission $submission, Publication $publication, Context $c
             $submission->setData('status', Submission::STATUS_QUEUED);
         }
         if (!$submission->getData('locale')) {
-            $submission->setData('locale', $context->getPrimaryLocale());
+            $submission->setData('locale', $context->getSupportedDefaultSubmissionLocale());
         }
         $submissionId = $this->dao->insert($submission);
         $submission = Repo::submission()->get($submissionId);
diff --git a/classes/submissionFile/Repository.php b/classes/submissionFile/Repository.php
index a66a9b5c90b..fcf8580c9dd 100644
--- a/classes/submissionFile/Repository.php
+++ b/classes/submissionFile/Repository.php
@@ -109,8 +109,8 @@ public function getSchemaMap(): Schema
      * Perform validation checks on data used to add or edit a submission file.
      *
      * @param array $props A key/value array with the new data to validate
-     * @param array $allowedLocales The context's supported locales
-     * @param string $primaryLocale The context's primary locale
+     * @param array $allowedLocales The supported submission metadata locales
+     * @param string $submissionLocale The submission's locale
      *
      * @return array A key/value array with validation errors. Empty if no errors
      *
@@ -120,7 +120,7 @@ public function validate(
         ?SubmissionFile $object,
         array $props,
         array $allowedLocales,
-        string $primaryLocale
+        string $submissionLocale
     ): array {
         $validator = ValidatorFactory::make(
             $props,
@@ -135,7 +135,7 @@ public function validate(
             $this->schemaService->getRequiredProps($this->dao->schema),
             $this->schemaService->getMultilingualProps($this->dao->schema),
             $allowedLocales,
-            $primaryLocale
+            $submissionLocale
         );
 
         // Check for input from disallowed locales
@@ -248,7 +248,7 @@ public function validate(
                 $object,
                 $props,
                 $allowedLocales,
-                $primaryLocale
+                $submissionLocale
             ]
         );
 
diff --git a/classes/submissionFile/SubmissionFile.php b/classes/submissionFile/SubmissionFile.php
index 5dc94715124..e31f2a60a48 100644
--- a/classes/submissionFile/SubmissionFile.php
+++ b/classes/submissionFile/SubmissionFile.php
@@ -16,7 +16,11 @@
 
 namespace PKP\submissionFile;
 
+use APP\core\Services;
 use APP\facades\Repo;
+use PKP\facades\Locale;
+use PKP\i18n\LocaleMetadata;
+use PKP\services\PKPSchemaService;
 
 /**
  * @extends \PKP\core\DataObject<DAO>
@@ -382,6 +386,30 @@ public function getDAO(): DAO
     {
         return Repo::submissionFile()->dao;
     }
+
+    /**
+     * Get metadata language names
+     */
+    public function getLanguageNames(): array
+    {
+        return Locale::getSubmissionLocaleDisplayNames($this->getLanguages());
+    }
+
+    /**
+     * Get metadata languages
+     */
+    public function getLanguages(): array
+    {
+        $props = Services::get('schema')->getMultilingualProps(PKPSchemaService::SCHEMA_SUBMISSION_FILE);
+        $locales = array_map(fn (string $prop): array => array_keys($this->getData($prop) ?? []), $props);
+        return collect([$this->getData('locale')])
+            ->concat($locales)
+            ->flatten()
+            ->filter()
+            ->unique()
+            ->values()
+            ->toArray();
+    }
 }
 
 if (!PKP_STRICT_MODE) {
diff --git a/classes/submissionFile/maps/Schema.php b/classes/submissionFile/maps/Schema.php
index afa93abd54f..b0311ed227c 100644
--- a/classes/submissionFile/maps/Schema.php
+++ b/classes/submissionFile/maps/Schema.php
@@ -226,10 +226,12 @@ protected function mapByProperties(array $props, SubmissionFile $submissionFile)
             $output[$prop] = $submissionFile->getData($prop);
         }
 
+        $locales = Repo::submission()->get($submissionFile->getData('submissionId'))->getPublicationLanguages($this->context->getSupportedSubmissionMetadataLocales(), $submissionFile->getLanguages());
+
         $output = $this->schemaService->addMissingMultilingualValues(
             $this->schema,
             $output,
-            $this->context->getSupportedFormLocales()
+            $locales
         );
 
         ksort($output);
diff --git a/classes/template/PKPTemplateManager.php b/classes/template/PKPTemplateManager.php
index ef8d42aea99..8719adf9f04 100644
--- a/classes/template/PKPTemplateManager.php
+++ b/classes/template/PKPTemplateManager.php
@@ -753,7 +753,8 @@ public function registerJSLibraryData()
                 $allLocales = array_merge(
                     $context->getSupportedLocales() ?? [],
                     $context->getSupportedFormLocales() ?? [],
-                    $context->getSupportedSubmissionLocales() ?? []
+                    $context->getSupportedSubmissionLocales() ?? [],
+                    $context->getSupportedSubmissionMetadataLocales() ?? [],
                 );
             } else {
                 $allLocales = $this->_request->getSite()->getSupportedLocales();
diff --git a/composer.json b/composer.json
index 23eba24c94d..3b24573e37a 100644
--- a/composer.json
+++ b/composer.json
@@ -53,10 +53,14 @@
 	"scripts": {
 		"fix": "PHP_CS_FIXER_IGNORE_ENV=1 ./lib/vendor/bin/php-cs-fixer fix --allow-risky=yes",
 		"post-install-cmd": [
-			"@isoFileCheck"
+			"@isoFileCheck",
+			"@weblateFilesDownload"
 		],
 		"isoFileCheck": [
-			"PKP\\dev\\ComposerScript::isoFileCheck"		]
+			"PKP\\dev\\ComposerScript::isoFileCheck"		],
+		"weblateFilesDownload": [
+			"PKP\\dev\\ComposerScript::weblateFilesDownload"
+		]
 	},
 	"autoload": {
 		"psr-4": {
diff --git a/controllers/grid/admin/languages/AdminLanguageGridHandler.php b/controllers/grid/admin/languages/AdminLanguageGridHandler.php
index ebdbf5ea294..03598c32712 100644
--- a/controllers/grid/admin/languages/AdminLanguageGridHandler.php
+++ b/controllers/grid/admin/languages/AdminLanguageGridHandler.php
@@ -166,7 +166,7 @@ protected function loadData($request, $filter)
         }
 
         if ($this->_canManage($request)) {
-            $data = $this->addManagementData($request, $data);
+            $data = $this->addLocaleSettingData($request, $data);
         }
 
         return $data;
@@ -430,7 +430,8 @@ protected function _updateContextLocaleSettings($request)
         while ($context = $contexts->next()) {
             $params = [];
             $primaryLocale = $context->getPrimaryLocale();
-            foreach (['supportedLocales', 'supportedFormLocales', 'supportedSubmissionLocales'] as $settingName) {
+            $params['supportedDefaultSubmissionLocale'] = $context->getData('supportedDefaultSubmissionLocale');
+            foreach (['supportedLocales', 'supportedFormLocales', 'supportedSubmissionLocales', 'supportedSubmissionMetadataLocales'] as $settingName) {
                 $localeList = $context->getData($settingName);
 
                 if (is_array($localeList)) {
diff --git a/controllers/grid/languages/LanguageGridCellProvider.php b/controllers/grid/languages/LanguageGridCellProvider.php
index ee61994f61a..4ddcc1c3f07 100644
--- a/controllers/grid/languages/LanguageGridCellProvider.php
+++ b/controllers/grid/languages/LanguageGridCellProvider.php
@@ -59,9 +59,15 @@ public function getTemplateVarsFromRowColumn($row, $column)
             case 'formLocale':
                 return ['selected' => $element['supportedFormLocales'],
                     'disabled' => !$element['supported']];
+            case 'defaultSubmissionLocale':
+                return ['selected' => $element['supportedDefaultSubmissionLocale'],
+                    'disabled' => !$element['supported']];
             case 'submissionLocale':
                 return ['selected' => $element['supportedSubmissionLocales'],
                     'disabled' => !$element['supported']];
+            case 'submissionMetadataLocale':
+                return ['selected' => $element['supportedSubmissionMetadataLocales'],
+                    'disabled' => !$element['supported']];
             default:
                 assert(false);
                 break;
@@ -128,12 +134,27 @@ public function getCellActions($request, $row, $column, $position = GridHandler:
                 $actionArgs['value'] = !$element['supportedFormLocales'];
                 $actionRequest = new AjaxAction($router->url($request, null, null, 'saveLanguageSetting', null, $actionArgs));
                 break;
+            case 'defaultSubmissionLocale':
+                $default = $element['supportedDefaultSubmissionLocale'];
+                if (!$default) {
+                    $action = 'setDefaultSubmissionLocale-' . $row->getId();
+                    $actionArgs['setting'] = 'supportedDefaultSubmissionLocale';
+                    $actionArgs['value'] = !$element['supportedDefaultSubmissionLocale'];
+                    $actionRequest = new AjaxAction($router->url($request, null, null, 'setDefaultSubmissionLocale', null, $actionArgs));
+                }
+                break;
             case 'submissionLocale':
                 $action = 'setSubmissionLocale-' . $row->getId();
                 $actionArgs['setting'] = 'supportedSubmissionLocales';
                 $actionArgs['value'] = !$element['supportedSubmissionLocales'];
                 $actionRequest = new AjaxAction($router->url($request, null, null, 'saveLanguageSetting', null, $actionArgs));
                 break;
+            case 'submissionMetadataLocale':
+                $action = 'setSubmissionMetadataLocale-' . $row->getId();
+                $actionArgs['setting'] = 'supportedSubmissionMetadataLocales';
+                $actionArgs['value'] = !$element['supportedSubmissionMetadataLocales'];
+                $actionRequest = new AjaxAction($router->url($request, null, null, 'saveLanguageSetting', null, $actionArgs));
+                break;
         }
 
         if ($action && $actionRequest) {
diff --git a/controllers/grid/languages/LanguageGridHandler.php b/controllers/grid/languages/LanguageGridHandler.php
index 9449bd4eb32..7b6cfa1ebad 100644
--- a/controllers/grid/languages/LanguageGridHandler.php
+++ b/controllers/grid/languages/LanguageGridHandler.php
@@ -23,6 +23,7 @@
 use PKP\controllers\grid\GridColumn;
 use PKP\controllers\grid\GridHandler;
 use PKP\core\JSONMessage;
+use PKP\db\DAO;
 use PKP\facades\Locale;
 use PKP\notification\PKPNotification;
 use PKP\security\Role;
@@ -37,7 +38,7 @@ public function __construct()
         parent::__construct();
         $this->addRoleAssignment(
             [Role::ROLE_ID_MANAGER, Role::ROLE_ID_SITE_ADMIN],
-            ['saveLanguageSetting', 'setContextPrimaryLocale']
+            ['saveLanguageSetting', 'setContextPrimaryLocale', 'setDefaultSubmissionLocale']
         );
     }
 
@@ -90,26 +91,32 @@ public function saveLanguageSetting($args, $request)
 
         $contextService = Services::get('context');
 
-        $permittedSettings = ['supportedFormLocales', 'supportedSubmissionLocales', 'supportedLocales'];
+        $permittedSettings = ['supportedLocales', 'supportedFormLocales', 'supportedSubmissionLocales', 'supportedSubmissionMetadataLocales'];
         if (in_array($settingName, $permittedSettings) && $locale) {
             $currentSettingValue = (array) $context->getData($settingName);
-            if (Locale::isLocaleValid($locale) && array_key_exists($locale, $availableLocales)) {
+            $isValidLocale = in_array($settingName, array_slice($permittedSettings, 0, 2)) ? Locale::isLocaleValid($locale) : Locale::isSubmissionLocaleValid($locale);
+            if ($isValidLocale && array_key_exists($locale, $availableLocales)) {
                 if ($settingValue) {
-                    array_push($currentSettingValue, $locale);
+                    (array_push($currentSettingValue, $locale) && sort($currentSettingValue));
                     if ($settingName == 'supportedFormLocales') {
                         // reload localized default context settings
                         $contextService->restoreLocaleDefaults($context, $request, $locale);
                     } elseif ($settingName == 'supportedSubmissionLocales') {
-                        // if a submission locale is enabled, and this locale is not in the form locales, add it
-                        $supportedFormLocales = (array) $context->getData('supportedFormLocales');
-                        if (!in_array($locale, $supportedFormLocales)) {
-                            array_push($supportedFormLocales, $locale);
-                            $context = $contextService->edit($context, ['supportedFormLocales' => $supportedFormLocales], $request);
+                        // if a submission locale is enabled, and this locale is not in the metadata locales, add it
+                        $supportedSubmissionMetadataLocales = (array) $context->getSupportedSubmissionMetadataLocales();
+                        if (!in_array($locale, $supportedSubmissionMetadataLocales)) {
+                            (array_push($supportedSubmissionMetadataLocales, $locale) && sort($supportedSubmissionMetadataLocales));
+                            $context = $contextService->edit($context, ['supportedSubmissionMetadataLocales' => $supportedSubmissionMetadataLocales], $request);
                             // reload localized default context settings
                             $contextService->restoreLocaleDefaults($context, $request, $locale);
                         }
                     }
                 } else {
+                    if (($settingName == 'supportedSubmissionLocales' || $settingName == 'supportedSubmissionMetadataLocales') && $locale === $context->getSupportedDefaultSubmissionLocale() ||
+                        ($settingName == 'supportedLocales' || $settingName == 'supportedFormLocales') && $locale === $context->getPrimaryLocale()) {
+                        return new JSONMessage(false, __('notification.defaultLocaleSettingsCannotBeSaved'));
+                    }
+
                     $key = array_search($locale, $currentSettingValue);
                     if ($key !== false) {
                         unset($currentSettingValue[$key]);
@@ -119,9 +126,9 @@ public function saveLanguageSetting($args, $request)
                         return new JSONMessage(false, __('notification.localeSettingsCannotBeSaved'));
                     }
 
-                    if ($settingName == 'supportedFormLocales') {
-                        // if a form locale is disabled, disable it form submission locales as well
-                        $supportedSubmissionLocales = (array) $context->getData('supportedSubmissionLocales');
+                    if ($settingName == 'supportedSubmissionMetadataLocales') {
+                        // if a metadata locale is disabled, disable it form submission locales as well
+                        $supportedSubmissionLocales = (array) $context->getSupportedSubmissionLocales();
                         $key = array_search($locale, $supportedSubmissionLocales);
                         if ($key !== false) {
                             unset($supportedSubmissionLocales[$key]);
@@ -132,19 +139,6 @@ public function saveLanguageSetting($args, $request)
                         }
                         $context = $contextService->edit($context, ['supportedSubmissionLocales' => $supportedSubmissionLocales], $request);
                     }
-
-                    if ($settingName == 'supportedSubmissionLocales') {
-                        // If someone tried to disable all submissions checkboxes, we should display an error message.
-                        $supportedSubmissionLocales = (array) $context->getData('supportedSubmissionLocales');
-                        $key = array_search($locale, $supportedSubmissionLocales);
-                        if ($key !== false) {
-                            unset($supportedSubmissionLocales[$key]);
-                        }
-                        $supportedSubmissionLocales = array_values($supportedSubmissionLocales);
-                        if ($supportedSubmissionLocales == []) {
-                            return new JSONMessage(false, __('notification.localeSettingsCannotBeSaved'));
-                        }
-                    }
                 }
             }
         }
@@ -186,13 +180,13 @@ public function setContextPrimaryLocale($args, $request)
 
         if (Locale::isLocaleValid($locale) && array_key_exists($locale, $availableLocales)) {
             // Make sure at least the primary locale is chosen as available
-            foreach (['supportedLocales', 'supportedSubmissionLocales', 'supportedFormLocales'] as $name) {
-                $$name = $context->getData($name);
-                if (!in_array($locale, $$name)) {
-                    array_push($$name, $locale);
-                    $context->updateSetting($name, $$name);
-                }
-            }
+            $context = Services::get('context')->edit(
+                $context,
+                collect(['supportedLocales', 'supportedFormLocales'])
+                    ->mapWithKeys(fn ($name) => [$name => collect($context->getData($name))->push($locale)->unique()->sort()->values()])
+                    ->toArray(),
+                $request
+            );
 
             $context->setPrimaryLocale($locale);
             $contextDao = Application::getContextDAO();
@@ -207,7 +201,44 @@ public function setContextPrimaryLocale($args, $request)
             );
         }
 
-        return \PKP\db\DAO::getDataChangedEvent();
+        return DAO::getDataChangedEvent();
+    }
+
+    /**
+     * Set default submission locale.
+     */
+    public function setDefaultSubmissionLocale(array $args, Request $request): JSONMessage
+    {
+        if (!$request->checkCSRF()) {
+            return new JSONMessage(false);
+        }
+        $locale = (string) $request->getUserVar('rowId');
+        $context = $request->getContext();
+        $availableLocales = $this->getGridDataElements($request);
+
+        if (Locale::isSubmissionLocaleValid($locale) && array_key_exists($locale, $availableLocales)) {
+            // Make sure at least the primary locale is chosen as available
+            Services::get('context')->edit(
+                $context,
+                [
+                    'supportedDefaultSubmissionLocale' => $locale,
+                    ...collect(['supportedSubmissionLocales', 'supportedSubmissionMetadataLocales'])
+                        ->mapWithKeys(fn ($name) => [$name => collect($context->getData($name))->push($locale)->unique()->sort()->values()])
+                        ->toArray(),
+                ],
+                $request
+            );
+
+            $notificationManager = new NotificationManager();
+            $user = $request->getUser();
+            $notificationManager->createTrivialNotification(
+                $user->getId(),
+                PKPNotification::NOTIFICATION_TYPE_SUCCESS,
+                ['contents' => __('notification.localeSettingsSaved')]
+            );
+        }
+
+        return DAO::getDataChangedEvent();
     }
 
     //
@@ -263,18 +294,16 @@ public function addLocaleCodeColumn()
     }
 
     /**
-     * Add primary column.
-     *
-     * @param string $columnId The column id.
+     * Add website/submission primary/default column.
      */
-    public function addPrimaryColumn($columnId)
+    public function addPrimaryColumn(string $columnId, string $name = 'locale.primary')
     {
         $cellProvider = $this->getCellProvider();
 
         $this->addColumn(
             new GridColumn(
                 $columnId,
-                'locale.primary',
+                $name,
                 null,
                 'controllers/grid/common/cell/radioButtonCell.tpl',
                 $cellProvider
@@ -307,6 +336,14 @@ public function addManagementColumns()
                 $cellProvider
             )
         );
+    }
+
+    /**
+     * Add columns related to submission langauge settings.
+     */
+    public function addSubmissionColumns(): void
+    {
+        $cellProvider = $this->getCellProvider();
 
         $this->addColumn(
             new GridColumn(
@@ -317,26 +354,31 @@ public function addManagementColumns()
                 $cellProvider
             )
         );
+
+        $this->addColumn(
+            new GridColumn(
+                'submissionMetadataLocale',
+                'manager.language.submissionMetadata',
+                null,
+                'controllers/grid/common/cell/selectStatusCell.tpl',
+                $cellProvider
+            )
+        );
     }
 
     /**
-     * Add data related to management settings.
-     *
-     * @param Request $request
-     * @param array $data Data already loaded.
-     *
-     * @return array Same passed array, but with
-     * the extra management data inserted.
+     * Add locales data related to management settings.
+     * $data Data already loaded.
+     * Return Same passed array, but with the extra management data inserted.
      */
-    public function addManagementData($request, $data)
+    public function addLocaleSettingData(Request $request, array $data, array $localeSettingNames = ['supportedFormLocales', 'supportedLocales']): array
     {
         $context = $request->getContext();
 
         if (is_array($data)) {
             foreach ($data as $locale => $localeData) {
-                foreach (['supportedFormLocales', 'supportedSubmissionLocales', 'supportedLocales'] as $name) {
+                foreach ($localeSettingNames as $name) {
                     $data[$locale][$name] = in_array($locale, $context->getData($name));
-                    // $data[$locale][$name] = in_array($locale, (array) $context->getData($name));
                 }
             }
         } else {
diff --git a/controllers/grid/languages/form/AddLanguageForm.php b/controllers/grid/languages/form/AddLanguageForm.php
new file mode 100644
index 00000000000..074bc4ab151
--- /dev/null
+++ b/controllers/grid/languages/form/AddLanguageForm.php
@@ -0,0 +1,131 @@
+<?php
+
+/**
+ * @file controllers/grid/languages/form/AddLanguageForm.php
+ *
+ * Copyright (c) 2024 Simon Fraser University
+ * Copyright (c) 2024 John Willinsky
+ * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
+ *
+ * @class AddLanguageForm
+ *
+ * @ingroup controllers_grid_languages_form
+ *
+ * @brief Form for adding languages.
+ */
+
+namespace PKP\controllers\grid\languages\form;
+
+use APP\core\Application;
+use APP\core\Services;
+use APP\template\TemplateManager;
+use PKP\facades\Locale;
+use PKP\form\Form;
+
+class AddLanguageForm extends Form
+{
+    /**
+     * Constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct('controllers/grid/languages/addLanguageForm.tpl');
+    }
+
+    //
+    // Overridden methods from Form.
+    //
+    /**
+     * @copydoc Form::initData()
+     */
+    public function initData()
+    {
+        parent::initData();
+        $this->setData('addedLocales', ((Application::get()->getRequest())->getContext())->getSupportedAddedSubmissionLocales());
+    }
+
+    /**
+     * @copydoc Form::fetch()
+     *
+     * @param null|mixed $template
+     */
+    public function fetch($request, $template = null, $display = false)
+    {
+        $templateMgr = TemplateManager::getManager($request);
+        $templateMgr->assign([
+            'availableLocales' => collect(Locale::getSubmissionLocaleDisplayNames())
+                ->map(fn ($name, $localeCode) => "[ $localeCode ] $name"),
+            'addedLocales' => $request->getContext()->getSupportedAddedSubmissionLocales(),
+        ]);
+
+        return parent::fetch($request, $template, $display);
+    }
+
+    /**
+     * @copydoc Form::readInputData()
+     */
+    public function readInputData()
+    {
+        parent::readInputData();
+
+        $request = Application::get()->getRequest();
+        $localesToAdd = $request->getUserVar('localesToAdd');
+        $this->setData('localesToAdd', $localesToAdd);
+    }
+
+    /**
+     * @copydoc Form::execute()
+     */
+    public function execute(...$functionArgs)
+    {
+        $request = Application::get()->getRequest();
+        $context = $request->getContext();
+        $localesToAdd = $this->getData('localesToAdd');
+
+        parent::execute(...$functionArgs);
+
+        if (isset($localesToAdd) && is_array($localesToAdd)) {
+            $locales = array_values(array_filter($localesToAdd, fn (string $locale) => Locale::isSubmissionLocaleValid($locale)));
+
+            if ($locales) {
+                sort($locales);
+
+                $removedLocales = array_values(array_diff($context->getSupportedAddedSubmissionLocales(), $locales));
+                $defaultLocaleRemoved = in_array($context->getSupportedDefaultSubmissionLocale(), $removedLocales);
+
+                $edit = fn (array $ll): array => collect($ll)
+                    ->diff($removedLocales)
+                    ->concat($defaultLocaleRemoved ? [$locales[0]] : [])
+                    ->unique()
+                    ->sort()
+                    ->values()
+                    ->toArray();
+
+                Services::get('context')->edit(
+                    $context,
+                    [
+                        'supportedAddedSubmissionLocales' => $locales,
+                        'supportedSubmissionLocales' => $edit($context->getSupportedSubmissionLocales()),
+                        'supportedSubmissionMetadataLocales' => $edit($context->getSupportedSubmissionMetadataLocales()),
+                        ...($defaultLocaleRemoved ? ['supportedDefaultSubmissionLocale' => $locales[0]] : []),
+                    ],
+                    $request
+                );
+            }
+        }
+    }
+
+    /**
+     * Perform additional validation checks
+     *
+     * @copydoc Form::validate
+     */
+    public function validate($callHooks = true)
+    {
+        $localesToAdd = $this->getData('localesToAdd');
+        if (!isset($localesToAdd) || !is_array($localesToAdd) || !array_filter($localesToAdd, fn (string $locale) => Locale::isSubmissionLocaleValid($locale))) {
+            $this->addError('localesToAdd', __('manager.language.submission.from.error'));
+        }
+        return parent::validate($callHooks);
+    }
+}
diff --git a/controllers/grid/settings/languages/ManageLanguageGridHandler.php b/controllers/grid/settings/languages/ManageLanguageGridHandler.php
index fcbc13bd6fd..bcb30e70a78 100644
--- a/controllers/grid/settings/languages/ManageLanguageGridHandler.php
+++ b/controllers/grid/settings/languages/ManageLanguageGridHandler.php
@@ -75,7 +75,7 @@ protected function loadData($request, $filter)
             $data[$locale]['primary'] = ($locale == $contextPrimaryLocale);
         }
 
-        $data = $this->addManagementData($request, $data);
+        $data = $this->addLocaleSettingData($request, $data);
         return $data;
     }
 
@@ -90,6 +90,9 @@ protected function loadData($request, $filter)
     public function initialize($request, $args = null)
     {
         parent::initialize($request, $args);
+
+        $this->setTitle('manager.language.websiteLanguages');
+
         $this->addNameColumn();
         $this->addLocaleCodeColumn();
         $this->addPrimaryColumn('contextPrimary');
diff --git a/controllers/grid/settings/languages/SubmissionLanguageGridHandler.php b/controllers/grid/settings/languages/SubmissionLanguageGridHandler.php
new file mode 100644
index 00000000000..630a256b3ef
--- /dev/null
+++ b/controllers/grid/settings/languages/SubmissionLanguageGridHandler.php
@@ -0,0 +1,152 @@
+<?php
+
+/**
+ * @file controllers/grid/settings/languages/SubmissionLanguageGridHandler.php
+ *
+ * Copyright (c) 2024 Simon Fraser University
+ * Copyright (c) 2024 John Willinsky
+ * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
+ *
+ * @class SubmissionLanguageGridHandler
+ *
+ * @ingroup controllers_grid_settings_languages
+ *
+ * @brief Handle language submission grid requests only.
+ */
+
+namespace PKP\controllers\grid\settings\languages;
+
+use APP\core\Request;
+use APP\notification\NotificationManager;
+use PKP\controllers\grid\languages\LanguageGridHandler;
+use PKP\controllers\grid\languages\form\AddLanguageForm;
+use PKP\core\JSONMessage;
+use PKP\core\PKPRequest;
+use PKP\facades\Locale;
+use PKP\linkAction\LinkAction;
+use PKP\linkAction\request\AjaxModal;
+use PKP\notification\PKPNotification;
+use PKP\security\authorization\ContextAccessPolicy;
+use PKP\security\Role;
+
+class SubmissionLanguageGridHandler extends LanguageGridHandler
+{
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->addRoleAssignment(
+            [Role::ROLE_ID_MANAGER, Role::ROLE_ID_SITE_ADMIN],
+            ['addLanguages', 'addLanguageModal', 'fetchGrid', 'fetchRow']
+        );
+    }
+
+
+    //
+    // Implement methods from GridHandler.
+    //
+    /**
+     * @copydoc GridHandler::authorize()
+     */
+    public function authorize($request, &$args, $roleAssignments)
+    {
+        $this->addPolicy(new ContextAccessPolicy($request, $roleAssignments));
+        return parent::authorize($request, $args, $roleAssignments);
+    }
+
+    /**
+     * @copydoc GridHandler::loadData()
+     */
+    protected function loadData($request, $filter)
+    {
+        $context = $request->getContext();
+        $addedLocales = $context->getSupportedAddedSubmissionLocales();
+        $defaultSubmissionLocale = $context->getSupportedDefaultSubmissionLocale();
+        $localeNames = Locale::getSubmissionLocaleDisplayNames($addedLocales);
+
+        $data = [];
+
+        foreach ($addedLocales as $locale) {
+            $data[$locale] = [];
+            $data[$locale]['code'] = $locale;
+            $data[$locale]['name'] = "$localeNames[$locale]/" . Locale::getSubmissionLocaleDisplayNames([$locale], $locale)[$locale];
+            $data[$locale]['supported'] = true;
+            $data[$locale]['supportedDefaultSubmissionLocale'] = ($locale === $defaultSubmissionLocale);
+        }
+
+        $data = $this->addLocaleSettingData($request, $data, ['supportedSubmissionLocales', 'supportedSubmissionMetadataLocales']);
+        return $data;
+    }
+
+    //
+    // Extended methods from LanguageGridHandler.
+    //
+    /**
+     * @copydoc LanguageGridHandler::initialize()
+     *
+     * @param null|mixed $args
+     */
+    public function initialize($request, $args = null): void
+    {
+        parent::initialize($request, $args);
+
+        $this->setTitle('manager.language.submissionLanguages');
+
+        $this->addNameColumn();
+        $this->addLocaleCodeColumn();
+        $this->addPrimaryColumn('defaultSubmissionLocale', 'common.default');
+        $this->addSubmissionColumns();
+
+        // Add grid action.
+        $this->addAction(
+            new LinkAction(
+                'addLanguageModal',
+                new AjaxModal(
+                   ($request->getRouter())->url($request, null, null, 'addLanguageModal', null, null),
+                    __('manager.language.gridAction.addLangauage'),
+                    null,
+                    true,
+                    'addLanguageForm'
+                ),
+                __('manager.language.gridAction.addLangauage')
+            )
+        );
+    }
+
+    /**
+     * Show the add language form.
+     */
+    public function addLanguageModal(array $args, PKPRequest $request): JSONMessage
+    {
+        $addLanguageForm = new AddLanguageForm();
+        $addLanguageForm->initData();
+        return new JSONMessage(true, $addLanguageForm->fetch($request));
+    }
+
+    /**
+     * Add/Remove languages
+     */
+    public function addLanguages(array $args, PKPRequest $request): JSONMessage
+    {
+        $addLanguageForm = new AddLanguageForm();
+        $addLanguageForm->readInputData();
+
+        if ($addLanguageForm->validate()) {
+            $addLanguageForm->execute();
+
+            $notificationManager = new NotificationManager();
+            $user = $request->getUser();
+            $notificationManager->createTrivialNotification(
+                $user->getId(),
+                PKPNotification::NOTIFICATION_TYPE_SUCCESS,
+                ['contents' => __('notification.submissionLocales')]
+            );
+
+            return \PKP\db\DAO::getDataChangedEvent();
+        } else {
+            return new JSONMessage(true, $addLanguageForm->fetch($request));
+        }
+    }
+}
diff --git a/controllers/wizard/fileUpload/FileUploadWizardHandler.php b/controllers/wizard/fileUpload/FileUploadWizardHandler.php
index 763c0d5bcf3..bad1a57cd0b 100644
--- a/controllers/wizard/fileUpload/FileUploadWizardHandler.php
+++ b/controllers/wizard/fileUpload/FileUploadWizardHandler.php
@@ -454,13 +454,14 @@ public function editMetadata($args, $request)
             'primaryLocale' => $this->getSubmission()->getData('locale'),
         ]);
 
+        $context = $request->getContext();
         $submissionFile = $this->getAuthorizedContextObject(Application::ASSOC_TYPE_SUBMISSION_FILE);
         $form = new SubmissionFilesMetadataForm($submissionFile, $this->getStageId(), $this->getReviewRound());
         $form->initData();
 
         /** @var GenreDAO $genreDao */
         $genreDao = DAORegistry::getDAO('GenreDAO');
-        $fileGenres = $genreDao->getByContextId($request->getContext()->getId())->toArray();
+        $fileGenres = $genreDao->getByContextId($context->getId())->toArray();
 
         $fileData = Repo::submissionFile()
             ->getSchemaMap()
diff --git a/controllers/wizard/fileUpload/form/SubmissionFilesMetadataForm.php b/controllers/wizard/fileUpload/form/SubmissionFilesMetadataForm.php
index 523286403e8..77c1271dfb1 100644
--- a/controllers/wizard/fileUpload/form/SubmissionFilesMetadataForm.php
+++ b/controllers/wizard/fileUpload/form/SubmissionFilesMetadataForm.php
@@ -16,6 +16,7 @@
 
 namespace PKP\controllers\wizard\fileUpload\form;
 
+use APP\core\Application;
 use APP\facades\Repo;
 use APP\template\TemplateManager;
 use PKP\db\DAORegistry;
@@ -48,7 +49,14 @@ public function __construct($submissionFile, $stageId, $reviewRound = null, $tem
         if ($template === null) {
             $template = 'controllers/wizard/fileUpload/form/submissionFileMetadataForm.tpl';
         }
-        parent::__construct($template);
+
+        $submissionLocale = $submissionFile->getData('locale');
+        $publicationLanguageNames = Repo::submission()->get($submissionFile->getData('submissionId'))->getPublicationLanguageNames();
+
+        $localeNames = Application::get()->getRequest()->getContext()->getSupportedSubmissionMetadataLocaleNames() + $publicationLanguageNames + $submissionFile->getLanguageNames();
+        ksort($localeNames);
+
+        parent::__construct($template, true, $submissionLocale, $localeNames);
 
         // Initialize the object.
         $this->_submissionFile = $submissionFile;
@@ -57,7 +65,6 @@ public function __construct($submissionFile, $stageId, $reviewRound = null, $tem
             $this->_reviewRound = $reviewRound;
         }
 
-        $submissionLocale = $submissionFile->getData('locale');
         $this->setDefaultFormLocale($submissionLocale);
 
         // Add validation checks.
diff --git a/locale/en/manager.po b/locale/en/manager.po
index ad6c78b2181..576240236d9 100644
--- a/locale/en/manager.po
+++ b/locale/en/manager.po
@@ -586,15 +586,33 @@ msgstr "Image"
 msgid "manager.importExport"
 msgstr "Import/Export Data"
 
+msgid "manager.language.websiteLanguages"
+msgstr "Website Languages"
+
+msgid "manager.language.submissionLanguages"
+msgstr "Submission Languages"
+
 msgid "manager.language.ui"
 msgstr "UI"
 
 msgid "manager.language.submissions"
 msgstr "Submissions"
 
+msgid "manager.language.gridAction.addLangauage"
+msgstr "Add/Remove Languages"
+
 msgid "manager.language.forms"
 msgstr "Forms"
 
+msgid "manager.language.submissionMetadata"
+msgstr "Metadata"
+
+msgid "manager.language.submission.form.description"
+msgstr "Select submission and metadata languages."
+
+msgid "manager.language.submission.from.error"
+msgstr "At least one locale needs to be selected."
+
 msgid "manager.language.reloadLocalizedDefaultSettings"
 msgstr "Reload defaults"
 
@@ -1637,6 +1655,12 @@ msgstr ""
 "The language setting could not be saved. At least one language must be "
 "enabled for each option"
 
+msgid "notification.defaultLocaleSettingsCannotBeSaved"
+msgstr "The language setting could not be saved. All options need to be enabled."
+
+msgid "notification.submissionLocales"
+msgstr "Submission locales updated."
+
 msgid "notification.editedUser"
 msgstr "User edited."
 
diff --git a/pages/authorDashboard/PKPAuthorDashboardHandler.php b/pages/authorDashboard/PKPAuthorDashboardHandler.php
index aebab920b64..6397ec38045 100644
--- a/pages/authorDashboard/PKPAuthorDashboardHandler.php
+++ b/pages/authorDashboard/PKPAuthorDashboardHandler.php
@@ -216,11 +216,15 @@ public function setupTemplate($request)
             }
         }
 
-        $locales = $submissionContext->getSupportedSubmissionLocaleNames();
-        $locales = array_map(fn (string $locale, string $name) => ['key' => $locale, 'label' => $name], array_keys($locales), $locales);
-
         $latestPublication = $submission->getLatestPublication();
 
+        $submissionLocale = $submission->getData('locale');
+        $locales = collect($submissionContext->getSupportedSubmissionMetadataLocaleNames() + $submission->getPublicationLanguageNames())
+            ->map(fn (string $name, string $locale) => ['key' => $locale, 'label' => $name])
+            ->sortBy('key')
+            ->values()
+            ->toArray();
+
         $submissionApiUrl = $request->getDispatcher()->url($request, PKPApplication::ROUTE_API, $submissionContext->getData('urlPath'), 'submissions/' . $submission->getId());
         $latestPublicationApiUrl = $request->getDispatcher()->url($request, PKPApplication::ROUTE_API, $submissionContext->getData('urlPath'), 'submissions/' . $submission->getId() . '/publications/' . $latestPublication->getId());
 
@@ -302,8 +306,8 @@ public function setupTemplate($request)
         $state = [
             'canEditPublication' => $canEditPublication,
             'components' => [
-                FORM_TITLE_ABSTRACT => $titleAbstractForm->getConfig(),
-                FORM_CITATIONS => $citationsForm->getConfig(),
+                FORM_TITLE_ABSTRACT => $this->getLocalizedForm($titleAbstractForm, $submissionLocale, $locales),
+                FORM_CITATIONS => $this->getLocalizedForm($citationsForm, $submissionLocale, $locales),
                 $contributorsListPanel->id => $contributorsListPanel->getConfig(),
             ],
             'currentPublication' => $currentPublicationProps,
@@ -326,16 +330,15 @@ public function setupTemplate($request)
         ];
 
         // Add the metadata form if one or more metadata fields are enabled
-        $vocabSuggestionUrlBase = $request->getDispatcher()->url($request, PKPApplication::ROUTE_API, $submissionContext->getData('urlPath'), 'vocabs', null, null, ['vocab' => '__vocab__']);
+        $vocabSuggestionUrlBase = $request->getDispatcher()->url($request, PKPApplication::ROUTE_API, $submissionContext->getData('urlPath'), 'vocabs', null, null, ['vocab' => '__vocab__', 'submissionId' => $submission->getId()]);
         $metadataForm = new PKPMetadataForm($latestPublicationApiUrl, $locales, $latestPublication, $submissionContext, $vocabSuggestionUrlBase, true);
-        $metadataFormConfig = $metadataForm->getConfig();
         $metadataEnabled = count($metadataForm->fields);
 
         if ($metadataEnabled) {
             $templateMgr->setConstants([
                 'FORM_METADATA' => FORM_METADATA,
             ]);
-            $state['components'][FORM_METADATA] = $metadataFormConfig;
+            $state['components'][FORM_METADATA] = $this->getLocalizedForm($metadataForm, $submissionLocale, $locales);
             $state['publicationFormIds'][] = FORM_METADATA;
         }
 
@@ -370,6 +373,31 @@ protected function getContributorsListPanel(Submission $submission, Context $con
         );
     }
 
+    /**
+     * Get the form configuration data with the correct
+     * locale settings based on the submission's locale
+     *
+     * Uses the submission locale as the primary and
+     * visible locale, and puts that locale first in the
+     * list of supported locales.
+     *
+     * Call this instead of $form->getConfig() to display
+     * a form with the correct submission's publication locales
+     */
+    protected function getLocalizedForm(\PKP\components\forms\FormComponent $form, string $submissionLocale, array $locales): array
+    {
+        $config = $form->getConfig();
+
+        $config['primaryLocale'] = $submissionLocale;
+        $config['visibleLocales'] = [$submissionLocale];
+        $config['supportedFormLocales'] = collect($locales)
+            ->sortBy([fn (array $a, array $b) => $b['key'] === $submissionLocale ? 1 : -1])
+            ->values()
+            ->toArray();
+
+        return $config;
+    }
+
     /**
      * Get the URL for the galley/publication formats grid with a placeholder for
      * the publicationId value
diff --git a/pages/submission/PKPSubmissionHandler.php b/pages/submission/PKPSubmissionHandler.php
index f964e8cbabd..4ecc8d4a743 100644
--- a/pages/submission/PKPSubmissionHandler.php
+++ b/pages/submission/PKPSubmissionHandler.php
@@ -186,12 +186,16 @@ protected function showWizard(array $args, Request $request, Submission $submiss
         }
 
 
-        $supportedSubmissionLocales = $context->getSupportedSubmissionLocaleNames();
-        $formLocales = array_map(fn (string $locale, string $name) => ['key' => $locale, 'label' => $name], array_keys($supportedSubmissionLocales), $supportedSubmissionLocales);
+        $supportedLocales = $context->getSupportedSubmissionMetadataLocaleNames() + $submission->getPublicationLanguageNames();
+        $formLocales = collect($supportedLocales)
+            ->map(fn (string $name, string $locale) => ['key' => $locale, 'label' => $name])
+            ->sortBy('key')
+            ->values()
+            ->toArray();
 
         // Order locales with submission locale first
-        $orderedLocales = $supportedSubmissionLocales;
-        uksort($orderedLocales, fn ($a, $b) => $a === $submission->getData('locale') ? $a : $b);
+        $orderedLocales = $supportedLocales;
+        uksort($orderedLocales, fn ($a, $b) => $b === $submission->getData('locale') ? 1 : -1);
 
         $userGroups = Repo::userGroup()
             ->getCollector()
@@ -301,7 +305,7 @@ public function saved(array $args, Request $request): void
     protected function getSteps(Request $request, Submission $submission, Publication $publication, array $locales, array $sections, LazyCollection $categories): array
     {
         $publicationApiUrl = $this->getPublicationApiUrl($request, $submission->getId(), $publication->getId());
-        $controlledVocabUrl = $this->getControlledVocabBaseUrl($request);
+        $controlledVocabUrl = $this->getControlledVocabBaseUrl($request, $submission->getId());
 
         $steps = [];
         $steps[] = $this->getDetailsStep($request, $submission, $publication, $locales, $publicationApiUrl, $sections, $controlledVocabUrl);
@@ -384,7 +388,7 @@ protected function getSubmissionFilesApiUrl(Request $request, int $submissionId)
      *
      * The entry `__vocab__` will be replaced with the user's search phrase.
      */
-    protected function getControlledVocabBaseUrl(Request $request): string
+    protected function getControlledVocabBaseUrl(Request $request, int $submissionId): string
     {
         return $request->getDispatcher()->url(
             $request,
@@ -393,7 +397,7 @@ protected function getControlledVocabBaseUrl(Request $request): string
             'vocabs',
             null,
             null,
-            ['vocab' => '__vocab__']
+            ['vocab' => '__vocab__', 'submissionId' => $submissionId]
         );
     }
 
@@ -456,7 +460,7 @@ protected function getSubmissionFilesListPanel(Request $request, Submission $sub
                 'dropzoneDictMaxFilesExceeded' => __('form.dropzone.dictMaxFilesExceeded'),
             ],
             'otherLabel' => __('about.other'),
-            'primaryLocale' => $request->getContext()->getPrimaryLocale(),
+            'primaryLocale' => $submission->getData('locale'),
             'removeConfirmLabel' => __('submission.submit.removeConfirm'),
             'stageId' => WORKFLOW_STAGE_ID_SUBMISSION,
             'title' => __('submission.files'),
@@ -569,7 +573,7 @@ protected function getDetailsStep(Request $request, Submission $submission, Publ
                 'name' => __('submission.details'),
                 'type' => self::SECTION_TYPE_FORM,
                 'description' => $request->getContext()->getLocalizedData('detailsHelp'),
-                'form' => $this->getLocalizedForm($titleAbstractForm, $submission, $request->getContext()),
+                'form' => $this->getLocalizedForm($titleAbstractForm, $submission->getData('locale'), $locales),
             ],
         ];
 
@@ -619,7 +623,7 @@ protected function getEditorsStep(Request $request, Submission $submission, Publ
                 'vocabs',
                 null,
                 null,
-                ['vocab' => '__vocab__']
+                ['vocab' => '__vocab__', 'submissionId' => $submission->getId()]
             ),
             $categories
         );
@@ -633,8 +637,8 @@ protected function getEditorsStep(Request $request, Submission $submission, Publ
 
         $hasMetadataForm = count($metadataForm->fields);
 
-        $metadataFormData = $this->getLocalizedForm($metadataForm, $submission, $request->getContext());
-        $commentsFormData = $this->getLocalizedForm($commentsForm, $submission, $request->getContext());
+        $metadataFormData = $this->getLocalizedForm($metadataForm, $submission->getData('locale'), $locales);
+        $commentsFormData = $this->getLocalizedForm($commentsForm, $submission->getData('locale'), $locales);
 
         $sections = [
             [
@@ -828,29 +832,21 @@ protected function isEditor(): bool
      *
      * Uses the submission locale as the primary and
      * visible locale, and puts that locale first in the
-     * list of supported locales.
+     * list of supported and publication's locales.
      *
      * Call this instead of $form->getConfig() to display
      * a form with the correct submission locales
      */
-    protected function getLocalizedForm(FormComponent $form, Submission $submission, Context $context): array
+    protected function getLocalizedForm(FormComponent $form, string $submissionLocale, array $locales): array
     {
         $config = $form->getConfig();
 
-        $config['primaryLocale'] = $submission->getData('locale');
-        $config['visibleLocales'] = [$submission->getData('locale')];
-
-        $supportedFormLocales = [];
-        foreach ($context->getSupportedSubmissionLocaleNames() as $localeKey => $name) {
-            $supportedFormLocales[] = [
-                'key' => $localeKey,
-                'label' => $name,
-            ];
-        }
-
-        usort($supportedFormLocales, fn ($a, $b) => $a['key'] === $submission->getData('locale') ? -1 : 1);
-
-        $config['supportedFormLocales'] = $supportedFormLocales;
+        $config['primaryLocale'] = $submissionLocale;
+        $config['visibleLocales'] = [$submissionLocale];
+        $config['supportedFormLocales'] = collect($locales)
+            ->sortBy([fn (array $a, array $b) => $b['key'] === $submissionLocale ? 1 : -1])
+            ->values()
+            ->toArray();
 
         return $config;
     }
diff --git a/pages/workflow/PKPWorkflowHandler.php b/pages/workflow/PKPWorkflowHandler.php
index 85937598c48..96ce73836c3 100644
--- a/pages/workflow/PKPWorkflowHandler.php
+++ b/pages/workflow/PKPWorkflowHandler.php
@@ -27,6 +27,7 @@
 use APP\template\TemplateManager;
 use Exception;
 use Illuminate\Support\Enumerable;
+use PKP\components\forms\FormComponent;
 use PKP\components\forms\publication\PKPCitationsForm;
 use PKP\components\forms\publication\PKPMetadataForm;
 use PKP\components\forms\publication\PKPPublicationLicenseForm;
@@ -217,11 +218,15 @@ public function index($args, $request)
         $genreDao = DAORegistry::getDAO('GenreDAO');
         $genres = $genreDao->getByContextId($submission->getData('contextId'))->toArray();
 
-        $locales = $submissionContext->getSupportedSubmissionLocaleNames();
-        $locales = array_map(fn (string $locale, string $name) => ['key' => $locale, 'label' => $name], array_keys($locales), $locales);
-
         $latestPublication = $submission->getLatestPublication();
 
+        $submissionLocale = $submission->getData('locale');
+        $locales = collect($submissionContext->getSupportedSubmissionMetadataLocaleNames() + $submission->getPublicationLanguageNames())
+            ->map(fn (string $name, string $locale) => ['key' => $locale, 'label' => $name])
+            ->sortBy('key')
+            ->values()
+            ->toArray();
+
         $submissionApiUrl = $request->getDispatcher()->url($request, Application::ROUTE_API, $submissionContext->getData('urlPath'), 'submissions/' . $submission->getId());
         $submissionFileApiUrl = $request->getDispatcher()->url($request, Application::ROUTE_API, $submissionContext->getData('urlPath'), 'submissions/' . $submission->getId() . '/files');
         $latestPublicationApiUrl = $request->getDispatcher()->url($request, Application::ROUTE_API, $submissionContext->getData('urlPath'), 'submissions/' . $submission->getId() . '/publications/' . $latestPublication->getId());
@@ -331,8 +336,8 @@ public function index($args, $request)
             'components' => [
                 $contributorsListPanel->id => $contributorsListPanel->getConfig(),
                 $citationsForm->id => $citationsForm->getConfig(),
-                $publicationLicenseForm->id => $publicationLicenseForm->getConfig(),
-                $titleAbstractForm->id => $titleAbstractForm->getConfig(),
+                $publicationLicenseForm->id => $this->getLocalizedForm($publicationLicenseForm, $submissionLocale, $locales),
+                $titleAbstractForm->id => $this->getLocalizedForm($titleAbstractForm, $submissionLocale, $locales),
             ],
             'currentPublication' => $currentPublicationProps,
             'decisionUrl' => $decisionUrl,
@@ -367,16 +372,15 @@ public function index($args, $request)
         ];
 
         // Add the metadata form if one or more metadata fields are enabled
-        $vocabSuggestionUrlBase = $request->getDispatcher()->url($request, PKPApplication::ROUTE_API, $submissionContext->getData('urlPath'), 'vocabs', null, null, ['vocab' => '__vocab__']);
+        $vocabSuggestionUrlBase = $request->getDispatcher()->url($request, PKPApplication::ROUTE_API, $submissionContext->getData('urlPath'), 'vocabs', null, null, ['vocab' => '__vocab__', 'submissionId' => $submission->getId()]);
         $metadataForm = new PKPMetadataForm($latestPublicationApiUrl, $locales, $latestPublication, $submissionContext, $vocabSuggestionUrlBase, true);
-        $metadataFormConfig = $metadataForm->getConfig();
         $metadataEnabled = count($metadataForm->fields);
 
         if ($metadataEnabled) {
             $templateMgr->setConstants([
                 'FORM_METADATA' => FORM_METADATA,
             ]);
-            $state['components'][FORM_METADATA] = $metadataFormConfig;
+            $state['components'][FORM_METADATA] = $this->getLocalizedForm($metadataForm, $submissionLocale, $locales);
             $state['publicationFormIds'][] = FORM_METADATA;
         }
 
@@ -403,7 +407,7 @@ public function index($args, $request)
             $selectRevisionDecisionForm = new \PKP\components\forms\decision\SelectRevisionDecisionForm();
             $selectRevisionRecommendationForm = new \PKP\components\forms\decision\SelectRevisionRecommendationForm();
             $state['components'][$selectRevisionDecisionForm->id] = $selectRevisionDecisionForm->getConfig();
-            $state['components'][$selectRevisionRecommendationForm->id] = $selectRevisionRecommendationForm->getConfig();
+            $state['components'][$selectRevisionRecommendationForm->id] = $this->getLocalizedForm($selectRevisionRecommendationForm, $submissionLocale, $locales);
             $templateMgr->setConstants([
                 'FORM_SELECT_REVISION_DECISION' => FORM_SELECT_REVISION_DECISION,
                 'FORM_SELECT_REVISION_RECOMMENDATION' => FORM_SELECT_REVISION_RECOMMENDATION,
@@ -824,6 +828,31 @@ protected function notificationOptionsByStage($user, $stageId, $contextId)
         return false;
     }
 
+    /**
+     * Get the form configuration data with the correct
+     * locale settings based on the publication's locale
+     *
+     * Uses the publication locale as the primary and
+     * visible locale, and puts that locale first in the
+     * list of supported locales.
+     *
+     * Call this instead of $form->getConfig() to display
+     * a form with the correct publication locales
+     */
+    protected function getLocalizedForm(FormComponent $form, string $submissionLocale, array $locales): array
+    {
+        $config = $form->getConfig();
+
+        $config['primaryLocale'] = $submissionLocale;
+        $config['visibleLocales'] = [$submissionLocale];
+        $config['supportedFormLocales'] = collect($locales)
+            ->sortBy([fn (array $a, array $b) => $b['key'] === $submissionLocale ? 1 : -1])
+            ->values()
+            ->toArray();
+
+        return $config;
+    }
+
     /**
      * Get a label for a recommendation decision type
      */
diff --git a/schemas/context.json b/schemas/context.json
index d8901d77e9f..f777e01d9ab 100644
--- a/schemas/context.json
+++ b/schemas/context.json
@@ -778,6 +778,21 @@
 			"default": false,
 			"description": "Whether or not submitting authors should be asked to select categories when they make a new submission."
 		},
+		"supportedAddedSubmissionLocales": {
+			"type": "array",
+			"items": {
+				"type": "string",
+				"validation": [
+					"regex:/^([A-Za-z]{2,4})(?<sc>[_-]([A-Za-z]{4,5}|[0-9]{4}))?([_-]([A-Za-z]{2}|[0-9]{3}))?(@[a-z]{2,30}(?&sc)?)?$/"
+				]
+			}
+		},
+		"supportedDefaultSubmissionLocale": {
+			"type": "string",
+			"validation": [
+				"regex:/^([A-Za-z]{2,4})(?<sc>[_-]([A-Za-z]{4,5}|[0-9]{4}))?([_-]([A-Za-z]{2}|[0-9]{3}))?(@[a-z]{2,30}(?&sc)?)?$/"
+			]
+		},
 		"supportedFormLocales": {
 			"type": "array",
 			"items": {
@@ -801,7 +816,16 @@
 			"items": {
 				"type": "string",
 				"validation": [
-					"regex:/^([a-z]{2})((_[A-Z]{2})?)(@[a-z]{0,})?$/"
+					"regex:/^([A-Za-z]{2,4})(?<sc>[_-]([A-Za-z]{4,5}|[0-9]{4}))?([_-]([A-Za-z]{2}|[0-9]{3}))?(@[a-z]{2,30}(?&sc)?)?$/"
+				]
+			}
+		},
+		"supportedSubmissionMetadataLocales": {
+			"type": "array",
+			"items": {
+				"type": "string",
+				"validation": [
+					"regex:/^([A-Za-z]{2,4})(?<sc>[_-]([A-Za-z]{4,5}|[0-9]{4}))?([_-]([A-Za-z]{2}|[0-9]{3}))?(@[a-z]{2,30}(?&sc)?)?$/"
 				]
 			}
 		},
diff --git a/schemas/submission.json b/schemas/submission.json
index fe4bd266128..8a700d7d249 100644
--- a/schemas/submission.json
+++ b/schemas/submission.json
@@ -68,7 +68,7 @@
 			"description": "The primary language of this submission.",
 			"apiSummary": true,
 			"validation": [
-				"regex:/^([a-z]{2})((_[A-Z]{2})?)(@[a-z]{0,})?$/"
+				"regex:/^([A-Za-z]{2,4})(?<sc>[_-]([A-Za-z]{4,5}|[0-9]{4}))?([_-]([A-Za-z]{2}|[0-9]{3}))?(@[a-z]{2,30}(?&sc)?)?$/"
 			]
 		},
 		"publications": {
diff --git a/templates/admin/contextSettings.tpl b/templates/admin/contextSettings.tpl
index e2d3d9d0735..d53cf0008c3 100644
--- a/templates/admin/contextSettings.tpl
+++ b/templates/admin/contextSettings.tpl
@@ -38,6 +38,8 @@
 				<tab id="languages" label="{translate key="common.languages"}">
 					{capture assign=languagesUrl}{url router=\PKP\core\PKPApplication::ROUTE_COMPONENT context=$editContext->getPath() component="grid.settings.languages.ManageLanguageGridHandler" op="fetchGrid" escape=false}{/capture}
 					{load_url_in_div id="languageGridContainer" url=$languagesUrl}
+					{capture assign=submissionLanguagesUrl}{url router=\PKP\core\PKPApplication::ROUTE_COMPONENT context=$editContext->getPath() component="grid.settings.languages.SubmissionLanguageGridHandler" op="fetchGrid" escape=false}{/capture}
+					{load_url_in_div id="submissionLanguageGridContainer" url=$submissionLanguagesUrl}
 				</tab>
 				<tab id="indexing" label="{translate key="manager.setup.searchEngineIndexing"}">
 					<pkp-form
diff --git a/templates/controllers/grid/languages/addLanguageForm.tpl b/templates/controllers/grid/languages/addLanguageForm.tpl
new file mode 100644
index 00000000000..e08cbb488a1
--- /dev/null
+++ b/templates/controllers/grid/languages/addLanguageForm.tpl
@@ -0,0 +1,35 @@
+{**
+ * templates/controllers/grid/languages/addLanguageForm.tpl
+ *
+ * Copyright (c) 2024 Simon Fraser University
+ * Copyright (c) 2024 John Willinsky
+ * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
+ *
+ * Form to add languages.
+ *}
+
+<script>
+	$(function() {ldelim}
+		// Attach the form handler.
+		$('#addLanguageForm').pkpHandler('$.pkp.controllers.form.AjaxFormHandler');
+	{rdelim});
+</script>
+
+<form class="pkp_form" id="addLanguageForm" method="post" action="{url router=\PKP\core\PKPApplication::ROUTE_COMPONENT component="grid.settings.languages.SubmissionLanguageGridHandler" op="addLanguages"}">
+	{csrf}
+	{include file="controllers/notification/inPlaceNotification.tpl" notificationId="installLanguageFormNotification"}
+
+	{fbvFormArea id="availableLocalesFormArea" title="admin.languages.availableLocales"}
+		{fbvFormSection list="true" description="manager.language.submission.form.description"}
+			{foreach $availableLocales as $locale => $name}
+				{fbvElement type="checkbox" id="locale-$locale" name="localesToAdd[$locale]" value=$locale label=$name|unescape:"html" translate=false checked=in_array($locale, $addedLocales)}
+			{foreachelse}
+				<p>{translate key="admin.languages.noLocalesAvailable"}</p>
+			{/foreach}
+		{/fbvFormSection}
+	{/fbvFormArea}
+
+	{if not empty($availableLocales)}
+		{fbvFormButtons id="installLanguageFormSubmit" submitText="common.save"}
+	{/if}
+</form>
diff --git a/templates/management/website.tpl b/templates/management/website.tpl
index 28c77ce2027..82af05a0f1a 100644
--- a/templates/management/website.tpl
+++ b/templates/management/website.tpl
@@ -70,6 +70,8 @@
 				<tab id="languages" label="{translate key="common.languages"}">
 					{capture assign=languagesUrl}{url router=\PKP\core\PKPApplication::ROUTE_COMPONENT component="grid.settings.languages.ManageLanguageGridHandler" op="fetchGrid" escape=false}{/capture}
 					{load_url_in_div id="languageGridContainer" url=$languagesUrl}
+					{capture assign=submissionLanguagesUrl}{url router=\PKP\core\PKPApplication::ROUTE_COMPONENT component="grid.settings.languages.SubmissionLanguageGridHandler" op="fetchGrid" escape=false}{/capture}
+					{load_url_in_div id="submissionLanguageGridContainer" url=$submissionLanguagesUrl}
 				</tab>
 				<tab id="navigationMenus" label="{translate key="manager.navigationMenus"}">
 					{capture assign=navigationMenusGridUrl}{url router=\PKP\core\PKPApplication::ROUTE_COMPONENT component="grid.navigationMenus.NavigationMenusGridHandler" op="fetchGrid" escape=false}{/capture}