Merge pull request #7336 from jonasraoni/feature/main/i6328-improved-…

…localization

Feature/main/i6328 improved localization

Support/Jobs/BaseJob.php

@@ -17,6 +17,7 @@
 
 namespace PKP\Support\Jobs;
 
+use APP\core\Application;
 use Illuminate\Bus\Queueable;
 
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -56,7 +57,7 @@ public function __construct()
 
     protected function defaultConnection(): string
     {
-        if (defined('RUNNING_UPGRADE')) {
+        if (Application::isUnderMaintenance()) {
             return 'sync';
         }
 

api/v1/submissions/PKPSubmissionHandler.inc.php

@@ -17,7 +17,6 @@
 use APP\core\Application;
 use APP\core\Services;
 use APP\facades\Repo;
-use APP\i18n\AppLocale;
 use APP\notification\Notification;
 use APP\notification\NotificationManager;
 use APP\submission\Collector;
@@ -379,11 +378,6 @@ protected function getSubmissionCollector(array $queryParams): Collector
      */
     public function get($slimRequest, $response, $args)
     {
-        AppLocale::requireComponents(
-            LOCALE_COMPONENT_PKP_READER,
-            LOCALE_COMPONENT_PKP_SUBMISSION
-        );
-
         $submission = $this->getAuthorizedContextObject(Application::ASSOC_TYPE_SUBMISSION);
 
         $userGroupDao = DAORegistry::getDAO('UserGroupDAO'); /** @var UserGroupDAO $userGroupDao */
@@ -403,8 +397,6 @@ public function get($slimRequest, $response, $args)
      */
     public function add($slimRequest, $response, $args)
     {
-        AppLocale::requireComponents(LOCALE_COMPONENT_APP_AUTHOR);
-
         $request = $this->getRequest();
 
         // Don't allow submissions to be added via the site-wide API
@@ -693,7 +685,6 @@ public function addPublication($slimRequest, $response, $args)
     public function versionPublication($slimRequest, $response, $args)
     {
         $request = $this->getRequest();
-        AppLocale::requireComponents(LOCALE_COMPONENT_PKP_SUBMISSION, LOCALE_COMPONENT_APP_SUBMISSION); // notification.type.submissionNewVersion
         $submission = $this->getAuthorizedContextObject(Application::ASSOC_TYPE_SUBMISSION);
         $publication = Repo::publication()->get((int) $args['publicationId']);
 
@@ -837,8 +828,6 @@ public function publishPublication($slimRequest, $response, $args)
             return $response->withStatus(403)->withJsonError('api.publication.403.alreadyPublished');
         }
 
-        AppLocale::requireComponents(LOCALE_COMPONENT_PKP_SUBMISSION, LOCALE_COMPONENT_APP_SUBMISSION);
-
         $submissionContext = $request->getContext();
         if (!$submissionContext || $submissionContext->getId() !== $submission->getData('contextId')) {
             $submissionContext = Services::get('context')->get($submission->getData('contextId'));

api/v1/users/PKPUserHandler.inc.php

@@ -15,7 +15,7 @@
  */
 
 use APP\facades\Repo;
-use APP\i18n\AppLocale;
+use PKP\facades\Locale;
 use PKP\handler\APIHandler;
 use PKP\plugins\HookRegistry;
 use PKP\security\authorization\ContextAccessPolicy;
@@ -123,7 +123,7 @@ public function getMany($slimRequest, $response, $args)
             ->assignedToCategoryIds(isset($params['assignedToCategory']) ? [$params['assignedToCategory']] : null)
             ->filterByRoleIds($params['roleIds'] ?? null)
             ->searchPhrase($params['searchPhrase'] ?? null)
-            ->orderBy($orderBy, $orderDirection, [AppLocale::getLocale(), $request->getSite()->getPrimaryLocale()])
+            ->orderBy($orderBy, $orderDirection, [Locale::getLocale(), $request->getSite()->getPrimaryLocale()])
             ->limit($params['count'] ?? null)
             ->offset($params['offset'] ?? null)
             ->filterByStatus($params['status'] ?? $collector::STATUS_ALL);

api/v1/vocabs/PKPVocabHandler.inc.php

@@ -15,7 +15,6 @@
  */
 
 use APP\core\Application;
-use APP\i18n\AppLocale;
 use PKP\core\APIResponse;
 use PKP\core\PKPString;
 use PKP\db\DAORegistry;
@@ -29,8 +28,8 @@
 use PKP\submission\SubmissionLanguageDAO;
 use PKP\submission\SubmissionSubjectDAO;
 use Slim\Http\Request;
-use Sokil\IsoCodes\IsoCodesFactory;
 use Stringy\Stringy;
+use PKP\facades\Locale;
 
 class PKPVocabHandler extends APIHandler
 {
@@ -77,7 +76,7 @@ public function getMany(Request $slimRequest, APIResponse $response, array $args
         $requestParams = $slimRequest->getQueryParams();
 
         $vocab = $requestParams['vocab'] ?? '';
-        $locale = $requestParams['locale'] ?? AppLocale::getLocale();
+        $locale = $requestParams['locale'] ?? Locale::getLocale();
         $term = $requestParams['term'] ?? null;
 
         if (!in_array($locale, $context->getData('supportedSubmissionLocales'))) {
@@ -98,11 +97,9 @@ public function getMany(Request $slimRequest, APIResponse $response, array $args
                 $entries = $submissionDisciplineEntryDao->getByContextId($vocab, $context->getId(), $locale, $term)->toArray();
                 break;
             case SubmissionLanguageDAO::CONTROLLED_VOCAB_SUBMISSION_LANGUAGE:
-                /** @var IsoCodesFactory */
-                $isoCodes = app(IsoCodesFactory::class);
                 $words = array_filter(PKPString::regexp_split('/\s+/', $term), 'strlen');
                 $languageNames = [];
-                foreach ($isoCodes->getLanguages(IsoCodesFactory::OPTIMISATION_IO) as $language) {
+                foreach (Locale::getLanguages() as $language) {
                     if ($language->getAlpha2() && $language->getType() === 'L' && $language->getScope() === 'I' && Stringy::create($language->getLocalName())->containsAny($words, false)) {
                         $languageNames[] = $language->getLocalName();
                     }

classes/announcement/Repository.inc.php

@@ -14,7 +14,6 @@
 namespace PKP\announcement;
 
 use APP\core\Request;
-use APP\i18n\AppLocale;
 use Illuminate\Support\Collection;
 use Illuminate\Support\LazyCollection;
 use PKP\core\Core;
@@ -106,11 +105,6 @@ public function getSchemaMap(): maps\Schema
      */
     public function validate(?Announcement $object, array $props, array $allowedLocales, string $primaryLocale): array
     {
-        AppLocale::requireComponents(
-            LOCALE_COMPONENT_PKP_MANAGER,
-            LOCALE_COMPONENT_APP_MANAGER
-        );
-
         $validator = ValidatorFactory::make(
             $props,
             $this->schemaService->getValidationRules($this->dao->schema, $allowedLocales),

classes/author/Author.inc.php

@@ -17,7 +17,7 @@
 
 namespace PKP\author;
 
-use APP\i18n\AppLocale;
+use PKP\facades\Locale;
 use PKP\db\DAORegistry;
 
 use PKP\identity\Identity;
@@ -34,7 +34,7 @@ class Author extends Identity
     public function &getLocalizedData($key, $preferredLocale = null)
     {
         if (is_null($preferredLocale)) {
-            $preferredLocale = AppLocale::getLocale();
+            $preferredLocale = Locale::getLocale();
         }
         $localePrecedence = [$preferredLocale];
         // the submission locale is the default locale
@@ -43,8 +43,8 @@ public function &getLocalizedData($key, $preferredLocale = null)
         }
         // for settings other than givenName, familyName and affiliation (that are required)
         // consider also the application primary locale
-        if (!in_array(AppLocale::getPrimaryLocale(), $localePrecedence)) {
-            $localePrecedence[] = AppLocale::getPrimaryLocale();
+        if (!in_array(Locale::getPrimaryLocale(), $localePrecedence)) {
+            $localePrecedence[] = Locale::getPrimaryLocale();
         }
         foreach ($localePrecedence as $locale) {
             if (empty($locale)) {

classes/category/Repository.inc.php

@@ -14,7 +14,6 @@
 namespace PKP\category;
 
 use APP\core\Request;
-use APP\i18n\AppLocale;
 use Illuminate\Support\Collection;
 use Illuminate\Support\LazyCollection;
 use PKP\plugins\HookRegistry;
@@ -105,11 +104,6 @@ public function getSchemaMap(): maps\Schema
      */
     public function validate(?Announcement $object, array $props, array $allowedLocales, string $primaryLocale): array
     {
-        AppLocale::requireComponents(
-            LOCALE_COMPONENT_PKP_MANAGER,
-            LOCALE_COMPONENT_APP_MANAGER
-        );
-
         $validator = ValidatorFactory::make(
             $props,
             $this->schemaService->getValidationRules($this->dao->schema, $allowedLocales),

classes/cliTool/CommandLineTool.inc.php

@@ -25,23 +25,21 @@
 
 use APP\core\Application;
 use APP\core\PageRouter;
+use APP\facades\Repo;
+use PKP\core\Registry;
+use PKP\db\DAORegistry;
+use PKP\plugins\PluginRegistry;
+use PKP\security\Role;
+use PKP\session\SessionManager;
 
 /** Initialization code */
 define('PWD', getcwd());
 chdir(dirname(INDEX_FILE_LOCATION)); /* Change to base directory */
 if (!defined('STDIN')) {
     define('STDIN', fopen('php://stdin', 'r'));
 }
-define('SESSION_DISABLE_INIT', 1);
-require('./lib/pkp/includes/bootstrap.inc.php');
-
-use APP\facades\Repo;
-use APP\i18n\AppLocale;
-use PKP\core\Registry;
-
-use PKP\db\DAORegistry;
-use PKP\plugins\PluginRegistry;
-use PKP\security\Role;
+require_once './lib/pkp/includes/bootstrap.inc.php';
+SessionManager::disable();
 
 class CommandLineTool
 {
@@ -69,7 +67,6 @@ public function __construct($argv = [])
         $request->setRouter($router);
 
         // Initialize the locale and load generic plugins.
-        AppLocale::initialize($request);
         PluginRegistry::loadCategory('generic');
 
         $this->argv = isset($argv) && is_array($argv) ? $argv : [];

classes/cliTool/InstallTool.inc.php

@@ -86,8 +86,6 @@ public function readParams()
         $this->printTitle('installer.localeSettings');
         $this->readParamOptions('locale', 'locale.primary', $installForm->supportedLocales, 'en_US');
         $this->readParamOptions('additionalLocales', 'installer.additionalLocales', $installForm->supportedLocales, '', true);
-        $this->readParamOptions('clientCharset', 'installer.clientCharset', $installForm->supportedClientCharsets, 'utf-8');
-        $this->readParamOptions('connectionCharset', 'installer.connectionCharset', $installForm->supportedConnectionCharsets, '');
 
         // File Settings
         $this->printTitle('installer.fileSettings');
@@ -108,7 +106,7 @@ public function readParams()
 
         // Database Settings
         $this->printTitle('installer.databaseSettings');
-        $this->readParamOptions('databaseDriver', 'installer.databaseDriver', $installForm->checkDBDrivers());
+        $this->readParamOptions('databaseDriver', 'installer.databaseDriver', $installForm->getDatabaseDriversOptions());
         $this->readParam('databaseHost', 'installer.databaseHost', '');
         $this->readParam('databaseUsername', 'installer.databaseUsername', '');
         $this->readParam('databasePassword', 'installer.databasePassword', '');

classes/cliTool/UpgradeTool.inc.php

@@ -17,14 +17,12 @@
 
 namespace PKP\cliTool;
 
-define('RUNNING_UPGRADE', 1);
-
 use APP\core\Application;
-
-use APP\i18n\AppLocale;
 use APP\install\Upgrade;
 use PKP\site\VersionCheck;
 
+Application::upgrade();
+
 class UpgradeTool extends \PKP\cliTool\CommandLineTool
 {
     /** @var string command to execute (check|upgrade|download) */
@@ -37,7 +35,6 @@ class UpgradeTool extends \PKP\cliTool\CommandLineTool
      */
     public function __construct($argv = [])
     {
-        Application::get()->initializeLaravelContainer();
         parent::__construct($argv);
 
         if (!isset($this->argv[0]) || !in_array($this->argv[0], ['check', 'latest', 'upgrade', 'download'])) {
@@ -46,7 +43,6 @@ public function __construct($argv = [])
         }
 
         $this->command = $this->argv[0];
-        AppLocale::requireComponents(LOCALE_COMPONENT_PKP_INSTALLER);
     }
 
     /**

classes/components/PKPStatsComponent.inc.php

@@ -42,9 +42,6 @@ class PKPStatsComponent
      */
     public function __construct($apiUrl, $args = [])
     {
-        \AppLocale::requireComponents(LOCALE_COMPONENT_PKP_MANAGER);
-        \AppLocale::requireComponents(LOCALE_COMPONENT_APP_MANAGER);
-
         $this->apiUrl = $apiUrl;
         $this->init($args);
     }

classes/components/forms/FormComponent.inc.php

@@ -16,6 +16,7 @@
 namespace PKP\components\forms;
 
 use Exception;
+use PKP\facades\Locale;
 
 define('FIELD_POSITION_BEFORE', 'before');
 define('FIELD_POSITION_AFTER', 'after');
@@ -278,9 +279,9 @@ public function getConfig()
 
         $fieldsConfig = array_map([$this, 'getFieldConfig'], $this->fields);
 
-        $visibleLocales = [\AppLocale::getLocale()];
-        if (\AppLocale::getLocale() !== \AppLocale::getPrimaryLocale()) {
-            array_unshift($visibleLocales, \AppLocale::getPrimaryLocale());
+        $visibleLocales = [Locale::getLocale()];
+        if (Locale::getLocale() !== Locale::getPrimaryLocale()) {
+            array_unshift($visibleLocales, Locale::getPrimaryLocale());
         }
 
         $config = [
@@ -290,7 +291,7 @@ public function getConfig()
             'fields' => $fieldsConfig,
             'groups' => $this->groups,
             'pages' => $this->pages,
-            'primaryLocale' => \AppLocale::getPrimaryLocale(),
+            'primaryLocale' => Locale::getPrimaryLocale(),
             'visibleLocales' => $visibleLocales,
             'supportedFormLocales' => array_values($this->locales), // See #5690
             'errors' => (object) [],

classes/components/forms/context/PKPContextForm.inc.php

@@ -19,7 +19,7 @@
 use PKP\components\forms\FieldSelect;
 use PKP\components\forms\FieldText;
 use PKP\components\forms\FormComponent;
-use Sokil\IsoCodes\IsoCodesFactory;
+use PKP\facades\Locale;
 
 define('FORM_CONTEXT', 'context');
 
@@ -45,10 +45,8 @@ public function __construct($action, $locales, $baseUrl, $context)
         $this->locales = $locales;
         $this->method = $context ? 'PUT' : 'POST';
 
-        $isoCodes = app(IsoCodesFactory::class);
-
         $countries = [];
-        foreach ($isoCodes->getCountries() as $country) {
+        foreach (Locale::getCountries() as $country) {
             $countries[] = [
                 'value' => $country->getAlpha2(),
                 'label' => $country->getLocalName()

classes/components/forms/context/PKPMastheadForm.inc.php

@@ -18,7 +18,7 @@
 use PKP\components\forms\FieldSelect;
 use PKP\components\forms\FieldText;
 use PKP\components\forms\FormComponent;
-use Sokil\IsoCodes\IsoCodesFactory;
+use PKP\facades\Locale;
 
 define('FORM_MASTHEAD', 'masthead');
 
@@ -43,9 +43,8 @@ public function __construct($action, $locales, $context, $imageUploadUrl)
         $this->action = $action;
         $this->locales = $locales;
 
-        $isoCodes = app(IsoCodesFactory::class);
         $countries = [];
-        foreach ($isoCodes->getCountries() as $country) {
+        foreach (Locale::getCountries() as $country) {
             $countries[] = [
                 'value' => $country->getAlpha2(),
                 'label' => $country->getLocalName()

classes/components/forms/context/PKPPaymentSettingsForm.inc.php

@@ -17,8 +17,8 @@
 use PKP\components\forms\FieldOptions;
 use PKP\components\forms\FieldSelect;
 use PKP\components\forms\FormComponent;
-
-use Sokil\IsoCodes\IsoCodesFactory;
+use PKP\facades\Locale;
+use PKP\plugins\PluginRegistry;
 
 define('FORM_PAYMENT_SETTINGS', 'paymentSettings');
 
@@ -43,16 +43,15 @@ public function __construct($action, $locales, $context)
         $this->locales = $locales;
 
         $currencies = [];
-        $isoCodes = app(IsoCodesFactory::class);
-        foreach ($isoCodes->getCurrencies() as $currency) {
+        foreach (Locale::getCurrencies() as $currency) {
             $currencies[] = [
                 'value' => $currency->getLetterCode(),
                 'label' => $currency->getLocalName(),
             ];
         }
 
         // Ensure payment method plugins can hook in
-        $paymentPlugins = \PluginRegistry::loadCategory('paymethod', true);
+        $paymentPlugins = PluginRegistry::loadCategory('paymethod', true);
         $pluginList = [];
         foreach ($paymentPlugins as $plugin) {
             $pluginList[] = [