dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16090
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-07-11 21:38:35 +0200
message:
  Scheduling, renamed from never to disabled
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/viewScheduledTasks.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-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2014-07-11 19:12:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2014-07-11 19:38:35 +0000
@@ -349,4 +349,5 @@
 data_set=Data Set
 last_year_daily=Last year daily
 show_fewer_options=Show fewer options
-show_more_options=Show more options
\ No newline at end of file
+show_more_options=Show more options
+disabled=Disabled
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/viewScheduledTasks.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/viewScheduledTasks.vm	2014-07-11 19:12:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/viewScheduledTasks.vm	2014-07-11 19:38:35 +0000
@@ -13,7 +13,7 @@
 
 <div class="setting settingIndent">
 <select id="resourceTableStrategy" name="resourceTableStrategy" class="scheduling">
-	<option value="never">$i18n.getString( "never" )</option>
+	<option value="disabled">$i18n.getString( "disabled" )</option>
 	<option value="allDaily"#if( $resourceTableStrategy && $resourceTableStrategy == "allDaily" ) selected="selected"#end>$i18n.getString( "all_daily" )</option>
 </select>
 </div>
@@ -26,7 +26,7 @@
 
 <div class="setting settingIndent">
 <select id="analyticsStrategy" name="analyticsStrategy" class="scheduling">
-    <option value="never">$i18n.getString( "never" )</option>
+    <option value="disabled">$i18n.getString( "disabled" )</option>
     <option value="allDaily"#if( $analyticsStrategy && $analyticsStrategy == "allDaily" ) selected="selected"#end>$i18n.getString( "all_daily" )</option>
     <option value="last3YearsDaily"#if( $analyticsStrategy && $analyticsStrategy == "last3YearsDaily" ) selected="selected"#end>$i18n.getString( "last_3_years_daily" )</option>
 </select>
@@ -40,7 +40,7 @@
 
 <div class="setting settingIndent">
 <select id="monitoringStrategy" name="monitoringStrategy" class="scheduling">
-    <option value="never">$i18n.getString( "never" )</option>
+    <option value="disabled">$i18n.getString( "disabled" )</option>
     <option value="allDaily"#if( $monitoringStrategy && $monitoringStrategy == "allDaily" ) selected="selected"#end>$i18n.getString( "all_daily" )</option>
 </select>
 </div>
@@ -57,7 +57,7 @@
 
 <div class="setting settingIndent">
 <select id="dataMartStrategy" name="dataMartStrategy" class="scheduling" onchange="toggleDataMart()">
-    <option value="never">$i18n.getString( "never" )</option>
+    <option value="disabled">$i18n.getString( "disabled" )</option>
     <option value="allDaily"#if( $dataMartStrategy && $dataMartStrategy == "allDaily" ) selected="selected"#end>$i18n.getString( "last_year_daily" )</option>
 </select>
 </div>