dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6156
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2012-03-04 11:37:05 +0100
message:
  DV, fixed bug, delete should not be used as property in a js object since it will be associated with the delete command in IE
modified:
  dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/i18n.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties	2012-02-28 11:43:07 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties	2012-03-04 10:37:05 +0000
@@ -60,7 +60,7 @@
 rename_favorite=Rename favorite
 cancel=Cancel
 name_already_in_use=* Name already in use
-delete=Delete
+delete_object=Delete
 delete_favorite=Delete favorite
 are_you_sure=Are you sure?
 save=Save

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2012-02-29 11:03:54 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2012-03-04 10:37:05 +0000
@@ -3655,7 +3655,7 @@
                                                                                 }
                                                                             },
                                                                             {
-                                                                                text: DV.i18n.delete,
+                                                                                text: DV.i18n.delete_object,
                                                                                 cls: 'dv-toolbar-btn-2',
                                                                                 disabled: true,
                                                                                 xable: function() {
@@ -3698,7 +3698,7 @@
                                                                                                 },
                                                                                                 '->',
                                                                                                 {
-                                                                                                    text: DV.i18n.delete,
+                                                                                                    text: DV.i18n.delete_object,
                                                                                                     handler: function() {
                                                                                                         this.up('window').close();
                                                                                                         DV.util.crud.favorite.del(function() {

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/i18n.vm'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/i18n.vm	2012-02-28 11:43:07 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/i18n.vm	2012-03-04 10:37:05 +0000
@@ -61,7 +61,7 @@
 rename_favorite:'$encoder.jsEscape($i18n.getString( 'rename_favorite' ) , "'")',
 cancel:'$encoder.jsEscape($i18n.getString( 'cancel' ) , "'")',
 name_already_in_use:'$encoder.jsEscape($i18n.getString( 'name_already_in_use' ) , "'")',
-delete:'$encoder.jsEscape($i18n.getString( 'delete' ) , "'")',
+delete_object:'$encoder.jsEscape($i18n.getString( 'delete_object' ) , "'")',
 delete_favorite:'$encoder.jsEscape($i18n.getString( 'delete_favorite' ) , "'")',
 are_you_sure:'$encoder.jsEscape($i18n.getString( 'are_you_sure' ) , "'")',
 save:'$encoder.jsEscape($i18n.getString( 'save' ) , "'")',