diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php index 78679cc16e5..e0d25ba3cc4 100644 --- a/htdocs/admin/translation.php +++ b/htdocs/admin/translation.php @@ -244,13 +244,12 @@ if (!getDolGlobalString('MAIN_ENABLE_OVERWRITE_TRANSLATION')) { $enabledisablehtml .= ''; } -print load_fiche_titre($langs->trans("Translation"), $enabledisablehtml, 'title_setup'); - $current_language_code = $langs->defaultlang; $s = picto_from_langcode($current_language_code); -print $form->textwithpicto(''.$langs->trans("CurrentUserLanguage").': '.$s.' '.$current_language_code.'', $langs->trans("TranslationDesc")).'
'; +$infoOnCurrentLang = $form->textwithpicto(''.$langs->trans("CurrentUserLanguage").': '.$s.' '.$current_language_code.'', $langs->trans("TranslationDesc")).'
'; + +print load_fiche_titre($langs->trans("Translation"), $enabledisablehtml, 'language', 0, '', '', $infoOnCurrentLang); -print '
'; if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) { $param .= '&contextpage='.urlencode($contextpage); @@ -361,14 +360,16 @@ if ($mode == 'overwrite') { $disablededit = ' disabled'; } - print '
'; - print img_info().' '.$langs->trans("SomeTranslationAreUncomplete"); + $infoOnTransProcess = '
'; + $infoOnTransProcess .= img_info().' '.$langs->trans("SomeTranslationAreUncomplete"); $urlwikitranslatordoc = 'https://wiki.dolibarr.org/index.php/Translator_documentation'; - print ' ('.str_replace('{s1}', ''.$langs->trans("Here").'', $langs->trans("SeeAlso", '{s1}')).')
'; - print '
'; - print $langs->trans("TranslationOverwriteDesc", $langs->transnoentitiesnoconv("Language"), $langs->transnoentitiesnoconv("TranslationKey"), $langs->transnoentitiesnoconv("NewTranslationStringToShow"))."\n"; - print ' ('.$langs->trans("TranslationOverwriteDesc2").').'."
\n"; - print '
'; + $infoOnTransProcess .= ' ('.str_replace('{s1}', ''.$langs->trans("Here").'', $langs->trans("SeeAlso", '{s1}')).')
'; + $infoOnTransProcess .= '
'; + $infoOnTransProcess .= $langs->trans("TranslationOverwriteDesc", $langs->transnoentitiesnoconv("Language"), $langs->transnoentitiesnoconv("TranslationKey"), $langs->transnoentitiesnoconv("NewTranslationStringToShow"))."\n"; + $infoOnTransProcess .= ' ('.$langs->trans("TranslationOverwriteDesc2").').'."
\n"; + $infoOnTransProcess .= '
'; + + print $infoOnTransProcess; print '
'; @@ -383,7 +384,7 @@ if ($mode == 'overwrite') { print_liste_field_titre("TranslationKey", $_SERVER["PHP_SELF"], 'transkey', '', $param, '', $sortfield, $sortorder); print_liste_field_titre("NewTranslationStringToShow", $_SERVER["PHP_SELF"], 'transvalue', '', $param, '', $sortfield, $sortorder); if (isModEnabled('multicompany') && !$user->entity) { - print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'Entity', '', $param, '', $sortfield, $sortorder); + print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'Entity', '', $param, '', $sortfield, $sortorder, 'center '); } print ''; print "\n"; @@ -411,8 +412,8 @@ if ($mode == 'overwrite') { // Multi company if (isModEnabled('multicompany') && !$user->entity) { - print ''; - print ''; + print ''; + print ''; print ''; } @@ -477,7 +478,7 @@ if ($mode == 'overwrite') { // Entity limit to superadmin if (isModEnabled('multicompany') && empty($user->entity)) { - print ''; + print ''; if ($action == 'edit' && $obj->rowid == GETPOSTINT('rowid')) { print ''; } else { diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index f8f0c7b863c..08b0254cc10 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -6680,7 +6680,7 @@ function print_fiche_titre($title, $mesg = '', $picto = 'generic', $pictoisfullp /** * Load a title with picto * - * @param string $title Title to show (HTML sanitized content) + * @param string $title Title to show (HTML sanitized content). Can be a string with a
as a substring. * @param string $morehtmlright Added message to show on right * @param string $picto Icon to use before title (should be a 32x32 transparent png file) * @param int<0,1> $pictoisfullpath 1=Icon name is a full absolute url of image