From f001cc66a420080fc8719d54c5480999f65c4494 Mon Sep 17 00:00:00 2001
From: Kevin Yeh <kevinyeh@alum.mit.edu>
Date: Mon, 6 Jan 2014 17:45:39 -0500
Subject: [PATCH] Correct missing instances of xl in various files.

---
 controllers/C_Prescription.class.php             |   2 +-
 interface/patient_file/printed_fee_sheet.php     |   2 +-
 interface/patient_file/report/patient_report.php |   2 +-
 library/dialog.js                                |   2 +-
 library/report.inc                               | 177 ++++++++++++-----------
 library/restoreSession.php                       |   1 +
 6 files changed, 95 insertions(+), 91 deletions(-)

diff --git a/controllers/C_Prescription.class.php b/controllers/C_Prescription.class.php
index 2f8670378..6b79bce51 100644
--- a/controllers/C_Prescription.class.php
+++ b/controllers/C_Prescription.class.php
@@ -35,7 +35,7 @@ class C_Prescription extends Controller {
 		if ($GLOBALS['inhouse_pharmacy']) {
 			// Make an array of drug IDs and selectors for the template.
 			$drug_array_values = array(0);
-			$drug_array_output = array("-- or select from inventory --");
+			$drug_array_output = array("-- " . xl('or select from inventory') ." --");
 			$drug_attributes = '';
 
 			// $res = sqlStatement("SELECT * FROM drugs ORDER BY selector");
diff --git a/interface/patient_file/printed_fee_sheet.php b/interface/patient_file/printed_fee_sheet.php
index e913b688f..87341afbe 100644
--- a/interface/patient_file/printed_fee_sheet.php
+++ b/interface/patient_file/printed_fee_sheet.php
@@ -146,7 +146,7 @@ if (empty($SBCODES)) {
     $pres = sqlStatement("SELECT option_id, title FROM list_options " .
             "WHERE list_id = 'superbill' ORDER BY seq");
     while ($prow = sqlFetchArray($pres)) {
-        $SBCODES[] = '*G|' . $prow['title'];
+        $SBCODES[] = '*G|' . xl_list_label($prow['title']);
         $res = sqlStatement("SELECT code_type, code, code_text FROM codes " .
                 "WHERE superbill = '" . $prow['option_id'] . "' AND active = 1 " .
                 "ORDER BY code_text");
diff --git a/interface/patient_file/report/patient_report.php b/interface/patient_file/report/patient_report.php
index 1575c08c2..cf83c9329 100644
--- a/interface/patient_file/report/patient_report.php
+++ b/interface/patient_file/report/patient_report.php
@@ -185,7 +185,7 @@ function show_date_fun(){
   <td class='text'>
    <input type='checkbox' name='include_demographics' id='include_demographics' value="demographics" checked><?php xl('Demographics','e'); ?><br>
    <?php if (acl_check('patients', 'med')): ?>
-   <input type='checkbox' name='include_history' id='include_history' value="history"><?php xl(' History','e'); ?><br>
+   <input type='checkbox' name='include_history' id='include_history' value="history"><?php xl('History','e'); ?><br>
    <?php endif; ?>
    <!--
    <input type='checkbox' name='include_employer' id='include_employer' value="employer"><?php xl('Employer','e'); ?><br>
diff --git a/library/dialog.js b/library/dialog.js
index 36a39562e..388322c82 100644
--- a/library/dialog.js
+++ b/library/dialog.js
@@ -61,7 +61,7 @@ function grabfocus(w) {
 function dlgopen(url, winname, width, height) {
  if (top.modaldialog && ! top.modaldialog.closed) {
   if (window.focus) top.modaldialog.focus();
-  if (top.modaldialog.confirm("OK to close this other popup window?")) {
+  if (top.modaldialog.confirm(top.oemr_dialog_close_msg)) {
    top.modaldialog.close();
    top.modaldialog = null;
   } else {
diff --git a/library/report.inc b/library/report.inc
index 5760fc303..7d903a347 100644
--- a/library/report.inc
+++ b/library/report.inc
@@ -9,100 +9,103 @@ require_once("{$GLOBALS['srcdir']}/acl.inc");
 require_once("{$GLOBALS['srcdir']}/formatting.inc.php");
 require_once("{$GLOBALS['srcdir']}/formdata.inc.php");
 
-$patient_data_array = array(title => "Title: ",
-fname => "First Name: ",
-mname => "Middle Name: ",
-lname => "Last Name: ",
-sex => "Sex",
-ss => "SS: ",
-DOB => "Date of Birth: ",
-street => "Street: ",
-city => "City: ",
-state => "State: ",
-postal_code => "Zip: ",
-country_code => "Country: ",
-occupation => "Occupation: ",
-phone_home => "Home Phone: ",
-phone_biz => "Business Phone: ",
-phone_contact => "Contact Phone: ",
-contact_relationship => "Contact Person",
-hipaa_mail => "Allows Mail: ",
-hipaa_voice => "Allows Voice msgs: ",
-hipaa_notice => "Notice Received: ",
-hipaa_message => "Leave Message With: "
+$patient_data_array = array(
+title => xl('Title') . ": ",
+fname => xl('First Name') . ": ",
+mname => xl('Middle Name') . ": ",
+lname => xl('Last Name') . ": ",
+sex => xl('Sex') . ": ",
+ss => xl('SS') . ": ",
+DOB => xl('Date of Birth') . ": ",
+street => xl('Street') . ": ",
+city => xl('City') . ": ",
+state => xl('State') . ": ",
+postal_code => xl('Zip') . ": ",
+country_code => xl('Country') . ": ",
+occupation => xl('Occupation') . ": ",
+phone_home => xl('Home Phone') . ": ",
+phone_biz => xl('Business Phone') . ": ",
+phone_contact => xl('Contact Phone') . ": ",
+contact_relationship => xl('Contact Person') . ": ",
+hipaa_mail => xl('Allows Mail') . ": ",
+hipaa_voice => xl('Allows Voice msgs') . ": ",
+hipaa_notice => xl('Notice Received') . ": ",
+hipaa_message => xl('Leave Message With') . ": "
 );
 
 $history_data_array = array(
-coffee => "Coffee Use: ",
-tobacco => "Tobacco Use: ",
-alcohol => "Alcohol Use: ",
-sleep_patterns => "Sleep Patterns: ",
-exercise_patterns => "Exercise Patterns: ",
-seatbelt_use => "Seatbelt Use: ",
-counseling => "Counseling: ",
-hazardous_activities => "Hazardous Activities: ",
-last_breast_exam => "Last Breast Exam: ",
-last_mammogram => "Last Mammogram: ",
-last_gynocological_exam => "Last Gyn. Exam: ",
-last_rectal_exam => "Last Rectal Exam: ",
-last_prostate_exam => "Last Prostate Exam: ",
-last_physical_exam => "Last Physical Exam: ",
-last_sigmoidoscopy_colonoscopy => "Last Sigmoid/Colonoscopy: ",
-cataract_surgery => "Last Cataract Surgery: ",
-tonsillectomy => "Last Tonsillectomy: ",
-cholecystestomy => "Last Cholecystestomy: ",
-heart_surgery => "Last Heart Surgery: ",
-hysterectomy => "Last Hysterectomy: ",
-hernia_repair => "Last Hernia Repair: ",
-hip_replacement => "Last Hip Replacement: ",
-knee_replacement => "Last Knee Replacement: ",
-appendectomy => "Last Appendectomy: ",
-history_mother => "Mother's History: ",
-history_father => "Father's History: ",
-history_siblings => "Sibling History: ",
-history_offspring => "Offspring History: ",
-history_spouse => "Spouse's History: ",
-relatives_cancer => "Relatives Cancer: ",
-relatives_tuberculosis => "Relatives Tuberculosis: ",
-relatives_diabetes => "Relatives Diabetes: ",
-relatives_high_blood_pressure => "Relatives Blood Pressure: ",
-relatives_heart_problems => "Relatives Heart: ",
-relatives_stroke => "Relatives Stroke: ",
-relatives_epilepsy => "Relatives Epilepsy: ",
-relatives_mental_illness => "Relatives Mental Illness: ",
-relatives_suicide => "Relatives Suicide: ");
+coffee => xl('Coffee Use') . ": ",
+tobacco => xl('Tobacco Use') . ": ",
+alcohol => xl('Alcohol Use') . ": ",
+sleep_patterns => xl('Sleep Patterns') . ": ",
+exercise_patterns => xl('Exercise Patterns') . ": ",
+seatbelt_use => xl('Seatbelt Use') . ": ",
+counseling => xl('Counseling') . ": ",
+hazardous_activities => xl('Hazardous Activities') . ": ",
+last_breast_exam => xl('Last Breast Exam') . ": ",
+last_mammogram => xl('Last Mammogram') . ": ",
+last_gynocological_exam => xl('Last Gyn. Exam') . ": ",
+last_rectal_exam => xl('Last Rectal Exam') . ": ",
+last_prostate_exam => xl('Last Prostate Exam') . ": ",
+last_physical_exam => xl('Last Physical Exam') . ": ",
+last_sigmoidoscopy_colonoscopy => xl('Last Sigmoid/Colonoscopy') . ": ",
+cataract_surgery => xl('Last Cataract Surgery') . ": ",
+tonsillectomy => xl('Last Tonsillectomy') . ": ",
+cholecystestomy => xl('Last Cholecystestomy') . ": ",
+heart_surgery => xl('Last Heart Surgery') . ": ",
+hysterectomy => xl('Last Hysterectomy') . ": ",
+hernia_repair => xl('Last Hernia Repair') . ": ",
+hip_replacement => xl('Last Hip Replacement') . ": ",
+knee_replacement => xl('Last Knee Replacement') . ": ",
+appendectomy => xl('Last Appendectomy') . ": ",
+history_mother => xl('Mothers History') . ": ",
+history_father => xl('Fathers History') . ": ",
+history_siblings => xl('Sibling History') . ": ",
+history_offspring => xl('Offspring History') . ": ",
+history_spouse => xl('Spouses History') . ": ",
+relatives_cancer => xl('Relatives Cancer') . ": ",
+relatives_tuberculosis => xl('Relatives Tuberculosis') . ": ",
+relatives_diabetes => xl('Relatives Diabetes') . ": ",
+relatives_high_blood_pressure => xl('Relatives Blood Pressure') . ": ",
+relatives_heart_problems => xl('Relatives Heart') . ": ",
+relatives_stroke => xl('Relatives Stroke') . ": ",
+relatives_epilepsy => xl('Relatives Epilepsy') . ": ",
+relatives_mental_illness => xl('Relatives Mental Illness') . ": ",
+relatives_suicide => xl('Relatives Suicide') . ": "
+);
 
 $employer_data_array = array(
-name => "Employer: ",
-street => "Address: ",
-city => "City: ",
-postal_code => "Zip: ",
-state => "State",
-country => "Country: ");
+name => xl('Employer') . ": ",
+street => xl('Address') . ": ",
+city => xl('City') . ": ",
+postal_code => xl('Zip') . ": ",
+state => xl('State') . ": ",
+country => xl('Country') . ": "
+);
 
 $insurance_data_array = array(
-provider_name => "Provider: ",
-plan_name => "Plan Name: ",
-policy_number => "Policy Number: ",
-group_number => "Group Number: ",
-subscriber_fname => "Subscriber First Name: ",
-subscriber_mname => "Subscriber Middle Name: ",
-subscriber_lname => "Subscriber Last Name: ",
-subscriber_relationship => "Subscriber Relationship: ",
-subscriber_ss => "Subscriber SS: ",
-subscriber_DOB => "Subscriber Date of Birth: ",
-subscriber_phone => "Subscriber Phone: ",
-subscriber_street => "Subscriber Address: ",
-subscriber_postal_code => "Subscriber Zip: ",
-subscriber_city => "Subscriber City: ",
-subscriber_state => "Subscriber State: ",
-subscriber_country => "Subscriber Country: ",
-subscriber_employer => "Subscriber Employer: ",
-subscriber_employer_street => "Subscriber Employer Street: ",
-subscriber_employer_city => "Subscriber Employer City: ",
-subscriber_employer_postal_code => "Subscriber Employer Zip: ",
-subscriber_employer_state => "Subscriber Employer State: ",
-subscriber_employer_country => "Subscriber Employer Country: "
+provider_name => xl('Provider') . ": ",
+plan_name => xl('Plan Name') . ": ",
+policy_number => xl('Policy Number') . ": ",
+group_number => xl('Group Number') . ": ",
+subscriber_fname => xl('Subscriber First Name') . ": ",
+subscriber_mname => xl('Subscriber Middle Name') . ": ",
+subscriber_lname => xl('Subscriber Last Name') . ": ",
+subscriber_relationship => xl('Subscriber Relationship') . ": ",
+subscriber_ss => xl('Subscriber SS') . ": ",
+subscriber_DOB => xl('Subscriber Date of Birth') . ": ",
+subscriber_phone => xl('Subscribter Phone') . ": ",
+subscriber_street => xl('Subscriber Address') . ": ",
+subscriber_postal_code => xl('Subscriber Zip') . ": ",
+subscriber_city => xl('Subscriber City') . ": ",
+subscriber_state => xl('Subscriber State') . ": ",
+subscriber_country => xl('Subscriber Country') . ": ",
+subscriber_employer => xl('Subscriber Employer') . ": ",
+subscriber_employer_street => xl('Subscriber Employer Street') . ": ",
+subscriber_employer_city => xl('Subscriber Employer City') . ": ",
+subscriber_employer_postal_code => xl('Subscriber Employer Zip') . ": ",
+subscriber_employer_state => xl('Subscriber Employer State') . ": ",
+subscriber_employer_country => xl('Subscriber Employer Country') . ": "
 );
 
 function getPatientReport($pid)
diff --git a/library/restoreSession.php b/library/restoreSession.php
index 7646939d7..01d2f0c5c 100644
--- a/library/restoreSession.php
+++ b/library/restoreSession.php
@@ -6,6 +6,7 @@
 //
 var oemr_session_name = '<?php echo session_name(); ?>';
 var oemr_session_id   = '<?php echo session_id(); ?>';
+var oemr_dialog_close_msg = '<?php echo xl('OK to close this other popup window?'); ?>';
 //
 function restoreSession() {
 <?php if (!empty($GLOBALS['restore_sessions'])) { ?>
-- 
2.11.4.GIT