feat(DropdownField): Load translation for plugin too

stonebuzz · btry · commit 16a1379a8e01 · 2023-09-29T10:15:46.000+02:00
diff --git a/inc/field/dropdownfield.class.php b/inc/field/dropdownfield.class.php
@@ -715,6 +715,7 @@ public function parseObjectProperties(
       // We need english locale to search searchOptions by name
       $oldLocale = $TRANSLATE->getLocale();
       $TRANSLATE->setLocale("en_GB");
+      $_SESSION['glpilanguage'] = "en_GB";
       if ($plug = isPluginItemType($itemtype)) {
          Plugin::loadLang(strtolower($plug['plugin']), "en_GB");
       }
@@ -736,6 +737,7 @@ public function parseObjectProperties(
          if (count($searchOption) == 0) {
             trigger_error("No search option found for $property", E_USER_WARNING);
             $TRANSLATE->setLocale($oldLocale);
+            $_SESSION['glpilanguage'] = $oldLocale;
             return $content;
          }
 
@@ -779,6 +781,7 @@ public function parseObjectProperties(
       }
       // Put the old locales on succes or if an expection was thrown
       $TRANSLATE->setLocale($oldLocale);
+      $_SESSION['glpilanguage'] = $oldLocale;
       if ($plug = isPluginItemType($itemtype)) {
          Plugin::loadLang(strtolower($plug['plugin']), $oldLocale);
       }

Original file line number	Diff line number	Diff line change
`@@ -715,6 +715,7 @@ public function parseObjectProperties(`
`715`	`715`	`// We need english locale to search searchOptions by name`
`716`	`716`	`$oldLocale = $TRANSLATE->getLocale();`
`717`	`717`	`$TRANSLATE->setLocale("en_GB");`
	`718`	`+ $_SESSION['glpilanguage'] = "en_GB";`
`718`	`719`	`if ($plug = isPluginItemType($itemtype)) {`
`719`	`720`	`Plugin::loadLang(strtolower($plug['plugin']), "en_GB");`
`720`	`721`	`}`
`@@ -736,6 +737,7 @@ public function parseObjectProperties(`
`736`	`737`	`if (count($searchOption) == 0) {`
`737`	`738`	`trigger_error("No search option found for $property", E_USER_WARNING);`
`738`	`739`	`$TRANSLATE->setLocale($oldLocale);`
	`740`	`+ $_SESSION['glpilanguage'] = $oldLocale;`
`739`	`741`	`return $content;`
`740`	`742`	`}`
`741`	`743`
`@@ -779,6 +781,7 @@ public function parseObjectProperties(`
`779`	`781`	`}`
`780`	`782`	`// Put the old locales on succes or if an expection was thrown`
`781`	`783`	`$TRANSLATE->setLocale($oldLocale);`
	`784`	`+ $_SESSION['glpilanguage'] = $oldLocale;`
`782`	`785`	`if ($plug = isPluginItemType($itemtype)) {`
`783`	`786`	`Plugin::loadLang(strtolower($plug['plugin']), $oldLocale);`
`784`	`787`	`}`