Thousands and decimal separators are now language dependant

This commit is contained in:
Loïc Chapeaux 2001-07-07 17:16:02 +00:00
parent 5c5a0ddc25
commit bdc19fd749
26 changed files with 66 additions and 15 deletions

View File

@ -17,6 +17,8 @@ $Source$
language dependant.
* tbl_properties.inc.php3, line 235: removed an unnecessary php closing
tag.
* lib.inc.php3, lines 946-950; db_details.php3, lines 96 & 118; language
files: thousands and decimal separators are now language dependant.
2001-07-06 Loïc Chapeaux <lolo@phpheaven.net>
* users_details.php3: fixed many little scripting bugs.

View File

@ -93,7 +93,7 @@ else if (MYSQL_MAJOR_VERSION>=3.23 && isset($tbl_cache)){
<td><a href="sql.php3<?php echo $query;?>&sql_query=<?php echo urlencode("DELETE FROM $table");?>&zero_rows=<?php echo urlencode($strTable." ".$table." ".$strHasBeenEmptied);?>"><?php echo $strEmpty; ?></a></td>
<?php
if (isset($sts_data["Rows"])){
echo "<td align=right>".number_format($sts_data["Rows"],0,',','.')."</td>\n";
echo "<td align=right>".number_format($sts_data["Rows"], 0, $number_decimal_separator, $number_thousands_separator)."</td>\n";
$tblsize=$sts_data["Data_length"]+$sts_data["Index_length"];
$sum_size+=$tblsize;
$sum_entries+=$sts_data["Rows"];
@ -115,7 +115,7 @@ else if (MYSQL_MAJOR_VERSION>=3.23 && isset($tbl_cache)){
if (!empty($strSum)) echo $strSum;
echo "</td>\n";
list ($sum_formated,$unit)=format_byte_down($sum_size,3,1);
echo "<td align=right>".number_format($sum_entries,0,',','.')."</td>\n";
echo "<td align=right>".number_format($sum_entries, 0, $number_decimal_separator, $number_thousands_separator)."</td>\n";
echo "<td align=right>$sum_formated $unit</td>\n";
echo "</tr>\n";

View File

@ -4,6 +4,8 @@
$charset = "iso-8859-1";
$left_font_family = "verdana, helvetica, arial, geneva, sans-serif";
$right_font_family = "helvetica, arial, geneva, sans-serif";
$number_thousands_separator = ",";
$number_decimal_separator = ".";
$strAccessDenied = "Acesso Negado";
$strAction = "Ações";

View File

@ -4,6 +4,8 @@
$charset = "windows-1251";
$left_font_family = "sans-serif";
$right_font_family = "sans-serif";
$number_thousands_separator = ",";
$number_decimal_separator = ".";
$strAccessDenied = "Îòêàçàí äîñòúï";
$strAction = "Äåéñòâèå";

View File

@ -4,6 +4,8 @@
$charset = "iso-8859-1";
$left_font_family = "verdana, helvetica, arial, geneva, sans-serif";
$right_font_family = "helvetica, arial, geneva, sans-serif";
$number_thousands_separator = ",";
$number_decimal_separator = ".";
$strAccessDenied = "Access denegat";
$strAction = "Acci&oacute;";

View File

@ -4,6 +4,8 @@
$charset = "big5";
$left_font_family = "sans-serif";
$right_font_family = "sans-serif";
$number_thousands_separator = ",";
$number_decimal_separator = ".";
$strAccessDenied = "訪問被拒絕";
$strAction = "執行操作";

View File

@ -4,6 +4,8 @@
$charset = "gb2312";
$left_font_family = "sans-serif";
$right_font_family = "sans-serif";
$number_thousands_separator = ",";
$number_decimal_separator = ".";
$strAccessDenied = "访问被拒绝";
$strAction = "执行操作";

View File

@ -4,6 +4,8 @@
$charset = "iso-8859-2";
$left_font_family = "verdana, helvetica, arial, geneva, sans-serif";
$right_font_family = "helvetica, arial, geneva, sans-serif";
$number_thousands_separator = ",";
$number_decimal_separator = ".";
$strAccessDenied = "Pøístup odepøen";
$strAction = "Akce";

View File

@ -4,6 +4,8 @@
$charset = "windows-1250";
$left_font_family = "sans-serif";
$right_font_family = "sans-serif";
$number_thousands_separator = ",";
$number_decimal_separator = ".";
$strAccessDenied = "Pøístup odepøen";
$strAction = "Akce";

View File

@ -4,6 +4,8 @@
$charset = "iso-8859-1";
$left_font_family = "verdana, helvetica, arial, geneva, sans-serif";
$right_font_family = "helvetica, arial, geneva, sans-serif";
$number_thousands_separator = ",";
$number_decimal_separator = ".";
$strAccessDenied = "Adgang N&aelig;gtet";
$strAction = "Handling";

View File

@ -4,6 +4,8 @@
$charset = "iso-8859-1";
$left_font_family = "verdana, helvetica, arial, geneva, sans-serif";
$right_font_family = "helvetica, arial, geneva, sans-serif";
$number_thousands_separator = ",";
$number_decimal_separator = ".";
$strAccessDenied = "Toegang geweigerd ";
$strAction = "Aktie";

View File

@ -4,6 +4,8 @@
$charset = "iso-8859-1";
$left_font_family = "verdana, helvetica, arial, geneva, sans-serif";
$right_font_family = "helvetica, arial, geneva, sans-serif";
$number_thousands_separator = ",";
$number_decimal_separator = ".";
$strAccessDenied = "Access denied";
$strAction = "Action";
@ -251,7 +253,7 @@ $strUsage = "Usage";
$strUser = "User";
$strUserEmpty = "The user name is empty!";
$strUserName = "User name";
$strUsers = "Users and privileges";
$strUsers = "Users";
$strUseTables = ""; //to translate, but its not in use ...
$strValue = "Value";

View File

@ -4,6 +4,8 @@
$charset = "iso-8859-1";
$left_font_family = "verdana, helvetica, arial, geneva, sans-serif";
$right_font_family = "helvetica, arial, geneva, sans-serif";
$number_thousands_separator = " ";
$number_decimal_separator = ",";
$strAccessDenied = "Accès refusé";
$strAction = "Action";
@ -13,8 +15,8 @@ $strAddNewField = "Ajouter un champ";
$strAddPriv = "Ajouter un privilège";
$strAddPrivMessage = "Vous avez ajouté un privilège";
$strAddSearchConditions = "Critères de recherche (pour l'énoncé \"where\"):";
$strAddUser = "Ajouter un utilisateur";
$strAddUserMessage = "Vous avez ajouté un utilisateur";
$strAddUser = "Ajouter un usager";
$strAddUserMessage = "Vous avez ajouté un usager";
$strAfter = "Après";
$strAll = "Tout";
$strAlterOrderBy = "<b>Ordonner</b> la table par";
@ -26,7 +28,7 @@ $strAnyColumn = "Toute colonne";
$strAnyDatabase = "Toute base de données";
$strAnyHost = "Tout serveur";
$strAnyTable = "Toute table";
$strAnyUser = "Tout utilisateur";
$strAnyUser = "Tout usager";
$strAPrimaryKey = "Une clé primaire a été ajoutée sur";
$strAscending = "Croissant";
$strAtBeginningOfTable = "En début de Table";
@ -70,7 +72,7 @@ $strDelete = "Effacer";
$strDeleted = "L'enregistrement a été effacé";
$strDeleteFailed = "L'effacement a échoué";
$strDeletePassword = "Effacer le mot de passe";
$strDeleteUserMessage = "Vous avez effacé l'utilisateur";
$strDeleteUserMessage = "Vous avez effacé l'usager";
$strDelPassMessage = "Vous avez effacé le mot de passe de ";
$strDescending = "Décroissant";
$strDisableMagicQuotes = "<b>Attention:</b> Vous avez positionné magic_quotes_gpc dans la configuration de PHP. Cette version de PhpMyAdmin ne peut fonctionner correctement avec. Veuillez vous référer au paragraphe traitant de la configration dans la documentation de PHP pour positionner cette variable à off.";
@ -155,7 +157,7 @@ $strNoRights = "Vous n'
$strNoTablesFound = "Aucune table n'a été trouvée dans cette base.";
$strNotNumber = "Ce n'est pas un nombre !";
$strNotValidNumber = " n'est pas un nombre valide !";
$strNoUsersFound = "Il n'y a aucun utilisateur";
$strNoUsersFound = "Il n'y a aucun usager";
$strNull = "Null";
$strNumberIndexes = " Nombre d'index spéciaux ";
@ -251,10 +253,10 @@ $strUpdatePassword = "Changer le mot de passe";
$strUpdatePrivMessage = "Vous avez modifié les privilèges pour";
$strUpdateQuery = "Mise-à-jour de la requête";
$strUsage = "Espace";
$strUser = "Utilisateur";
$strUserEmpty = "Le nom d'utilisateur est vide";
$strUserName = "Nom d'utilisateur";
$strUsers = "Utilisateurs et privilèges";
$strUser = "Usager";
$strUserEmpty = "Le nom d'usager est vide";
$strUserName = "Nom d'usager";
$strUsers = "Usagers";
$strUseTables = "Utiliser les tables";
$strValue = "Valeur";

View File

@ -4,6 +4,8 @@
$charset = "iso-8859-1";
$left_font_family = "verdana, helvetica, arial, geneva, sans-serif";
$right_font_family = "helvetica, arial, geneva, sans-serif";
$number_thousands_separator = ",";
$number_decimal_separator = ".";
$strAccessDenied = "Zugriff verweigert.";
$strAction = "Aktion";

View File

@ -4,6 +4,8 @@
$charset = "iso-8859-1";
$left_font_family = "verdana, helvetica, arial, geneva, sans-serif";
$right_font_family = "helvetica, arial, geneva, sans-serif";
$number_thousands_separator = ",";
$number_decimal_separator = ".";
$strAccessDenied = "Accesso negato";
$strAction = "Azione";

View File

@ -4,6 +4,8 @@
$charset = "euc-jp";
$left_font_family = "sans-serif";
$right_font_family = "sans-serif";
$number_thousands_separator = ",";
$number_decimal_separator = ".";
$strAccessDenied = "アクセスは拒否されました。";
$strAction = "実行";

View File

@ -4,6 +4,8 @@
$charset = "ks_c_5601-1987";
$left_font_family = "sans-serif";
$right_font_family = "sans-serif";
$number_thousands_separator = ",";
$number_decimal_separator = ".";
$strAccessDenied = "접근이 거부되었습니다.";
$strAction = "실행";

View File

@ -4,6 +4,8 @@
$charset = "iso-8859-1";
$left_font_family = "verdana, helvetica, arial, geneva, sans-serif";
$right_font_family = "helvetica, arial, geneva, sans-serif";
$number_thousands_separator = ",";
$number_decimal_separator = ".";
$strAccessDenied = "Ingen tilgang";
$strAction = "Handling";

View File

@ -4,6 +4,8 @@
$charset = "iso-8859-2";
$left_font_family = "sans-serif";
$right_font_family = "sans-serif";
$number_thousands_separator = ",";
$number_decimal_separator = ".";
$strAccessDenied = "Brak dostêpu";
$strAction = "Dzia³anie";

View File

@ -4,6 +4,8 @@
$charset = "iso-8859-1";
$left_font_family = "sans-serif";
$right_font_family = "sans-serif";
$number_thousands_separator = ",";
$number_decimal_separator = ".";
$strAccessDenied = "Acesso Negado";
$strAction = "Ações";

View File

@ -4,6 +4,8 @@
$charset = "koi8-r";
$left_font_family = "sans-serif";
$right_font_family = "sans-serif";
$number_thousands_separator = ",";
$number_decimal_separator = ".";
$strAccessDenied = "÷ ÄÏÓÔÕÐÅ ÏÔËÁÚÁÎÏ";
$strAction = "äÅÊÓÔ×ÉÅ";

View File

@ -4,6 +4,8 @@
$charset = "windows-1251";
$left_font_family = "sans-serif";
$right_font_family = "sans-serif";
$number_thousands_separator = ",";
$number_decimal_separator = ".";
$strAccessDenied = "Â äîñòóïå îòêàçàíî";
$strAction = "Äåéñòâèå";

View File

@ -4,6 +4,8 @@
$charset = "iso-8859-1";
$left_font_family = "sans-serif";
$right_font_family = "sans-serif";
$number_thousands_separator = ",";
$number_decimal_separator = ".";
$strAccessDenied = "Acceso denegado ";
$strAction = "Acci&oacute;n";

View File

@ -4,6 +4,8 @@
$charset = "iso-8859-1";
$left_font_family = "verdana, helvetica, arial, geneva, sans-serif";
$right_font_family = "helvetica, arial, geneva, sans-serif";
$number_thousands_separator = ",";
$number_decimal_separator = ".";
$strAccessDenied = "Åtkommst nekad";
$strAction = "Handling";

View File

@ -4,6 +4,8 @@
$charset = "tis-620";
$left_font_family = "sans-serif";
$right_font_family = "sans-serif";
$number_thousands_separator = ",";
$number_decimal_separator = ".";
$strAccessDenied = "淞柰关<EFBFBD>点碎悛椐夜";#Access denied";
$strAction = "∶蟹印颐";

View File

@ -943,9 +943,12 @@ function format_byte_down($value,$limes=6,$comma=0){
$value=round($value/(1024/$dh))/$dh;
$unit="KB";
}
if ($unit!="Byte") $returnvalue=number_format($value,$comma,',','.');
else $returnvalue=number_format($value,0,',','.');
return array($returnvalue,$unit);
if ($unit!="Byte") {
$return_value = number_format($value, $comma, $GLOBALS['number_decimal_separator'], $GLOBALS['number_thousands_separator']);
} else {
$return_value = number_format($value, 0, $GLOBALS['number_decimal_separator'], $GLOBALS['number_thousands_separator']);
}
return array($return_value, $unit);
}
// to support special characters in db names: Lem9, 2001-06-27