Lang correction

htdocs/core/modules/modPrinting.class.php

@@ -131,7 +131,6 @@ class modPrinting extends DolibarrModules
      */
     function init($options='')
     {
-        // insertion modele dans llx_document_model 
         $sql = array();
 
         return $this->_init($sql, $options);
@@ -147,7 +146,6 @@ class modPrinting extends DolibarrModules
      */
     function remove($options='')
     {
-        // suppression des modeles "printing"
         $sql = array();
 
         return $this->_remove($sql, $options);

htdocs/core/modules/printing/printgcp.modules.php

@@ -72,13 +72,13 @@ class printing_printgcp extends PrintingDriver
         $var=true;
         $html = '<table width="100%" class="noborder">';
         $html.= '<tr class="liste_titre">';
-        $html.= '<td>Name</td>';
-        $html.= '<td>displayName</td>';
-        $html.= '<td>Id</td>';
-        $html.= '<td>OwnerName</td>';
-        $html.= '<td>State</td>';
-        $html.= '<td>connectionStatus</td>';
-        $html.= '<td>Type</td>';
+        $html.= '<td>'.$langs->trans('GCP_Name').'</td>';
+        $html.= '<td>'.$langs->trans('GCP_displayName').'</td>';
+        $html.= '<td>'.$langs->trans('GCP_Id').'</td>';
+        $html.= '<td>'.$langs->trans('GCP_OwnerName').'</td>';
+        $html.= '<td>'.$langs->trans('GCP_State').'</td>';
+        $html.= '<td>'.$langs->trans('GCP_connectionStatus').'</td>';
+        $html.= '<td>'.$langs->trans('GCP_Type').'</td>';
         $html.= '<td align="center">'.$langs->trans("Select").'</td>';
         $html.= '</tr>'."\n";
         $list = $this->getlist_available_printers();

htdocs/core/modules/printing/printipp.modules.php

@@ -131,16 +131,16 @@ class printing_printipp extends PrintingDriver
         $var=true;
         $html = '<table width="100%" class="noborder">';
         $html.= '<tr class="liste_titre">';
-        $html.= '<td>Uri</td>';
-        $html.= '<td>Name</td>';
-        $html.= '<td>State</td>';
-        $html.= '<td>State_reason</td>';
-        $html.= '<td>State_reason1</td>';
-        $html.= '<td>BW</td>';
-        $html.= '<td>Color</td>';
-        //$html.= '<td>Device</td>';
-        $html.= '<td>Media</td>';
-        $html.= '<td>Supported</td>';
+        $html.= '<td>'.$langs->trans('IPP_Uri').'</td>';
+        $html.= '<td>'.$langs->trans('IPP_Name').'</td>';
+        $html.= '<td>'.$langs->trans('IPP_State').'</td>';
+        $html.= '<td>'.$langs->trans('IPP_State_reason').'</td>';
+        $html.= '<td>'.$langs->trans('IPP_State_reason1').'</td>';
+        $html.= '<td>'.$langs->trans('IPP_BW').'</td>';
+        $html.= '<td>'.$langs->trans('IPP_Color').'</td>';
+        //$html.= '<td>'.$langs->trans('IPP_Device').'</td>';
+        $html.= '<td>'.$langs->trans('IPP_Media').'</td>';
+        $html.= '<td>'.$langs->trans('IPP_Supported').'</td>';
         $html.= '<td align="center">'.$langs->trans("Select").'</td>';
         $html.= "</tr>\n";
         $list = $this->getlist_available_printers();
@@ -153,14 +153,14 @@ class printing_printipp extends PrintingDriver
             $html.= '<td>'.$value.'</td>';
             //$html.= '<td><pre>'.print_r($printer_det,true).'</pre></td>';
             $html.= '<td>'.$printer_det->printer_name->_value0.'</td>';
-            $html.= '<td>'.$printer_det->printer_state->_value0.'</td>';
-            $html.= '<td>'.$printer_det->printer_state_reasons->_value0.'</td>';
-            $html.= '<td>'.$printer_det->printer_state_reasons->_value1.'</td>';
-            $html.= '<td>'.$printer_det->printer_type->_value2.'</td>';
-            $html.= '<td>'.$printer_det->printer_type->_value3.'</td>';
+            $html.= '<td>'.$langs->trans('STATE_IPP_'.$printer_det->printer_state->_value0).'</td>';
+            $html.= '<td>'.$langs->trans('STATE_IPP_'.$printer_det->printer_state_reasons->_value0).'</td>';
+            $html.= '<td>'.(! empty($printer_det->printer_state_reasons->_value1)?$langs->trans('STATE_IPP_'.$printer_det->printer_state_reasons->_value1):'').'</td>';
+            $html.= '<td>'.$langs->trans('IPP_COLOR_'.$printer_det->printer_type->_value2).'</td>';
+            $html.= '<td>'.$langs->trans('IPP_COLOR_'.$printer_det->printer_type->_value3).'</td>';
             //$html.= '<td>'.$printer_det->device_uri->_value0.'</td>';
             $html.= '<td>'.$printer_det->media_default->_value0.'</td>';
-            $html.= '<td>'.$printer_det->media_type_supported->_value1.'</td>';
+            $html.= '<td>'.$langs->trans('MEDIA_IPP_'.$printer_det->media_type_supported->_value1).'</td>';
             // Defaut
             $html.= '<td align="center">';
             if ($conf->global->PRINTIPP_URI_DEFAULT == $value)

htdocs/langs/en_US/printgcp.lang

@@ -16,3 +16,10 @@ TYPE_DRIVE=Google Drive
 TYPE_FEDEX=Fedex
 TYPE_ANDROID_CHROME_SNAPSHOT=Android
 TYPE_IOS_CHROME_SNAPSHOT=IOS
+GCP_Name=Name
+GCP_displayName=Display Name
+GCP_Id=Printer Id
+GCP_OwnerName=Owner Name
+GCP_State=Printer State
+GCP_connectionStatus=Online State
+GCP_Type=Printer Type

htdocs/langs/en_US/printipp.lang

@@ -15,3 +15,23 @@ NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
 CupsServer=CUPS Server
+IPP_Uri=Printer Uri
+IPP_Name=Printer Name
+IPP_State=Printer State
+IPP_State_reason=State reason
+IPP_State_reason1=State reason1
+IPP_BW=BW
+IPP_Color=Color
+IPP_Device=Device
+IPP_Media=Printer media
+IPP_Supported=Type of media
+STATE_IPP_idle=Idle
+STATE_IPP_stopped=Stopped
+STATE_IPP_paused=Paused
+STATE_IPP_toner-low-report=Low Toner
+STATE_IPP_none=None
+MEDIA_IPP_stationery=Stationery
+MEDIA_IPP_thermal=Thermal
+IPP_COLOR_print-black=BW Printer
+IPP_COLOR_print-color=Color Printer
+IPP_COLOR_=No