dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3351
committer: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-04-11 17:59:50 +0200
message:
  Adding missing patterns for some period types.
modified:
  dhis-2/dhis-api/src/test/java/org/hisp/dhis/period/StringFormatTest.java
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties


--
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-api/src/test/java/org/hisp/dhis/period/StringFormatTest.java'
--- dhis-2/dhis-api/src/test/java/org/hisp/dhis/period/StringFormatTest.java	2011-01-14 16:18:27 +0000
+++ dhis-2/dhis-api/src/test/java/org/hisp/dhis/period/StringFormatTest.java	2011-04-11 15:59:50 +0000
@@ -45,7 +45,7 @@
 
         // override locale settings for weeks
         calendar.setFirstDayOfWeek( Calendar.MONDAY);
-        calendar.setMinimalDaysInFirstWeek( 4);
+        calendar.setMinimalDaysInFirstWeek( 4 );
 
         calendar.clear();
         calendar.set( year, month - 1, day );

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2011-04-11 13:46:07 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2011-04-11 15:59:50 +0000
@@ -125,9 +125,10 @@
 FinancialOct			= Financial-Oct
 
 format.Daily.startDate		= yyyy-MM-dd
-format.Daily.endDate		=
-format.Weekly.startDate 	= 'Week' w' '
-format.Weekly.endDate		= yyyy
+format.Daily.endDate
+#--Weekly periods are always ISO weeks regardless of this setting#
+format.Weekly.startDate 	= yyyy 'W' w
+format.Weekly.endDate		= 
 format.Monthly.startDate	= MMMM yyyy
 format.Monthly.endDate		=
 format.Quarterly.startDate	= MMM 'to '
@@ -146,6 +147,10 @@
 format.Relative.endDate		= yyyy-MM-dd
 format.FinancialApril.startDate	= dd MMM yyyy 'to '
 format.FinancialApril.endDate= dd MMM yyyy
+format.FinancialJuly.startDate	= dd MMM yyyy 'to '
+format.FinancialJuly.endDate= dd MMM yyyy
+format.FinancialOct.startDate	= 'FY '
+format.FinancialOct.endDate= yyyy
 
 #-- Months and weeks ----------------------------------------------------------#