lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix trans

Browse Source
This commit is contained in:
Frédéric FRANCE 2021-01-13 16:18:23 +01:00
parent ce15b31a53
commit cb7266d261
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/admin/dav.php
View File

@ -172,13 +172,13 @@ $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domai
// Show message
$message = '';
$url = '<a href="'.$urlwithroot.'/dav/fileserver.php" target="_blank">'.$urlwithroot.'/dav/fileserver.php</a>';
$message .= img_picto('', 'globe').' '.$langs->trans("WebDavServer", 'WebDAV', $url);
$message .= img_picto('', 'globe').' '.str_replace('{url}', $url, $langs->trans("WebDavServer", 'WebDAV', '{url}'));
$message .= '<br>';
if (!empty($conf->global->DAV_ALLOW_PUBLIC_DIR))
{
$urlEntity = (!empty($conf->multicompany->enabled) ? '?entity='.$conf->entity : '');
$url = '<a href="'.$urlwithroot.'/dav/fileserver.php/public/'.$urlEntity.'" target="_blank">'.$urlwithroot.'/dav/fileserver.php/public/'.$urlEntity.'</a>';
$message .= img_picto('', 'globe').' '.$langs->trans("WebDavServer", 'WebDAV public', $url);
$message .= img_picto('', 'globe').' '.str_replace('{url}', $url, $langs->trans("WebDavServer", 'WebDAV public', '{url}'));
$message .= '<br>';
}
print $message;

8
htdocs/core/class/commonobject.class.php
View File

@ -3671,7 +3671,9 @@ abstract class CommonObject
*/
static public function getAllItemsLinkedByObjectID($fk_object_where, $field_select, $field_where, $table_element)
{
if(empty($fk_object_where) || empty($field_where) || empty($table_element)) return -1;
if (empty($fk_object_where) || empty($field_where) || empty($table_element)) {
return -1;
}
global $db;
@ -3686,7 +3688,6 @@ abstract class CommonObject
}
return $TRes;
}
/**
@ -3698,7 +3699,7 @@ abstract class CommonObject
*/
static public function deleteAllItemsLinkedByObjectID($fk_object_where, $field_where, $table_element)
{
if(empty($fk_object_where) || empty($field_where) || empty($table_element)) return -1;
if (empty($fk_object_where) || empty($field_where) || empty($table_element)) return -1;
global $db;
@ -3708,7 +3709,6 @@ abstract class CommonObject
if (empty($resql)) return 0;
return 1;
}
/**