remove translations config, translations are now enabled by default (g…

…lpi-project#13643)
cconard96 · Jan 12, 2024 · f81ac57 · f81ac57
1 parent cde4d9d
commit f81ac57
Show file tree

Hide file tree

Showing 13 changed files with 110 additions and 108 deletions.
diff --git a/ajax/projecttask.php b/ajax/projecttask.php
@@ -49,15 +49,13 @@
     $template = new ProjectTaskTemplate();
     $template->getFromDB($_POST['projecttasktemplates_id']);
 
-    if (DropdownTranslation::isDropdownTranslationActive()) {
-        $template->fields['description'] = DropdownTranslation::getTranslatedValue(
-            $template->getID(),
-            $template->getType(),
-            'description',
-            $_SESSION['glpilanguage'],
-            $template->fields['description']
-        );
-    }
+    $template->fields['description'] = DropdownTranslation::getTranslatedValue(
+        $template->getID(),
+        $template->getType(),
+        'description',
+        $_SESSION['glpilanguage'],
+        $template->fields['description']
+    );
 
     echo json_encode($template->fields);
 }
diff --git a/ajax/solution.php b/ajax/solution.php
@@ -89,16 +89,13 @@
    // Render template content using twig
     $template->fields['content'] = $template->getRenderedContent($parent);
 } else {
-    $content = $template->fields['content'];
-    if (DropdownTranslation::isDropdownTranslationActive()) {
-        $content = DropdownTranslation::getTranslatedValue(
-            $template->getID(),
-            $template->getType(),
-            'content',
-            $_SESSION['glpilanguage'],
-            $content
-        );
-    }
+    $content = DropdownTranslation::getTranslatedValue(
+        $template->getID(),
+        $template->getType(),
+        'content',
+        $_SESSION['glpilanguage'],
+        $template->fields['content']
+    );
     $template->fields['content'] = RichText::getSafeHtml($content);
 }
 

diff --git a/install/empty_data.php b/install/empty_data.php
@@ -261,9 +261,6 @@ public function getEmptyData(): array
             'registration_number_ssofield' => '',
             'ssovariables_id' => '0',
             'ssologout_url' => '',
-            'translate_kb' => '0',
-            'translate_dropdowns' => '0',
-            'translate_reminders' => '0',
             'pdffont' => 'dejavusans',
             'keep_devices_when_purging_item' => '0',
             'maintenance_mode' => '0',

diff --git a/install/migrations/update_10.0.x_to_10.1.0/translations.php b/install/migrations/update_10.0.x_to_10.1.0/translations.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * ---------------------------------------------------------------------
+ *
+ * GLPI - Gestionnaire Libre de Parc Informatique
+ *
+ * http://glpi-project.org
+ *
+ * @copyright 2015-2024 Teclib' and contributors.
+ * @copyright 2003-2014 by the INDEPNET Development Team.
+ * @licence   https://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * ---------------------------------------------------------------------
+ *
+ * LICENSE
+ *
+ * This file is part of GLPI.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * ---------------------------------------------------------------------
+ */
+
+Config::deleteConfigurationValues('core', [
+    'translate_dropdowns',
+    'translate_kb',
+    'translate_reminders',
+]);
diff --git a/src/AbstractITILChildTemplate.php b/src/AbstractITILChildTemplate.php
@@ -128,15 +128,13 @@ public function getRenderedContent(CommonITILObject $itil_item): string
         }
 
         $content = $this->fields['content'];
-        if (DropdownTranslation::isDropdownTranslationActive()) {
-            $content = DropdownTranslation::getTranslatedValue(
-                $this->getID(),
-                $this->getType(),
-                'content',
-                $_SESSION['glpilanguage'],
-                $content
-            );
-        }
+        $content = DropdownTranslation::getTranslatedValue(
+            $this->getID(),
+            $this->getType(),
+            'content',
+            $_SESSION['glpilanguage'],
+            $content
+        );
 
         $html = TemplateManager::renderContentForCommonITIL(
             $itil_item,

diff --git a/src/CommonDBTM.php b/src/CommonDBTM.php
@@ -1003,6 +1003,16 @@ protected function deleteChildrenAndRelationsFromDb(array $relations_classes)
         }
     }
 
+    /**
+     * Is translation enabled for this itemtype
+     *
+     * @return true if translation is available, false otherwise
+     **/
+    public function maybeTranslated()
+    {
+        return false;
+    }
+
 
     /**
      * Clean translations associated to a dropdown
@@ -1015,7 +1025,7 @@ public function cleanTranslations()
     {
 
        //Do not try to clean is dropdown translation is globally off
-        if (DropdownTranslation::isDropdownTranslationActive()) {
+        if ($this->maybeTranslated()) {
             $translation = new DropdownTranslation();
             $translation->deleteByCriteria(['itemtype' => get_class($this),
                 'items_id' => $this->getID()

diff --git a/src/DropdownTranslation.php b/src/DropdownTranslation.php
@@ -701,6 +701,12 @@ public static function getTranslatedValue($ID, $itemtype, $field = 'name', $lang
         }
        //ID > 0 : dropdown item might be translated !
         if ($ID > 0) {
+            $item = new $itemtype();
+            $item->getFromDB($ID);
+            if (!$item->maybeTranslated()) {
+                return $value;
+            }
+
            //There's at least one translation for this itemtype
             if (self::hasItemtypeATranslation($itemtype)) {
                 $iterator = $DB->request([
@@ -780,23 +786,22 @@ public static function getTranslationID($ID, $itemtype, $field, $language)
     public static function canBeTranslated(CommonGLPI $item)
     {
 
-        return (self::isDropdownTranslationActive()
-              && (($item instanceof CommonDropdown)
-                  && $item->maybeTranslated()));
+        return ($item instanceof CommonDropdown) && $item->maybeTranslated();
     }
 
 
     /**
      * Is dropdown item translation functionality active
      *
+     * @deprecated 10.1.0
+     *
      * @return true if active, false if not
      **/
     public static function isDropdownTranslationActive()
     {
-        /** @var array $CFG_GLPI */
-        global $CFG_GLPI;
+        Toolbox::deprecated("Dropdown translations are now always active");
 
-        return $CFG_GLPI['translate_dropdowns'];
+        return true;
     }
 
 
@@ -905,19 +910,17 @@ public static function getAvailableTranslations($language)
         global $DB;
 
         $tab = [];
-        if (self::isDropdownTranslationActive()) {
-            $iterator = $DB->request([
-                'SELECT'          => [
-                    'itemtype',
-                    'field'
-                ],
-                'DISTINCT'        => true,
-                'FROM'            => self::getTable(),
-                'WHERE'           => ['language' => $language]
-            ]);
-            foreach ($iterator as $data) {
-                 $tab[$data['itemtype']][$data['field']] = $data['field'];
-            }
+        $iterator = $DB->request([
+            'SELECT'          => [
+                'itemtype',
+                'field'
+            ],
+            'DISTINCT'        => true,
+            'FROM'            => self::getTable(),
+            'WHERE'           => ['language' => $language]
+        ]);
+        foreach ($iterator as $data) {
+                $tab[$data['itemtype']][$data['field']] = $data['field'];
         }
         return $tab;
     }

diff --git a/src/KnowbaseItem.php b/src/KnowbaseItem.php
@@ -1571,10 +1571,7 @@ public static function getListRequest(array $params, $type = 'search')
             }
         }
 
-        if (
-            KnowbaseItemTranslation::isKbTranslationActive()
-            && (countElementsInTable('glpi_knowbaseitemtranslations') > 0)
-        ) {
+        if (countElementsInTable('glpi_knowbaseitemtranslations') > 0) {
             $criteria['LEFT JOIN']['glpi_knowbaseitemtranslations'] = [
                 'ON'  => [
                     'glpi_knowbaseitems'             => 'id',
@@ -1621,10 +1618,7 @@ public static function getListRequest(array $params, $type = 'search')
                     $search_wilcard = self::computeBooleanFullTextSearch($search);
 
                     $addscore = [];
-                    if (
-                        KnowbaseItemTranslation::isKbTranslationActive()
-                        && (countElementsInTable('glpi_knowbaseitemtranslations') > 0)
-                    ) {
+                    if (countElementsInTable('glpi_knowbaseitemtranslations') > 0) {
                         $addscore = [
                             'glpi_knowbaseitemtranslations.name',
                             'glpi_knowbaseitemtranslations.answer'
@@ -1711,10 +1705,7 @@ public static function getListRequest(array $params, $type = 'search')
                             ["glpi_knowbaseitems.name"     => ['LIKE', Search::makeTextSearchValue($contains)]],
                             ["glpi_knowbaseitems.answer"   => ['LIKE', Search::makeTextSearchValue($contains)]]
                         ];
-                        if (
-                            KnowbaseItemTranslation::isKbTranslationActive()
-                            && (countElementsInTable('glpi_knowbaseitemtranslations') > 0)
-                        ) {
+                        if (countElementsInTable('glpi_knowbaseitemtranslations') > 0) {
                             $ors[] = ["glpi_knowbaseitemtranslations.name"   => ['LIKE', Search::makeTextSearchValue($contains)]];
                             $ors[] = ["glpi_knowbaseitemtranslations.answer" => ['LIKE', Search::makeTextSearchValue($contains)]];
                         }
@@ -2210,10 +2201,7 @@ public static function showRecentPopular(string $type = "", bool $display = true
             $criteria['WHERE']['glpi_knowbaseitems.is_faq'] = 1;
         }
 
-        if (
-            KnowbaseItemTranslation::isKbTranslationActive()
-            && (countElementsInTable('glpi_knowbaseitemtranslations') > 0)
-        ) {
+        if (countElementsInTable('glpi_knowbaseitemtranslations') > 0) {
             $criteria['LEFT JOIN']['glpi_knowbaseitemtranslations'] = [
                 'ON'  => [
                     'glpi_knowbaseitems'             => 'id',

diff --git a/src/KnowbaseItemTranslation.php b/src/KnowbaseItemTranslation.php
@@ -372,14 +372,15 @@ public static function getTranslatedValue(KnowbaseItem $item, $field = "name")
     /**
      * Is kb item translation functionality active
      *
+     * @deprecated 10.1.0
+     *
      * @return true if active, false if not
      **/
     public static function isKbTranslationActive()
     {
-        /** @var array $CFG_GLPI */
-        global $CFG_GLPI;
+        Toolbox::deprecated("KB translations are now always active");
 
-        return $CFG_GLPI['translate_kb'];
+        return true;
     }
 
 
@@ -395,8 +396,7 @@ public static function isKbTranslationActive()
     public static function canBeTranslated(CommonGLPI $item)
     {
 
-        return (self::isKbTranslationActive()
-              && $item instanceof KnowbaseItem);
+        return $item instanceof KnowbaseItem;
     }
 
 

diff --git a/src/Reminder.php b/src/Reminder.php
@@ -945,7 +945,7 @@ public static function showListForCentral(bool $personal = true, bool $display =
         // Do not force the inclusion of reminders created by the current user
         unset($public_criteria['WHERE']['glpi_reminders.users_id'], $public_criteria['WHERE']['OR']['glpi_reminders.users_id']);
 
-        if (ReminderTranslation::isReminderTranslationActive()) {
+        if (countElementsInTable('glpi_remindertranslations') > 0) {
             $additional_criteria = [
                 'SELECT'    => ["glpi_remindertranslations.name AS transname", "glpi_remindertranslations.text AS transtext"],
                 'LEFT JOIN' => [

diff --git a/src/ReminderTranslation.php b/src/ReminderTranslation.php
@@ -296,14 +296,15 @@ public static function getTranslatedValue(Reminder $item, $field = "name")
     /**
      * Is reminder translation functionality active
      *
+     * @deprecated 10.1.0
+     *
      * @return boolean
      **/
     public static function isReminderTranslationActive()
     {
-        /** @var array $CFG_GLPI */
-        global $CFG_GLPI;
+        Toolbox::deprecated("Reminders translations are now always active");
 
-        return $CFG_GLPI['translate_reminders'];
+        return true;
     }
 
 
@@ -319,8 +320,7 @@ public static function isReminderTranslationActive()
     public static function canBeTranslated(CommonGLPI $item)
     {
 
-        return (self::isReminderTranslationActive()
-              && $item instanceof Reminder);
+        return ($item instanceof Reminder);
     }
 
 

diff --git a/templates/pages/setup/general/general_setup.html.twig b/templates/pages/setup/general/general_setup.html.twig
@@ -105,36 +105,6 @@
 
 </div>
 
-<div class="hr-text">
-    <i class="ti ti-language"></i>
-    <span>{{ __('Translations') }}</span>
-</div>
-
-<div class="row ps-4">
-
-    {{ fields.checkboxField(
-        'translate_dropdowns',
-        config['translate_dropdowns'],
-        __("Translation of dropdowns"),
-        field_options
-    ) }}
-
-    {{ fields.checkboxField(
-        'translate_kb',
-        config['translate_kb'],
-        __("Knowledge base translation"),
-        field_options
-    ) }}
-
-    {{ fields.checkboxField(
-        'translate_reminders',
-        config['translate_reminders'],
-        __("Translation of reminders"),
-        field_options
-    ) }}
-
-</div>
-
 <div class="hr-text">
     <i class="ti ti-list"></i>
     <span>{{ __('Dynamic display') }}</span>

diff --git a/tests/functional/OperatingSystemEdition.php b/tests/functional/OperatingSystemEdition.php
@@ -68,6 +68,7 @@ protected function getTabs()
     {
         return [
             'OperatingSystemEdition$main' => "<span><i class='ti ti-edit me-2'></i>Edition</span>",
+            'DropdownTranslation$1' => "<span><i class='ti ti-language me-2'></i>Translations</span>"
         ];
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -68,6 +68,7 @@ protected function getTabs() @@
         {
             return [
                 'OperatingSystemEdition$main' => "<span><i class='ti ti-edit me-2'></i>Edition</span>",
+                'DropdownTranslation$1' => "<span><i class='ti ti-language me-2'></i>Translations</span>"
             ];
         }
@@ Expand Down @@