Skip to content

Commit

Permalink
gettext conversion
Browse files Browse the repository at this point in the history
  • Loading branch information
Marc Delisle committed May 14, 2010
1 parent d904da4 commit b05a903
Show file tree
Hide file tree
Showing 34 changed files with 176 additions and 175 deletions.
2 changes: 1 addition & 1 deletion import.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@
if ($timeout_passed) {
$message = PMA_Message::error(__('Script timeout passed, if you want to finish import, please resubmit same file and import will resume.'));
if ($offset == 0 || (isset($original_skip) && $original_skip == $offset)) {
$message->addString('strTimeoutNothingParsed');
$message->addString(__('However on last run no data has been parsed, this usually means phpMyAdmin won't be able to finish this import unless you increase php time limits.'));
}
}
Expand Down
10 changes: 5 additions & 5 deletions libraries/Message.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,13 +182,13 @@ public function __toString()
* @static
* @uses PMA_Message as returned object
* @uses PMA_Message::SUCCESS
* @param string $string a localized string e.g. 'strSuccess'
* @param string $string a localized string e.g. __('Your SQL query has been executed successfully')
* @return PMA_Message
*/
static public function success($string = '')
{
if (empty($string)) {
$string = 'strSuccess';
$string = __('Your SQL query has been executed successfully');
}

return new PMA_Message($string, PMA_Message::SUCCESS);
Expand All @@ -202,13 +202,13 @@ static public function success($string = '')
* @static
* @uses PMA_Message as returned object
* @uses PMA_Message::ERROR
* @param string $string a localized string e.g. 'strError'
* @param string $string a localized string e.g. __('Error')
* @return PMA_Message
*/
static public function error($string = '')
{
if (empty($string)) {
$string = 'strError';
$string = __('Error');
}

return new PMA_Message($string, PMA_Message::ERROR);
Expand Down Expand Up @@ -238,7 +238,7 @@ static public function warning($string)
* @static
* @uses PMA_Message as returned object
* @uses PMA_Message::NOTICE
* @param string $string a localized string e.g. 'strRelationNotWorking'
* @param string $string a localized string e.g. __('The additional features for working with linked tables have been deactivated. To find out why click %shere%s.')
* @return PMA_Message
*/
static public function notice($string)
Expand Down
2 changes: 1 addition & 1 deletion libraries/common.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,7 @@
* - > 5.0.15
*/
if (PMA_MYSQL_INT_VERSION < 50015) {
PMA_fatalError('strUpgrade', array('MySQL', '5.0.15'));
PMA_fatalError(__('You should upgrade to %s %s or later.'), array('MySQL', '5.0.15'));
}

/**
Expand Down
4 changes: 2 additions & 2 deletions libraries/export/codegen.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
'mime_type' => 'text/cs',
'options' => array(
array('type' => 'hidden', 'name' => 'data'),
array('type' => 'select', 'name' => 'format', 'text' => 'strFormat', 'values' => $CG_FORMATS),
array('type' => 'select', 'name' => 'format', 'text' => __('Format'), 'values' => $CG_FORMATS),
),
'options_text' => 'strOptions',
'options_text' => __('Options'),
);
} else {

Expand Down
18 changes: 9 additions & 9 deletions libraries/export/csv.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@

if (isset($plugin_list)) {
$plugin_list['csv'] = array(
'text' => 'strCSV',
'text' => __('CSV'),
'extension' => 'csv',
'mime_type' => 'text/comma-separated-values',
'options' => array(
array('type' => 'text', 'name' => 'separator', 'text' => 'strFieldsTerminatedBy'),
array('type' => 'text', 'name' => 'enclosed', 'text' => 'strFieldsEnclosedBy'),
array('type' => 'text', 'name' => 'escaped', 'text' => 'strFieldsEscapedBy'),
array('type' => 'text', 'name' => 'terminated', 'text' => 'strLinesTerminatedBy'),
array('type' => 'text', 'name' => 'null', 'text' => 'strReplaceNULLBy'),
array('type' => 'bool', 'name' => 'removeCRLF', 'text' => 'strRemoveCRLF'),
array('type' => 'bool', 'name' => 'columns', 'text' => 'strPutColNames'),
array('type' => 'text', 'name' => 'separator', 'text' => __('Fields terminated by')),
array('type' => 'text', 'name' => 'enclosed', 'text' => __('Fields enclosed by')),
array('type' => 'text', 'name' => 'escaped', 'text' => __('Fields escaped by')),
array('type' => 'text', 'name' => 'terminated', 'text' => __('Lines terminated by')),
array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')),
array('type' => 'bool', 'name' => 'removeCRLF', 'text' => __('Remove CRLF characters within fields')),
array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')),
array('type' => 'hidden', 'name' => 'data'),
),
'options_text' => 'strOptions',
'options_text' => __('Options'),
);
} else {

Expand Down
12 changes: 6 additions & 6 deletions libraries/export/excel.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,24 @@
*/
if (isset($plugin_list)) {
$plugin_list['excel'] = array(
'text' => 'strStrucExcelCSV',
'text' => __('CSV for MS Excel'),
'extension' => 'csv',
'mime_type' => 'text/comma-separated-values',
'options' => array(
array('type' => 'text', 'name' => 'null', 'text' => 'strReplaceNULLBy'),
array('type' => 'bool', 'name' => 'removeCRLF', 'text' => 'strRemoveCRLF'),
array('type' => 'bool', 'name' => 'columns', 'text' => 'strPutColNames'),
array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')),
array('type' => 'bool', 'name' => 'removeCRLF', 'text' => __('Remove CRLF characters within fields')),
array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')),
array(
'type' => 'select',
'name' => 'edition',
'values' => array(
'win' => 'Windows',
'mac_excel2003' => 'Excel 2003 / Macintosh',
'mac_excel2008' => 'Excel 2008 / Macintosh'),
'text' => 'strExcelEdition'),
'text' => __('Excel edition')),
array('type' => 'hidden', 'name' => 'data'),
),
'options_text' => 'strOptions',
'options_text' => __('Options'),
);
} else {
/* Everything rest is coded in csv plugin */
Expand Down
12 changes: 6 additions & 6 deletions libraries/export/htmlword.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@
*/
if (isset($plugin_list)) {
$plugin_list['htmlword'] = array(
'text' => 'strHTMLWord',
'text' => __('Microsoft Word 2000'),
'extension' => 'doc',
'mime_type' => 'application/vnd.ms-word',
'force_file' => true,
'options' => array(
array('type' => 'bool', 'name' => 'structure', 'text' => 'strStructure', 'force' => 'data'),
array('type' => 'bgroup', 'name' => 'data', 'text' => 'strData', 'force' => 'structure'),
array('type' => 'text', 'name' => 'null', 'text' => 'strReplaceNULLBy'),
array('type' => 'bool', 'name' => 'columns', 'text' => 'strPutColNames'),
array('type' => 'bool', 'name' => 'structure', 'text' => __('Structure'), 'force' => 'data'),
array('type' => 'bgroup', 'name' => 'data', 'text' => __('Data'), 'force' => 'structure'),
array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')),
array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')),
array('type' => 'egroup'),
),
'options_text' => 'strOptions',
'options_text' => __('Options'),
);
} else {

Expand Down
32 changes: 16 additions & 16 deletions libraries/export/latex.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,50 +19,50 @@
$hide_structure = true;
}
$plugin_list['latex'] = array(
'text' => 'strLaTeX',
'text' => __('LaTeX'),
'extension' => 'tex',
'mime_type' => 'application/x-tex',
'options' => array(
array('type' => 'bool', 'name' => 'caption', 'text' => 'strLatexIncludeCaption'),
array('type' => 'bool', 'name' => 'caption', 'text' => __('Include table caption')),
),
'options_text' => 'strOptions',
'options_text' => __('Options'),
);
/* Structure options */
if (!$hide_structure) {
$plugin_list['latex']['options'][] =
array('type' => 'bgroup', 'name' => 'structure', 'text' => 'strStructure', 'force' => 'data');
array('type' => 'bgroup', 'name' => 'structure', 'text' => __('Structure'), 'force' => 'data');
$plugin_list['latex']['options'][] =
array('type' => 'text', 'name' => 'structure_caption', 'text' => 'strLatexCaption');
array('type' => 'text', 'name' => 'structure_caption', 'text' => __('Table caption'));
$plugin_list['latex']['options'][] =
array('type' => 'text', 'name' => 'structure_continued_caption', 'text' => 'strLatexContinuedCaption');
array('type' => 'text', 'name' => 'structure_continued_caption', 'text' => __('Continued table caption'));
$plugin_list['latex']['options'][] =
array('type' => 'text', 'name' => 'structure_label', 'text' => 'strLatexLabel');
array('type' => 'text', 'name' => 'structure_label', 'text' => __('Label key'));
if (!empty($GLOBALS['cfgRelation']['relation'])) {
$plugin_list['latex']['options'][] =
array('type' => 'bool', 'name' => 'relation', 'text' => 'strRelations');
array('type' => 'bool', 'name' => 'relation', 'text' => __('Relations'));
}
$plugin_list['latex']['options'][] =
array('type' => 'bool', 'name' => 'comments', 'text' => 'strComments');
array('type' => 'bool', 'name' => 'comments', 'text' => __('Comments'));
if (!empty($GLOBALS['cfgRelation']['mimework'])) {
$plugin_list['latex']['options'][] =
array('type' => 'bool', 'name' => 'mime', 'text' => 'strMIME_MIMEtype');
array('type' => 'bool', 'name' => 'mime', 'text' => __('MIME type'));
}
$plugin_list['latex']['options'][] =
array('type' => 'egroup');
}
/* Data */
$plugin_list['latex']['options'][] =
array('type' => 'bgroup', 'name' => 'data', 'text' => 'strData', 'force' => 'structure');
array('type' => 'bgroup', 'name' => 'data', 'text' => __('Data'), 'force' => 'structure');
$plugin_list['latex']['options'][] =
array('type' => 'bool', 'name' => 'columns', 'text' => 'strPutColNames');
array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row'));
$plugin_list['latex']['options'][] =
array('type' => 'text', 'name' => 'data_caption', 'text' => 'strLatexCaption');
array('type' => 'text', 'name' => 'data_caption', 'text' => __('Table caption'));
$plugin_list['latex']['options'][] =
array('type' => 'text', 'name' => 'data_continued_caption', 'text' => 'strLatexContinuedCaption');
array('type' => 'text', 'name' => 'data_continued_caption', 'text' => __('Continued table caption'));
$plugin_list['latex']['options'][] =
array('type' => 'text', 'name' => 'data_label', 'text' => 'strLatexLabel');
array('type' => 'text', 'name' => 'data_label', 'text' => __('Label key'));
$plugin_list['latex']['options'][] =
array('type' => 'text', 'name' => 'null', 'text' => 'strReplaceNULLBy');
array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by'));
$plugin_list['latex']['options'][] =
array('type' => 'egroup');
} else {
Expand Down
4 changes: 2 additions & 2 deletions libraries/export/mediawiki.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@

if (isset($plugin_list)) {
$plugin_list['mediawiki'] = array(
'text' => 'strMediaWiki',
'text' => __('MediaWiki Table'),
'extension' => 'txt',
'mime_type' => 'text/plain',
'options' => array(
array('type' => 'hidden', 'name' => 'data'),
),
'options_text' => 'strOptions',
'options_text' => __('Options'),
);
} else {

Expand Down
8 changes: 4 additions & 4 deletions libraries/export/ods.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@
*/
if (isset($plugin_list)) {
$plugin_list['ods'] = array(
'text' => 'strOpenDocumentSpreadsheet',
'text' => __('Open Document Spreadsheet'),
'extension' => 'ods',
'mime_type' => 'application/vnd.oasis.opendocument.spreadsheet',
'force_file' => true,
'options' => array(
array('type' => 'text', 'name' => 'null', 'text' => 'strReplaceNULLBy'),
array('type' => 'bool', 'name' => 'columns', 'text' => 'strPutColNames'),
array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')),
array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')),
array('type' => 'hidden', 'name' => 'data'),
),
'options_text' => 'strOptions',
'options_text' => __('Options'),
);
} else {

Expand Down
18 changes: 9 additions & 9 deletions libraries/export/odt.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,37 +19,37 @@
$hide_structure = true;
}
$plugin_list['odt'] = array(
'text' => 'strOpenDocumentText',
'text' => __('Open Document Text'),
'extension' => 'odt',
'mime_type' => 'application/vnd.oasis.opendocument.text',
'force_file' => true,
'options' => array(), /* Filled later */
'options_text' => 'strOptions',
'options_text' => __('Options'),
);
/* Structure options */
if (!$hide_structure) {
$plugin_list['odt']['options'][] =
array('type' => 'bgroup', 'name' => 'structure', 'text' => 'strStructure', 'force' => 'data');
array('type' => 'bgroup', 'name' => 'structure', 'text' => __('Structure'), 'force' => 'data');
if (!empty($GLOBALS['cfgRelation']['relation'])) {
$plugin_list['odt']['options'][] =
array('type' => 'bool', 'name' => 'relation', 'text' => 'strRelations');
array('type' => 'bool', 'name' => 'relation', 'text' => __('Relations'));
}
$plugin_list['odt']['options'][] =
array('type' => 'bool', 'name' => 'comments', 'text' => 'strComments');
array('type' => 'bool', 'name' => 'comments', 'text' => __('Comments'));
if (!empty($GLOBALS['cfgRelation']['mimework'])) {
$plugin_list['odt']['options'][] =
array('type' => 'bool', 'name' => 'mime', 'text' => 'strMIME_MIMEtype');
array('type' => 'bool', 'name' => 'mime', 'text' => __('MIME type'));
}
$plugin_list['odt']['options'][] =
array('type' => 'egroup');
}
/* Data */
$plugin_list['odt']['options'][] =
array('type' => 'bgroup', 'name' => 'data', 'text' => 'strData', 'force' => 'structure');
array('type' => 'bgroup', 'name' => 'data', 'text' => __('Data'), 'force' => 'structure');
$plugin_list['odt']['options'][] =
array('type' => 'bool', 'name' => 'columns', 'text' => 'strPutColNames');
array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row'));
$plugin_list['odt']['options'][] =
array('type' => 'text', 'name' => 'null', 'text' => 'strReplaceNULLBy');
array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by'));
$plugin_list['odt']['options'][] =
array('type' => 'egroup');
} else {
Expand Down
8 changes: 4 additions & 4 deletions libraries/export/pdf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@
*/
if (isset($plugin_list)) {
$plugin_list['pdf'] = array(
'text' => 'strPDF',
'text' => __('PDF'),
'extension' => 'pdf',
'mime_type' => 'application/pdf',
'force_file' => true,
'options' => array(
array('type' => 'message_only', 'name' => 'explanation', 'text' => 'strPDFReportExplanation'),
array('type' => 'text', 'name' => 'report_title', 'text' => 'strPDFReportTitle'),
array('type' => 'message_only', 'name' => 'explanation', 'text' => __('(Generates a report containing the data of a single table)')),
array('type' => 'text', 'name' => 'report_title', 'text' => __('Report title')),
array('type' => 'hidden', 'name' => 'data'),
),
'options_text' => 'strOptions',
'options_text' => __('Options'),
);
} else {

Expand Down
4 changes: 2 additions & 2 deletions libraries/export/php_array.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*/
if (isset($plugin_list)) {
$plugin_list['php_array'] = array(
'text' => 'strPhpArray',
'text' => __('PHP array'),
'extension' => 'php',
'mime_type' => 'text/plain',
'options' => array(
Expand All @@ -22,7 +22,7 @@
'name' => 'data',
),
),
'options_text' => 'strOptions',
'options_text' => __('Options'),
);
} else {

Expand Down
Loading

0 comments on commit b05a903

Please sign in to comment.