[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5-6723-g882892a
Michal Čihař
nijel at users.sourceforge.net
Thu Aug 19 11:31:00 CEST 2010
The branch, master has been updated
via 882892af230aefcc3d8beb99a3c0ae13b3dda848 (commit)
via 763aff5a6f6852dc2dbadff7d697310a458f4f66 (commit)
via 124ba18d03a4cbf6ace5f10ef23021599d4244a9 (commit)
from 66ce9352c58800869ca05dab4e0987167671c501 (commit)
- Log -----------------------------------------------------------------
commit 882892af230aefcc3d8beb99a3c0ae13b3dda848
Author: Michal Čihař <mcihar at novell.com>
Date: Thu Aug 19 11:30:44 2010 +0200
Better translatable messages.
commit 763aff5a6f6852dc2dbadff7d697310a458f4f66
Author: Michal Čihař <mcihar at novell.com>
Date: Thu Aug 19 11:30:32 2010 +0200
Use format strings.
commit 124ba18d03a4cbf6ace5f10ef23021599d4244a9
Author: Michal Čihař <mcihar at novell.com>
Date: Thu Aug 19 11:26:34 2010 +0200
Better to use format strings.
-----------------------------------------------------------------------
Summary of changes:
enum_editor.php | 6 +++---
libraries/display_export.lib.php | 4 ++--
libraries/display_import.lib.php | 4 ++--
libraries/export/sql.php | 16 ++++++++--------
libraries/tbl_properties.inc.php | 4 ++--
5 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/enum_editor.php b/enum_editor.php
index f7397ea..74ed09a 100644
--- a/enum_editor.php
+++ b/enum_editor.php
@@ -1,4 +1,4 @@
-<?php
+<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
@@ -18,7 +18,7 @@ require_once './libraries/header_meta_style.inc.php';
<body>
<form action="enum_editor.php" method="get">
<div id="enum_editor_no_js">
- <h3><?php echo __('Values for the column "' . urldecode($_GET['field']) . '"'); ?></h3>
+ <h3><?php printf(__('Values for the column "%s"'), htmlspecialchars($_GET['field'])); ?></h3>
<p><?php echo __('Enter each value in a separate field, enclosed in single quotes. If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, precede it with a backslash (for example \'\\\\xyz\' or \'a\\\'b\').'); ?></p>
<div id="values">
<?php
@@ -72,4 +72,4 @@ require_once './libraries/header_meta_style.inc.php';
</div>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 1726157..62641f3 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -86,9 +86,9 @@ if(isset($_GET['sql_query'])) {
if($export_type == 'server') {
echo __('Exporting databases in the current server');
} elseif($export_type == 'database') {
- echo __('Exporting tables in the database "' . $db . '"');
+ printf(__('Exporting tables in the database "%s"'), htmlspecialchars($db));
} else {
- echo __('Exporting rows in the table "' . $table . '"');
+ printf(__('Exporting rows in the table "%s"'), htmlspecialchars($table));
}?>
</h2>
</div>
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index daa97c3..d83244e 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -128,9 +128,9 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
if($import_type == 'server') {
echo __('Importing into the current server');
} elseif($import_type == 'database') {
- echo __('Importing into the database "' . $db . '"');
+ printf(__('Importing into the database "%s"'), htmlspecialchars($db));
} else {
- echo __('Importing into the table "' . $table . '"');
+ printf(__('Importing into the table "%s"'), htmlspecialchars($table));
}?>
</h2>
</div>
diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index 60a0864..e093339 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -80,7 +80,7 @@ if (isset($plugin_list)) {
$plugin_list['sql']['options'][] = array('type' => 'end_subgroup');
$plugin_list['sql']['options'][] = array('type' => 'end_group');
-
+
/* begin Structure options */
if (!$hide_structure) {
$plugin_list['sql']['options'][] =
@@ -102,9 +102,9 @@ if (isset($plugin_list)) {
}
}
$plugin_list['sql']['options'][] =
- array('type' => 'bool', 'name' => 'drop_table', 'text' => sprintf(__('%s'), $drop_clause));
+ array('type' => 'bool', 'name' => 'drop_table', 'text' => sprintf(__('Add %s statement'), $drop_clause));
$plugin_list['sql']['options'][] =
- array('type' => 'bool', 'name' => 'procedure_function', 'text' => sprintf(__('%s'), '<code>CREATE PROCEDURE / FUNCTION' . (PMA_MYSQL_INT_VERSION > 50100 ? ' / EVENT</code>' : '</code>')));
+ array('type' => 'bool', 'name' => 'procedure_function', 'text' => sprintf(__('Add %s statement'), '<code>CREATE PROCEDURE / FUNCTION' . (PMA_MYSQL_INT_VERSION > 50100 ? ' / EVENT</code>' : '</code>')));
/* begin CREATE TABLE statements*/
$plugin_list['sql']['options'][] =
@@ -133,7 +133,7 @@ if (isset($plugin_list)) {
/* begin SQL statements */
$plugin_list['sql']['options'][] =
- array('type' => 'begin_subgroup', 'subgroup_header' => array('type' => 'message_only', 'text' => __('Instead of <code>INSERT</code> statements, use:')));
+ array('type' => 'begin_subgroup', 'subgroup_header' => array('type' => 'message_only', 'text' => __('Instead of <code>INSERT</code> statements, use:')));
$plugin_list['sql']['options'][] =
array('type' => 'bool', 'name' => 'delayed', 'text' => __('<code>INSERT DELAYED</code> statements'), 'doc' => array('manual_MySQL_Database_Administration', 'insert_delayed'));
$plugin_list['sql']['options'][] =
@@ -151,10 +151,10 @@ if (isset($plugin_list)) {
array('type' => 'begin_subgroup', 'subgroup_header' => array('type' => 'message_only', 'text' => __('Syntax to use when inserting data:')));
$plugin_list['sql']['options'][] =
array('type' => 'radio', 'name' => 'insert_syntax', 'values' => array(
- 'complete' => __('include column names in every <code>INSERT</code> statement <br /> Example: <code>INSERT INTO tbl_name (col_A,col_B,col_C) VALUES (1,2,3)</code>'),
- 'extended' => __('insert multiple rows in every <code>INSERT</code> statement<br /> Example: <code>INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), (7,8,9)</code>'),
- 'both' => __('both of the above<br /> Example: <code>INSERT INTO tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)</code>'),
- 'none' => __('neither of the above<br /> Example: <code>INSERT INTO tbl_name VALUES (1,2,3)</code>')));
+ 'complete' => __('include column names in every <code>INSERT</code> statement <br /> Example: <code>INSERT INTO tbl_name (col_A,col_B,col_C) VALUES (1,2,3)</code>'),
+ 'extended' => __('insert multiple rows in every <code>INSERT</code> statement<br /> Example: <code>INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), (7,8,9)</code>'),
+ 'both' => __('both of the above<br /> Example: <code>INSERT INTO tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)</code>'),
+ 'none' => __('neither of the above<br /> Example: <code>INSERT INTO tbl_name VALUES (1,2,3)</code>')));
$plugin_list['sql']['options'][] =
array('type' => 'end_subgroup');
diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
index 34e2c6d..845f752 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -795,11 +795,11 @@ if ($action == 'tbl_create.php') {
<div id="enum_editor">
<a class="close_enum_editor">Close</a>
-<h3><?php echo __('Values for the column "' . (isset($row['Field']) ? urlencode($row['Field']) : "") . '"'); ?></h3>
+<h3><?php printf(__('Values for the column "%s"'), isset($row['Field']) ? htmlspecialchars($row['Field']) : ""); ?></h3>
<p><?php echo __('Enter each value in a separate field. If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, precede it with a backslash (for example \'\\\\xyz\' or \'a\\\'b\').'); ?></p>
<div id="values"></div>
<p><a class="add_value">+ Add a new value</a></p>
<input type="submit" value="Go" /> <a class="cancel_enum_editor">Cancel</a>
</div>
-<div id="popup_background"></div>
\ No newline at end of file
+<div id="popup_background"></div>
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list