Prepare next version. Drop deprecated functions.

InfotelGLPI · Apr 15, 2017 · 01f2524 · 01f2524
1 parent d875eb5
commit 01f2524
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/inc/typology_item.class.php b/inc/typology_item.class.php
@@ -701,7 +701,7 @@ public static function showForTypology(PluginTypologyTypology $typo) {
       if(empty($type)){
          echo "<table class='tab_cadre_fixe'>";
          echo "<tr><th class='center'>";
-         _e('Select a type', 'typology');
+         echo __('Select a type', 'typology');
          echo "</th></tr>";
          echo "</table>";
 
@@ -724,9 +724,9 @@ public static function showForTypology(PluginTypologyTypology $typo) {
          echo "<th colspan='" . ($canedit ? (7 + $colsup) : (6 + $colsup)) . "'>";
 
          if ($number == 0) {
-            _e('No linked element', 'typology');
+            echo __('No linked element', 'typology');
          } else {
-            _e('Linked elements', 'typology');
+            echo __('Linked elements', 'typology');
          }
 
          echo "</th></tr><tr>";
@@ -909,7 +909,7 @@ static function showManagementConsole($ID, $typo_ID, $display = true){
 
             //title
             echo "<tr><th colspan='7'>";
-            _e('Management console','typology');
+            echo __('Management console','typology');
             echo "</th></tr>";
 
             //column name

diff --git a/setup.php b/setup.php
@@ -83,7 +83,7 @@ function plugin_version_typology() {
 // Optional : check prerequisites before install : may print errors or add to message after redirect
 function plugin_typology_check_prerequisites() {
    if (version_compare(GLPI_VERSION,'9.1','lt') || version_compare(GLPI_VERSION,'9.2','ge')) {
-      _e('This plugin requires GLPI >= 9.1', 'typology');
+      echo __('This plugin requires GLPI >= 9.1', 'typology');
       return false;
    }
    return true;