dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #15733
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5782: I18n db commons module
------------------------------------------------------------
revno: 5782
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2012-01-22 12:28:12 +0100
message:
I18n db commons module
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElement.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroup.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroupSet.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroupSets.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroups.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElements.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataSet.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataSets.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicator.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicatorGroup.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicatorGroupSet.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicatorGroupSets.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicatorGroups.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicators.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitGroup.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitGroupSet.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitGroupSets.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitGroups.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonSection.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonminDataElementGroups.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonminDataElements.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonminIndicatorGroups.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonminIndicators.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElement.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElementGroup.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElementGroupSet.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElementGroups.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElements.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataSet.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataSets.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlIndicator.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlIndicatorGroup.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlIndicatorGroupSet.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlIndicatorGroups.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlIndicators.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-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElement.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElement.vm 2011-09-26 10:48:38 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElement.vm 2012-01-22 11:28:12 +0000
@@ -1,11 +1,11 @@
{ "dataElement":
{
"id": $!{dataElement.id},
- "name": "$!encoder.jsonEncode( ${dataElement.name} )",
+ "name": "$!encoder.jsonEncode( ${dataElement.displayName} )",
"alternativeName": "$!encoder.jsonEncode( ${dataElement.alternativeNamee} )",
- "shortName": "$!encoder.jsonEncode( ${dataElement.shortName} )",
+ "shortName": "$!encoder.jsonEncode( ${dataElement.displayShortName} )",
"code": "$!encoder.jsonEncode( ${dataElement.code} )",
- "description": "$!encoder.jsonEncode( ${dataElement.description} )",
+ "description": "$!encoder.jsonEncode( ${dataElement.displayDescription} )",
"active": "$!{dataElement.active}",
"type": "$!{dataElement.type}",
"valueType": "$!{dataElement.type}",
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroup.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroup.vm 2010-12-12 19:49:23 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroup.vm 2012-01-22 11:28:12 +0000
@@ -1,7 +1,7 @@
{ "dataElementGroup":
{
"id": $!{dataElementGroup.id},
- "name": "$!encoder.jsonEncode( ${dataElementGroup.name} )",
+ "name": "$!encoder.jsonEncode( ${dataElementGroup.displayName} )",
"memberCount": "$memberCount"
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroupSet.vm 2011-09-27 07:36:07 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroupSet.vm 2012-01-22 11:28:12 +0000
@@ -1,7 +1,7 @@
{ "dataElementGroupSet":
{
"id": "${dataElementGroupSet.id}" ,
- "name": "$!encoder.jsonEncode( ${dataElementGroupSet.name} )",
+ "name": "$!encoder.jsonEncode( ${dataElementGroupSet.displayName} )",
"memberCount": "$dataElementGroupSet.members.size()"
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroupSets.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroupSets.vm 2011-05-24 09:42:48 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroupSets.vm 2012-01-22 11:28:12 +0000
@@ -3,7 +3,7 @@
#foreach( $dataElementGroupSet in $dataElementGroupSets )
{
"id": ${dataElementGroupSet.id} ,
- "name": "$!encoder.jsonEncode( ${dataElementGroupSet.name} )"
+ "name": "$!encoder.jsonEncode( ${dataElementGroupSet.displayName} )"
}#if( $velocityCount < $size ),#end
#end
]
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroups.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroups.vm 2011-05-16 14:21:57 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroups.vm 2012-01-22 11:28:12 +0000
@@ -3,7 +3,7 @@
#foreach( $dataElementGroup in $dataElementGroups )
{
"id": ${dataElementGroup.id} ,
- "name": "$!encoder.jsonEncode( ${dataElementGroup.name} )"
+ "name": "$!encoder.jsonEncode( ${dataElementGroup.displayName} )"
}#if( $velocityCount < $size ),#end
#end
]
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElements.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElements.vm 2011-05-30 08:42:17 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElements.vm 2012-01-22 11:28:12 +0000
@@ -5,9 +5,9 @@
#set( $dataSets = $dataElement.dataSets )
{
"id": ${dataElement.id} ,
- "name": "$!encoder.jsonEncode( ${dataElement.name} )",
+ "name": "$!encoder.jsonEncode( ${dataElement.displayName} )",
"alternativeName": "$!encoder.jsonEncode( ${dataElement.alternativeNamee} )",
- "shortName": "$!encoder.jsonEncode( ${dataElement.shortName} )",
+ "shortName": "$!encoder.jsonEncode( ${dataElement.displayShortName} )",
"code": "$!encoder.jsonEncode( ${dataElement.code} )",
"type": "$!{dataElement.type}",
"aggregationOperator": "$!{dataElement.aggregationOperator}",
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataSet.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataSet.vm 2011-10-06 09:36:47 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataSet.vm 2012-01-22 11:28:12 +0000
@@ -1,8 +1,8 @@
{ "dataSet":
{
"id": $!{dataSet.id},
- "name": "$!encoder.jsonEncode( ${dataSet.name} )",
- "shortName": "$!encoder.jsonEncode( ${dataSet.shortName} )",
+ "name": "$!encoder.jsonEncode( ${dataSet.displayName} )",
+ "shortName": "$!encoder.jsonEncode( ${dataSet.displayShortName} )",
"periodTypeId": "$!{dataSet.periodTypeId}",
"frequency": "$i18n.getString( $!{dataSet.periodType.name} )",
"dataElementCount": "$!{dataSet.dataElements.size()}"
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataSets.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataSets.vm 2011-07-13 09:32:37 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataSets.vm 2012-01-22 11:28:12 +0000
@@ -3,8 +3,8 @@
#foreach( $dataSet in $dataSets )
{
"id": $!{dataSet.id},
- "name": "$!encoder.jsonEncode( ${dataSet.name} )",
- "shortName": "$!encoder.jsonEncode( ${dataSet.shortName} )",
+ "name": "$!encoder.jsonEncode( ${dataSet.displayName} )",
+ "shortName": "$!encoder.jsonEncode( ${dataSet.displayShortName} )",
"periodTypeId": "$!{dataSet.periodTypeId}",
"version": "$!{dataSet.version}"
}#if( $velocityCount < $size ),#end
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicator.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicator.vm 2011-12-01 04:07:26 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicator.vm 2012-01-22 11:28:12 +0000
@@ -1,11 +1,11 @@
{ "indicator":
{
"id": $!{indicator.id},
- "name": "$!encoder.jsonEncode( ${indicator.name} )",
+ "name": "$!encoder.jsonEncode( ${indicator.displayName} )",
"alternativeName": "$!encoder.jsonEncode( ${indicator.alternativeNamee} )",
- "shortName": "$!encoder.jsonEncode( ${indicator.shortName} )",
+ "shortName": "$!encoder.jsonEncode( ${indicator.displayShortName} )",
"code": "$!encoder.jsonEncode( ${indicator.code} )",
- "description": "$!encoder.xmlEncode( ${indicator.description} )",
+ "description": "$!encoder.xmlEncode( ${indicator.displayDescription} )",
"annualized": "${indicator.annualized}",
"indicatorTypeId": "$!{indicator.indicatorType.id}",
"indicatorTypeName": "$!encoder.xmlEncode( $!{indicator.indicatorType.name} )",
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicatorGroup.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicatorGroup.vm 2010-12-13 06:40:41 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicatorGroup.vm 2012-01-22 11:28:12 +0000
@@ -1,8 +1,8 @@
{ "indicatorGroup":
{
"id": $!{indicatorGroup.id},
- "name": "$!encoder.jsonEncode( ${indicatorGroup.name} )",
- "alternativeName": "$!encoder.jsonEncode( ${indicatorGroup.alternativeNamee} )",
+ "name": "$!encoder.jsonEncode( ${indicatorGroup.displayName} )",
+ "alternativeName": "$!encoder.jsonEncode( ${indicatorGroup.alternativeName} )",
"memberCount": "$memberCount"
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicatorGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicatorGroupSet.vm 2011-09-27 07:36:07 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicatorGroupSet.vm 2012-01-22 11:28:12 +0000
@@ -1,7 +1,7 @@
{ "indicatorGroupSet":
{
"id": $!{indicatorGroupSet.id},
- "name": "$!encoder.jsonEncode( ${indicatorGroupSet.name} )",
+ "name": "$!encoder.jsonEncode( ${indicatorGroupSet.displayName} )",
"memberCount": "$!indicatorGroupSet.members.size()"
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicatorGroupSets.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicatorGroupSets.vm 2011-05-24 09:42:48 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicatorGroupSets.vm 2012-01-22 11:28:12 +0000
@@ -3,7 +3,7 @@
#foreach( $indicatorGroupSet in $indicatorGroupSets )
{
"id": $!{indicatorGroupSet.id},
- "name": "$!encoder.jsonEncode( ${indicatorGroupSet.name} )"
+ "name": "$!encoder.jsonEncode( ${indicatorGroupSet.displayName} )"
}#if( $velocityCount < $size ),#end
#end
]
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicatorGroups.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicatorGroups.vm 2011-05-16 14:21:57 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicatorGroups.vm 2012-01-22 11:28:12 +0000
@@ -3,7 +3,7 @@
#foreach( $indicatorGroup in $indicatorGroups )
{
"id": $!{indicatorGroup.id},
- "name": "$!encoder.jsonEncode( ${indicatorGroup.name} )"
+ "name": "$!encoder.jsonEncode( ${indicatorGroup.displayName} )"
}#if( $velocityCount < $size ),#end
#end
]
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicators.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicators.vm 2011-05-30 08:42:17 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicators.vm 2012-01-22 11:28:12 +0000
@@ -4,9 +4,9 @@
#set( $groups = $indicator.groups )
{
"id": $!{indicator.id},
- "name": "$!encoder.jsonEncode( ${indicator.name} )",
+ "name": "$!encoder.jsonEncode( ${indicator.displayName} )",
"alternativeName": "$!encoder.jsonEncode( ${indicator.alternativeNamee} )",
- "shortName": "$!encoder.jsonEncode( ${indicator.shortName} )",
+ "shortName": "$!encoder.jsonEncode( ${indicator.displayShortName} )",
"code": "$!encoder.jsonEncode( ${indicator.code} )",
"annualized": "${indicator.annualized}",
"indicatorTypeId": $!{indicator.indicatorType.id},
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitGroup.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitGroup.vm 2011-09-27 08:37:54 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitGroup.vm 2012-01-22 11:28:12 +0000
@@ -1,7 +1,7 @@
{ "organisationUnitGroup":
{
"id": "$!{organisationUnitGroup.id}",
- "name": "$!encoder.jsonEncode( ${organisationUnitGroup.name} )",
+ "name": "$!encoder.jsonEncode( ${organisationUnitGroup.displayName} )",
"memberCount": "$!{organisationUnitGroup.members.size()}"
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitGroupSet.vm 2011-09-27 08:37:54 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitGroupSet.vm 2012-01-22 11:28:12 +0000
@@ -1,7 +1,7 @@
{ "organisationUnitGroupSet":
{
"id": "${organisationUnitGroupSet.id}",
- "name": "$!encoder.jsonEncode( ${organisationUnitGroupSet.name} )",
+ "name": "$!encoder.jsonEncode( ${organisationUnitGroupSet.displayName} )",
"description": "$!encoder.jsonEncode( ${organisationUnitGroupSet.description} )",
"compulsory": "$!{organisationUnitGroupSet.compulsory}",
"memberCount": "$!{memberCount}"
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitGroupSets.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitGroupSets.vm 2011-05-24 11:00:34 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitGroupSets.vm 2012-01-22 11:28:12 +0000
@@ -3,7 +3,7 @@
#foreach( $groupSet in $organisationUnitGroupSets )
{
"id": "$groupSet.id",
- "name": "$!encoder.jsonEncode( ${groupSet.name} )"
+ "name": "$!encoder.jsonEncode( ${groupSet.displayName} )"
}#if( $velocityCount < $size ),#end
#end
]
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitGroups.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitGroups.vm 2011-05-16 14:21:57 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitGroups.vm 2012-01-22 11:28:12 +0000
@@ -3,7 +3,7 @@
#foreach( $group in $organisationUnitGroups )
{
"id": "$group.id",
- "name": "$!encoder.jsonEncode( ${group.name} )"
+ "name": "$!encoder.jsonEncode( ${group.displayName} )"
}#if( $velocityCount < $size ),#end
#end
]
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonSection.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonSection.vm 2011-09-27 09:10:27 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonSection.vm 2012-01-22 11:28:12 +0000
@@ -1,7 +1,7 @@
{ "section":
{
"id": "$!{section.id}",
- "name": "$!encoder.jsonEncode( ${section.name} )",
+ "name": "$!encoder.jsonEncode( ${section.displayName} )",
"dataSet": "$!encoder.jsonEncode( ${section.dataSet.name} )",
"categoryCombo": "$!encoder.jsonEncode( ${categoryCombo.name} )",
"dataElementCount": "$!{sectionDataElements.size()}"
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonminDataElementGroups.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonminDataElementGroups.vm 2011-09-22 13:17:39 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonminDataElementGroups.vm 2012-01-22 11:28:12 +0000
@@ -1,2 +1,2 @@
#set( $size = $dataElementGroups.size() )
-{"dataElementGroups":[#foreach( $group in $dataElementGroups ){"id":$!{group.id},"name":"$!encoder.jsonEncode( ${group.name} )"}#if( $velocityCount < $size ),#end#end]}
\ No newline at end of file
+{"dataElementGroups":[#foreach( $group in $dataElementGroups ){"id":$!{group.id},"name":"$!encoder.jsonEncode( ${group.displayName} )"}#if( $velocityCount < $size ),#end#end]}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonminDataElements.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonminDataElements.vm 2011-12-06 10:53:15 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonminDataElements.vm 2012-01-22 11:28:12 +0000
@@ -1,2 +1,2 @@
#set( $size = $dataElements.size() )
-{"dataElements":[#foreach( $dataElement in $dataElements ){"id":$!{dataElement.id},"s":"$!encoder.jsonEncode( ${dataElement.shortName} )"}#if( $velocityCount < $size ),#end#end]}
\ No newline at end of file
+{"dataElements":[#foreach( $dataElement in $dataElements ){"id":$!{dataElement.id},"s":"$!encoder.jsonEncode( ${dataElement.displayShortName} )"}#if( $velocityCount < $size ),#end#end]}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonminIndicatorGroups.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonminIndicatorGroups.vm 2011-09-22 13:17:39 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonminIndicatorGroups.vm 2012-01-22 11:28:12 +0000
@@ -1,2 +1,2 @@
#set( $size = $indicatorGroups.size() )
-{"indicatorGroups":[#foreach( $group in $indicatorGroups ){"id":$!{group.id},"name":"$!encoder.jsonEncode( ${group.name} )"}#if( $velocityCount < $size ),#end#end]}
\ No newline at end of file
+{"indicatorGroups":[#foreach( $group in $indicatorGroups ){"id":$!{group.id},"name":"$!encoder.jsonEncode( ${group.displayName} )"}#if( $velocityCount < $size ),#end#end]}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonminIndicators.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonminIndicators.vm 2011-12-06 10:53:15 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonminIndicators.vm 2012-01-22 11:28:12 +0000
@@ -1,1 +1,1 @@
-#set( $size = $indicators.size() ){"indicators":[#foreach( $indicator in $indicators ){"id":$!{indicator.id},"s":"$!encoder.jsonEncode( ${indicator.shortName} )"}#if( $velocityCount < $size ),#end#end]}
\ No newline at end of file
+#set( $size = $indicators.size() ){"indicators":[#foreach( $indicator in $indicators ){"id":$!{indicator.id},"s":"$!encoder.jsonEncode( ${indicator.displayShortName} )"}#if( $velocityCount < $size ),#end#end]}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElement.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElement.vm 2011-09-06 07:57:07 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElement.vm 2012-01-22 11:28:12 +0000
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<dataElement>
<id>$dataElement.id</id>
- <name>$encoder.xmlEncode( $dataElement.name )</name>
- <shortName>$encoder.xmlEncode( $dataElement.shortName )</shortName>
+ <name>$encoder.xmlEncode( $dataElement.displayName )</name>
+ <shortName>$encoder.xmlEncode( $dataElement.displayShortName )</shortName>
<alternativeName>$!encoder.xmlEncode( $dataElement.alternativeName )</alternativeName>
<code>$!encoder.xmlEncode( $dataElement.code )</code>
- <description>$!encoder.xmlEncode( $dataElement.description )</description>
+ <description>$!encoder.xmlEncode( $dataElement.displayDescription )</description>
<active>$dataElement.active</active>
<domainType>$dataElement.getDomainTypeNullSafe()</domainType>
<valueType>$dataElement.type</valueType>
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElementGroup.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElementGroup.vm 2010-11-20 08:23:34 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElementGroup.vm 2012-01-22 11:28:12 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<dataElementGroup>
<id>$dataElementGroup.id</id>
- <name>$encoder.xmlEncode( $dataElementGroup.name )</name>
+ <name>$encoder.xmlEncode( $dataElementGroup.displayName )</name>
<memberCount>$memberCount</memberCount>
</dataElementGroup>
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElementGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElementGroupSet.vm 2010-11-20 08:23:34 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElementGroupSet.vm 2012-01-22 11:28:12 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<dataElementGroupSet>
<id>$dataElementGroupSet.id</id>
- <name>$encoder.xmlEncode( $dataElementGroupSet.name )</name>
+ <name>$encoder.xmlEncode( $dataElementGroupSet.displayName )</name>
<memberCount>$dataElementGroupSet.members.size()</memberCount>
</dataElementGroupSet>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElementGroups.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElementGroups.vm 2010-11-20 08:23:34 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElementGroups.vm 2012-01-22 11:28:12 +0000
@@ -3,7 +3,7 @@
#foreach( $dataElementGroup in $dataElementGroups )
<dataElementGroup>
<id>$dataElementGroup.id</id>
- <name>$encoder.xmlEncode( $dataElementGroup.name )</name>
+ <name>$encoder.xmlEncode( $dataElementGroup.displayName )</name>
</dataElementGroup>
#end
</dataElementGroups>
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElements.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElements.vm 2010-11-20 08:23:34 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElements.vm 2012-01-22 11:28:12 +0000
@@ -3,11 +3,11 @@
#foreach( $dataElement in $dataElements )
<dataElement>
<id>$dataElement.id</id>
- <name>$encoder.xmlEncode( $dataElement.name )</name>
- <shortName>$encoder.xmlEncode( $dataElement.shortName )</shortName>
+ <name>$encoder.xmlEncode( $dataElement.displayName )</name>
+ <shortName>$encoder.xmlEncode( $dataElement.displayShortName )</shortName>
<alternativeName>$!encoder.xmlEncode( $dataElement.alternativeName )</alternativeName>
<code>$!encoder.xmlEncode( $dataElement.code )</code>
- <description>$!encoder.xmlEncode( $dataElement.description )</description>
+ <description>$!encoder.xmlEncode( $dataElement.displayDescription )</description>
<active>$dataElement.active</active>
<domainType>$dataElement.getDomainTypeNullSafe()</domainType>
<type>$dataElement.type</type>
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataSet.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataSet.vm 2010-11-20 08:23:34 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataSet.vm 2012-01-22 11:28:12 +0000
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<dataSet>
<id>$dataSet.id</id>
- <name>$!encoder.xmlEncode( $dataSet.name )</name>
- <shortName>$!encoder.xmlEncode( $dataSet.shortName )</shortName>
+ <name>$!encoder.xmlEncode( $dataSet.displayName )</name>
+ <shortName>$!encoder.xmlEncode( $dataSet.displayShortName )</shortName>
<periodTypeId>$dataSet.periodType.id</periodTypeId>
<frequency>$i18n.getString( $dataSet.periodType.name )</frequency>
<dataElementCount>$dataSet.dataElements.size()</dataElementCount>
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataSets.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataSets.vm 2010-01-25 09:23:35 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataSets.vm 2012-01-22 11:28:12 +0000
@@ -3,8 +3,8 @@
#foreach( $dataSet in $dataSets )
<dataSet>
<id>$dataSet.id</id>
- <name>$!encoder.xmlEncode( $dataSet.name )</name>
- <shortName>$!encoder.xmlEncode( $dataSet.shortName )</shortName>
+ <name>$!encoder.xmlEncode( $dataSet.displayName )</name>
+ <shortName>$!encoder.xmlEncode( $dataSet.displayShortName )</shortName>
<periodTypeId>$dataSet.periodType.id</periodTypeId>
</dataSet>
#end
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlIndicator.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlIndicator.vm 2011-09-27 07:36:07 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlIndicator.vm 2012-01-22 11:28:12 +0000
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<indicator>
<id>$indicator.id</id>
- <name>$!encoder.xmlEncode( $indicator.name )</name>
- <shortName>$!encoder.xmlEncode( $indicator.shortName )</shortName>
+ <name>$!encoder.xmlEncode( $indicator.displayName )</name>
+ <shortName>$!encoder.xmlEncode( $indicator.displayShortName )</shortName>
<alternativeName>$!encoder.xmlEncode( $indicator.alternativeName )</alternativeName>
<code>$!encoder.xmlEncode( $indicator.code )</code>
- <description>$!encoder.xmlEncode( $indicator.description )</description>
+ <description>$!encoder.xmlEncode( $indicator.displayDescription )</description>
<annualized>$indicator.isAnnualized()</annualized>
<indicatorTypeId>$indicator.indicatorType.id</indicatorTypeId>
<indicatorTypeName>$!encoder.xmlEncode( $indicator.indicatorType.name )</indicatorTypeName>
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlIndicatorGroup.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlIndicatorGroup.vm 2010-11-20 08:23:34 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlIndicatorGroup.vm 2012-01-22 11:28:12 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<indicator>
<id>$indicatorGroup.id</id>
- <name>$!encoder.xmlEncode( $indicatorGroup.name )</name>
+ <name>$!encoder.xmlEncode( $indicatorGroup.displayName )</name>
<memberCount>$memberCount</memberCount>
</indicator>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlIndicatorGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlIndicatorGroupSet.vm 2010-11-20 08:23:34 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlIndicatorGroupSet.vm 2012-01-22 11:28:12 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<indicatorGroupSet>
<id>$indicatorGroupSet.id</id>
- <name>$encoder.xmlEncode( $indicatorGroupSet.name )</name>
+ <name>$encoder.xmlEncode( $indicatorGroupSet.displayName )</name>
<memberCount>$indicatorGroupSet.members.size()</memberCount>
</indicatorGroupSet>
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlIndicatorGroups.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlIndicatorGroups.vm 2010-11-20 08:23:34 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlIndicatorGroups.vm 2012-01-22 11:28:12 +0000
@@ -3,7 +3,7 @@
#foreach( $indicatorGroup in $indicatorGroups )
<indicatorGroup>
<id>$indicatorGroup.id</id>
- <name>$encoder.xmlEncode( $indicatorGroup.name )</name>
+ <name>$encoder.xmlEncode( $indicatorGroup.displayName )</name>
</indicatorGroup>
#end
</indicatorGroups>
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlIndicators.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlIndicators.vm 2010-01-25 09:23:35 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlIndicators.vm 2012-01-22 11:28:12 +0000
@@ -3,11 +3,11 @@
#foreach( $indicator in $indicators )
<indicator>
<id>$indicator.id</id>
- <name>$!encoder.xmlEncode( $indicator.name )</name>
+ <name>$!encoder.xmlEncode( $indicator.displayName )</name>
<alternativeName>$!encoder.xmlEncode( $indicator.alternativeName )</alternativeName>
- <shortName>$!encoder.xmlEncode( $indicator.shortName )</shortName>
+ <shortName>$!encoder.xmlEncode( $indicator.displayShortName )</shortName>
<code>$!encoder.xmlEncode( $indicator.code )</code>
- <description>$!encoder.xmlEncode( $indicator.description )</description>
+ <description>$!encoder.xmlEncode( $indicator.displayDescription )</description>
<annualized>$indicator.annualized</annualized>
</indicator>
#end
