Browse Source

Fix translation of printing menu

Laurent Destailleur 10 years ago
parent
commit
f1e87478ff

+ 2 - 2
htdocs/core/modules/modPrinting.class.php

@@ -94,7 +94,7 @@ class modPrinting extends DolibarrModules
 
         $r++;
         $this->rights[$r][0] = 64001;
-        $this->rights[$r][1] = 'Printing';
+        $this->rights[$r][1] = 'DirectPrint';
         $this->rights[$r][2] = 'r';
         $this->rights[$r][3] = 1;
         $this->rights[$r][4] = 'read';
@@ -106,7 +106,7 @@ class modPrinting extends DolibarrModules
         // This is to declare the Top Menu entry:
         $this->menu[$r]=array(  'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=modulesadmintools',               // Put 0 if this is a top menu
                                 'type'=>'left',                 // This is a Top menu entry
-                                'titre'=>'Printing',
+                                'titre'=>'MenuDirectPrinting',
                                 'mainmenu'=>'printing',
                                 'url'=>'/printing/index.php',
                                 'langs'=>'printing',            // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.

+ 2 - 0
htdocs/langs/en_US/printing.lang

@@ -3,6 +3,8 @@ Module64000Name=Direct Printing
 Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
+MenuDirectPrinting=Direct Printing
+DirectPrint=Direct print
 ModuleDriverSetup=Setup Module Driver
 PrintingDriverDesc=Configuration variables for printing driver.
 ListDrivers=List of drivers

+ 2 - 2
htdocs/user/perms.php

@@ -412,8 +412,8 @@ if ($result)
         	print '<td>&nbsp</td>';
         }
 
-		$perm_libelle=($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id)!=("PermissionAdvanced".$obj->id))?$langs->trans("PermissionAdvanced".$obj->id):(($langs->trans("Permission".$obj->id)!=("Permission".$obj->id))?$langs->trans("Permission".$obj->id):$obj->libelle));
-		print '<td>'.$perm_libelle. '</td>';
+		$permlabel=($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id)!=("PermissionAdvanced".$obj->id))?$langs->trans("PermissionAdvanced".$obj->id):(($langs->trans("Permission".$obj->id)!=("Permission".$obj->id))?$langs->trans("Permission".$obj->id):$langs->trans($obj->libelle)));
+		print '<td>'.$permlabel. '</td>';
 
 		print '</tr>'."\n";