Partial port of #14 to stable-3_4_0

pkp · May 10, 2024 · d546c11 · d546c11
1 parent 2cacdb6
commit d546c11
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CustomLocalePlugin.php b/CustomLocalePlugin.php
@@ -56,7 +56,7 @@ public function register($category, $path, $mainContextId = null): bool
      */
     public function setupLocalizationOverriding(): void
     {
-        Locale::registerPath(static::getStoragePath(), PHP_INT_MAX);
+        if (is_dir($path = static::getStoragePath())) Locale::registerPath($path, PHP_INT_MAX);
     }
 
     /**
@@ -166,7 +166,7 @@ public static function getTranslator(string $locale): Translator
     public static function getContextFileManager(): ContextFileManager
     {
         $context = Application::get()->getRequest()->getContext();
-        return new ContextFileManager($context->getId());
+        return new ContextFileManager($context ? $context->getId() : Application::CONTEXT_SITE);
     }
 
     /**

diff --git a/controllers/grid/CustomLocaleGridHandler.php b/controllers/grid/CustomLocaleGridHandler.php
@@ -161,7 +161,8 @@ public function initialize($request, $args = null): void
     public function loadData($request, $filter): array
     {
         $gridDataElements = [];
-        $locales = $request->getContext()->getSupportedFormLocaleNames();
+        $context = $request->getContext();
+        $locales = $context ? $context->getSupportedFormLocaleNames() : $request->getSite()->getSupportedLocaleNames();
         foreach (array_keys($locales) as $i => $locale) {
             $gridDataElements[] = new CustomLocale($i, $locale, $locales[$locale]);
         }