dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #08061
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2406: Edit strings in methods writeAllDataElements, writeAllIndicators, writeDataSetCompletenessResult, ...
------------------------------------------------------------
revno: 2406
committer: Nguyen Tran Do Xuan Thuy <thuy.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2010-10-21 19:01:19 +0530
message:
Edit strings in methods writeAllDataElements, writeAllIndicators, writeDataSetCompletenessResult, writeAllOrganisationUnits to refer from i18n_global.properties, i18n_global_vi_VN.properties and i18n_module_vi_VN.properties file
modified:
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/workbook/WorkbookService.java*
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/workbook/impl/JExcelWorkbookService.java*
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/CollectionUtils.java*
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/ContextUtils.java*
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/InternalProcessUtil.java*
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/SessionUtils.java*
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/StreamActionSupport.java*
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/comparator/DataElementIdComparator.java*
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/comparator/PeriodStartDateComparator.java*
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalMenuInterceptor.java*
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalModuleInterceptor.java*
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalParamsInterceptor.java*
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalUserInterceptor.java*
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/menu/MenuState.java*
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/menu/MenuStateManager.java*
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/menu/SessionMenuStateManager.java*
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/menu/action/SetMenuHiddenAction.java*
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/menu/action/SetMenuVisibleAction.java*
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/ConfigurableModuleComparator.java*
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/CurrentModuleDetectorFilter.java*
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/DefaultModuleManager.java*
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/Module.java*
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/ModuleManager.java*
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_vi_VN.properties*
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/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 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/workbook/WorkbookService.java' (properties changed: -x to +x)
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/workbook/WorkbookService.java 2010-08-30 06:24:45 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/workbook/WorkbookService.java 2010-10-21 13:31:19 +0000
@@ -48,11 +48,11 @@
String writeReportTableData( OutputStream outputStream, int id, I18nFormat format );
- void writeAllDataElements( OutputStream outputStream );
-
- void writeAllIndicators( OutputStream outputStream );
-
- void writeAllOrganisationUnits( OutputStream outputStream );
+ void writeAllDataElements( OutputStream outputStream, I18n i18n );
+
+ void writeAllIndicators( OutputStream outputStream, I18n i18n );
+
+ void writeAllOrganisationUnits( OutputStream outputStream, I18n i18n );
void writeDataSetCompletenessResult( Collection<DataSetCompletenessResult> results, OutputStream out, I18n i18n, OrganisationUnit unit, DataSet dataSet );
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/workbook/impl/JExcelWorkbookService.java' (properties changed: -x to +x)
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/workbook/impl/JExcelWorkbookService.java 2010-10-15 09:47:16 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/workbook/impl/JExcelWorkbookService.java 2010-10-21 13:31:19 +0000
@@ -178,7 +178,7 @@
return data.getName();
}
- public void writeAllDataElements( OutputStream outputStream )
+ public void writeAllDataElements( OutputStream outputStream, I18n i18n )
{
try
{
@@ -194,25 +194,25 @@
rowNumber++;
- sheet.addCell( new Label( 0, rowNumber, "Alternative name", FORMAT_LABEL ) );
+ sheet.addCell( new Label( 0, rowNumber, i18n.getString( "alternative_name" ), FORMAT_LABEL ) );
sheet.addCell( new Label( 1, rowNumber++, element.getAlternativeName(), FORMAT_TEXT ) );
- sheet.addCell( new Label( 0, rowNumber, "Short name", FORMAT_LABEL ) );
+ sheet.addCell( new Label( 0, rowNumber, i18n.getString( "short_name" ), FORMAT_LABEL ) );
sheet.addCell( new Label( 1, rowNumber++, element.getShortName(), FORMAT_TEXT ) );
- sheet.addCell( new Label( 0, rowNumber, "Code", FORMAT_LABEL ) );
+ sheet.addCell( new Label( 0, rowNumber, i18n.getString( "code" ), FORMAT_LABEL ) );
sheet.addCell( new Label( 1, rowNumber++, element.getCode(), FORMAT_TEXT ) );
- sheet.addCell( new Label( 0, rowNumber, "Description", FORMAT_LABEL ) );
+ sheet.addCell( new Label( 0, rowNumber, i18n.getString( "description" ), FORMAT_LABEL ) );
sheet.addCell( new Label( 1, rowNumber++, element.getDescription(), FORMAT_TEXT ) );
- sheet.addCell( new Label( 0, rowNumber, "Active", FORMAT_LABEL ) );
+ sheet.addCell( new Label( 0, rowNumber, i18n.getString( "active" ), FORMAT_LABEL ) );
sheet.addCell( new Label( 1, rowNumber++, getBoolean().get( element.isActive() ), FORMAT_TEXT ) );
- sheet.addCell( new Label( 0, rowNumber, "Type", FORMAT_LABEL ) );
+ sheet.addCell( new Label( 0, rowNumber, i18n.getString( "type" ), FORMAT_LABEL ) );
sheet.addCell( new Label( 1, rowNumber++, getType().get( element.getType() ), FORMAT_TEXT ) );
- sheet.addCell( new Label( 0, rowNumber, "Aggregation operator", FORMAT_LABEL ) );
+ sheet.addCell( new Label( 0, rowNumber, i18n.getString( "aggregation_operator" ), FORMAT_LABEL ) );
sheet.addCell( new Label( 1, rowNumber++, getAggregationOperator().get(
element.getAggregationOperator() ), FORMAT_TEXT ) );
@@ -229,7 +229,7 @@
}
}
- public void writeAllIndicators( OutputStream outputStream )
+ public void writeAllIndicators( OutputStream outputStream, I18n i18n )
{
try
{
@@ -245,28 +245,28 @@
rowNumber++;
- sheet.addCell( new Label( 0, rowNumber, "Alternative name", FORMAT_LABEL ) );
+ sheet.addCell( new Label( 0, rowNumber, i18n.getString( "alternative_name" ), FORMAT_LABEL ) );
sheet.addCell( new Label( 1, rowNumber++, indicator.getAlternativeName(), FORMAT_TEXT ) );
- sheet.addCell( new Label( 0, rowNumber, "Short name", FORMAT_LABEL ) );
+ sheet.addCell( new Label( 0, rowNumber, i18n.getString( "short_name" ), FORMAT_LABEL ) );
sheet.addCell( new Label( 1, rowNumber++, indicator.getShortName(), FORMAT_TEXT ) );
- sheet.addCell( new Label( 0, rowNumber, "Code", FORMAT_LABEL ) );
+ sheet.addCell( new Label( 0, rowNumber, i18n.getString( "code" ), FORMAT_LABEL ) );
sheet.addCell( new Label( 1, rowNumber++, indicator.getCode(), FORMAT_TEXT ) );
- sheet.addCell( new Label( 0, rowNumber, "Description", FORMAT_LABEL ) );
+ sheet.addCell( new Label( 0, rowNumber, i18n.getString( "description" ), FORMAT_LABEL ) );
sheet.addCell( new Label( 1, rowNumber++, indicator.getDescription(), FORMAT_TEXT ) );
- sheet.addCell( new Label( 0, rowNumber, "Annualized", FORMAT_LABEL ) );
+ sheet.addCell( new Label( 0, rowNumber, i18n.getString( "annualized" ), FORMAT_LABEL ) );
sheet.addCell( new Label( 1, rowNumber++, getBoolean().get( indicator.getAnnualized() ), FORMAT_TEXT ) );
- sheet.addCell( new Label( 0, rowNumber, "Indicator type", FORMAT_LABEL ) );
+ sheet.addCell( new Label( 0, rowNumber, i18n.getString( "indicator_type" ), FORMAT_LABEL ) );
sheet.addCell( new Label( 1, rowNumber++, indicator.getIndicatorType().getName(), FORMAT_TEXT ) );
- sheet.addCell( new Label( 0, rowNumber, "Numerator description", FORMAT_LABEL ) );
+ sheet.addCell( new Label( 0, rowNumber, i18n.getString( "numerator_description" ), FORMAT_LABEL ) );
sheet.addCell( new Label( 1, rowNumber++, indicator.getNumeratorDescription(), FORMAT_TEXT ) );
- sheet.addCell( new Label( 0, rowNumber, "Denominator description", FORMAT_LABEL ) );
+ sheet.addCell( new Label( 0, rowNumber, i18n.getString( "denominator_description" ), FORMAT_LABEL ) );
sheet.addCell( new Label( 1, rowNumber++, indicator.getDenominatorDescription(), FORMAT_TEXT ) );
rowNumber++;
@@ -282,7 +282,7 @@
}
}
- public void writeAllOrganisationUnits( OutputStream outputStream )
+ public void writeAllOrganisationUnits( OutputStream outputStream, I18n i18n )
{
try
{
@@ -298,19 +298,19 @@
rowNumber++;
- sheet.addCell( new Label( 0, rowNumber, "Short name", FORMAT_LABEL ) );
+ sheet.addCell( new Label( 0, rowNumber, i18n.getString( "short_name" ), FORMAT_LABEL ) );
sheet.addCell( new Label( 1, rowNumber++, unit.getShortName(), FORMAT_TEXT ) );
- sheet.addCell( new Label( 0, rowNumber, "Code", FORMAT_LABEL ) );
+ sheet.addCell( new Label( 0, rowNumber, i18n.getString( "code" ), FORMAT_LABEL ) );
sheet.addCell( new Label( 1, rowNumber++, unit.getCode(), FORMAT_TEXT ) );
- sheet.addCell( new Label( 0, rowNumber, "Active", FORMAT_LABEL ) );
+ sheet.addCell( new Label( 0, rowNumber, i18n.getString( "active" ), FORMAT_LABEL ) );
sheet.addCell( new Label( 1, rowNumber++, getBoolean().get( unit.isActive() ), FORMAT_TEXT ) );
- sheet.addCell( new Label( 0, rowNumber, "Comment", FORMAT_LABEL ) );
+ sheet.addCell( new Label( 0, rowNumber, i18n.getString( "comment" ), FORMAT_LABEL ) );
sheet.addCell( new Label( 1, rowNumber++, unit.getComment(), FORMAT_TEXT ) );
- sheet.addCell( new Label( 0, rowNumber, "Geo code", FORMAT_LABEL ) );
+ sheet.addCell( new Label( 0, rowNumber, i18n.getString( "geo_code" ), FORMAT_LABEL ) );
sheet.addCell( new Label( 1, rowNumber++, unit.getGeoCode(), FORMAT_TEXT ) );
rowNumber++;
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/CollectionUtils.java' (properties changed: -x to +x)
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/ContextUtils.java' (properties changed: -x to +x)
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/InternalProcessUtil.java' (properties changed: -x to +x)
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/SessionUtils.java' (properties changed: -x to +x)
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/StreamActionSupport.java' (properties changed: -x to +x)
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/comparator/DataElementIdComparator.java' (properties changed: -x to +x)
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/comparator/PeriodStartDateComparator.java' (properties changed: -x to +x)
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalMenuInterceptor.java' (properties changed: -x to +x)
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalModuleInterceptor.java' (properties changed: -x to +x)
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalParamsInterceptor.java' (properties changed: -x to +x)
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalUserInterceptor.java' (properties changed: -x to +x)
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/menu/MenuState.java' (properties changed: -x to +x)
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/menu/MenuStateManager.java' (properties changed: -x to +x)
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/menu/SessionMenuStateManager.java' (properties changed: -x to +x)
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/menu/action/SetMenuHiddenAction.java' (properties changed: -x to +x)
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/menu/action/SetMenuVisibleAction.java' (properties changed: -x to +x)
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/ConfigurableModuleComparator.java' (properties changed: -x to +x)
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/CurrentModuleDetectorFilter.java' (properties changed: -x to +x)
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/DefaultModuleManager.java' (properties changed: -x to +x)
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/Module.java' (properties changed: -x to +x)
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/ModuleManager.java' (properties changed: -x to +x)
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties' (properties changed: -x to +x)
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties' (properties changed: -x to +x)
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties 2010-10-21 05:41:06 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties 2010-10-21 13:31:19 +0000
@@ -39,7 +39,7 @@
cannot_clear_selected_orgunits = Kh\u00f4ng th\u1ec3 x\u00f3a c\u00e1c \u0111\u01a1n v\u1ecb \u0111\u01b0\u1ee3c ch\u1ecdn tr\u01b0\u1edbc \u0111\u00f3
error_occurred = L\u1ed7i trong qu\u00e1 tr\u00ecnh duy\u1ec7t d\u1eef li\u1ec7u.
select_organisationunit = Vui l\u00f2ng ch\u1ecdn m\u1ed9t \u0111\u01a1n v\u1ecb trong c\u00e2y \u0111\u01a1n v\u1ecb.
-
+geo_code = Geo Code
#-- Modules -------------------------------------------------------------------#
dhis-web-maintenance-datadictionary = Ph\u1ea7n t\u1eed d\u1eef li\u1ec7u & Ch\u1ec9 s\u1ed1
@@ -376,4 +376,4 @@
numerator_formula = C\u00f4ng th\u1ee9c t\u1eed s\u1ed1
denominator_formula = C\u00f4ng th\u1ee9c m\u1eabu s\u1ed1
numerator_aggregation_operator = Ki\u1ec3u s\u1ed1 li\u1ec7u t\u1ed5ng h\u1ee3p cho t\u1eed s\u1ed1
-denominator_aggregation_operator = Ki\u1ec3u s\u1ed1 li\u1ec7u t\u1ed5ng h\u1ee3p cho m\u1eabu s\u1ed1
\ No newline at end of file
+denominator_aggregation_operator = Ki\u1ec3u s\u1ed1 li\u1ec7u t\u1ed5ng h\u1ee3p cho m\u1eabu s\u1ed1
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_vi_VN.properties' (properties changed: -x to +x)
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_vi_VN.properties 2010-10-14 08:54:26 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_vi_VN.properties 2010-10-21 13:31:19 +0000
@@ -92,8 +92,7 @@
view_data_completeness = View data completeness
submit = Submit
generate_pdf = Xu\u1ea5t PDF
-data_completeness_report = Data Completeness Report
-district_health_information_software = District Health Information Software
+data_completeness_report = Ba\u0301o ca\u0301o ti\u0300nh hi\u0300nh hoa\u0300n thi\u00ea\u0323n d\u01b0\u0303 li\u00ea\u0323u
edit_report = Edit report
select_period_type_all = Select period type / View all
processing = Processing
