dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #24403
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11955: Translation
------------------------------------------------------------
revno: 11955
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2013-09-07 16:08:04 +0700
message:
Translation
modified:
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/webapp/dhis-web-maintenance-patient/addProgramForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.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-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 2013-09-06 15:53:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2013-09-07 09:08:04 +0000
@@ -336,7 +336,6 @@
death_date = Date of death
registration_date = Registration date
is_dead = Is dead
-health_worker = Health worker
phone_number = Phone number
patient_registration_details = Person registration details
design_patient_registration_form = Design person registration form
@@ -413,11 +412,10 @@
intro_patient_attribute_visit_schedule = Configure which person attributes are added to the visit schedule. Gives better overview when used for tracking.
selected_program_stages = Selected program stages
patient = Person
-orgunit_registered = Organisation unit registered
+orgunit_registered = Organisation unit phone number
all_users_in_orgunit_registered = All users in organisation unit registered
date_in_future = Date in future
age_years = Age(years)
-send_when_to = Send when to
complete_event = Complete event
send_to = Send to
complete_program = Complete program
@@ -458,4 +456,10 @@
relationship_details = Relationship details
program_related = Program related
no_program = No program
-display_as_radio_button = Display as radio button
\ No newline at end of file
+display_as_radio_button = Display as radio button
+days_scheduled = Days scheduled
+patient_sms_only = Person (SMS only)
+orgunit_phone_number_sms_only = Organisation unit phone number (SMS only)
+health_worker_assigned_to_person = Health worker assigned to person
+all_users_at_orgunit = All users at organisation unit
+send_base_on = Send base on
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm 2013-09-05 18:16:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm 2013-09-07 09:08:04 +0000
@@ -338,12 +338,12 @@
var i18n_name_exists = '$encoder.jsEscape( $i18n.getString( "name_exists" ) , "'")';
var i18n_date_to_compare = '$encoder.jsEscape( $i18n.getString( "date_to_compare" ) , "'")';
var i18n_recipients = '$encoder.jsEscape( $i18n.getString( "recipients" ) , "'")';
- var i18n_patient = '$encoder.jsEscape( $i18n.getString( "patient" ) , "'")';
- var i18n_health_worker = '$encoder.jsEscape( $i18n.getString( "health_worker" ) , "'")';
- var i18n_orgunit_registered = '$encoder.jsEscape( $i18n.getString( "orgunit_registered" ) , "'")';
- var i18n_all_users_in_orgunit_registered = '$encoder.jsEscape( $i18n.getString( "all_users_in_orgunit_registered" ) , "'")';
- var i18n_send_when_to = '$encoder.jsEscape( $i18n.getString( "send_when_to" ) , "'")';
- var i18n_scheduled = '$encoder.jsEscape( $i18n.getString( "scheduled" ) , "'")';
+ var i18n_patient_sms_only = '$encoder.jsEscape( $i18n.getString( "patient_sms_only" ) , "'")';
+ var i18n_health_worker_assigned_to_person = '$encoder.jsEscape( $i18n.getString( "health_worker_assigned_to_person" ) , "'")';
+ var i18n_orgunit_phone_number_sms_only = '$encoder.jsEscape( $i18n.getString( "orgunit_phone_number_sms_only" ) , "'")';
+ var i18n_all_users_at_orgunit = '$encoder.jsEscape( $i18n.getString( "all_users_at_orgunit" ) , "'")';
+ var i18n_send_when_to = '$encoder.jsEscape( $i18n.getString( "send_base_on" ) , "'")';
+ var i18n_days_scheduled = '$encoder.jsEscape( $i18n.getString( "days_scheduled" ) , "'")';
var i18n_complete_program = '$encoder.jsEscape( $i18n.getString( "complete_program" ) , "'")';
var i18n_program_enrollment = '$encoder.jsEscape( $i18n.getString( "program_enrollment" ) , "'")';
var i18n_user_group = '$encoder.jsEscape( $i18n.getString( "user_group" ) , "'")';
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm 2013-09-06 15:53:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm 2013-09-07 09:08:04 +0000
@@ -210,12 +210,12 @@
var i18n_message = '$encoder.jsEscape( $i18n.getString( "message" ) , "'")';
var i18n_name_exists = '$encoder.jsEscape( $i18n.getString( "name_exists" ) , "'")';
var i18n_recipients = '$encoder.jsEscape( $i18n.getString( "recipients" ) , "'")';
- var i18n_patient = '$encoder.jsEscape( $i18n.getString( "patient" ) , "'")';
- var i18n_health_worker = '$encoder.jsEscape( $i18n.getString( "health_worker" ) , "'")';
- var i18n_orgunit_registered = '$encoder.jsEscape( $i18n.getString( "orgunit_registered" ) , "'")';
- var i18n_all_users_in_orgunit_registered = '$encoder.jsEscape( $i18n.getString( "all_users_in_orgunit_registered" ) , "'")';
- var i18n_send_when_to = '$encoder.jsEscape( $i18n.getString( "send_when_to" ) , "'")';
- var i18n_scheduled = '$encoder.jsEscape( $i18n.getString( "scheduled" ) , "'")';
+ var i18n_patient_sms_only = '$encoder.jsEscape( $i18n.getString( "patient_sms_only" ) , "'")';
+ var i18n_health_worker_assigned_to_person = '$encoder.jsEscape( $i18n.getString( "health_worker_assigned_to_person" ) , "'")';
+ var i18n_orgunit_phone_number_sms_only = '$encoder.jsEscape( $i18n.getString( "orgunit_phone_number_sms_only" ) , "'")';
+ var i18n_all_users_at_orgunit = '$encoder.jsEscape( $i18n.getString( "all_users_at_orgunit" ) , "'")';
+ var i18n_send_when_to = '$encoder.jsEscape( $i18n.getString( "send_base_on" ) , "'")';
+ var i18n_days_scheduled = '$encoder.jsEscape( $i18n.getString( "days_scheduled" ) , "'")';
var i18n_complete_event = '$encoder.jsEscape( $i18n.getString( "complete_event" ) , "'")';
var i18n_user_group = '$encoder.jsEscape( $i18n.getString( "user_group" ) , "'")';
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js 2013-09-05 17:59:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js 2013-09-07 09:08:04 +0000
@@ -282,7 +282,7 @@
+ '<td><label>' + i18n_send_when_to + '</label></td>'
+ '<td>'
+ '<select id="whenToSend' + rowId + '" name="whenToSend' + rowId + '" class="whenToSend" onchange="whenToSendOnChange(' + rowId + ')" >'
- + '<option value="">' + i18n_scheduled + '</option>'
+ + '<option value="">' + i18n_days_scheduled + '</option>'
+ '<option value="3">' + i18n_complete_program + '</option>'
+ '<option value="1">' + i18n_program_enrollment + '</option>'
+ '</select>'
@@ -305,10 +305,10 @@
+ '<td><label>' + i18n_recipients + '</label></td>'
+ '<td>'
+ '<select id="sendTo' + rowId + '" name="sendTo' + rowId + '" class="sendTo" onchange="onchangeUserGroup('+ rowId +')">'
- + '<option value="1">' + i18n_patient + '</option>'
- + '<option value="2">' + i18n_health_worker + '</option>'
- + '<option value="3">' + i18n_orgunit_registered + '</option>'
- + '<option value="4">' + i18n_all_users_in_orgunit_registered + '</option>'
+ + '<option value="1">' + i18n_patient_sms_only + '</option>'
+ + '<option value="3">' + i18n_orgunit_phone_number_sms_only + '</option>'
+ + '<option value="2">' + i18n_health_worker_assigned_to_person + '</option>'
+ + '<option value="4">' + i18n_all_users_at_orgunit + '</option>'
+ '<option value="5">' + i18n_user_group + '</option>'
+ '</select>'
+ '</td>'
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js 2013-09-06 15:53:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js 2013-09-07 09:08:04 +0000
@@ -315,7 +315,7 @@
+ '<td><label>' + i18n_send_when_to + '</label></td>'
+ '<td>'
+ '<select id="whenToSend' + rowId + '" name="whenToSend' + rowId + '" class="whenToSend" onchange="whenToSendOnChange(' + rowId + ')">'
- + '<option value="">' + i18n_scheduled + '</option>'
+ + '<option value="">' + i18n_days_scheduled + '</option>'
+ '<option value="2">' + i18n_complete_event + '</option>'
+ '</select>'
+ '</td>'
@@ -328,10 +328,10 @@
+ '<td><label>' + i18n_recipients + '</label></td>'
+ '<td>'
+ '<select id="sendTo' + rowId + '" name="sendTo' + rowId + '" class="sendTo" onchange="onchangeUserGroup('+ rowId +')">'
- + '<option value="1">' + i18n_patient + '</option>'
- + '<option value="2">' + i18n_health_worker + '</option>'
- + '<option value="3">' + i18n_orgunit_registered + '</option>'
- + '<option value="4">' + i18n_all_users_in_orgunit_registered + '</option>'
+ + '<option value="1">' + i18n_patient_sms_only + '</option>'
+ + '<option value="3">' + i18n_orgunit_phone_number_sms_only + '</option>'
+ + '<option value="2">' + i18n_health_worker_assigned_to_person + '</option>'
+ + '<option value="4">' + i18n_all_users_at_orgunit + '</option>'
+ '<option value="5">' + i18n_user_group + '</option>'
+ '</select>'
+ '</td>'
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm 2013-09-05 18:16:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm 2013-09-07 09:08:04 +0000
@@ -377,9 +377,9 @@
<td><label>$i18n.getString( "recipients" )</label></td>
<td>
<select type="text" id="sendTo$index" name="sendTo$index" class="sendTo {validate:{required:true,number:true}}" onchange="onchangeUserGroup( $index )">
- <option value="1" #if($!reminder.sendTo==1) selected #end >$i18n.getString("patient")</option>
- <option value="2" #if($!reminder.sendTo==2) selected #end >$i18n.getString("health_worker")</option>
- <option value="3" #if($!reminder.sendTo==3) selected #end >$i18n.getString("orgunit_registered")</option>
+ <option value="1" #if($!reminder.sendTo==1) selected #end >$i18n.getString("patient_sms_only")</option>
+ <option value="2" #if($!reminder.sendTo==2) selected #end >$i18n.getString("orgunit_phone_number_sms_only")</option>
+ <option value="3" #if($!reminder.sendTo==3) selected #end >$i18n.getString("health_worker_assigned_to_person")</option>
<option value="4" #if($!reminder.sendTo==4) selected #end >$i18n.getString("all_users_in_orgunit_registered")</option>
<option value="5" #if($!reminder.sendTo==5) selected #end >$i18n.getString("user_group")</option>
</select>
@@ -450,12 +450,12 @@
var i18n_name_exists = '$encoder.jsEscape( $i18n.getString( "name_exists" ) , "'")';
var i18n_date_to_compare = '$encoder.jsEscape( $i18n.getString( "date_to_compare" ) , "'")';
var i18n_recipients = '$encoder.jsEscape( $i18n.getString( "recipients" ) , "'")';
- var i18n_patient = '$encoder.jsEscape( $i18n.getString( "patient" ) , "'")';
- var i18n_health_worker = '$encoder.jsEscape( $i18n.getString( "health_worker" ) , "'")';
- var i18n_orgunit_registered = '$encoder.jsEscape( $i18n.getString( "orgunit_registered" ) , "'")';
- var i18n_all_users_in_orgunit_registered = '$encoder.jsEscape( $i18n.getString( "all_users_in_orgunit_registered" ) , "'")';
- var i18n_send_when_to = '$encoder.jsEscape( $i18n.getString( "send_when_to" ) , "'")';
- var i18n_scheduled = '$encoder.jsEscape( $i18n.getString( "scheduled" ) , "'")';
+ var i18n_patient_sms_only = '$encoder.jsEscape( $i18n.getString( "patient_sms_only" ) , "'")';
+ var i18n_health_worker_assigned_to_person = '$encoder.jsEscape( $i18n.getString( "health_worker_assigned_to_person" ) , "'")';
+ var i18n_orgunit_phone_number_sms_only = '$encoder.jsEscape( $i18n.getString( "orgunit_phone_number_sms_only" ) , "'")';
+ var i18n_all_users_at_orgunit = '$encoder.jsEscape( $i18n.getString( "all_users_at_orgunit" ) , "'")';
+ var i18n_send_when_to = '$encoder.jsEscape( $i18n.getString( "send_base_on" ) , "'")';
+ var i18n_days_scheduled = '$encoder.jsEscape( $i18n.getString( "days_scheduled" ) , "'")';
var i18n_complete_program = '$encoder.jsEscape( $i18n.getString( "complete_program" ) , "'")';
var i18n_program_enrollment = '$encoder.jsEscape( $i18n.getString( "program_enrollment" ) , "'")';
var i18n_complete_program_stage = '$encoder.jsEscape( $i18n.getString( "complete_program_stage" ) , "'")';
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm 2013-09-06 15:53:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm 2013-09-07 09:08:04 +0000
@@ -232,10 +232,10 @@
<td><label>$i18n.getString( "recipients" )</label></td>
<td>
<select type="text" id="sendTo$index" name="sendTo$index" class="sendTo {validate:{required:true,number:true}}" onchange="onchangeUserGroup( $index )">
- <option value="1" #if($!reminder.sendTo==1) selected #end >$i18n.getString("patient")</option>
- <option value="2" #if($!reminder.sendTo==2) selected #end >$i18n.getString("health_worker")</option>
- <option value="3" #if($!reminder.sendTo==3) selected #end >$i18n.getString("orgunit_registered")</option>
- <option value="4" #if($!reminder.sendTo==4) selected #end >$i18n.getString("all_users_in_orgunit_registered")</option>
+ <option value="1" #if($!reminder.sendTo==1) selected #end >$i18n.getString("patient_sms_only")</option>
+ <option value="2" #if($!reminder.sendTo==2) selected #end >$i18n.getString("orgunit_phone_number_sms_only")</option>
+ <option value="3" #if($!reminder.sendTo==3) selected #end >$i18n.getString("health_worker_assigned_to_person")</option>
+ <option value="4" #if($!reminder.sendTo==4) selected #end >$i18n.getString("all_users_at_orgunit")</option>
<option value="5" #if($!reminder.sendTo==5) selected #end >$i18n.getString("user_group")</option>
</select>
</td>
@@ -303,12 +303,12 @@
var i18n_message = '$encoder.jsEscape( $i18n.getString( "message" ) , "'")';
var i18n_days_before_after_due_date = '$encoder.jsEscape( $i18n.getString( "days_before_after_due_date" ) , "'")';
var i18n_recipients = '$encoder.jsEscape( $i18n.getString( "recipients" ) , "'")';
- var i18n_patient = '$encoder.jsEscape( $i18n.getString( "patient" ) , "'")';
- var i18n_health_worker = '$encoder.jsEscape( $i18n.getString( "health_worker" ) , "'")';
- var i18n_orgunit_registered = '$encoder.jsEscape( $i18n.getString( "orgunit_registered" ) , "'")';
- var i18n_all_users_in_orgunit_registered = '$encoder.jsEscape( $i18n.getString( "all_users_in_orgunit_registered" ) , "'")';
- var i18n_send_when_to = '$encoder.jsEscape( $i18n.getString( "send_when_to" ) , "'")';
- var i18n_scheduled = '$encoder.jsEscape( $i18n.getString( "scheduled" ) , "'")';
+ var i18n_patient_sms_only = '$encoder.jsEscape( $i18n.getString( "patient_sms_only" ) , "'")';
+ var i18n_health_worker_assigned_to_person = '$encoder.jsEscape( $i18n.getString( "health_worker_assigned_to_person" ) , "'")';
+ var i18n_orgunit_phone_number_sms_only = '$encoder.jsEscape( $i18n.getString( "orgunit_phone_number_sms_only" ) , "'")';
+ var i18n_all_users_at_orgunit = '$encoder.jsEscape( $i18n.getString( "all_users_at_orgunit" ) , "'")';
+ var i18n_send_when_to = '$encoder.jsEscape( $i18n.getString( "send_base_on" ) , "'")';
+ var i18n_days_scheduled = '$encoder.jsEscape( $i18n.getString( "days_scheduled" ) , "'")';
var i18n_complete_event = '$encoder.jsEscape( $i18n.getString( "complete_event" ) , "'")';
var i18n_program_stage_name = '$encoder.jsEscape( $i18n.getString( "program_stage_name" ) , "'" )';
var i18n_user_group = '$encoder.jsEscape( $i18n.getString( "user_group" ) , "'")';
