dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5746
committer: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-01-18 14:02:22 +0200
message:
  (DV) More i18n of data visualizer
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-01-18 05:05:02 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties	2012-01-18 12:02:22 +0000
@@ -78,4 +78,9 @@
 saving=Saving
 renaming=Renaming
 deleting=Deleting
-
+data=Data
+indicator=Indicator
+data_element=Data element
+period=Period
+organisation_unit=Organisation unit
+invalid_uid=Invalid uid

=== 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-01-18 05:05:02 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2012-01-18 12:02:22 +0000
@@ -42,23 +42,23 @@
         dimension: {
             data: {
                 value: 'data',
-                rawvalue: 'Data'  /*TODO i18n?*/
+                rawvalue: G.i18n.data
             },
             indicator: {
                 value: 'indicator',
-                rawvalue: 'Indicator'     /*TODO i18n?*/
+                rawvalue: G.i18n.indicator
             },
             dataelement: {
                 value: 'dataelement',
-                rawvalue: 'Data element'     /*TODO i18n?*/
+                rawvalue: G.i18n.data_element
             },
             period: {
                 value: 'period',
-                rawvalue: 'Period'         /*TODO i18n?*/
+                rawvalue: G.i18n.period
             },
             organisationunit: {
                 value: 'organisationunit',
-                rawvalue: 'Organisation unit'   /*TODO i18n?*/
+                rawvalue: G.i18n.organisation_unit
             }
         },        
         chart: {
@@ -768,7 +768,7 @@
                 },
                 updateName: function(name) {
                     if (DV.store.favorite.findExact('name', name) != -1) {
-                        alert('Name is already in use');
+                        alert(G.i18n.name_already_in_use);
                         return;
                     }
                     DV.util.mask.setMask(DV.cmp.favorite.window, G.i18n.renaming + '...');
@@ -1053,7 +1053,7 @@
                     success: function(r) {
                         if (!r.responseText) {
                             DV.mask.hide();
-                            alert('Invalid uid');
+                            alert(G.i18n.invalid_uid);
                             return;
                         }
                         var f = Ext.JSON.decode(r.responseText),

=== 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-01-18 05:05:02 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/i18n.vm	2012-01-18 12:02:22 +0000
@@ -79,8 +79,12 @@
 data_elemenent_store_does_not_exist:'$encoder.jsEscape($i18n.getString( 'data_elemenent_store_does_not_exist' ) , "'")',
 saving:'$encoder.jsEscape($i18n.getString( 'saving' ) , "'")',
 renaming:'$encoder.jsEscape($i18n.getString( 'renaming' ) , "'")',
-Deleting:'$encoder.jsEscape($i18n.getString( 'Deleting' ) , "'")'
-
-
+deleting:'$encoder.jsEscape($i18n.getString( 'deleting' ) , "'")',
+data:'$encoder.jsEscape($i18n.getString( 'data' ) , "'")',
+indicator:'$encoder.jsEscape($i18n.getString( 'indicator' ) , "'")',
+data_element:'$encoder.jsEscape($i18n.getString( 'data_element' ) , "'")',
+period:'$encoder.jsEscape($i18n.getString( 'period' ) , "'")',
+organisation_unit:'$encoder.jsEscape($i18n.getString( 'organisation_unit' ) , "'")',
+invalid_uid:'$encoder.jsEscape($i18n.getString( 'invalid_uid' ) , "'")'
 
 };
\ No newline at end of file