diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php index 3ed46ca33a1..706ee91f38a 100644 --- a/htdocs/admin/system/database.php +++ b/htdocs/admin/system/database.php @@ -57,8 +57,16 @@ print ''.$langs->trans("DriverType").'< // @phan-suppress-next-line PhanTypeSuspiciousStringExpression (user is defined in the stdClass) print ''.$langs->trans("User").''.$conf->db->user.''."\n"; print ''.$langs->trans("Password").''.preg_replace('/./i', '*', $dolibarr_main_db_pass).''."\n"; -print ''.$langs->trans("DBStoringCharset").''.$db->getDefaultCharacterSetDatabase().''."\n"; -print ''.$langs->trans("DBSortingCharset").''.$db->getDefaultCollationDatabase().''."\n"; +print ''.$langs->trans("DBStoringCharset").''.$db->getDefaultCharacterSetDatabase(); +if ($db->type == 'mysqli') { + print ' '.$form->textwithpicto('', $langs->transnoentitiesnoconv("HelpMariaDBToGetPossibleValues", "SHOW CHARACTER SET")); +} +print ''."\n"; +print ''.$langs->trans("DBSortingCharset").''.$db->getDefaultCollationDatabase(); +if ($db->type == 'mysqli') { + print ' '.$form->textwithpicto('', $langs->transnoentitiesnoconv("HelpMariaDBToGetPossibleValues", "SHOW COLLATION")); +} +print ''."\n"; print ''; print ''; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 7b08eb85291..24065c6af26 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -2555,3 +2555,4 @@ MenuDict=Dictionary AddMoreParams=Add more parameters for connection (cookies, tokens, ...)
Example: token : value token ParamName=Name of parameter ParamValue=Value of parameter +HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s