Fix SQL Report i18n for numbered labels.

This commit is contained in:
Colin Kuskie 2010-02-12 11:59:17 -08:00
parent d6cbcf4604
commit 98af8f2b9b
2 changed files with 69 additions and 27 deletions

View file

@ -49,127 +49,146 @@ property paginateAfter => (
property dbQuery1 => ( property dbQuery1 => (
fieldType => "codearea", fieldType => "codearea",
default => undef, default => undef,
label => $i18n->get(4) . ' 1', label => [4, 'Asset_SQLReport', 1],
hoverHelp => ['4 description', 'Asset_RichEdit'],
); );
property prequeryStatements1 => ( property prequeryStatements1 => (
fieldType => "codearea", fieldType => "codearea",
default => undef, default => undef,
label => $i18n->get('Prequery statements') . ' 1', label => ['Prequery statements %s', 'Asset_SQLReport', 1],
); );
property preprocessMacros1 => ( property preprocessMacros1 => (
fieldType => "yesNo", fieldType => "yesNo",
default => 0, default => 0,
label => $i18n->get(15) . ' 1', label => ['Preprocess macros on query %s?', 'Asset_SQLReport', 1],
hoverHelp => ['15 description', 'Asset_RichEdit'],
); );
property placeholderParams1 => ( property placeholderParams1 => (
fieldType => "textarea", fieldType => "textarea",
default => undef, default => undef,
label => $i18n->get('Placeholder Parameters') . ' 1', label => ['Placeholder Parameters %s', 'Asset_SQLReport', 1],
hoverHelp => ['Placeholder Parameters description', 'Asset_RichEdit'],
); );
property databaseLinkId1 => ( property databaseLinkId1 => (
fieldType => "databaseLink", fieldType => "databaseLink",
default => 0, default => 0,
label => $i18n->get("1075", 'WebGUI').' 1', label => ['Database Link %s', 'Asset_SQLReport', 1],
); );
property dbQuery2 => ( property dbQuery2 => (
fieldType => "codearea", fieldType => "codearea",
default => undef, default => undef,
label => $i18n->get(4) . ' 2', label => [4, 'Asset_SQLReport', 2],
hoverHelp => ['4 description', 'Asset_RichEdit'],
); );
property prequeryStatements2 => ( property prequeryStatements2 => (
fieldType => "codearea", fieldType => "codearea",
default => undef, default => undef,
label => $i18n->get('Prequery statements') . ' 2', label => ['Prequery statements %s', 'Asset_SQLReport', 2],
hoverHelp => ['15 description', 'Asset_RichEdit'],
); );
property preprocessMacros2 => ( property preprocessMacros2 => (
fieldType => "yesNo", fieldType => "yesNo",
default => 0, default => 0,
label => $i18n->get(15) . ' 2', label => ['Preprocess macros on query %s?', 'Asset_SQLReport', 2],
hoverHelp => ['15 description', 'Asset_RichEdit'],
); );
property placeholderParams2 => ( property placeholderParams2 => (
fieldType => "textarea", fieldType => "textarea",
default => undef, default => undef,
label => $i18n->get('Placeholder Parameters') . ' 2', label => ['Placeholder Parameters %s', 'Asset_SQLReport', 2],
hoverHelp => ['Placeholder Parameters description', 'Asset_RichEdit'],
); );
property databaseLinkId2 => ( property databaseLinkId2 => (
fieldType => "databaseLink", fieldType => "databaseLink",
default => 0, default => 0,
label => $i18n->get("1075", 'WebGUI').' 2', label => ['Database Link %s', 'Asset_SQLReport', 2],
); );
property dbQuery3 => ( property dbQuery3 => (
fieldType => "codearea", fieldType => "codearea",
default => undef, default => undef,
label => $i18n->get(4) . ' 3', label => [4, 'Asset_SQLReport', 3],
hoverHelp => ['4 description', 'Asset_RichEdit'],
); );
property prequeryStatements3 => ( property prequeryStatements3 => (
fieldType => "codearea", fieldType => "codearea",
default => undef, default => undef,
label => $i18n->get('Prequery statements') . ' 3', label => ['Prequery statements %s', 'Asset_SQLReport', 3],
hoverHelp => ['15 description', 'Asset_RichEdit'],
); );
property preprocessMacros3 => ( property preprocessMacros3 => (
fieldType => "yesNo", fieldType => "yesNo",
default => 0, default => 0,
label => $i18n->get(15) . ' 3', label => ['Preprocess macros on query %s?', 'Asset_SQLReport', 3],
hoverHelp => ['15 description', 'Asset_RichEdit'],
); );
property placeholderParams3 => ( property placeholderParams3 => (
fieldType => "textarea", fieldType => "textarea",
default => undef, default => undef,
label => $i18n->get('Placeholder Parameters') . ' 3', label => ['Placeholder Parameters %s', 'Asset_SQLReport', 3],
hoverHelp => ['Placeholder Parameters description', 'Asset_RichEdit'],
); );
property databaseLinkId3 => ( property databaseLinkId3 => (
fieldType => "databaseLink", fieldType => "databaseLink",
default => 0, default => 0,
label => $i18n->get("1075", 'WebGUI').' 3', label => ['Database Link %s', 'Asset_SQLReport', 3],
); );
property dbQuery4 => ( property dbQuery4 => (
fieldType => "codearea", fieldType => "codearea",
default => undef, default => undef,
label => $i18n->get(4) . ' 4', label => [4, 'Asset_SQLReport', 4],
hoverHelp => ['4 description', 'Asset_RichEdit'],
); );
property prequeryStatements4 => ( property prequeryStatements4 => (
fieldType => "codearea", fieldType => "codearea",
default => undef, default => undef,
label => $i18n->get('Prequery statements') . ' 4', label => ['Prequery statements %s', 'Asset_SQLReport', 4],
hoverHelp => ['15 description', 'Asset_RichEdit'],
); );
property preprocessMacros4 => ( property preprocessMacros4 => (
fieldType => "yesNo", fieldType => "yesNo",
default => 0, default => 0,
label => $i18n->get(15) . ' 4', label => ['Preprocess macros on query %s?', 'Asset_SQLReport', 4],
hoverHelp => ['15 description', 'Asset_RichEdit'],
); );
property placeholderParams4 => ( property placeholderParams4 => (
fieldType => "textarea", fieldType => "textarea",
default => undef, default => undef,
label => $i18n->get('Placeholder Parameters') . ' 4', label => ['Placeholder Parameters %s', 'Asset_SQLReport', 4],
hoverHelp => ['Placeholder Parameters description', 'Asset_RichEdit'],
); );
property databaseLinkId4 => ( property databaseLinkId4 => (
fieldType => "databaseLink", fieldType => "databaseLink",
default => 0, default => 0,
label => $i18n->get("1075", 'WebGUI').' 4', label => ['Database Link %s', 'Asset_SQLReport', 4],
); );
property dbQuery5 => ( property dbQuery5 => (
fieldType => "codearea", fieldType => "codearea",
default => undef, default => undef,
label => $i18n->get(4) . ' 5', label => [4, 'Asset_SQLReport', 5],
hoverHelp => ['4 description', 'Asset_RichEdit'],
); );
property prequeryStatements5 => ( property prequeryStatements5 => (
fieldType => "codearea", fieldType => "codearea",
default => undef, default => undef,
label => $i18n->get('Prequery statements') . ' 5', label => ['Prequery statements %s', 'Asset_SQLReport', 5],
hoverHelp => ['15 description', 'Asset_RichEdit'],
); );
property preprocessMacros5 => ( property preprocessMacros5 => (
fieldType => "yesNo", fieldType => "yesNo",
default => 0, default => 0,
label => $i18n->get(15) . '5', label => ['Preprocess macros on query %s?', 'Asset_SQLReport', 5],
hoverHelp => ['15 description', 'Asset_RichEdit'],
); );
property placeholderParams5 => ( property placeholderParams5 => (
fieldType => "textarea", fieldType => "textarea",
default => undef, default => undef,
label => $i18n->get('Placeholder Parameters') . ' 5', label => ['Placeholder Parameters %s', 'Asset_SQLReport', 5],
hoverHelp => ['Placeholder Parameters description', 'Asset_RichEdit'],
); );
property databaseLinkId5 => ( property databaseLinkId5 => (
fieldType => "databaseLink", fieldType => "databaseLink",
default => 0, default => 0,
label => $i18n->get("1075", 'WebGUI').' 5', label => ['Database Link %s', 'Asset_SQLReport', 5],
); );
property debugMode => ( property debugMode => (
fieldType => "yesNo", fieldType => "yesNo",
@ -183,7 +202,7 @@ property downloadType => (
fieldType => "text", fieldType => "text",
default => "none", default => "none",
label => ["download type", 'Asset_SQLReport'], label => ["download type", 'Asset_SQLReport'],
hoverHelp => $i18n->get("download type description"), hoverHelp => ["download type description", 'Asset_RichEdit'],
vertical => 1, vertical => 1,
options => \&_downloadType_options, options => \&_downloadType_options,
extras => "onclick='changeDownloadType(this)'" extras => "onclick='changeDownloadType(this)'"
@ -327,7 +346,7 @@ sub getEditForm {
-name=>"downloadMimeType", -name=>"downloadMimeType",
-label=>$i18n->get("download mimetype"), -label=>$i18n->get("download mimetype"),
-hoverHelp=>$i18n->get("download mimetype description"), -hoverHelp=>$i18n->get("download mimetype description"),
-options=> \%downloadMimeType, #-options=> \%downloadMimeType,
-value=>$self->getValue("downloadMimeType"), -value=>$self->getValue("downloadMimeType"),
-defaultValue=>"application/octet-stream", -defaultValue=>"application/octet-stream",
); );

View file

@ -88,6 +88,11 @@ while the second question mark will contain the form variable "field1".</p>
lastUpdated => 1031514049 lastUpdated => 1031514049
}, },
'Preprocess macros on query %s?' => {
message => q|Preprocess macros on query %s?|,
lastUpdated => 1266003604,
},
'14' => { '14' => {
message => q|Paginate After|, message => q|Paginate After|,
lastUpdated => 1031514049 lastUpdated => 1031514049
@ -108,6 +113,11 @@ while the second question mark will contain the form variable "field1".</p>
lastUpdated => 1031514049 lastUpdated => 1031514049
}, },
'Query %s' => {
message => q|Query %s|,
lastUpdated => 1266003369
},
'18' => { '18' => {
message => q|There were no results for this query.|, message => q|There were no results for this query.|,
lastUpdated => 1031514049 lastUpdated => 1031514049
@ -268,6 +278,10 @@ will always be false for query5.|,
message => q|<b>Debug:</b> Error: The SQL specified is of an improper format.|, message => q|<b>Debug:</b> Error: The SQL specified is of an improper format.|,
lastUpdated => 1031514049 lastUpdated => 1031514049
}, },
'Placeholder Parameters %s' => {
message => q|Placeholder Parameters %s|,
lastUpdated => 1266003738,
},
'Placeholder Parameters' => { 'Placeholder Parameters' => {
message => q|Placeholder Parameters|, message => q|Placeholder Parameters|,
lastUpdated => 1031514049 lastUpdated => 1031514049
@ -288,6 +302,10 @@ will always be false for query5.|,
message => q|Prequery statements|, message => q|Prequery statements|,
lastUpdated => 0, lastUpdated => 0,
}, },
'Prequery statements %s' => {
message => q|Prequery statements %s|,
lastUpdated => 1266003505,
},
'Prequery statements description' => { 'Prequery statements description' => {
message => q|<p>Prequery statements are sql statements executed before the real query. You can use prequery statements for instance to set variables that you want to use in the real query. For example:</p> message => q|<p>Prequery statements are sql statements executed before the real query. You can use prequery statements for instance to set variables that you want to use in the real query. For example:</p>
<div class="helpIndent">set @myVariable := 1</div> <div class="helpIndent">set @myVariable := 1</div>
@ -501,6 +519,11 @@ will always be false for query5.|,
lastUpdated => 1168886083, lastUpdated => 1168886083,
}, },
'Database Link %s' => {
message => q|Database Link %s|,
lastUpdated => 1266003847,
},
}; };
1; 1;