diff --git a/ChangeLog b/ChangeLog
index df1988eff..f3b0872ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -84,6 +84,7 @@ $Id$
3.3.4.0 (not yet released)
- bug #2996161 [import] properly escape import value
+- bug #2998889 [import] Import button does not work in Catalan
3.3.3.0 (not yet released)
- patch #2982480 [navi] Do not group if there would be one table in group,
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 898984d68..ef43bdef0 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2342,7 +2342,7 @@ function PMA_userDir($dir)
*
* @uses $cfg['DefaultTabDatabase']
* @uses $GLOBALS['db']
- * @uses $GLOBALS['strJumpToDB']
+ * @uses __('Jump to database "%s".')
* @uses PMA_generate_common_url()
* @uses PMA_unescape_mysql_wildcards()
* @uses strlen()
@@ -2363,7 +2363,7 @@ function PMA_getDbLink($database = null)
}
return ''
+ .' title="' . sprintf(__('Jump to database "%s".'), htmlspecialchars($database)) . '">'
.htmlspecialchars($database) . '';
}
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index 343248a58..0e803c404 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -74,7 +74,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
if (finished==true) {
$('#importmain').css('display', 'none');
$('#import_form_status').css('display', 'inline');
- $('#import_form_status').html(' ');
+ $('#import_form_status').html('
');
$('#import_form_status').load('import_status.php?message=true&'); // loads the message, either success or mysql error
$import_run_buffer['full'], 'error' => PMA_DBI_getError());
if ($cfg['VerboseMultiSubmit']) {
- $msg .= $GLOBALS['strError'];
+ $msg .= __('Error');
}
if (!$cfg['IgnoreMultiSubmitErrors']) {
@@ -142,12 +142,12 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false)
$a_num_rows = (int)@PMA_DBI_num_rows($result);
$a_aff_rows = (int)@PMA_DBI_affected_rows();
if ($a_num_rows > 0) {
- $msg .= $GLOBALS['strRows'] . ': ' . $a_num_rows;
+ $msg .= __('Rows'). ': ' . $a_num_rows;
} elseif ($a_aff_rows > 0) {
$message = PMA_Message::affected_rows($a_aff_rows);
$msg .= $message->getMessage();
} else {
- $msg .= $GLOBALS['strEmptyResultSet'];
+ $msg .= __('MySQL returned an empty result set (i.e. zero rows).');
}
}
if (!$sql_query_disabled) {
@@ -1075,16 +1075,16 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql =
$db_ops_url = 'db_operations.php' . PMA_generate_common_url($params);
$message = '
';
- $message .= '' . $GLOBALS['strImportNoticePt1'] . '
';
- $message .= '