From e02ac3b518aee7ce8005fdefb826fef2cf82812e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 13 Apr 2020 15:57:25 +0200 Subject: [PATCH] Trans --- htdocs/admin/modulehelp.php | 2 +- htdocs/admin/modules.php | 2 +- htdocs/core/modules/DolibarrModules.class.php | 2 +- htdocs/langs/en_US/admin.lang | 3 ++- htdocs/theme/eldy/info-box.inc.php | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php index 065c70d2a89..339b98be44a 100644 --- a/htdocs/admin/modulehelp.php +++ b/htdocs/admin/modulehelp.php @@ -324,7 +324,7 @@ if ($mode == 'desc') $textexternal = ''; if ($objMod->isCoreOrExternalModule() == 'external') { - $textexternal .= '
'.$langs->trans("Origin").': '.$langs->trans("ExternalModule", $dirofmodule); + $textexternal .= '
'.$langs->trans("Origin").': '.$langs->trans("ExternalModule").' - '.$langs->trans("InstalledInto", $dirofmodule); if ($objMod->editor_name != 'dolibarr') $textexternal .= '
'.$langs->trans("Publisher").': '.(empty($objMod->editor_name) ? $langs->trans("Unknown") : $objMod->editor_name); $editor_url = $objMod->editor_url; if (!preg_match('/^http/', $editor_url)) $editor_url = 'http://'.$editor_url; diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index ea863893874..926a4c34f70 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -868,7 +868,7 @@ if ($mode == 'common' || $mode == 'commonkanban') // Help print ''; //print $form->textwithpicto('', $text, 1, $imginfo, 'minheight20', 0, 2, 1); - print ''.img_picto($langs->trans("ClickToShowDescription"), $imginfo).''; + print ''.img_picto(($objMod->isCoreOrExternalModule() == 'external' ? $langs->trans("ExternalModule").' - ' : '').$langs->trans("ClickToShowDescription"), $imginfo).''; print ''; // Version diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php index 5721e41cc4b..cd3fe7922ee 100644 --- a/htdocs/core/modules/DolibarrModules.class.php +++ b/htdocs/core/modules/DolibarrModules.class.php @@ -2321,7 +2321,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it print ''; */ print '
'; - print ''.img_picto($langs->trans("ClickToShowDescription"), $imginfo).''; + print ''.img_picto(($this->isCoreOrExternalModule() == 'external' ? $langs->trans("ExternalModule").' - ' : '').$langs->trans("ClickToShowDescription"), $imginfo).''; print '

'; print '
'; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index b4aac9e1858..bc239743e7a 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -447,7 +447,8 @@ KeepEmptyToUseDefault=Keep empty to use default value DefaultLink=Default link SetAsDefault=Set as default ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url) -ExternalModule=External module - Installed into directory %s +ExternalModule=External module +InstalledInto=Installed into directory %s BarcodeInitForthird-parties=Mass barcode init for third-parties BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services CurrentlyNWithoutBarCode=Currently, you have %s record on %s %s without barcode defined. diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php index 05657e3d850..3222cbe7964 100644 --- a/htdocs/theme/eldy/info-box.inc.php +++ b/htdocs/theme/eldy/info-box.inc.php @@ -118,7 +118,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> transition: opacity 0.5s, visibility 0s 0.5s; } .box-flex-item.info-box-module.info-box-module-disabled { - opacity: 0.6; + /* opacity: 0.6; */ } .info-box-actions {