oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Internationalize the Add button in the Criteria builder for the Shortcut.

Browse source
This commit is contained in:
Colin Kuskie 2010-04-06 13:54:24 -07:00
parent 982e5117f1
commit f06ce2e0eb
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -18,6 +18,7 @@
- fixed #11513: white text, broken account mgmt - fixed #11513: white text, broken account mgmt
- fixed #11514: Added JS-type cancel button to edit view of WebGUI::Asset::Post (Bernd Kalbfuß-Zimmermann) - fixed #11514: Added JS-type cancel button to edit view of WebGUI::Asset::Post (Bernd Kalbfuß-Zimmermann)
- fixed #11469: Survey Ruler - fixed #11469: Survey Ruler
- fixed Shortcut i18n for the Criteria Builder.
- fixed #11516: Shortcut Asset: Properties panel messed up in edit view - fixed #11516: Shortcut Asset: Properties panel messed up in edit view
7.9.1 7.9.1

5
lib/WebGUI/Asset/Shortcut.pm
View file

@ -77,6 +77,7 @@ sub _drawQueryBuilder {
# Here starts the field loop # Here starts the field loop
my $i = 1; my $i = 1;
my $addLabel = $i18n->get('add', 'Asset_Wobject');
foreach my $field (keys %$fields) { foreach my $field (keys %$fields) {
my $fieldLabel = $fields->{$field}{fieldName}; my $fieldLabel = $fields->{$field}{fieldName};
my $fieldType = $fields->{$field}{fieldType} || "text"; my $fieldType = $fields->{$field}{fieldType} || "text";
@ -115,11 +116,15 @@ sub _drawQueryBuilder {
</td> </td>
<td class="qbtd"></td> <td class="qbtd"></td>
<td class="qbtdright"> <td class="qbtdright">
<<<<<<< HEAD:lib/WebGUI/Asset/Shortcut.pm
<<<<<<< HEAD:lib/WebGUI/Asset/Shortcut.pm <<<<<<< HEAD:lib/WebGUI/Asset/Shortcut.pm
<input class="qbButton" type=button value=Add onclick="addCriteria('$fieldLabel', this.form.$opFieldName, this.form.$valFieldName)"></td> <input class="qbButton" type=button value=Add onclick="addCriteria('$fieldLabel', this.form.$opFieldName, this.form.$valFieldName)"></td>
======= =======
<input class="qbButton" type=button value=$addLabel onclick="addCriteria('$fieldLabel', this.form.$opFieldName, this.form.$valFieldName)" $disabled></td> <input class="qbButton" type=button value=$addLabel onclick="addCriteria('$fieldLabel', this.form.$opFieldName, this.form.$valFieldName)" $disabled></td>
>>>>>>> f32f209... Fix shortcut hoverhelp, javascript, and criteria builder usability. Fixes bug #11516:lib/WebGUI/Asset/Shortcut.pm >>>>>>> f32f209... Fix shortcut hoverhelp, javascript, and criteria builder usability. Fixes bug #11516:lib/WebGUI/Asset/Shortcut.pm
=======
<input class="qbButton" type=button value=$addLabel onclick="addCriteria('$fieldLabel', this.form.$opFieldName, this.form.$valFieldName)"></td>
>>>>>>> 08b662b... Internationalize the Add button in the Criteria builder for the Shortcut.:lib/WebGUI/Asset/Shortcut.pm
</tr> </tr>
|; |;
$i++; $i++;