Fix account notification email language (#28)

Digital-Peak · Mar 26, 2023 · 14ad2ab · 14ad2ab
1 parent fb9f8fa
commit 14ad2ab
Showing 1 changed file with 22 additions and 11 deletions.
diff --git a/plugins/user/joomla/src/Extension/Joomla.php b/plugins/user/joomla/src/Extension/Joomla.php
@@ -164,21 +164,24 @@ public function onUserAfterSave($user, $isnew, $success, $msg): void
             return;
         }
 
+        $app           = $this->getApplication();
+        $language      = $app->getLanguage();
+        $defaultLocale = $language->getTag();
+
         // @todo: Suck in the frontend registration emails here as well. Job for a rainy day.
         // The method check here ensures that if running as a CLI Application we don't get any errors
-        if (method_exists($this->getApplication(), 'isClient') && ($this->getApplication()->isClient('site') || $this->getApplication()->isClient('cli'))) {
+        if (method_exists($app, 'isClient') && ($app->isClient('site') || $app->isClient('cli'))) {
             return;
         }
 
         // Check if we have a sensible from email address, if not bail out as mail would not be sent anyway
-        if (strpos($this->getApplication()->get('mailfrom'), '@') === false) {
-            $this->getApplication()->enqueueMessage($this->getApplication()->getLanguage()->_('JERROR_SENDING_EMAIL'), 'warning');
+        if (strpos($app->get('mailfrom'), '@') === false) {
+            $app->enqueueMessage($language->_('JERROR_SENDING_EMAIL'), 'warning');
 
             return;
         }
 
-        $defaultLanguage = Factory::getLanguage();
-        $defaultLocale   = $defaultLanguage->getTag();
+
 
         /**
          * Look for user language. Priority:
@@ -192,7 +195,11 @@ public function onUserAfterSave($user, $isnew, $success, $msg): void
         if ($userLocale !== $defaultLocale) {
             Factory::$language = Factory::getContainer()
                 ->get(LanguageFactoryInterface::class)
-                ->createLanguage($userLocale, $this->getApplication()->get('debug_lang', false));
+                ->createLanguage($userLocale, $app->get('debug_lang', false));
+
+            if (method_exists($app, 'loadLanguage')) {
+                $app->loadLanguage(Factory::$language);
+            }
         }
 
         // Load plugin language files.
@@ -201,7 +208,7 @@ public function onUserAfterSave($user, $isnew, $success, $msg): void
         // Collect data for mail
         $data = [
             'name'     => $user['name'],
-            'sitename' => $this->getApplication()->get('sitename'),
+            'sitename' => $app->get('sitename'),
             'url'      => Uri::root(),
             'username' => $user['username'],
             'password' => $user['password_clear'],
@@ -216,23 +223,27 @@ public function onUserAfterSave($user, $isnew, $success, $msg): void
             $res = $mailer->send();
         } catch (\Exception $exception) {
             try {
-                Log::add($this->getApplication()->getLanguage()->_($exception->getMessage()), Log::WARNING, 'jerror');
+                Log::add($language->_($exception->getMessage()), Log::WARNING, 'jerror');
 
                 $res = false;
             } catch (\RuntimeException $exception) {
-                $this->getApplication()->enqueueMessage($this->getApplication()->getLanguage()->_($exception->getMessage()), 'warning');
+                $app->enqueueMessage($language->_($exception->getMessage()), 'warning');
 
                 $res = false;
             }
         }
 
         if ($res === false) {
-            $this->getApplication()->enqueueMessage($this->getApplication()->getLanguage()->_('JERROR_SENDING_EMAIL'), 'warning');
+            $app->enqueueMessage($language->_('JERROR_SENDING_EMAIL'), 'warning');
         }
 
         // Set application language back to default if we changed it
         if ($userLocale !== $defaultLocale) {
-            Factory::$language = $defaultLanguage;
+            Factory::$language = $language;
+
+            if (method_exists($app, 'loadLanguage')) {
+                $app->loadLanguage(Factory::$language);
+            }
         }
     }