constants optimize (openemr#5000)

bradymiller · Mar 14, 2022 · cd2484e · cd2484e
1 parent 09caca3
commit cd2484e
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 13 deletions.
diff --git a/contrib/util/language_translations/collectConstants.pl b/contrib/util/language_translations/collectConstants.pl
@@ -217,6 +217,14 @@
     next;
    }
 
+   # skip \. Another rare usage of xl() function.
+   #  Can put in manually if require.
+   if ($de eq "\\") {
+    print LOGFILE "MESSAGE:  Special case character \\ skipped\n";
+    print LOGFILE $editvar2."\n";
+    next;
+   }
+
    # skip if starts with d of date(), since
    #  this is used in calendar frequently
    #  for translation of variables returned

diff --git a/contrib/util/language_translations/filterDirectories.txt b/contrib/util/language_translations/filterDirectories.txt
@@ -3,6 +3,7 @@ openemr/contrib/forms
 openemr/.git
 openemr/contrib/icd10
 openemr/contrib/icd9
+openemr/contrib/util/language_translations
 openemr/vendor
 openemr/public
 openemr/images

diff --git a/contrib/util/language_translations/manuallyRemovedConstants.txt b/contrib/util/language_translations/manuallyRemovedConstants.txt
@@ -8,11 +8,13 @@ tring[,'r'[,
 tring)  Which with example
 cfirst($array_his_alcohol[0])); ?>' ></td>                 <td><?php echo $this->listenerObject->z_
 cfirst($this->listenerObject->z_
+elf::MEDICATION_REQUEST_CATEGORY_COMMUNITY_TITLE),                         '
 heda
 rim($i
 rim($row['
-xiale lengte)																	
-xiale lengte)'); INSERT INTO `lang_definitions` V
+rrorConstants::
+rrorConstants::M
+rrorConstants::R
 cwords($item['row_s
 tring) {     if (typeof top.i18next.t == 'function') {         return top.i18next.t(
 ...

diff --git a/interface/forms/eye_mag/php/taskman_functions.php b/interface/forms/eye_mag/php/taskman_functions.php
@@ -130,7 +130,7 @@ function process_tasks($task)
         $send['DOC_link'] = "<a onclick=\"openNewForm('" . $GLOBALS['webroot'] . "/controller.php?document&view&patient_id=" . attr($task['PATIENT_ID']) . "&doc_id=" . attr($task['DOC_ID']) . "', 'Fax Report');\"
                                 href=\"JavaScript:void(0);\"
                                 title='" . xlt('Report was faxed to') . " " . attr($task['to_name']) . " @ " . attr($task['to_fax']) . " on " .
-                                text($task['COMPLETED_DATE']) . ". " . xla(' Click to view.') . "'><i class='far fa-file-pdf fa-fw'></i></a>";
+                                text($task['COMPLETED_DATE']) . ". " . xla('Click to view.') . "'><i class='far fa-file-pdf fa-fw'></i></a>";
                             //if we want a "resend" icon, add it here.
     }
 

diff --git a/interface/forms/gad7/new.php b/interface/forms/gad7/new.php
@@ -124,7 +124,7 @@ function create_q8(question, menue){
 <table>
   <tr>
 <td>
-<span class="text"><?php echo xlt('Being so restless that it\'s hard to sit still'); ?></span>
+<span class="text"><?php echo xlt("Being so restless that it's hard to sit still"); ?></span>
 <select name="restless_score" onchange="update_score(4, my_form.restless_score.value);">
  <option selected value="undef" ><?php echo text($str_default); ?></option>
     <option value="0"><?php echo text($str_not); ?></option>

diff --git a/interface/language/csv/commit_csv.php b/interface/language/csv/commit_csv.php
@@ -24,7 +24,7 @@
 }
 
 if (!$errmsg && !isset($_REQUEST['lang_id'])) {
-    $errmsg = xlt("No Language ID specified!");
+    $errmsg = xlt("No Language ID specified");
 }
 
 if (!isset($_REQUEST['preview'])) {

diff --git a/library/globals.inc.php b/library/globals.inc.php
@@ -4108,7 +4108,7 @@ function gblTimeZones()
             xl('Visits by Item Report'),
             'bool',                           // data type
             '0',                              // default
-            xl('Visits by Item Report.')
+            xl('Visits by Item Report')
         ),
 
         'gbl_menu_acct_trans' => array(
@@ -4157,7 +4157,7 @@ function gblTimeZones()
             xl('Service and Client Volume Report'),
             'bool', // data type
             '1', // default
-            xl('Service and client volume report')
+            xl('Service and Client Volume Report')
         ),
     );
 

diff --git a/src/Billing/BillingProcessor/Tasks/GeneratorHCFA_PDF.php b/src/Billing/BillingProcessor/Tasks/GeneratorHCFA_PDF.php
@@ -161,7 +161,7 @@ public function validateAndClear(BillingClaim $claim)
             'hcfa'
         );
 
-        $this->printToScreen(xl("Successfully marked claim") . ": " . $claim->getId() . xl(" as billed"));
+        $this->printToScreen(xl("Successfully marked claim") . ": " . $claim->getId() .  " " . xl("as billed"));
     }
 
     /**

diff --git a/src/RestControllers/SMART/SMARTAuthorizationController.php b/src/RestControllers/SMART/SMARTAuthorizationController.php
@@ -151,7 +151,7 @@ public function patientSelectConfirm()
         if (!isset($user_uuid)) {
             $this->logger->error("SMARTAuthorizationController->patientSelect() Unauthorized call, user has not authenticated");
             http_response_code(401);
-            die(xlt('Invalid request'));
+            die(xlt('Invalid Request'));
         }
 
         if (!CsrfUtils::verifyCsrfToken($_POST["csrf_token"], 'oauth2')) {
@@ -199,7 +199,7 @@ public function patientSelect()
         if (empty($user_uuid)) {
             $this->logger->error("SMARTAuthorizationController->patientSelect() Unauthorized call, user has not authenticated");
             http_response_code(401);
-            die(xlt('Invalid request'));
+            die(xlt('Invalid Request'));
         }
 
         $hasMore = false;

diff --git a/src/Services/PatientService.php b/src/Services/PatientService.php
@@ -341,7 +341,7 @@ public function getAll($search = array(), $isAndCondition = true, $puuidBind = n
 
     public function search($search, $isAndCondition = true)
     {
-        $sql = "SELECT 
+        $sql = "SELECT
                     patient_data.*
                     ,patient_history_type_key
                     ,previous_name_first
@@ -353,7 +353,7 @@ public function search($search, $isAndCondition = true)
                     ,previous_name_enddate
                 FROM patient_data
                 LEFT JOIN (
-                    SELECT 
+                    SELECT
                     pid AS patient_history_pid
                     ,history_type_key AS patient_history_type_key
                     ,previous_name_prefix
@@ -776,7 +776,7 @@ private function parseSuffixForPatientRecord($patientRecord)
     private function getPatientSuffixKeys()
     {
         if (!isset($this->patientSuffixKeys)) {
-            $this->patientSuffixKeys = array(xl('Jr.'), xl(' Jr'), xl('Sr.'), xl(' Sr'), xl('II'), xl('III'), xl('IV'));
+            $this->patientSuffixKeys = array(xl('Jr.'), ' ' . xl('Jr'), xl('Sr.'), ' ' . xl('Sr'), xl('II{{patient suffix}}'), xl('III{{patient suffix}}'), xl('IV{{patient suffix}}'));
         }
         return $this->patientSuffixKeys;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -161,7 +161,7 @@ public function validateAndClear(BillingClaim $claim) @@
                 'hcfa'
             );
-            $this->printToScreen(xl("Successfully marked claim") . ": " . $claim->getId() . xl(" as billed"));
+            $this->printToScreen(xl("Successfully marked claim") . ": " . $claim->getId() .  " " . xl("as billed"));
         }
         /**
@@ Expand Down @@