dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 13100
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-12-02 14:47:39 +0100
message:
  minor i18n fix in ip feed
modified:
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretationFeed.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/interpretation.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-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretationFeed.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretationFeed.vm	2013-12-02 12:30:19 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretationFeed.vm	2013-12-02 13:47:39 +0000
@@ -11,6 +11,9 @@
 #end
 
 <script>
+var i18n_cancel = '$encoder.jsEscape( $i18n.getString( "cancel" ) , "'")';
+var i18n_save = '$encoder.jsEscape( $i18n.getString( "save" ) , "'")';
+
 jQuery(function() {
   var dropDown = jQuery('.dropDown');
 

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/interpretation.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/interpretation.js	2013-12-02 13:45:03 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/interpretation.js	2013-12-02 13:47:39 +0000
@@ -120,13 +120,13 @@
     .append(textArea);
 
   var cancelButton = jQuery("<button/>")
-    .text('Cancel')
+    .text(i18n_cancel)
     .on('click', function( e ) {
       $target.html(oldContent);
     });
 
   var saveButton = jQuery("<button/>")
-    .text('Save')
+    .text(i18n_save)
     .on('click', function( e ) {
       alert('save is not implemented');
     });