dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7343
committer: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-06-21 09:43:10 +0000
message:
  (Translations) adjust shell script to remove empty values
modified:
  dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_es_ES.properties
  dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_fr_FR.properties
  dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_my_MM.properties
  dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_pt_PT.properties
  dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_vi_VN.properties
  resources/util/clean_translations.sh


--
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-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_es_ES.properties'
--- dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_es_ES.properties	2012-06-21 08:20:13 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_es_ES.properties	2012-06-21 09:43:10 +0000
@@ -1,65 +1,24 @@
 
-namebased_data_entry=
-current_activityplan=
-sections=
-beneficiary_search=
 available_periods=Perdiodos disponibles
 reports=Informes
-is_empty=
-select_option=
 dashboard_reports=Informes del Cuadro de Mandos
-is_invalid_positive_integer=
 get_report=Generar Informe
-date_of_birth=
 report_table_parameters=Parametros de Informe
-male=
-gender=
 navigate_to=Navegar
-beneficiary_registration=
 data_entry=Introducir datos
 logout=Salir
 DHIS_2=DHIS 2
-conversations=
 dashboard_charts=Gr\u00e1ficas del Cuadro de Mandos
-organisation_unit=
-form_complete=
-subject=
-is_invalid_number=
 available_organisation_units=Unidades Organizativas disponibles
 documents=Documentos
-beneficiary_enrollment=
-full_name=
-successfully_saved=
 available_datasets=Conjuntos de Datos disponibles
-female=
-all_activityplan=
 select_organisation_unit=Selecione una Unidad Organizativa
-messages=
-activity_list=
 reporting_period=Periodo del Informe
-saved_section=
 charts=Gr\u00e1ficas
-reply=
-is_invalid_boolean=
-data_entry_overview=
 home=Inicio
 language=Idioma
-id=
-is_invalid_integer=
-transgender=
-beneficiary_list=
-activity_type=
-type_violation_errors=
-completed=
-warnings_and_errors=
-minmax_violation_warnings=
-validation_rule_violation_warnings=
-details_for=
-is_invalid_date=
 dashboard_documents=Documentos del Cuadro de Mandos
-blood_group=
 dashboard=Cuadro de mandos
-is_invalid_negative_integer=
 desktop_version=Version Escritorio
 menu=Menu
 settings=Ajustes

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_fr_FR.properties'
--- dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_fr_FR.properties	2012-06-21 08:20:13 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_fr_FR.properties	2012-06-21 09:43:10 +0000
@@ -1,41 +1,25 @@
 
-namebased_data_entry=
-current_activityplan=
 sections=Sections
-beneficiary_search=
 available_periods=P\u00e9riodes Disponible
 reports=Rapports
-is_empty=
-select_option=
 dashboard_reports=Rapports de tableau de bord
 is_invalid_positive_integer=n'est pas un entier positif valide
 get_report=Obtenir le rapport
-date_of_birth=
 report_table_parameters=Rapport param\u00e8tres
-male=
-gender=
 navigate_to=Acc\u00e9dez \u00e0 navigation
-beneficiary_registration=
 data_entry=Entr\u00e9e de donn\u00e9es
 logout=D\u00e9connexion
 DHIS_2=DHIS2
 conversations=Conversations
 dashboard_charts=Graphiques de tableau de bord
-organisation_unit=
 form_complete=Formulaire complet
 subject=Sujet
 is_invalid_number=n'est pas un bool\u00e9en valide
 available_organisation_units=Disponible unit\u00e9s d'organisation
 documents=Documents
-beneficiary_enrollment=
-full_name=
-successfully_saved=
 available_datasets=Ensembles de donn\u00e9es disponibles
-female=
-all_activityplan=
 select_organisation_unit=S'il vous pla\u00eet s\u00e9lectionner unit\u00e9 d'organisation
 messages=Messages
-activity_list=
 reporting_period=P\u00e9riode du rapport
 saved_section=Section enregistr\u00e9
 charts=Graphiques
@@ -44,20 +28,14 @@
 data_entry_overview=Aper\u00e7u de saisie de donn\u00e9es
 home=Accueil
 language=Langue de l'interface
-id=
 is_invalid_integer=n'est pas un entier valide
-transgender=
-beneficiary_list=
-activity_type=
 type_violation_errors=Erreurs de violation de type
 completed=Termin\u00e9
 warnings_and_errors=Avertissements et erreurs
 minmax_violation_warnings=Avertissements Violation Min / Max
 validation_rule_violation_warnings=Violation d'avertissement de r\u00e8gle de validation
-details_for=
 is_invalid_date=n'est pas une date valide (aaaa-MM-jj)
 dashboard_documents=Documents de tableau de bord
-blood_group=
 dashboard=Dashboard
 is_invalid_negative_integer=n'est pas un entier valide n\u00e9gative
 desktop_version=Version bureau

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_my_MM.properties'
--- dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_my_MM.properties	2012-06-21 08:20:13 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_my_MM.properties	2012-06-21 09:43:10 +0000
@@ -1,65 +1,1 @@
 
-namebased_data_entry=
-current_activityplan=
-sections=
-beneficiary_search=
-available_periods=
-reports=
-is_empty=
-select_option=
-dashboard_reports=
-is_invalid_positive_integer=
-get_report=
-date_of_birth=
-report_table_parameters=
-male=
-gender=
-navigate_to=
-beneficiary_registration=
-data_entry=
-logout=
-DHIS_2=
-conversations=
-dashboard_charts=
-organisation_unit=
-form_complete=
-subject=
-is_invalid_number=
-available_organisation_units=
-documents=
-beneficiary_enrollment=
-full_name=
-successfully_saved=
-available_datasets=
-female=
-all_activityplan=
-select_organisation_unit=
-messages=
-activity_list=
-reporting_period=
-saved_section=
-charts=
-reply=
-is_invalid_boolean=
-data_entry_overview=
-home=
-language=
-id=
-is_invalid_integer=
-transgender=
-beneficiary_list=
-activity_type=
-type_violation_errors=
-completed=
-warnings_and_errors=
-minmax_violation_warnings=
-validation_rule_violation_warnings=
-details_for=
-is_invalid_date=
-dashboard_documents=
-blood_group=
-dashboard=
-is_invalid_negative_integer=
-desktop_version=
-menu=
-settings=

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_pt_PT.properties'
--- dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_pt_PT.properties	2012-06-21 08:20:13 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_pt_PT.properties	2012-06-21 09:43:10 +0000
@@ -1,41 +1,25 @@
 
-namebased_data_entry=
-current_activityplan=
 sections=Sec\u00e7\u00f5es
-beneficiary_search=
 available_periods=Per\u00edodos\u00a0dispon\u00edveis
 reports=Relat\u00f3rios
-is_empty=
-select_option=
 dashboard_reports=Relat\u00f3rios do Painel de Instrumentos
 is_invalid_positive_integer=n\u00e3o \u00e9 um inteiro positivo v\u00e1lido
 get_report=Obter\u00a0relat\u00f3rio
-date_of_birth=
 report_table_parameters=Par\u00e2metros de relat\u00f3rio
-male=
-gender=
 navigate_to=Navegar para
-beneficiary_registration=
 data_entry=Entrada de Dados
 logout=Sair
 DHIS_2=DHIS 2
 conversations=Conversas
 dashboard_charts=Gr\u00e1ficos do Painel de Instrumentos
-organisation_unit=
 form_complete=Formul\u00e1rio concluido
 subject=Assunto
 is_invalid_number=n\u00e3o \u00e9 um n\u00famero v\u00e1lido
 available_organisation_units=Unidades organizacionais dispon\u00edveis
 documents=Documentos
-beneficiary_enrollment=
-full_name=
-successfully_saved=
 available_datasets=Conjuntos de dados\u00a0dispon\u00edveis
-female=
-all_activityplan=
 select_organisation_unit=Por favor seleccione\u00a0unidade organizacional
 messages=Mensagens
-activity_list=
 reporting_period=Per\u00edodo de\u00a0relat\u00f3rio
 saved_section=Sec\u00e7\u00e3o gravada
 charts=Gr\u00e1ficos
@@ -44,20 +28,14 @@
 data_entry_overview=Vis\u00e3o geral de entrada de dados
 home=P\u00e1gina Principal
 language=L\u00edngua da interface
-id=
 is_invalid_integer=n\u00e3o \u00e9 um n\u00famero inteiro v\u00e1lido
-transgender=
-beneficiary_list=
-activity_type=
 type_violation_errors=Tipos de erros de viola\u00e7\u00e3o
 completed=Conclu\u00eddo
 warnings_and_errors=Advert\u00eancias e erros
 minmax_violation_warnings=Advert\u00eancias sobre viola\u00e7\u00e3o de valores Min/Max
 validation_rule_violation_warnings=Advert\u00eancias sobre viola\u00e7\u00e3o da regra de valida\u00e7\u00e3o
-details_for=
 is_invalid_date=n\u00e3o \u00e9 uma data v\u00e1lida (yyyy-MM-dd)
 dashboard_documents=Documentos do Painel de Instrumentos
-blood_group=
 dashboard=Dashboard
 is_invalid_negative_integer=n\u00e3o \u00e9 um n\u00famero inteiro negativo v\u00e1lido
 desktop_version=Vers\u00e3o para Desktop

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_vi_VN.properties	2012-06-21 08:20:13 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_vi_VN.properties	2012-06-21 09:43:10 +0000
@@ -1,41 +1,25 @@
 
-namebased_data_entry=
-current_activityplan=
 sections=C\u00e1c section
-beneficiary_search=
 available_periods=C\u00e1c th\u1eddi \u0111i\u1ec3m hi\u1ec7n c\u00f3
 reports=C\u00e1c b\u00e1o c\u00e1o
-is_empty=
-select_option=
 dashboard_reports=B\u00e1o c\u00e1o tr\u00ean b\u1ea3ng \u0111i\u1ec1u khi\u1ec3n
 is_invalid_positive_integer=l\u00e0 gi\u00e1 tr\u1ecb (ki\u1ec3u nguy\u00ean d\u01b0\u01a1ng) kh\u00f4ng h\u1ee3p l\u1ec7
 get_report=Xem b\u00e1o c\u00e1o
-date_of_birth=
 report_table_parameters=Tham s\u1ed1 b\u00e1o c\u00e1o
-male=
-gender=
 navigate_to=Di chuy\u1ec3n \u0111\u1ebfn
-beneficiary_registration=
 data_entry=Nh\u1eadp d\u1eef li\u1ec7u
 logout=\u0110\u0103ng xu\u1ea5t
 DHIS_2=DHIS 2
 conversations=C\u00e1c th\u1ea3o lu\u1eadn
 dashboard_charts=Bi\u1ec3u \u0111\u1ed3 tr\u00ean b\u1ea3ng \u0111i\u1ec1u khi\u1ec3n
-organisation_unit=
 form_complete=M\u1eabu ho\u00e0n t\u1ea5t
 subject=Ch\u1ee7 \u0111\u1ec1
 is_invalid_number=l\u00e0 gi\u00e1 tr\u1ecb (ki\u1ec3u s\u1ed1) kh\u00f4ng h\u1ee3p l\u1ec7
 available_organisation_units=C\u00e1c \u0111\u01a1n v\u1ecb hi\u1ec7n c\u00f3
 documents=T\u00e0i li\u1ec7u
-beneficiary_enrollment=
-full_name=
-successfully_saved=
 available_datasets=C\u00e1c bi\u1ec3u nh\u1eadp hi\u1ec7n c\u00f3
-female=
-all_activityplan=
 select_organisation_unit=Vui l\u00f2ng ch\u1ecdn d\u01a1n v\u1ecb
 messages=C\u00e1c tin nh\u1eafn
-activity_list=
 reporting_period=Th\u1eddi \u0111i\u1ec3m b\u00e1o c\u00e1o
 saved_section=Section \u0111\u01b0\u1ee3c l\u01b0u
 charts=C\u00e1c bi\u1ec3u \u0111\u1ed3
@@ -44,20 +28,14 @@
 data_entry_overview=Kh\u00e1i qu\u00e1t ch\u1ee9c n\u0103ng nh\u1eadp li\u1ec7u
 home=Trang ch\u1ee7
 language=Ng\u00f4n ng\u1eef giao di\u1ec7n
-id=
 is_invalid_integer=l\u00e0 gi\u00e1 tr\u1ecb (ki\u1ec3u s\u1ed1 nguy\u00ean) kh\u00f4ng h\u1ee3p l\u1ec7
-transgender=
-beneficiary_list=
-activity_type=
 type_violation_errors=Lo\u1ea1i l\u1ed7i
 completed=Ho\u00e0n t\u1ea5t
 warnings_and_errors=C\u1ea3nh b\u00e1o v\u00e0 l\u1ed7i
 minmax_violation_warnings=C\u1ea3nh b\u00e1o vi ph\u1ea1m Min/Max
 validation_rule_violation_warnings=C\u1ea3nh b\u00e1o v\u1ec1 l\u1ed7i
-details_for=
 is_invalid_date=l\u00e0 gi\u00e1 tr\u1ecb (ki\u1ec3u ng\u00e0y dd-MM-yyyy) kh\u00f4ng h\u1ee3p l\u1ec7
 dashboard_documents=T\u00e0i li\u1ec7u tr\u00ean b\u1ea3ng \u0111i\u1ec1u khi\u1ec3n
-blood_group=
 dashboard=Dashboard
 is_invalid_negative_integer=l\u00e0 gi\u00e1 tr\u1ecb (ki\u1ec3u nguy\u00ean \u00e2m) kh\u00f4ng h\u1ee3p l\u1ec7
 desktop_version=Phi\u00ean b\u1ea3n m\u00e1y t\u00ednh

=== modified file 'resources/util/clean_translations.sh'
--- resources/util/clean_translations.sh	2012-06-21 08:20:13 +0000
+++ resources/util/clean_translations.sh	2012-06-21 09:43:10 +0000
@@ -1,5 +1,14 @@
 #!/bin/bash
 
+isNotSet() {
+    if [[ ! ${!1} && ${!1-_} ]]
+    then
+        return 1
+    fi
+}
+
+
+
 if [[ $# -lt 1 ]]; then
   echo "Usage: $0 original-properties-file translation-properties-file"
   exit 1
@@ -23,5 +32,10 @@
 echo "" > $2
 
 for key in "${!array1[@]}"; do
-        echo "$key=${array2[$key]}" >> ${PROP_FILE}
+
+isNotSet array2[${key}]
+if [ $? -ne 1 ]
+then
+        echo "$key=${array2[$key]}" >> ${PROP_FILE};
+fi
 done