dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 13086
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2013-12-01 17:26:11 +0100
message:
  removed some duplicate i18n keys in dashboard module, also added i18n for deletion error messages
modified:
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretationFeed.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-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties	2013-10-09 18:06:43 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties	2013-12-01 16:26:11 +0000
@@ -42,9 +42,7 @@
 explore=Explore
 interpretations=Interpretations
 share_your_own_interpretations_from=Share your own interpretations from
-data_visualizer=Data visualizer
 gis=GIS
-report_table=Report table
 pivot_table=Pivot table
 add_a_comment=Add a comment
 new_interpretations=new interpretations
@@ -65,7 +63,6 @@
 select_users_and_user_groups=Select users and user groups
 generate_data_set_report_click_share=generate a data set report and click 'Share' on the top menu
 data_visualizer=Data visualizer
-report_table=Report table
 data_set_report=Data set report
 search_for_users_charts_maps_reports=Search for users, charts, maps, reports and resources
 no_hits=No hits, try again
@@ -82,7 +79,7 @@
 follow_up=Follow up
 unread=Unread
 send_message=Send message
-to=to
+to=To
 scroll_down=Scroll down
 scroll_up=Scroll up
 latest_interpretations=Latest interpretations
@@ -116,11 +113,11 @@
 click_to_explore_drag_to_new_position=Click to explore or drag to new position
 drag_to_new_position=Drag to new position
 system_notification=System notification
-to=To
 and=and
 more=more
 see_more_hits=See more hits
 see_fewer_hits=See fewer hits
 add=Add
 add_items_to_current_dashboard=Add items to current dashboard
-share_interpretation=Share interpretation
\ No newline at end of file
+could_not_delete_interpretation=Could not delete interpretation, please try again later
+could_not_delete_interpretation_comment=Could not delete interpretation comment, please try again later

=== 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-01 15:05:10 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretationFeed.vm	2013-12-01 16:26:11 +0000
@@ -71,7 +71,7 @@
     }).done(function() {
       jqInterpretation.remove();
     }).error(function() {
-      setHeaderDelayMessage('Could not delete interpretation, please try again later');
+      setHeaderDelayMessage('$i18n.getString("could_not_delete_interpretation")');
     });
   } else if( isComment ) {
     jQuery.ajax({
@@ -80,7 +80,7 @@
     }).done(function() {
       jqInterpretationComment.remove();
     }).error(function() {
-      setHeaderDelayMessage('Could not delete interpretation comment, please try again later');
+      setHeaderDelayMessage('$i18n.getString("could_not_delete_interpretation_comment")');
     });
   }
 }