dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6046
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-02-20 16:02:21 +0700
message:
  local vn - Bumped to 2.7 version and minor fixed.
modified:
  local/vn/dhis-service-spreadsheet-reporting/pom.xml
  local/vn/dhis-web-spreadsheet-reporting/pom.xml
  local/vn/dhis-web-spreadsheet-reporting/src/main/resources/META-INF/dhis/beans.xml
  local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module.properties
  local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module_vi_VN.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 'local/vn/dhis-service-spreadsheet-reporting/pom.xml'
--- local/vn/dhis-service-spreadsheet-reporting/pom.xml	2012-02-03 08:38:42 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/pom.xml	2012-02-20 09:02:21 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-services</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7</version>
   </parent>
   
   <artifactId>dhis-service-spreadsheet-reporting</artifactId>

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/pom.xml'
--- local/vn/dhis-web-spreadsheet-reporting/pom.xml	2011-12-27 04:30:21 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/pom.xml	2012-02-20 09:02:21 +0000
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-web</artifactId>
-    <version>2.7-SNAPSHOT</version>
+    <version>2.7</version>
   </parent>
   
   <artifactId>dhis-web-spreadsheet-reporting</artifactId>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-spreadsheet-reporting</artifactId>
-	  <version>2.7-SNAPSHOT</version>
+	  <version>2.7</version>
     </dependency>
 	<dependency>
       <groupId>org.hisp.dhis</groupId>

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/resources/META-INF/dhis/beans.xml	2012-02-03 08:38:42 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/resources/META-INF/dhis/beans.xml	2012-02-20 09:02:21 +0000
@@ -84,7 +84,7 @@
 		id="org.hisp.dhis.reportsheet.configuration.action.GetReportConfigurationAction"
 		class="org.hisp.dhis.reportsheet.configuration.action.GetReportConfigurationAction"
 		scope="prototype">
-		<property name="systemSettingManager" ref="org.hisp.dhis.options.SystemSettingManager" />
+		<property name="systemSettingManager" ref="org.hisp.dhis.setting.SystemSettingManager" />
 	</bean>
 
 	<bean
@@ -92,7 +92,7 @@
 		class="org.hisp.dhis.reportsheet.configuration.action.SetReportConfigurationAction"
 		scope="prototype">
 		<property name="reportLocationManager" ref="org.hisp.dhis.reportsheet.ReportLocationManager" />
-		<property name="systemSettingManager" ref="org.hisp.dhis.options.SystemSettingManager" />
+		<property name="systemSettingManager" ref="org.hisp.dhis.setting.SystemSettingManager" />
 	</bean>
 	
 	<bean

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module.properties'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module.properties	2012-01-12 07:06:28 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module.properties	2012-02-20 09:02:21 +0000
@@ -306,4 +306,5 @@
 indicator_with_id			= Indicator with id
 dataelement_with_id			= Dataelement with id
 cate_option_combo_with_id	= Option combo with id
-does_not_exist				= does not exist
\ No newline at end of file
+does_not_exist				= does not exist
+period_columns				= Period columns
\ No newline at end of file

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module_vi_VN.properties'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module_vi_VN.properties	2012-01-12 07:06:28 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module_vi_VN.properties	2012-02-20 09:02:21 +0000
@@ -338,4 +338,5 @@
 indicator_with_id=Ch\u1ec9 s\u1ed1 c\u00f3 m\u00e3
 dataelement_with_id=Ph\u1ea7n t\u1eed d\u1eef li\u1ec7u c\u00f3 m\u00e3
 cate_option_combo_with_id=T\u1eadp m\u1ee5c ch\u1ecdn ph\u00e2n lo\u1ea1i c\u00f3 m\u00e3
-does_not_exist=kh\u00f4ng t\u1ed3n t\u1ea1i
\ No newline at end of file
+does_not_exist=kh\u00f4ng t\u1ed3n t\u1ea1i
+Period_columns=C\u1ed9t th\u1eddi \u0111i\u1ec3m
\ No newline at end of file