From 3b2ceb7ee5de9d7c413b266a69aa876b7fa9391b Mon Sep 17 00:00:00 2001
From: DB4SCW <dev@db4scw.de>
Date: Tue, 19 Nov 2024 06:30:11 +0000
Subject: [PATCH] fix curly braces and commit suggested changes by HB9HIL

---
 application/controllers/Cabrillo.php       | 2 +-
 application/libraries/Cbr_parser.php       | 9 +++------
 application/models/Logbook_model.php       | 3 +--
 application/views/adif/dcl_success.php     | 2 +-
 application/views/adif/import.php          | 4 ++--
 application/views/cabrillo/cbr_success.php | 2 +-
 6 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/application/controllers/Cabrillo.php b/application/controllers/Cabrillo.php
index 17ca2121e..49265a1e1 100644
--- a/application/controllers/Cabrillo.php
+++ b/application/controllers/Cabrillo.php
@@ -231,7 +231,7 @@ class Cabrillo extends CI_Controller {
 			
 			//create error if more than 1 QSO is found and skip
 			if(count($contest_qsos) != 1){
-				array_push($custom_errors, "QSO " . $i . " not found or more that 1 QSOs found that match the criteria of the CBR file. Skipping as a safety measure.");
+				array_push($custom_errors, sprintf(__("QSO %s not found or more that 1 QSOs found that match the criteria of the CBR file. Skipping as a safety measure.", $i)));
 				$i++;
 				continue;
 			}
diff --git a/application/libraries/Cbr_parser.php b/application/libraries/Cbr_parser.php
index e4f2e4d73..7995444b8 100755
--- a/application/libraries/Cbr_parser.php
+++ b/application/libraries/Cbr_parser.php
@@ -88,8 +88,7 @@ class CBR_Parser
         }
 
         //abort further processing if no qso lines were found, return header only
-        if(count($qso_lines_raw) < 1)
-        {
+        if(count($qso_lines_raw) < 1) {
             $result = [];
             $result["HEADER"] = $header;
             $result["QSOS"] = [];
@@ -147,8 +146,7 @@ class CBR_Parser
             $qso_line["SENT_59"] = $line[$sent_59_pos];
            
             //set serial if requested
-            if($serial_number_present)
-            {
+            if($serial_number_present) {
                 $qso_line["SENT_SERIAL"] = $line[$sent_59_pos + 1];
             }
 
@@ -166,8 +164,7 @@ class CBR_Parser
             $qso_line["RCVD_59"] = $line[$rcvd_59_pos];
 
             //set serial if requested
-            if($serial_number_present)
-            {
+            if($serial_number_present) {
                 $qso_line["RCVD_SERIAL"] = $line[$rcvd_59_pos + 1];
             }
 
diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index 7987b1448..20043e446 100644
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -5451,8 +5451,7 @@ class Logbook_model extends CI_Model {
 		$this->db->where('COL_BAND', $band);
 
 		//load only for specific mode if the mode is determinate. If not, omit it. In most cases, that should be fine. Also provided by wavelog itself, so no cleaning.
-		if($mode != '')
-		{
+		if($mode != '') {
 			$this->db->where('COL_MODE', $mode);
 		}
 
diff --git a/application/views/adif/dcl_success.php b/application/views/adif/dcl_success.php
index 9763a9eed..321de6ad9 100644
--- a/application/views/adif/dcl_success.php
+++ b/application/views/adif/dcl_success.php
@@ -13,7 +13,7 @@
   </div>
   <div class="card-body">
     <?php if($dcl_error_count[0] > 0) { ?>
-       <h3 class="card-title">Yay, its updated!</h3>
+       <h3 class="card-title"><?= __("Yay, its updated!"); ?></h3>
        <p class="card-text"><?= __("DCL information for DOKs has been updated.")?></p>
     <?php } else { ?>
        <h3 class="card-title"><?= __("No QSOs found which could be updated.")?></h3>
diff --git a/application/views/adif/import.php b/application/views/adif/import.php
index 6cf40fc87..f0e94ce1d 100644
--- a/application/views/adif/import.php
+++ b/application/views/adif/import.php
@@ -305,8 +305,8 @@
                         </div>
                     <?php } ?>
 
-                    <p class="card-text"><span class="badge text-bg-info">Information</span> <?= __("If you imported an ADIF file of a contest, provided by another logging software, sometimes, depending on that software, your exchanges will not be imported properly from that softwares ADIF. If you like to correct that, you can provide the Cabrillo file that this software also provides to rewrite that data in Wavelog.") ?></p>
-                    <p class="card-text"><span class="badge text-bg-warning">Important</span> <?= __("Please use this function before changing anything about the QSOs in Wavelog, as this function uses the Contest ID, as well as date and time information from both your already imported ADIF file, as well as the CBR file you are about to upload to match the QSOs and only correct relevant data.") ?></p>
+                    <p class="card-text"><span class="badge text-bg-info"><?= __("Information"); ?></span> <?= __("If you imported an ADIF file of a contest, provided by another logging software, sometimes, depending on that software, your exchanges will not be imported properly from that softwares ADIF. If you like to correct that, you can provide the Cabrillo file that this software also provides to rewrite that data in Wavelog.") ?></p>
+                    <p class="card-text"><span class="badge text-bg-warning"><?= __("Important"); ?></span> <?= __("Please use this function before changing anything about the QSOs in Wavelog, as this function uses the Contest ID, as well as date and time information from both your already imported ADIF file, as well as the CBR file you are about to upload to match the QSOs and only correct relevant data.") ?></p>
                     <form class="form" action="<?php echo site_url('cabrillo/cbrimport'); ?>" method="post" enctype="multipart/form-data">
 
                         <div class="mb-3 row">
diff --git a/application/views/cabrillo/cbr_success.php b/application/views/cabrillo/cbr_success.php
index 80138eee9..7e11d8119 100755
--- a/application/views/cabrillo/cbr_success.php
+++ b/application/views/cabrillo/cbr_success.php
@@ -13,7 +13,7 @@
   </div>
   <div class="card-body">
     <?php if($cbr_update_count > 0) { ?>
-       <h3 class="card-title">Yay, its updated!</h3>
+       <h3 class="card-title"><?= __("Yay, its updated!"); ?></h3>
        <p class="card-text"><?= __("Your contest QSOs have been updated using the values of your Cabrillo file.")?></p>
     <?php } else { ?>
        <h3 class="card-title"><?= __("No QSOs were updated by your Cabrillo file.")?></h3>