Merge branch '20.0' of [email protected]:Dolibarr/dolibarr.git into 20.0

Dolibarr · Sep 30, 2024 · f36dc40 · f36dc40
1 parent aa4fb14
commit f36dc40
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
@@ -59,13 +59,13 @@
 print '<tr class="oddeven"><td width="300">'.$langs->trans("Password").'</td><td>'.preg_replace('/./i', '*', $dolibarr_main_db_pass).'</td></tr>'."\n";
 print '<tr class="oddeven"><td width="300">'.$langs->trans("DBStoringCharset").'</td><td>'.$db->getDefaultCharacterSetDatabase();
 if ($db->type == 'mysqli') {
-	print ' '.$form->textwithpicto('', $langs->transnoentitiesnoconv("HelpMariaDBToGetPossibleValues", "SHOW CHARSET"));
+	print ' '.$form->textwithpicto('', $langs->transnoentitiesnoconv("HelpMariaDBToGetValue", "SHOW VARIABLES LIKE 'character_set_database'").'<br>'.$langs->transnoentitiesnoconv("HelpMariaDBToGetPossibleValues", "SHOW CHARSET"));
 	// We can use $db->getDefaultCharacterSetDatabase(),  $db->getListOfCharacterSet(),
 }
 print '</td></tr>'."\n";
 print '<tr class="oddeven"><td width="300">'.$langs->trans("DBSortingCharset").'</td><td>'.$db->getDefaultCollationDatabase();
 if ($db->type == 'mysqli') {
-	print ' '.$form->textwithpicto('', $langs->transnoentitiesnoconv("HelpMariaDBToGetPossibleValues", "SHOW COLLATION"));
+	print ' '.$form->textwithpicto('', $langs->transnoentitiesnoconv("HelpMariaDBToGetValue", "SHOW VARIABLES LIKE 'collation_database'").'<br>'.$langs->transnoentitiesnoconv("HelpMariaDBToGetPossibleValues", "SHOW COLLATION"));
 	// We can use $db->getDefaultCollationDatabase(), $db->getListOfCollation();
 }
 print '</td></tr>'."\n";

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
@@ -2555,3 +2555,7 @@ AddMoreParams=Add more parameters for connection (cookies, tokens, ...)<br> Exam
 ParamName=Name of parameter
 ParamValue=Value of parameter
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+Captcha=Captcha
+CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
+DolibarrStandardCaptcha=A native captcha generated by Dolibarr