dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 20471
committer: Halvdan Hoem Grelland <halvdanhg@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-10-02 13:57:20 +0200
message:
  i18n
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.fileresource.js
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.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-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2015-09-26 16:08:33 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2015-10-02 11:57:20 +0000
@@ -113,3 +113,6 @@
 print_blank_form=Print blank form
 instruction=Instruction
 there_is_no_audit_trail_for_this_value=There is no audit trail for this value
+are_you_sure_you_want_to_delete_this_file=Are you sure you want to delete this file?
+confirm_deletion=Confirm deletion
+file_upload_failed=File upload failed
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.fileresource.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.fileresource.js	2015-10-02 11:06:55 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.fileresource.js	2015-10-02 11:57:20 +0000
@@ -69,7 +69,7 @@
             $button.unbind( 'click' );
             $button.on( 'click', function() {
                 $( '#fileDeleteConfirmationDialog' ).dialog( {
-                    title: 'Confirm deletion',
+                    title: i18n_confirm_deletion,
                     resizable: false,
                     height: 140,
                     modal: true,
@@ -172,7 +172,7 @@
             },
             fail: function( e, data )
             {
-                setHeaderDelayMessage( "File upload failed!" );
+                setHeaderDelayMessage( i18n_file_upload_failed );
                 console.log( data.errorThrown );
                 setButtonUpload();
             },

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm	2015-10-01 12:37:19 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm	2015-10-02 11:57:20 +0000
@@ -53,6 +53,8 @@
 var i18n_no_periods_click_prev_year_button = '$encoder.jsEscape( $i18n.getString( "no_periods_click_prev_year_button" ) , "'")';
 var i18n_view_comment = '$encoder.jsEscape( $i18n.getString( "view_comment" ) , "'")';
 var i18n_no_orgunits = '$encoder.jsEscape( $i18n.getString( "no_orgunits" ) , "'")';
+var i18n_confirm_deletion = '$encoder.jsEscape( $i18n.getString( "confirm_deletion" ), "'" )';
+var i18n_file_upload_failed = '$encoder.jsEscape( $i18n.getString( "file_upload_failed" ), "'" )';
 </script>
 
 <style type="text/css" media="print">
@@ -145,9 +147,9 @@
     </tr>
 </table>
 </div>
-
+## Are you sure you want to delete the file?
 <div id="fileDeleteConfirmationDialog">
     <div class="confirm-dialog-content">
-        <span class="fa fa-exclamation-triangle fa-lg"></span><span>Are you sure you want to delete the file?</span>
+        <span class="fa fa-exclamation-triangle fa-lg"></span><span>$i18n.getString( "are_you_sure_you_want_to_delete_this_file" )</span>
     </div>
 </div>