Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 01:28:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: bad lang file

Browse Source
This commit is contained in:
Jean-François Ferry
2014-03-15 21:24:37 +01:00
committed by jfefe
parent 1ad3405ee8
commit c04812cd15
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/modules/modResource.class.php
View File

@@ -73,7 +73,7 @@ class modResource extends DolibarrModules
// use this->picto='pictovalue' // use this->picto='pictovalue'
// If file is in module/img directory under name object_pictovalue.png // If file is in module/img directory under name object_pictovalue.png
// use this->picto='pictovalue@module' // use this->picto='pictovalue@module'
$this->picto = 'resource@resource'; // mypicto@resource $this->picto = 'resource'; // mypicto@resource
// Defined all module parts (triggers, login, substitutions, menus, css, etc...) // Defined all module parts (triggers, login, substitutions, menus, css, etc...)
// for default path (eg: /resource/core/xxxxx) (0=disable, 1=enable) // for default path (eg: /resource/core/xxxxx) (0=disable, 1=enable)
// for specific path of parts (eg: /resource/core/modules/barcode) // for specific path of parts (eg: /resource/core/modules/barcode)
@@ -116,7 +116,7 @@ class modResource extends DolibarrModules
$this->phpmin = array(5, 3); $this->phpmin = array(5, 3);
// Minimum version of Dolibarr required by module // Minimum version of Dolibarr required by module
$this->need_dolibarr_version = array(3, 5); $this->need_dolibarr_version = array(3, 5);
$this->langfiles = array("resource@resource"); // langfiles@resource $this->langfiles = array("resource"); // langfiles@resource
// Constants // Constants
// List of particular constants to add when module is enabled // List of particular constants to add when module is enabled
// (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive) // (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)

5
htdocs/resource/class/actions_resource.class.php
View File

@@ -23,7 +23,6 @@
/** /**
* Actions class file for resources * Actions class file for resources
* *
* \class ActionsResource
*/ */
class ActionsResource class ActionsResource
{ {
@@ -47,13 +46,13 @@ class ActionsResource
* *
* @param array $parameters parameters * @param array $parameters parameters
* @param object &$object object * @param object &$object object
* @param string &$action action * @param string &$action action
* @return void * @return void
*/ */
function doActions($parameters, &$object, &$action) { function doActions($parameters, &$object, &$action) {
global $langs,$user; global $langs,$user;
$langs->load('resource@resource'); $langs->load('resource');
if (in_array('element_resource',explode(':',$parameters['context']))) if (in_array('element_resource',explode(':',$parameters['context'])))
{ {