Skip to content

Commit

Permalink
gettext conversion
Browse files Browse the repository at this point in the history
  • Loading branch information
@lem9
lem9 committed May 11, 2010
1 parent b22dadd commit 7925c03
Show file tree
Hide file tree
Showing 70 changed files with 10,302 additions and 9,884 deletions.
4 changes: 2 additions & 2 deletions db_qbe.php
View file
Expand Up @@ -39,7 +39,7 @@

if (isset($_REQUEST['submit_sql'])
&& ! preg_match('@^SELECT@i', $sql_query)) {
PMA_Message::warning('strHaveToShow')->display();
PMA_Message::warning(__('You have to choose at least one column to display'))->display();
}


Expand Down Expand Up @@ -99,7 +99,7 @@
$tbl_result = PMA_DBI_query('SHOW TABLES FROM ' . PMA_backquote($db) . ';', null, PMA_DBI_QUERY_STORE);
$tbl_result_cnt = PMA_DBI_num_rows($tbl_result);
if (0 == $tbl_result_cnt) {
PMA_Message::error('strNoTablesFound')->display();
PMA_Message::error(__('No tables found in database.'))->display();
require_once './libraries/footer.inc.php';
exit;
}
Expand Down
18 changes: 9 additions & 9 deletions export.php
View file
Expand Up @@ -59,7 +59,7 @@

// Does export require to be into file?
if (isset($export_list[$type]['force_file']) && ! $asfile) {
$message = PMA_Message::error('strExportMustBeFile');
$message = PMA_Message::error(__('Selected export type has to be saved in file!'));
$GLOBALS['js_include'][] = 'functions.js';
require_once './libraries/header.inc.php';
if ($export_type == 'server') {
Expand Down Expand Up @@ -151,7 +151,7 @@ function PMA_exportOutputHandler($line)
if ($GLOBALS['save_on_server']) {
$write_result = @fwrite($GLOBALS['file_handle'], $dump_buffer);
if (!$write_result || ($write_result != strlen($dump_buffer))) {
$GLOBALS['message'] = PMA_Message::error('strNoSpace');
$GLOBALS['message'] = PMA_Message::error(__('Insufficient space to save the file %s.'));
$GLOBALS['message']->addParam($save_filename);
return false;
}
Expand All @@ -176,7 +176,7 @@ function PMA_exportOutputHandler($line)
if ($GLOBALS['save_on_server'] && strlen($line) > 0) {
$write_result = @fwrite($GLOBALS['file_handle'], $line);
if (!$write_result || ($write_result != strlen($line))) {
$GLOBALS['message'] = PMA_Message::error('strNoSpace');
$GLOBALS['message'] = PMA_Message::error(__('Insufficient space to save the file %s.'));
$GLOBALS['message']->addParam($save_filename);
return false;
}
Expand Down Expand Up @@ -291,15 +291,15 @@ function PMA_exportOutputHandler($line)
$save_filename = PMA_userDir($cfg['SaveDir']) . preg_replace('@[/\\\\]@', '_', $filename);
unset($message);
if (file_exists($save_filename) && empty($onserverover)) {
$message = PMA_Message::error('strFileAlreadyExists');
$message = PMA_Message::error(__('File %s already exists on server, change filename or check overwrite option.'));
$message->addParam($save_filename);
} else {
if (is_file($save_filename) && !is_writable($save_filename)) {
$message = PMA_Message::error('strNoPermission');
$message = PMA_Message::error(__('The web server does not have permission to save the file %s.'));
$message->addParam($save_filename);
} else {
if (!$file_handle = @fopen($save_filename, 'w')) {
$message = PMA_Message::error('strNoPermission');
$message = PMA_Message::error(__('The web server does not have permission to save the file %s.'));
$message->addParam($save_filename);
}
}
Expand Down Expand Up @@ -356,7 +356,7 @@ function PMA_exportOutputHandler($line)
if ($export_type == 'database') {
$num_tables = count($tables);
if ($num_tables == 0) {
$message = PMA_Message::error('strNoTablesFound');
$message = PMA_Message::error(__('No tables found in database.'));
$GLOBALS['js_include'][] = 'functions.js';
require_once './libraries/header.inc.php';
$active_page = 'db_export.php';
Expand Down Expand Up @@ -624,9 +624,9 @@ function PMA_exportOutputHandler($line)
$write_result = @fwrite($file_handle, $dump_buffer);
fclose($file_handle);
if (strlen($dump_buffer) !=0 && (!$write_result || ($write_result != strlen($dump_buffer)))) {
$message = new PMA_Message('strNoSpace', PMA_Message::ERROR, $save_filename);
$message = new PMA_Message(__('Insufficient space to save the file %s.'), PMA_Message::ERROR, $save_filename);
} else {
$message = new PMA_Message('strDumpSaved', PMA_Message::SUCCESS, $save_filename);
$message = new PMA_Message(__('Dump has been saved to file %s.'), PMA_Message::SUCCESS, $save_filename);
}

$GLOBALS['js_include'][] = 'functions.js';
Expand Down
24 changes: 12 additions & 12 deletions libraries/import/csv.php
View file
Expand Up @@ -55,8 +55,8 @@
$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
Expand All @@ -67,16 +67,16 @@
// 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;
}

Expand Down Expand Up @@ -116,7 +116,7 @@
}
}
if (!$found) {
$message = PMA_Message::error('strInvalidColumn');
$message = PMA_Message::error(__('Invalid column (%s) specified!'));
$message->addParam($val);
$error = TRUE;
break;
Expand Down Expand Up @@ -174,7 +174,7 @@
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;
Expand Down Expand Up @@ -309,7 +309,7 @@
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;
Expand Down Expand Up @@ -421,7 +421,7 @@
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;
}
Expand Down
2 changes: 1 addition & 1 deletion libraries/import/ldi.php
View file
Expand Up @@ -52,7 +52,7 @@

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;
}
Expand Down
4 changes: 2 additions & 2 deletions libraries/import/xml.php
View file
Expand Up @@ -71,7 +71,7 @@
* 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;
Expand Down Expand Up @@ -127,7 +127,7 @@
* 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;
Expand Down
4 changes: 2 additions & 2 deletions main.php
View file
Expand Up @@ -313,7 +313,7 @@
require_once './libraries/relation.lib.php';
$cfgRelation = PMA_getRelationsParam();
if(!$cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) {
$message = PMA_Message::notice('strRelationNotWorking');
$message = PMA_Message::notice(__('The additional features for working with linked tables have been deactivated. To find out why click %shere%s.'));
$message->addParam('<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $common_url_query . '">', false);
$message->addParam('</a>', false);
/* Show error if user has configured something, notice elsewhere */
Expand All @@ -328,7 +328,7 @@
* Show warning when javascript support is missing.
*/
echo '<noscript>';
$message = PMA_Message::notice('strJavascriptDisabled');
$message = PMA_Message::notice(__('Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'));
$message->isError(true);
$message->display();
echo '</noscript>';
Expand Down

0 comments on commit 7925c03

Please sign in to comment.