dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 13628
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-01-07 19:18:30 +0100
message:
  Nullpointer check. Translations.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/GetPatientAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.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-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/GetPatientAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/GetPatientAction.java	2014-01-07 15:02:45 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/GetPatientAction.java	2014-01-07 18:18:30 +0000
@@ -325,7 +325,8 @@
             for ( PatientAttributeValue patientAttributeValue : patientAttributeValues )
             {
                 String value = patientAttributeValue.getValue();
-                if ( patientAttributeValue.getPatientAttribute().getValueType().equals( PatientAttribute.TYPE_AGE ) )
+                
+                if ( patientAttributeValue.getPatientAttribute().getValueType().equals( PatientAttribute.TYPE_AGE ) && value != null )
                 {
                     Date date = format.parseDate( value );
                     value = PatientAttribute.getAgeFromDate( date ) + "";

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2014-01-07 15:02:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2014-01-07 18:18:30 +0000
@@ -209,7 +209,7 @@
 in_range_due_date=In range due date
 data_element=Data element
 condition=Condition
-no_date_data_element_in_selected_program_stage=No data elements with date-type in the selected program stage
+no_date_data_element_in_selected_program_stage=No data elements of type date in the selected program stage
 shown_on_reports=Shown on reports
 show_provided_provided_elsewhere=Show provided elsewhere
 available_values=Available values
@@ -242,7 +242,7 @@
 show_incident_date = Show incidence date
 display_date_of_incident = Display date of incident
 patient_attribute_group_sort_order = Person attribute group sort order
-visit_selected_program_stage_x_th_time = Visit selected program stage x(th) time
+visit_selected_program_stage_x_th_time = Visit selected program stage n(th) time
 program_stage_section = Program stage section
 create_new_program_stage_section = Create new program stage section
 update_program_stage_section = Update program stage section
@@ -254,7 +254,7 @@
 available_identifiers_and_attributes = Available identifiers / attributes
 select_identifiers_and_attributes = Select identifiers / attributes
 identifiers_and_attributes = Identifiers / Attributes
-displayed_in_patient_list = Displayed in person list
+displayed_in_patient_list = Display in person list
 report_date_description = Description of report date
 days_before_after_due_date = Days before/after due date
 template_reminder_message = Template reminder message
@@ -280,11 +280,11 @@
 number_of_identifier_types = The number of identifier types
 reminder = Reminder
 remove_reminder = Remove reminder
-add_more = Add more ...
+add_more = Add more
 inherit = Inherit
 auto_generate_event = Auto-generate event
 generated_events_by_enrollment_date = Generate events by enrollment date
-execute_success = Execute successfully
+execute_success = Executed successfully
 plus = Plus
 diff_from = Different from
 not_null = Not null
@@ -396,7 +396,7 @@
 combine_operator = COMBINE
 filter_by_type = Filter by type
 orgunit_group = Organisation unit group
-enrollement_date = Enrollement date
+enrollement_date = Enrollment date
 days_since_incident_date = Days since incident date
 view_all = View all
 patient_attribute_visit_schedule = Patient Attribute Visit Schedule
@@ -476,7 +476,7 @@
 is_hidden = Is hidden ?
 default_value = Default value
 dashboard_shortcut_to_add_relative = Shortcut link to add a relative
-shortcut_link_label_eg_add_child = Shortcut link label (e.g. Add Child)
+shortcut_link_label_eg_add_child = Shortcut link label (e.g. Add child)
 relationship = Relationship
 select_at_least_one_scope=Select at least one scope for local id
 scheduling_of_events = Scheduling of events