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

gettext conversion

Browse Source
This commit is contained in:
Marc Delisle
2010-05-11 13:05:43 -04:00
parent b22daddbb7
commit 7925c03896
70 changed files with 10302 additions and 9884 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libraries/import/csv.php
View File

@@ -55,8 +55,8 @@ $csv_escaped = strtr($csv_escaped, $replacements);
$csv_new_line = strtr($csv_new_line, $replacements);
if (strlen($csv_terminated) != 1) {
$message = PMA_Message::error('strInvalidCSVParameter');
$message->addParam('strFieldsTerminatedBy', false);
$message = PMA_Message::error(__('Invalid parameter for CSV import: %s'));
$message->addParam(__('Fields terminated by'), false);
$error = TRUE;
// The default dialog of MS Excel when generating a CSV produces a
// semi-colon-separated file with no chance of specifying the
@@ -67,16 +67,16 @@ if (strlen($csv_terminated) != 1) {
// But the parser won't work correctly with strings so we allow just
// one character.
} elseif (strlen($csv_enclosed) > 1) {
$message = PMA_Message::error('strInvalidCSVParameter');
$message->addParam('strFieldsEnclosedBy', false);
$message = PMA_Message::error(__('Invalid parameter for CSV import: %s'));
$message->addParam(__('Fields enclosed by'), false);
$error = TRUE;
} elseif (strlen($csv_escaped) != 1) {
$message = PMA_Message::error('strInvalidCSVParameter');
$message->addParam('strFieldsEscapedBy', false);
$message = PMA_Message::error(__('Invalid parameter for CSV import: %s'));
$message->addParam(__('Fields escaped by'), false);
$error = TRUE;
} elseif (strlen($csv_new_line) != 1 && $csv_new_line != 'auto') {
$message = PMA_Message::error('strInvalidCSVParameter');
$message->addParam('strLinesTerminatedBy', false);
$message = PMA_Message::error(__('Invalid parameter for CSV import: %s'));
$message->addParam(__('Lines terminated by'), false);
$error = TRUE;
}
@@ -116,7 +116,7 @@ if (!$analyze) {
}
}
if (!$found) {
$message = PMA_Message::error('strInvalidColumn');
$message = PMA_Message::error(__('Invalid column (%s) specified!'));
$message->addParam($val);
$error = TRUE;
break;
@@ -174,7 +174,7 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) {
while ($i < $len) {
// Deadlock protection
if ($lasti == $i && $lastlen == $len) {
$message = PMA_Message::error('strInvalidCSVFormat');
$message = PMA_Message::error(__('Invalid format of CSV input on line %d.'));
$message->addParam($line);
$error = TRUE;
break;
@@ -309,7 +309,7 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) {
if ($values[count($values) - 1] == ';') {
unset($values[count($values) - 1]);
} else {
$message = PMA_Message::error('strInvalidCSVFieldCount');
$message = PMA_Message::error(__('Invalid field count in CSV input on line %d.'));
$message->addParam($line);
$error = TRUE;
break;
@@ -421,7 +421,7 @@ if ($analyze) {
PMA_importRunQuery();
if (count($values) != 0 && !$error) {
$message = PMA_Message::error('strInvalidCSVFormat');
$message = PMA_Message::error(__('Invalid format of CSV input on line %d.'));
$message->addParam($line);
$error = TRUE;
}

2
libraries/import/ldi.php
View File

@@ -52,7 +52,7 @@ if (isset($plugin_list)) {
if ($import_file == 'none' || $compression != 'none' || $charset_conversion) {
// We handle only some kind of data!
$message = PMA_Message::error('strInvalidLDIImport');
$message = PMA_Message::error(__('This plugin does not support compressed imports!'));
$error = TRUE;
return;
}

4
libraries/import/xml.php
View File

@@ -71,7 +71,7 @@ unset($buffer);
* The XML was malformed
*/
if ($xml === FALSE) {
PMA_Message::error('strXMLError')->display();
PMA_Message::error(__('The XML file specified was either malformed or incomplete. Please correct the issue and try again.'))->display();
unset($xml);
$GLOBALS['finished'] = false;
return;
@@ -127,7 +127,7 @@ if ($db_attr instanceof SimpleXMLElement) {
* The XML was malformed
*/
if ($db_name === NULL) {
PMA_Message::error('strXMLError')->display();
PMA_Message::error(__('The XML file specified was either malformed or incomplete. Please correct the issue and try again.'))->display();
unset($xml);
$GLOBALS['finished'] = false;
return;