From 434a15996e91a3c875fa6555faf576ca98821a73 Mon Sep 17 00:00:00 2001
From: int2001 <joerg@dj7nt.de>
Date: Sat, 28 Sep 2024 11:10:28 +0000
Subject: [PATCH] Several Wordings/localisations for ADIF-Import

---
 application/models/Logbook_model.php      | 16 ++++++++--------
 application/views/adif/import_success.php |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index 2e4256b45..5be85ffed 100644
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -3539,8 +3539,8 @@ class Logbook_model extends CI_Model {
 			$record['station_callsign'] = $station_profile_call;
 		}
 		if ((!$skipStationCheck) && ($station_id != 0) && (strtoupper($record['station_callsign']) != strtoupper($station_profile_call))) {     // Check if station_call from import matches profile ONLY when submitting via GUI.
-			$returner['error'] = "Wrong station callsign <b>\"" . htmlentities($record['station_callsign'] ?? '') . "\"</b> while importing QSO with " . $record['call'] ?? '' . " for <b>" . $station_profile_call ?? '' . "</b> : SKIPPED" .
-				"<br>See the <a target=\"_blank\" href=\"https://github.com/wavelog/Wavelog/wiki/ADIF-file-can't-be-imported\">Wavelog Wiki</a> for hints about errors in ADIF files.";
+			$returner['error'] = __("Wrong station callsign")." <b>\"" . htmlentities($record['station_callsign'] ?? '') . "\"</b> ".__("while importing QSO with "). $record['call'] ?? '' . " ".__("for")." <b>" . $station_profile_call ?? '' . "</b> : ".__("SKIPPED") .
+				"<br>".__("Check ")." <a target=\"_blank\" href=\"https://github.com/wavelog/Wavelog/wiki/ADIF-file-can't-be-imported\">Wavelog Wiki</a>"." ".__("for hints about errors in ADIF files.");
 			return ($returner);
 		}
 
@@ -3841,7 +3841,7 @@ class Logbook_model extends CI_Model {
 					$input_qslrdate = $record['qslrdate'];
 				} else {
 					$input_qslrdate = NULL;
-					$my_error .= "Error QSO: Date: " . $time_on . " Callsign: " . $record['call'] . " the qslrdate is invalid (YYYYMMDD): " . $record['qslrdate'] . "<br>";
+					$my_error .= "Error QSO: Date: " . $time_on . " Callsign: " . $record['call'] . " ".__("the qslrdate is invalid (YYYYMMDD)").": " . $record['qslrdate'] . "<br>";
 				}
 			} else {
 				$input_qslrdate = NULL;
@@ -3852,7 +3852,7 @@ class Logbook_model extends CI_Model {
 					$input_qslsdate = $record['qslsdate'];
 				} else {
 					$input_qslsdate = NULL;
-					$my_error .= "Error QSO: Date: " . $time_on . " Callsign: " . $record['call'] . " the qslsdate is invalid (YYYYMMDD): " . $record['qslsdate'] . "<br>";
+					$my_error .= "Error QSO: Date: " . $time_on . " Callsign: " . $record['call'] . " ".__("the qslsdate is invalid (YYYYMMDD)").": " . $record['qslsdate'] . "<br>";
 				}
 			} else {
 				$input_qslsdate = NULL;
@@ -3896,7 +3896,7 @@ class Logbook_model extends CI_Model {
 					$input_clublog_qslsdate = $record['clublog_qso_upload_date'];
 				} else {
 					$input_clublog_qslsdate = NULL;
-					$my_error .= "Error QSO: Date: " . $time_on . " Callsign: " . $record['call'] . " the clublog_qso_upload_date is invalid (YYYYMMDD): " . $record['clublog_qso_upload_date'] . "<br>";
+					$my_error .= "Error QSO: Date: " . $time_on . " Callsign: " . $record['call'] . " ".__("the clublog_qso_upload_date is invalid (YYYYMMDD)").": " . $record['clublog_qso_upload_date'] . "<br>";
 				}
 			} else {
 				$input_clublog_qslsdate = NULL;
@@ -3916,7 +3916,7 @@ class Logbook_model extends CI_Model {
 					$input_lotw_qslrdate = $record['lotw_qslrdate'];
 				} else {
 					$input_lotw_qslrdate = NULL;
-					$my_error .= "Error QSO: Date: " . $time_on . " Callsign: " . $record['call'] . " the lotw_qslrdate is invalid (YYYYMMDD): " . $record['lotw_qslrdate'] . "<br>";
+					$my_error .= "Error QSO: Date: " . $time_on . " Callsign: " . $record['call'] . " ".__("the lotw_qslrdate is invalid (YYYYMMDD)").": " . $record['lotw_qslrdate'] . "<br>";
 				}
 			} else {
 				$input_lotw_qslrdate = NULL;
@@ -3935,7 +3935,7 @@ class Logbook_model extends CI_Model {
 					$input_lotw_qslsdate = $record['lotw_qslsdate'];
 				} else {
 					$input_lotw_qslsdate = NULL;
-					$my_error .= "Error QSO: Date: " . $time_on . " Callsign: " . $record['call'] . " the lotw_qslsdate is invalid (YYYYMMDD): " . $record['lotw_qslsdate'] . "<br>";
+					$my_error .= "Error QSO: Date: " . $time_on . " Callsign: " . $record['call'] . " ".__("the lotw_qslsdate is invalid (YYYYMMDD)").": " . $record['lotw_qslsdate'] . "<br>";
 				}
 			} else if ($markLotw != NULL) {
 				$input_lotw_qslsdate = $date = date("Y-m-d H:i:s", strtotime("now"));
@@ -4193,7 +4193,7 @@ class Logbook_model extends CI_Model {
 				$this->add_qso($data, $skipexport);
 			}
 		} else {
-			$my_error .= "Date/Time: " . ($time_on ?? 'N/A') . " Callsign: " . ($record['call'] ?? 'N/A') . " Band: " . ($band ?? 'N/A') . "  Duplicate for " . ($station_profile_call ?? 'N/A') . "<br>";
+			$my_error .= "Date/Time: " . ($time_on ?? 'N/A') . " Callsign: " . ($record['call'] ?? 'N/A') . " Band: " . ($band ?? 'N/A') . " ".__("Duplicate for")." ". ($station_profile_call ?? 'N/A') . "<br>";
 		}
 
 		if ($batchmode) {
diff --git a/application/views/adif/import_success.php b/application/views/adif/import_success.php
index e6e6111d3..a696b92c4 100644
--- a/application/views/adif/import_success.php
+++ b/application/views/adif/import_success.php
@@ -22,7 +22,7 @@
     </p>
     <?php if($adif_errors) { ?>
       <h3><?= __("Import details / possible problems")?></h3>
-      <p><?= __("You might have ADIF errors, the QSOs have still been added. Please check the following QSOs")?></p>
+      <p><?= __("You might have ADIF errors, the QSOs have still been added. Please check the following informations:")?></p>
       <p class="card-text"><?php echo $adif_errors; ?></p>
     <?php } ?>
   </div>