From d26df476c2cdb2ae496b852c3882c1a782b2fb17 Mon Sep 17 00:00:00 2001
From: HB9HIL <fabian.berg@hb9hil.org>
Date: Thu, 15 Aug 2024 09:04:04 +0200
Subject: [PATCH] adjusted strings to remove the html from gettext

---
 application/views/adif/import.php             | 2 +-
 application/views/debug/index.php             | 2 +-
 application/views/distances/index.php         | 2 +-
 application/views/interface_assets/footer.php | 2 +-
 application/views/simplefle/index.php         | 4 ++--
 application/views/simplefle/syntax_help.php   | 2 +-
 application/views/themes/index.php            | 2 +-
 application/views/user/login.php              | 6 ++++--
 8 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/application/views/adif/import.php b/application/views/adif/import.php
index 6d55e66bd..4421e07ed 100644
--- a/application/views/adif/import.php
+++ b/application/views/adif/import.php
@@ -151,7 +151,7 @@
                                     <input class="form-check-input" type="checkbox" name="skipStationCheck" value="1" id="skipStationCheck">
                                     <label class="form-check-label" for="skipStationCheck"><span class="badge text-bg-warning"><?= __("DANGER") ?></span> <?= __("Ignore Stationcallsign on import") ?></label>
                                 </div>
-                                <div class="small form-text text-muted"><?= __("If selected, Wavelog will try to import <b>all</b> QSO's of the ADIF, regardless if they match to the chosen station-location.") ?></div>
+                                <div class="small form-text text-muted"><?= sprintf(__("If selected, Wavelog will try to import %sall%s QSO's of the ADIF, regardless if they match to the chosen station-location."), '<b>', '</b>'); ?></div>
                             </div>
                         </div>
 
diff --git a/application/views/debug/index.php b/application/views/debug/index.php
index 65a5ee5ab..9f5e9df39 100644
--- a/application/views/debug/index.php
+++ b/application/views/debug/index.php
@@ -44,7 +44,7 @@
                             <div class="alert alert-danger mt-3 mb-3">
                                 <h5><?= __("Migration is outdated and locked!"); ?></h5>
                                 <p><?= sprintf(__("The current migration is not the version it is supposed to be. Reload this page after %s seconds. If this warning persists, your migration is likely locked due to a previously failed process. Delete the file %s to force the migration to run again."), $miglock_lifetime, $migration_lockfile); ?></p>
-                                <p><?= sprintf(__("Check this wiki article <u><a href='%s' target='_blank'>here</a></u> for more information."), "https://github.com/wavelog/wavelog/wiki/Migration-is-locked"); ?></p>
+                                <p><?= sprintf(__("Check this wiki article %shere%s for more information."), '<u><a href="https://github.com/wavelog/wavelog/wiki/Migration-is-locked" target="_blank">', '</a></u>'); ?></p>
                                 <p><?= sprintf(__("Current migration is %s"), $migration_version); ?><br>
                                     <?= sprintf(__("Migration should be %s"), $migration_config); ?></p>
                             </div>
diff --git a/application/views/distances/index.php b/application/views/distances/index.php
index ca4845785..a02f379ff 100644
--- a/application/views/distances/index.php
+++ b/application/views/distances/index.php
@@ -6,7 +6,7 @@
     <script>
         var lang_general_word_qso_data = '<?= __("QSO Data"); ?>';
         var lang_statistics_distances_worked = '<?= __("Distances Worked"); ?>';
-        var lang_statistics_distances_part1_contacts_were_plotted_furthest = '<?= __("contacts were plotted.<br /> Your furthest contact was with"); ?>';
+        var lang_statistics_distances_part1_contacts_were_plotted_furthest = '<?= sprintf(__("contacts were plotted.%s Your furthest contact was with"), '<br>'); ?>';
         var lang_statistics_distances_part2_contacts_were_plotted_furthest = '<?= __("in gridsquare"); ?>';
         var lang_statistics_distances_part3_contacts_were_plotted_furthest = '<?= __("the distance was"); ?>';
         var lang_statistics_distances_number_of_qsos = '<?= __("Number of QSOs"); ?>';
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index 8c6d42ca1..7855aebe9 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -1153,7 +1153,7 @@ $($('#callsign')).on('keypress',function(e) {
 					    if (data.error == 'not_logged_in') {
 						    $(".radio_cat_state" ).remove();
 						    if($('.radio_login_error').length == 0) {
-							    $('.qso_panel').prepend('<div class="alert alert-danger radio_login_error" role="alert"><i class="fas fa-broadcast-tower"></i> '+"<?= sprintf(__("You're not logged it. Please <a href='%s'>login</a>"), base_url()); ?>"+'</div>');
+							    $('.qso_panel').prepend('<div class="alert alert-danger radio_login_error" role="alert"><i class="fas fa-broadcast-tower"></i> '+"<?= sprintf(__("You're not logged it. Please %slogin%s"), '<a href="'.base_url().'">', '</a>'); ?>"+'</div>');
 						    }
 					    }
 					    // Put future Errorhandling here
diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php
index 60abadd1b..cdfaf337b 100644
--- a/application/views/simplefle/index.php
+++ b/application/views/simplefle/index.php
@@ -104,7 +104,7 @@
 								<?php } ?>
 							</select>
 							<div class="alert alert-danger" role="alert" id="warningStationCall" style="display: none"> </div>
-							<small class="form-text text-muted"><?= sprintf(__("If you did operate from a new location, first create a new <a href='%s'>Station Location</a>"), site_url('station')); ?></small>
+							<small class="form-text text-muted"><?= sprintf(__("If you did operate from a new location, first create a new %sStation Location%s"), '<a href="'.site_url('station').'">', '</a>'); ?></small>
 						</div>
 					</div>
 					<div class="col-xs-12 col-lg-6">
@@ -157,7 +157,7 @@
 						<span class="js-qso-count"></span>
 					</div>
 					<div class="col-6 col-sm-6 text-end" id="refs_hint">
-						<?= __("The Refs can be either <u>S</u>OTA, <u>I</u>OTA, <u>P</u>OTA or <u>W</u>WFF"); ?>
+						<?= sprintf(__("The Refs can be either %sS%sOTA, %sI%sOTA, %sP%sOTA, or %sW%sWFF"), '<u>', '</u>', '<u>', '</u>', '<u>', '</u>', '<u>', '</u>'); ?>
 					</div>
 				</div>
 			</div>
diff --git a/application/views/simplefle/syntax_help.php b/application/views/simplefle/syntax_help.php
index 2817e7dc8..62e770a3c 100644
--- a/application/views/simplefle/syntax_help.php
+++ b/application/views/simplefle/syntax_help.php
@@ -25,5 +25,5 @@
     day ++
     df3et
 </pre>
-<p><?= sprintf(__("A full summary of all commands and the necessary syntax can be found in <a href='%s' target='_blank'>this article</a> of our Wiki."), "https://github.com/wavelog/wavelog/wiki/SimpleFLE"); ?></p>
+<p><?= sprintf(__("A full summary of all commands and the necessary syntax can be found in %sthis article%s of our Wiki."), '<a href="https://github.com/wavelog/wavelog/wiki/SimpleFLE" target="_blank">', '</a>'); ?></p>
 
diff --git a/application/views/themes/index.php b/application/views/themes/index.php
index cc8fe759f..fea7321bf 100644
--- a/application/views/themes/index.php
+++ b/application/views/themes/index.php
@@ -70,7 +70,7 @@
 						<h6><?= __("4. Step"); ?></h6>
 					</div>
 					<div class="col-md-10">
-						<p><?= __("Click here on 'Add a Theme' and type in the necessary data. Type in the filenames for the logos <b>without</b> the file extension '.png'"); ?></p>
+						<p><?= sprintf(__("Click here on 'Add a Theme' and type in the necessary data. Type in the filenames for the logos %swithout%s the file extension '.png'"), '<u><b>', '</b></u>'); ?></p>
 					</div>
 				</div>
 			</div>
diff --git a/application/views/user/login.php b/application/views/user/login.php
index 2bb2271e7..b30bdd982 100644
--- a/application/views/user/login.php
+++ b/application/views/user/login.php
@@ -57,9 +57,11 @@
                     <p><?= __("This demo will be reset every night at 0200z."); ?><br><br>
                     <?= __("Username"); ?>: demo<br>
                     <?= __("Password"); ?>: demo<br><br>
-                    <?= sprintf(__("More Information about Wavelog on <a href='%s' target='_blank'>Github</a>."), "https://www.github.com/wavelog/wavelog"); ?></p>
+                    <?= sprintf(__("More Information about Wavelog on %sGithub%s."), '<a href="https://www.github.com/wavelog/wavelog" target="_blank">', '</a>'); ?></p>
                 </div>
-            <?php } ?>
+            <?php }
+            // End of Demo Part
+             ?>
             <form method="post" action="<?php echo site_url('user/login'); ?>" name="users">
                 <?php $this->form_validation->set_error_delimiters('', ''); ?>
                 <input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" />