dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 2631 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-01-19 11:43:17 +0100
message:
  (GIS) IE adjustments.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js


--
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-mapping/src/main/webapp/dhis-web-mapping/i18n.vm'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm	2011-01-07 10:58:35 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm	2011-01-19 10:23:43 +0000
@@ -3,7 +3,7 @@
 G.i18n = {
     save: '$encoder.jsEscape($i18n.getString( 'save' ) , "'")',
     saved: '$encoder.jsEscape($i18n.getString( 'saved' ) , "'")',
-    delete: '$encoder.jsEscape($i18n.getString( 'delete' ) , "'")',
+    delete_: '$encoder.jsEscape($i18n.getString( 'delete' ) , "'")',
     deleted: '$encoder.jsEscape($i18n.getString( 'deleted' ) , "'")',
     update: '$encoder.jsEscape($i18n.getString( 'update' ) , "'")',
     updated: '$encoder.jsEscape($i18n.getString( 'updated' ) , "'")',
@@ -25,9 +25,9 @@
     boundary: '$encoder.jsEscape($i18n.getString( 'boundary' ) , "'")',
     level: '$encoder.jsEscape($i18n.getString( 'level' ) , "'")',
     type: '$encoder.jsEscape($i18n.getString( 'type' ) , "'")',
-    new: '$encoder.jsEscape($i18n.getString( 'new' ) , "'")',
+    new_: '$encoder.jsEscape($i18n.getString( 'new' ) , "'")',
     edit: '$encoder.jsEscape($i18n.getString( 'edit' ) , "'")',
-    export: '$encoder.jsEscape($i18n.getString( 'export' ) , "'")',
+    export_: '$encoder.jsEscape($i18n.getString( 'export' ) , "'")',
     map: '$encoder.jsEscape($i18n.getString( 'map' ) , "'")',
     favorite: '$encoder.jsEscape($i18n.getString( 'favorite' ) , "'")',
     favorites: '$encoder.jsEscape($i18n.getString( 'favorites' ) , "'")',

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2011-01-11 16:08:05 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2011-01-19 10:23:43 +0000
@@ -545,7 +545,7 @@
                 id: 'deleteview_b',
                 iconCls: 'icon-remove',
 				hideLabel: true,
-				text: G.i18n.delete,
+				text: G.i18n.delete_,
 				handler: function() {
 					var v = Ext.getCmp('favorite_cb').getValue();
 					var rw = Ext.getCmp('favorite_cb').getRawValue();
@@ -702,7 +702,7 @@
                 id: 'exportimage_b',
 				labelSeparator: G.conf.labelseparator,
                 iconCls: 'icon-export',
-				text: G.i18n.export,
+				text: G.i18n.export_,
 				handler: function() {
                     var values, svgElement, svg;
                     if (Ext.getCmp('exportimagelayers_cb').getValue() == 1) {
@@ -924,7 +924,7 @@
                                     {
                                         xtype: 'button',
                                         id: 'deletepredefinedmaplegend_b',
-                                        text: G.i18n.delete,
+                                        text: G.i18n.delete_,
                                         iconCls: 'icon-remove',
                                         handler: function() {
                                             var mlv = Ext.getCmp('predefinedmaplegend_cb').getValue();
@@ -1085,7 +1085,7 @@
                                     {
                                         xtype: 'button',
                                         id: 'deletepredefinedmaplegendset_b',
-                                        text: G.i18n.delete,
+                                        text: G.i18n.delete_,
                                         iconCls: 'icon-remove',
                                         handler: function() {
                                             var mlsv = Ext.getCmp('predefinedmaplegendsetindicator_cb').getValue();
@@ -1655,7 +1655,7 @@
             {
                 xtype: 'button',
                 id: 'deletemaplayer_b',
-                text: G.i18n.delete,
+                text: G.i18n.delete_,
                 iconCls: 'icon-remove',
                 handler: function() {
                     var ml = Ext.getCmp('maplayer_cb').getValue();
@@ -1785,7 +1785,7 @@
             {
                 xtype: 'button',
                 id: 'deletemaplayerbaselayers_b',
-                text: G.i18n.delete,
+                text: G.i18n.delete_,
                 iconCls: 'icon-remove',
                 handler: function() {
                     var ml = Ext.getCmp('maplayerbaselayers_cb').getValue();