Merge branch '3.2' into 'main'

thorsten · May 30, 2024 · 7c68fa6 · 7c68fa6
2 parents 56b88da + 0b903fb
commit 7c68fa6
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/phpmyfaq/admin/category.main.php b/phpmyfaq/admin/category.main.php
@@ -2,6 +2,7 @@
 
 /**
  * List all categories in the admin section.
+ *
  * This Source Code Form is subject to the terms of the Mozilla Public License,
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at http://mozilla.org/MPL/2.0/.

diff --git a/phpmyfaq/sitemap.xml.php b/phpmyfaq/sitemap.xml.php
@@ -27,8 +27,10 @@
 use phpMyFAQ\Date;
 use phpMyFAQ\Faq;
 use phpMyFAQ\Filter;
+use phpMyFAQ\Language;
 use phpMyFAQ\Link;
 use phpMyFAQ\Strings;
+use phpMyFAQ\Translation;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -56,6 +58,30 @@
     exit();
 }
 
+//
+// Get language (default: english)
+//
+$Language = new Language($faqConfig);
+$faqLangCode = $Language->setLanguage($faqConfig->get('main.languageDetection'), $faqConfig->get('main.language'));
+$faqConfig->setLanguage($Language);
+
+if (!Language::isASupportedLanguage($faqLangCode)) {
+    $faqLangCode = 'en';
+}
+
+//
+// Set translation class
+//
+try {
+    Translation::create()
+        ->setLanguagesDir(PMF_LANGUAGE_DIR)
+        ->setDefaultLanguage('en')
+        ->setCurrentLanguage($faqLangCode)
+        ->setMultiByteLanguage();
+} catch (Exception $e) {
+    echo '<strong>Error:</strong> ' . $e->getMessage();
+}
+
 /**
  * @param string|null $lastModified
  */

diff --git a/phpmyfaq/src/phpMyFAQ/Attachment/AttachmentAbstract.php b/phpmyfaq/src/phpMyFAQ/Attachment/AttachmentAbstract.php
@@ -27,11 +27,7 @@
  */
 abstract class AttachmentAbstract
 {
-    /**
-     * Attachment id.
-     *
-     * @var int
-     */
+    /** @var int Attachment id. */
     protected int $id = 0;
 
     /**