The branch, master has been updated via d50e5120d97d8d55d293eabeac6296881d6aa75c (commit) via a3115184945f62a578a86d529cf225ce3df6db0b (commit) via 5fa80010f599fd1f55f608a69b85dd0acbafe4a0 (commit) via 82891c683206acb7f4b5e39f11160913a6c7bcfd (commit) via 0edbd742ab90a205767cce4d0a85c6aa34f509e1 (commit) via 11c852d057329be369b0f1d8b9d6aceea234d965 (commit) via 71b418333fb2e805605d286107afcb507edf6d61 (commit) from a47ac24a49d5d925553f8d3c92f6a9722ee8b0ad (commit)
- Log ----------------------------------------------------------------- commit d50e5120d97d8d55d293eabeac6296881d6aa75c Author: Tyron Madlener tyronx@gmail.com Date: Tue May 31 14:05:32 2011 +0200
Display 0 for actual 0 values
commit a3115184945f62a578a86d529cf225ce3df6db0b Author: Tyron Madlener tyronx@gmail.com Date: Tue May 31 10:33:37 2011 +0200
If the PMA_formatNumber() parameters would result in 0.0, it displays <0.1 instead
commit 5fa80010f599fd1f55f608a69b85dd0acbafe4a0 Author: Marc Delisle marc@infomarc.info Date: Tue May 31 17:18:39 2011 +0200
Translation update done using Pootle.
commit 82891c683206acb7f4b5e39f11160913a6c7bcfd Author: Marc Delisle marc@infomarc.info Date: Tue May 31 17:18:17 2011 +0200
Translation update done using Pootle.
commit 0edbd742ab90a205767cce4d0a85c6aa34f509e1 Merge: 11c852d057329be369b0f1d8b9d6aceea234d965 a47ac24a49d5d925553f8d3c92f6a9722ee8b0ad Author: Pootle server pootle@cihar.com Date: Tue May 31 12:40:07 2011 +0200
Merge remote-tracking branch 'origin/master'
commit 11c852d057329be369b0f1d8b9d6aceea234d965 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Tue May 31 12:04:20 2011 +0200
Translation update done using Pootle.
commit 71b418333fb2e805605d286107afcb507edf6d61 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Tue May 31 12:03:56 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: libraries/common.lib.php | 26 ++++++++++++++++---------- po/en_GB.po | 5 ++--- po/fr.po | 3 +-- po/ja.po | 6 +++--- 4 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 39b78f9..77fc3fc 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -891,9 +891,9 @@ function PMA_reloadNavigation($jsonly=false) unset($_SESSION['tmp_user_values']['table_limit_offset']); echo "\n"; $reload_url = './navigation.php?' . PMA_generate_common_url($GLOBALS['db'], '', '&'); - if (!$jsonly) - echo '<script type="text/javascript">' . PHP_EOL; - ?> + if (!$jsonly) + echo '<script type="text/javascript">' . PHP_EOL; + ?> //<![CDATA[ if (typeof(window.parent) != 'undefined' && typeof(window.parent.frame_navigation) != 'undefined' @@ -1430,9 +1430,13 @@ function PMA_localizeNumber($value) */ function PMA_formatNumber($value, $length = 3, $comma = 0, $only_down = false) { + $originalValue = $value; //number_format is not multibyte safe, str_replace is safe if ($length === 0) { - return PMA_localizeNumber(number_format($value, $comma)); + $value = number_format($value, $comma); + if($originalValue!=0 && floatval($value) == 0) $value = ' <'.(1/PMA_pow(10,$comma)); + + return PMA_localizeNumber($value); }
// this units needs no translation, ISO @@ -1494,6 +1498,8 @@ function PMA_formatNumber($value, $length = 3, $comma = 0, $only_down = false)
//number_format is not multibyte safe, str_replace is safe $value = PMA_localizeNumber(number_format($value, $comma)); + + if($originalValue!=0 && floatval($value) == 0) return ' <'.(1/PMA_pow(10,$comma)).' '.$unit;
return $sign . $value . ' ' . $unit; } // end of the 'PMA_formatNumber' function @@ -1644,10 +1650,10 @@ function PMA_generate_html_tab($tab, $url_params = array()) $tab['attr'] .= ' title="' . htmlspecialchars($tab['warning']) . '"'; }
- // If there are any tab specific URL parameters, merge those with the general URL parameters - if(! empty($tab['url_params']) && is_array($tab['url_params'])) { - $url_params = array_merge($url_params, $tab['url_params']); - } + // If there are any tab specific URL parameters, merge those with the general URL parameters + if(! empty($tab['url_params']) && is_array($tab['url_params'])) { + $url_params = array_merge($url_params, $tab['url_params']); + }
// build the link if (!empty($tab['link'])) { @@ -2937,8 +2943,8 @@ function PMA_browseUploadFile($max_upload_size) { * @param $uploaddir */ function PMA_selectUploadFile($import_list, $uploaddir) { - echo '<label for="radio_local_import_file">' . sprintf(__("Select from the web server upload directory <b>%s</b>:"), htmlspecialchars(PMA_userDir($uploaddir))) . '</label>'; - $extensions = ''; + echo '<label for="radio_local_import_file">' . sprintf(__("Select from the web server upload directory <b>%s</b>:"), htmlspecialchars(PMA_userDir($uploaddir))) . '</label>'; + $extensions = ''; foreach ($import_list as $key => $val) { if (!empty($extensions)) { $extensions .= '|'; diff --git a/po/en_GB.po b/po/en_GB.po index 4e34b04..7d875f7 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-18 07:46-0400\n" -"PO-Revision-Date: 2011-05-18 17:48+0200\n" +"PO-Revision-Date: 2011-05-31 17:18+0200\n" "Last-Translator: Marc Delisle marc@infomarc.info\n" "Language-Team: english-gb en_GB@li.org\n" "Language: en_GB\n" @@ -4552,10 +4552,9 @@ msgstr "MySQL 4.0 compatible"
#: libraries/display_create_database.lib.php:21 #: libraries/display_create_database.lib.php:39 -#, fuzzy #| msgid "Create new database" msgid "Create database" -msgstr "Create new database" +msgstr "Create database"
#: libraries/display_create_database.lib.php:33 msgid "Create" diff --git a/po/fr.po b/po/fr.po index eb46005..76d82ef 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-18 07:46-0400\n" -"PO-Revision-Date: 2011-05-18 17:49+0200\n" +"PO-Revision-Date: 2011-05-31 17:18+0200\n" "Last-Translator: Marc Delisle marc@infomarc.info\n" "Language-Team: french fr@li.org\n" "Language: fr\n" @@ -4606,7 +4606,6 @@ msgstr "Compatible MySQL 4.0"
#: libraries/display_create_database.lib.php:21 #: libraries/display_create_database.lib.php:39 -#, fuzzy #| msgid "Create new database" msgid "Create database" msgstr "Créer une base de données" diff --git a/po/ja.po b/po/ja.po index d154593..b7a8952 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-18 07:46-0400\n" -"PO-Revision-Date: 2011-05-29 07:59+0200\n" +"PO-Revision-Date: 2011-05-31 12:04+0200\n" "Last-Translator: Yuichiro yuichiro@pop07.odn.ne.jp\n" "Language-Team: japanese jp@li.org\n" "Language: ja\n" @@ -4919,7 +4919,7 @@ msgstr "行/クエリ"
#: libraries/display_tbl.lib.php:2045 msgid "Showing rows" -msgstr "表示中の列" +msgstr "行の表示"
#: libraries/display_tbl.lib.php:2055 msgid "total" @@ -6510,7 +6510,7 @@ msgstr "同名のブックマークは差し替える"
#: libraries/sql_query_form.lib.php:366 msgid "Do not overwrite this query from outside the window" -msgstr "他のウィンドウからクエリを上書きすることはできません" +msgstr "別ウインドウからのクエリの上書きを禁止する"
#: libraries/sql_query_form.lib.php:373 msgid "Delimiter"
hooks/post-receive