gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into 0616_server_replication

Browse Source
This commit is contained in:
xmujay 2013-06-24 01:13:32 +08:00
commit 5c7c5698a8
5 changed files with 259 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
libraries/DisplayResults.class.php
View File

@ -905,7 +905,7 @@ class PMA_DisplayResults
. '<select name="session_max_rows" class="autosubmit">';
$numberOfRowsChoices = array(25,50,100,250,500);
foreach($numberOfRowsChoices as $oneNumberOfRowsChoice) {
foreach ($numberOfRowsChoices as $oneNumberOfRowsChoice) {
$additional_fields_html .= '<option value="'
. $oneNumberOfRowsChoice . '"';
@ -1078,7 +1078,9 @@ class PMA_DisplayResults
// See if this column should get highlight because it's used in the
// where-query.
$condition_field = (isset($highlight_columns[$fields_meta[$i]->name])
|| isset($highlight_columns[PMA_Util::backquote($fields_meta[$i]->name)]))
|| isset(
$highlight_columns[PMA_Util::backquote($fields_meta[$i]->name)])
)
? true
: false;
@ -2803,7 +2805,10 @@ class PMA_DisplayResults
$parsed_sql, $row[$i]
);
include_once $this->syntax_highlighting_column_info[strtolower($this->__get('db'))][strtolower($this->__get('table'))][strtolower($meta->name)][0];
$transformation_plugin = new $this->syntax_highlighting_column_info[strtolower($this->__get('db'))][strtolower($this->__get('table'))][strtolower($meta->name)][1](null);
$transformation_plugin = new $this->syntax_highlighting_column_info
[strtolower($this->__get('db'))]
[strtolower($this->__get('table'))]
[strtolower($meta->name)][1](null);
$transform_options = PMA_transformation_getOptions(
isset($mime_map[$meta->name]['transformation_options'])
@ -2828,7 +2833,8 @@ class PMA_DisplayResults
$linking_url = $this->_getSpecialLinkUrl(
$row[$i], $row_info, strtolower($meta->name)
);
include_once "libraries/plugins/transformations/Text_Plain_Link.class.php";
include_once
"libraries/plugins/transformations/Text_Plain_Link.class.php";
$transformation_plugin = new Text_Plain_Link(null);
$transform_options = array(
@ -3658,8 +3664,9 @@ class PMA_DisplayResults
&& ($_SESSION['tmp_user_values']['display_text'] == self::DISPLAY_PARTIAL_TEXT)
&& ! $this->_isNeedToSyntaxHighlight(strtolower($meta->name))
) {
$column = $GLOBALS['PMA_String']::substr($column, 0, $GLOBALS['cfg']['LimitChars'])
. '...';
$column = $GLOBALS['PMA_String']::substr(
$column, 0, $GLOBALS['cfg']['LimitChars']
) . '...';
$is_field_truncated = true;
}
@ -3748,8 +3755,9 @@ class PMA_DisplayResults
if (($GLOBALS['PMA_String']::strlen($wktval) > $GLOBALS['cfg']['LimitChars'])
&& ($_SESSION['tmp_user_values']['display_text'] == self::DISPLAY_PARTIAL_TEXT)
) {
$wktval = $GLOBALS['PMA_String']::substr($wktval, 0, $GLOBALS['cfg']['LimitChars'])
. '...';
$wktval = $GLOBALS['PMA_String']::substr(
$wktval, 0, $GLOBALS['cfg']['LimitChars']
) . '...';
$is_field_truncated = true;
}
@ -3772,9 +3780,9 @@ class PMA_DisplayResults
if (($GLOBALS['PMA_String']::strlen($wkbval) > $GLOBALS['cfg']['LimitChars'])
&& ($_SESSION['tmp_user_values']['display_text'] == self::DISPLAY_PARTIAL_TEXT)
) {
$wkbval
= $GLOBALS['PMA_String']::substr($wkbval, 0, $GLOBALS['cfg']['LimitChars'])
. '...';
$wkbval = $GLOBALS['PMA_String']::substr(
$wkbval, 0, $GLOBALS['cfg']['LimitChars']
) . '...';
$is_field_truncated = true;
}
@ -3861,8 +3869,9 @@ class PMA_DisplayResults
&& gettype($transformation_plugin) == "object"
&& ! strpos($transformation_plugin->getName(), 'Link') === true
) {
$column = $GLOBALS['PMA_String']::substr($column, 0, $GLOBALS['cfg']['LimitChars'])
. '...';
$column = $GLOBALS['PMA_String']::substr(
$column, 0, $GLOBALS['cfg']['LimitChars']
) . '...';
$is_field_truncated = true;
}
@ -4055,7 +4064,9 @@ class PMA_DisplayResults
$vertical_table_html .= '<tr>' . "\n"
. $vertical_display['textbtn']
. $this->_getCheckBoxesForMultipleRowOperations('_right', $is_display)
. $this->_getCheckBoxesForMultipleRowOperations(
'_right', $is_display
)
. '</tr>' . "\n";
} // end if
@ -4242,7 +4253,9 @@ class PMA_DisplayResults
$_SESSION['tmp_user_values']['query'][$sql_md5]['max_rows']
= $_REQUEST['session_max_rows'];
unset($_REQUEST['session_max_rows']);
} elseif (empty($_SESSION['tmp_user_values']['query'][$sql_md5]['max_rows'])) {
} elseif (
empty($_SESSION['tmp_user_values']['query'][$sql_md5]['max_rows'])
) {
$_SESSION['tmp_user_values']['query'][$sql_md5]['max_rows']
= $GLOBALS['cfg']['MaxRows'];
}
@ -5473,7 +5486,8 @@ class PMA_DisplayResults
/* Create link to download */
if (count($url_params) > 0) {
$result = '<a href="tbl_get_field.php'
. PMA_generate_common_url($url_params) . '" class="disableAjax">'
. PMA_generate_common_url($url_params)
. '" class="disableAjax">'
. $result . '</a>';
}
}
@ -5629,8 +5643,9 @@ class PMA_DisplayResults
. $where_comparison,
);
$result .= '<a class="ajax" href="sql.php' . PMA_generate_common_url($_url_params)
. '"' . $title . '>';
$result .= '<a class="ajax" href="sql.php'
. PMA_generate_common_url($_url_params)
. '"' . $title . '>';
if ($transformation_plugin != $default_function) {
// always apply a transformation on the real data,
@ -6000,11 +6015,10 @@ class PMA_DisplayResults
private function _displayBinaryAsPrintable(
$content, $binary_or_blob, $hexlength = null
) {
if (PMA_PHP_INT_VERSION < 50400
|| ($binary_or_blob === 'binary'
&& $_SESSION['tmp_user_values']['display_binary_as_hex']
&& PMA_Util::containsNonPrintableAscii($content)
)
if ((PMA_PHP_INT_VERSION < 50400)
|| (($binary_or_blob === 'binary')
&& $_SESSION['tmp_user_values']['display_binary_as_hex']
&& PMA_Util::containsNonPrintableAscii($content))
) {
$content = bin2hex($content);
if ($hexlength !== null) {

36
po/hi.po
View File

@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2013-06-20 08:22+0200\n"
"PO-Revision-Date: 2013-06-09 12:34+0200\n"
"Last-Translator: Ghanshyam Bagul <ghanshyambagul@gmail.com>\n"
"PO-Revision-Date: 2013-06-22 11:37+0200\n"
"Last-Translator: asdf sasd <ashkgwithu@mailinator.com>\n"
"Language-Team: Hindi <http://l10n.cihar.com/projects/phpmyadmin/master/hi/>\n"
"Language: hi\n"
"MIME-Version: 1.0\n"
@ -384,7 +384,7 @@ msgstr "पहुँच निषेधित"
#: db_structure.php:86
msgid "No tables found in database"
msgstr "डाटाबेस में कोई टेबल नहीं।"
msgstr "डाटाबेस में कोई टेबल नहीं है ।"
#: db_tracking.php:73
msgid "Tracked tables"
@ -3764,7 +3764,7 @@ msgstr "नियमित कार्य"
#: libraries/Util.class.php:2661
#, php-format
msgid "Jump to database &quot;%s&quot;."
msgstr "&quot;%s&quot; डेटाबेस पर जायें;"
msgstr "&quot;%s&quot; डेटाबेस पर जायें;."
#: libraries/Util.class.php:2685
#, php-format
@ -4167,7 +4167,7 @@ msgstr "सामान्य यूसरओं को &quot;ड्रॉप
msgid ""
"Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] "
"authentication"
msgstr "गुप्त कुकी में कुकीज़ प्रमाणीकरण के लिए इस्तेमाल किया कूटशब्द"
msgstr "कुकीज़ प्रमाणीकरण में गुप्त कुकी के लिए कूट शब्द का इस्तेमाल किया गया।"
#: libraries/config/messages.inc.php:21
msgid "Blowfish secret"
@ -4199,7 +4199,7 @@ msgstr ""
#: libraries/config/messages.inc.php:27
msgid "Bzip2"
msgstr "Bzip2"
msgstr "Bzip2(बीजिप2)"
#: libraries/config/messages.inc.php:28
msgid ""
@ -4207,9 +4207,9 @@ msgid ""
"columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/"
"kbd] - allows newlines in columns"
msgstr ""
"परिभाषित करता है जो संपादन नियंत्रणों के प्रकार CHAR और VARCHAR कोलम के लिए इस्तेमाल "
"किया जाना चाहिए; इनपुट - इनपुट की लंबाई को सीमित अनुमति देता है, textarea - कोलम में "
"नयी-लाईन की अनुमति देता है"
"परिभाषित करता है, कि किस प्रकार के संपादन नियंत्रणों का CHAR और VARCHAR "
"कोलम के लिए इस्तेमाल किया जाना चाहिए; इनपुट - इनपुट की लंबाई को सीमित करने "
"की अनुमति देता है, textarea - कोलम में नयी-लाईन की अनुमति देता है"
#: libraries/config/messages.inc.php:29
msgid "CHAR columns editing"
@ -4288,7 +4288,9 @@ msgstr "विन्यास फाइल"
msgid ""
"Whether a warning (&quot;Are your really sure…&quot;) should be displayed "
"when you're about to lose data"
msgstr "क्या एक चेतावनी प्रदर्शित किया जाना चाहिए जब आप डेटा खो रहे हो."
msgstr ""
"जब आप डेटा खो रहे हो तब एक चेतावनी (\"आपको वास्तव में यकीन हैं ...\") "
"प्रदर्शित किय़ा जाएँ ।"
#: libraries/config/messages.inc.php:45
msgid "Confirm DROP queries"
@ -4355,14 +4357,13 @@ msgid ""
msgstr ""
#: libraries/config/messages.inc.php:61
#, fuzzy
#| msgid "Table maintenance"
msgid "Disable multi table maintenance"
msgstr "टेबल रख-रखाव"
msgstr "कई टेबल के रखरखाव को अक्षम करे।"
#: libraries/config/messages.inc.php:62
msgid "Edit SQL queries in popup window"
msgstr "पॉपअप विंडो में क्वरीों को संपादित करें"
msgstr "पॉपअप विंडो में एसक्यूएल प्रश्नों को संपादित करें"
#: libraries/config/messages.inc.php:63
msgid "Edit in window"
@ -4370,7 +4371,7 @@ msgstr "विंडो में संपादित करें"
#: libraries/config/messages.inc.php:64
msgid "Display errors"
msgstr "त्रुटिय दिखाओ"
msgstr "त्रुटियों को दिखाओ"
#: libraries/config/messages.inc.php:65
msgid "Gather errors"
@ -4380,7 +4381,8 @@ msgstr "त्रुटियों को इकट्ठा करें"
msgid ""
"Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no "
"limit)"
msgstr "एक स्क्रिप्ट को चलाने की अवधि दें, (शून्य - कोई सीमा नहीं)"
msgstr ""
"एक स्क्रिप्ट को चलने की अवधि सेकंड में दें, (शून्य - कोई सीमा नहीं के लिए)"
#: libraries/config/messages.inc.php:67
msgid "Maximum execution time"
@ -4388,7 +4390,7 @@ msgstr "अधिकतम निष्पादन समय"
#: libraries/config/messages.inc.php:68 prefs_manage.php:305
msgid "Save as file"
msgstr "फाईल मे सेव करें"
msgstr "फ़ाइल के रूप में सहेजें"
#: libraries/config/messages.inc.php:69 libraries/config/messages.inc.php:241
msgid "Character set of the file"
@ -7734,7 +7736,7 @@ msgstr "टेबल का नाम बदलें"
#: libraries/operations.lib.php:787
msgid "Table comments"
msgstr "टेबल टिप्पणि:"
msgstr "टेबल टिप्पणी:"
#: libraries/operations.lib.php:796 server_engines.php:71
msgid "Storage Engine"

357
po/zh_TW.po
View File

File diff suppressed because it is too large Load Diff

2
themes/original/css/common.css.php
View File

@ -1455,7 +1455,7 @@ div.upload_progress_bar_outer
div.upload_progress_bar_inner
{
background-color: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
background-color: <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
width: 0;
height: 12px;
margin: 1px;

2
themes/pmahomme/css/common.css.php
View File

@ -1840,7 +1840,7 @@ div.upload_progress_bar_outer
div.upload_progress_bar_inner
{
background-color: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
background-color: <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
width: 0;
height: 12px;
margin: 1px;