fix(form_language): filter out obsolete translations

pluginsGLPI · Jan 31, 2023 · b38555c · b38555c
1 parent 35315ca
commit b38555c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/inc/form_language.class.php b/inc/form_language.class.php
@@ -356,9 +356,18 @@ public function showTranslations($options = []) {
       echo $header;
       echo '</thead>';
 
+      $all_translated_strings = $form->getTranslatableStrings([
+         'translated' => true,
+         'language'   => $this->fields['name']
+      ]);
+
       echo '<tbody>';
       foreach ($translations as $original => $translated) {
          $id = PluginFormcreatorTranslation::getTranslatableStringId($original);
+         if (!in_array($id, array_keys($all_translated_strings['id']))) {
+            // String is translated but no longer used in the form or its sub objects
+            continue;
+         }
          echo '<tr data-itemtype="PluginFormcreatorTranslation" data-id="' . $id . '">';
          echo '<td>'
          . Html::getCheckbox([

diff --git a/inc/translation.class.php b/inc/translation.class.php
@@ -161,7 +161,7 @@ public static function getEditorFieldsHtml(PluginFormcreatorForm_Language $formL
       if (!isset($translatableString['id'][$id])) {
          // Show nothing if string definitively not found
          // Should not happen
-         return '';
+         return '<td colspan="2">' . __('Iternal error : translatable string not found.', 'formcreator') . '</td>';;
       }
 
       $type = $translatableString['id'][$id] ?? 'string';