From 29f3dfc0363a4464e7b9b313142d74d5ab25d453 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 7 Jun 2024 22:40:11 +0200 Subject: [PATCH] stringify --- application/views/eqslcard/index.php | 2 +- application/views/oqrs/index.php | 14 ++--- application/views/oqrs/notinlogform.php | 23 ++++--- application/views/oqrs/qsolist.php | 10 ++-- application/views/oqrs/request.php | 26 ++++---- application/views/oqrs/request_grouped.php | 32 +++++----- application/views/oqrs/result.php | 16 +++-- application/views/oqrs/showrequests.php | 60 +++++++++---------- application/views/public_search/empty.php | 4 +- application/views/public_search/result.php | 4 +- application/views/qrbcalc/index.php | 8 +-- application/views/qrz/analysis.php | 2 +- application/views/qrz/export.php | 36 +++++------ application/views/qrz/mark_qrz.php | 6 +- application/views/qslcard/index.php | 10 ++-- application/views/qslcard/qslcarousel.php | 6 +- application/views/qslcard/searchform.php | 4 +- application/views/qslcard/searchresult.php | 2 +- application/views/qslmanagement/index.php | 12 ++-- application/views/qslprint/qslprint.php | 10 ++-- .../qso/components/previous_contacts.php | 2 +- .../views/qso/components/winkeysettings.php | 26 ++++---- .../qso/components/winkeysettings_results.php | 26 ++++---- application/views/qso/edit_ajax.php | 2 +- application/views/qso/index.php | 12 ++-- application/views/radio/index.php | 8 +-- application/views/satellite/create.php | 32 +++++----- application/views/satellite/edit.php | 30 +++++----- application/views/satellite/index.php | 16 ++--- application/views/sattimers/index.php | 28 ++++----- 30 files changed, 237 insertions(+), 232 deletions(-) diff --git a/application/views/eqslcard/index.php b/application/views/eqslcard/index.php index 91bfe1c6e..322f4acd4 100644 --- a/application/views/eqslcard/index.php +++ b/application/views/eqslcard/index.php @@ -7,7 +7,7 @@ config->item('userdata'); if (isset($userdata_dir)) { ?> diff --git a/application/views/oqrs/index.php b/application/views/oqrs/index.php index 9dc7d2dc5..a872a5cc2 100644 --- a/application/views/oqrs/index.php +++ b/application/views/oqrs/index.php @@ -6,7 +6,7 @@
- Request a QSL card +
@@ -18,9 +18,9 @@ echo '

'; } if ($groupedSearch == 'on') { - echo 'This search will search in all station locations where OQRS is active.

- - + echo __("This search will search in all station locations where OQRS is active.").'

+ +
'; echo '
'; ?> @@ -45,13 +45,13 @@ if ($stations->result() != NULL) { ?>
- + - +
@@ -61,7 +61,7 @@ } else { - echo 'No stations found that are using Wavelog OQRS.'; + echo __("No stations found that are using Wavelog OQRS."); } } ?> diff --git a/application/views/oqrs/notinlogform.php b/application/views/oqrs/notinlogform.php index 8367873b3..d34bc0210 100644 --- a/application/views/oqrs/notinlogform.php +++ b/application/views/oqrs/notinlogform.php @@ -1,15 +1,14 @@
-If you can't find your QSO in the log, please fill out the form below. You will be contacted after the log has been -checked.
+
- - - - + + + + @@ -22,22 +21,22 @@ checked.
#DateTime (UTC)BandMode
- +
- + - Any extra information we need to know about? +
- + - Your e-mail address where we can contact you +
+ class="fas fa-plus-square">
diff --git a/application/views/oqrs/qsolist.php b/application/views/oqrs/qsolist.php index 2e1b54575..4fa9b4fe1 100644 --- a/application/views/oqrs/qsolist.php +++ b/application/views/oqrs/qsolist.php @@ -11,10 +11,10 @@ if ($qsos->result() != NULL) { ' . __("Station") . ' ' . __("QSL") . ''; if ($this->session->userdata('user_eqsl_name') != "") { - echo 'eQSL'; + echo '' . __("eQSL") . ''; } if($this->session->userdata('user_lotw_name') != "") { - echo 'LoTW'; + echo '' . __("LoTW") . ''; } echo ' @@ -114,7 +114,7 @@ if ($qsos->result() != NULL) { echo " (".__("Direct").")"; break; case "M": - echo " (Manager)"; + echo " (" . __("Manager") . ")"; break; case "E": echo " (".__("Electronic").")"; @@ -181,7 +181,7 @@ if ($qsos->result() != NULL) { echo '">▼'; echo ''; } - echo ''; + echo ''; echo ''; } @@ -190,6 +190,6 @@ if ($qsos->result() != NULL) { No QSO\'s were found. It seems you were not active at this time.
'; + echo '
' . __("No QSO's were found. It seems you were not active at this time.") . '
'; } ?> diff --git a/application/views/oqrs/request.php b/application/views/oqrs/request.php index 3f7b2953a..4e7f59943 100644 --- a/application/views/oqrs/request.php +++ b/application/views/oqrs/request.php @@ -6,16 +6,16 @@ } ?>
-The following QSO(s) were found. Please fill out the date and time and submit your request. + - - - - + + + + @@ -37,31 +37,31 @@ The following QSO(s) were found. Please fill out the date and time and submit yo
- +
- +
- +


- + - Any extra information we need to know about? +
- + - Your e-mail address where we can contact you +
+ class="fas fa-plus-square"> diff --git a/application/views/oqrs/request_grouped.php b/application/views/oqrs/request_grouped.php index 62330269c..bc2d36855 100644 --- a/application/views/oqrs/request_grouped.php +++ b/application/views/oqrs/request_grouped.php @@ -1,19 +1,19 @@
-The following QSO(s) were found. Please fill out the date and time and submit your request. +
#DateTime (UTC)BandMode
- - - - - + + + + + optionslib->get_option('groupedSearchShowStationName'); if ($showStationName == 'on'): ?> - + @@ -41,35 +41,35 @@ The following QSO(s) were found. Please fill out the date and time and submit yo
- +
- +
- +


- + - Any extra information we need to know about? +
- + - Your e-mail address where we can contact you +
+ class="fas fa-plus-square">'; + echo __("No QSOs found in the log.").'
'; } ?> \ No newline at end of file diff --git a/application/views/oqrs/result.php b/application/views/oqrs/result.php index 23e64b068..44d783b9c 100644 --- a/application/views/oqrs/result.php +++ b/application/views/oqrs/result.php @@ -2,7 +2,7 @@ if ($qsocount > 0) { $count = 0; -echo '
Log search result for ' . strtoupper($callsign) . ':
'; +echo '
' . sprintf(__("Log search result for %s"), strtoupper($callsign)) . ':
'; echo '
#DateTime (UTC)BandModeCallsign Station Name
@@ -26,13 +26,19 @@ foreach ($result as $mode => $value) { echo ''; } echo '
'; -echo strtoupper($callsign) . ' has ' . $count . ' band slot(s) and has ' . $qsocount . ' QSO(s) in the log.

'; +echo strtoupper($callsign) . ' ' . sprintf( + ngettext('has %d band slot', 'has %d band slots', intval($count)), + intval($count) +) . ' ' . sprintf( + ngettext('and has %d QSO in the log', 'and has %d QSOs in the log', intval($qsocount)), + intval($qsocount) +) . '.

'; ?> - +
No QSOs found in the log.
'; + echo '
' . __("No QSOs found in the log.") . '
'; } ?>
- \ No newline at end of file + \ No newline at end of file diff --git a/application/views/oqrs/showrequests.php b/application/views/oqrs/showrequests.php index ea7749a7c..a45f87ef5 100644 --- a/application/views/oqrs/showrequests.php +++ b/application/views/oqrs/showrequests.php @@ -2,16 +2,16 @@ function echo_status($status) { switch($status) { - case '0': echo 'Open request'; break; - case '1': echo 'Not in log request'; break; - case '2': echo 'Request done'; break; + case '0': echo __("Open request"); break; + case '1': echo __("Not in log request"); break; + case '2': echo __("Request done"); break; } } function echo_qsl_method($method) { switch(strtoupper($method)) { - case 'B': echo 'Bureau'; break; - case 'D': echo 'Direct'; break; - case 'E': echo 'Electronic'; break; + case 'B': echo __("Bureau"); break; + case 'D': echo __("Direct"); break; + case 'E': echo __("Electronic"); break; } } @@ -30,7 +30,7 @@ function echo_qsl_method($method) {
- - - - + + + +
@@ -59,16 +59,16 @@ function echo_qsl_method($method) { - +

- - - With selected : - - + + + : + +
@@ -77,18 +77,18 @@ function echo_qsl_method($method) {
- Time of request - QSO Date - QSO Time - Band - Mode - Request callsign - Station callsign - E-mail - Note - QSL route - Check log - Status + + + + + + + + + + + + diff --git a/application/views/public_search/empty.php b/application/views/public_search/empty.php index 8c5d8460b..b1229b4d7 100644 --- a/application/views/public_search/empty.php +++ b/application/views/public_search/empty.php @@ -1,4 +1,4 @@
-

Results Searching for

- +

+
diff --git a/application/views/public_search/result.php b/application/views/public_search/result.php index a93b30f3f..104514b87 100644 --- a/application/views/public_search/result.php +++ b/application/views/public_search/result.php @@ -1,5 +1,5 @@
-

Results Searching for

+

- Station Callsign + diff --git a/application/views/qrbcalc/index.php b/application/views/qrbcalc/index.php index c85c9f788..ecf7ad8e1 100644 --- a/application/views/qrbcalc/index.php +++ b/application/views/qrbcalc/index.php @@ -1,13 +1,13 @@
-
Locator 1
+
" aria-label="locator1">
-
Locator 2
+
@@ -16,8 +16,8 @@
- - + +
diff --git a/application/views/qrz/analysis.php b/application/views/qrz/analysis.php index d99bdb450..5e04d4932 100644 --- a/application/views/qrz/analysis.php +++ b/application/views/qrz/analysis.php @@ -5,7 +5,7 @@ if (isset ($tableheaders)) { echo $tableheaders; } else { - echo 'No data imported. please check selected date. Must be in the past!'; + echo __("No data imported. please check selected date. Must be in the past!"); } ?> diff --git a/application/views/qrz/export.php b/application/views/qrz/export.php index 60cede635..5dd471567 100644 --- a/application/views/qrz/export.php +++ b/application/views/qrz/export.php @@ -7,15 +7,15 @@
@@ -24,8 +24,8 @@
-

Here you can see all QSOs which have not been previously uploaded to a QRZ logbook.

-

You need to set a QRZ Logbook API key in your station profile. Only station profiles with an API Key set are displayed.

+

+

config->item('disable_manual_qrz'))) { echo '

Warning This might take a while as QSO uploads are processed sequentially.

'; } ?> - Profile name - Station callsign - Edited QSOs not uploaded - Total QSOs not uploaded - Total QSOs uploaded - Actions + ' . __("Profile name") . ' + ' . __("Station callsign") . ' + ' . __("Edited QSOs not uploaded") . ' + ' . __("Total QSOs not uploaded") . ' + ' . __("Total QSOs uploaded") . ' + ' . __("Actions") . ' '; foreach ($station_profile->result() as $station) { // Fills the table with the data @@ -51,7 +51,7 @@ echo '' . $station->notcount . ''; echo '' . $station->totcount . ''; if (!($this->config->item('disable_manual_qrz'))) { - echo ''; + echo ''; } else { echo ' '; } @@ -61,7 +61,7 @@ } else { - echo ''; + echo ''; } ?> @@ -70,7 +70,7 @@
-

Warning If no startdate is given then all QSOs after last confirmation will be downloaded/updated!

+

@@ -78,7 +78,7 @@

- +
@@ -86,12 +86,12 @@
-

Warning If a date range is not selected then all QSOs will be marked!

+

@@ -104,7 +104,7 @@

- +
diff --git a/application/views/qrz/mark_qrz.php b/application/views/qrz/mark_qrz.php index ac0b5ff1c..d1a19fa34 100644 --- a/application/views/qrz/mark_qrz.php +++ b/application/views/qrz/mark_qrz.php @@ -9,11 +9,11 @@
- QSOs marked +
-

Yay, it's done!

-

The QSOs are marked as exported to QRZ Logbook.

+

+

diff --git a/application/views/qslcard/index.php b/application/views/qslcard/index.php index 78c610547..a124e33cb 100644 --- a/application/views/qslcard/index.php +++ b/application/views/qslcard/index.php @@ -7,7 +7,7 @@ config->item('userdata'); if (isset($userdata_dir)) { ?> @@ -30,7 +30,7 @@ '.__("Date").' '.__("Time").' '.__("Band").' - '.__("QSL").' '.__("Date").' + '.__("QSL Date").' @@ -62,9 +62,9 @@ $timestamp = strtotime($qsl->COL_QSLRDATE ?? ''); echo date($custom_date_format, $timestamp); echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; echo ''; } diff --git a/application/views/qslcard/qslcarousel.php b/application/views/qslcard/qslcarousel.php index db62d444c..c6d4c02a0 100644 --- a/application/views/qslcard/qslcarousel.php +++ b/application/views/qslcard/qslcarousel.php @@ -22,17 +22,17 @@ echo ' active'; } echo '">'; - echo 'QSL picture #'. $i++.''; + echo '' . __('; echo '
'; } ?>
- + - +
diff --git a/application/views/qslcard/searchform.php b/application/views/qslcard/searchform.php index b07b173b8..92a8aa79a 100644 --- a/application/views/qslcard/searchform.php +++ b/application/views/qslcard/searchform.php @@ -1,11 +1,11 @@ diff --git a/application/views/qslcard/searchresult.php b/application/views/qslcard/searchresult.php index d175cd8e7..b662d58e9 100644 --- a/application/views/qslcard/searchresult.php +++ b/application/views/qslcard/searchresult.php @@ -190,7 +190,7 @@ case 'Operator': echo '' . ($row->COL_OPERATOR); break; } echo ' - '; + '; echo ''; $i++; } ?> diff --git a/application/views/qslmanagement/index.php b/application/views/qslmanagement/index.php index a36b3028d..ff243a14e 100644 --- a/application/views/qslmanagement/index.php +++ b/application/views/qslmanagement/index.php @@ -10,7 +10,7 @@
-

Incoming QSL Cards

+

@@ -20,10 +20,10 @@ - - - - + + + + @@ -43,7 +43,7 @@
-

Outgoing QSL Cards

+

diff --git a/application/views/qslprint/qslprint.php b/application/views/qslprint/qslprint.php index 88ec6596d..52ce3a052 100644 --- a/application/views/qslprint/qslprint.php +++ b/application/views/qslprint/qslprint.php @@ -64,15 +64,15 @@ if ($qsos->result() != NULL) { echo '
Date/TimeBandReportOption
'; ?> -

+

-

+

-

+

" class="btn btn-primary"> - + " class="btn btn-primary"> -

+ " class="btn btn-primary">

- + session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1')); diff --git a/application/views/qso/components/winkeysettings.php b/application/views/qso/components/winkeysettings.php index b6915182e..74a1fbc05 100644 --- a/application/views/qso/components/winkeysettings.php +++ b/application/views/qso/components/winkeysettings.php @@ -4,19 +4,19 @@
-
Winkey Macros
+
- +
- +
@@ -25,14 +25,14 @@
- +
- +
@@ -41,14 +41,14 @@
- +
- +
@@ -57,14 +57,14 @@
- +
- +
@@ -73,22 +73,22 @@
- +
- +
- - + +
diff --git a/application/views/qso/components/winkeysettings_results.php b/application/views/qso/components/winkeysettings_results.php index 45fdffdc6..bd85f9337 100644 --- a/application/views/qso/components/winkeysettings_results.php +++ b/application/views/qso/components/winkeysettings_results.php @@ -4,19 +4,19 @@
-
Winkey Macros
+
- +
- +
@@ -25,14 +25,14 @@
- +
- +
@@ -41,14 +41,14 @@
- +
- +
@@ -57,14 +57,14 @@
- +
- +
@@ -73,22 +73,22 @@
- +
- +
- - + +
diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php index 04645d957..9dc775525 100644 --- a/application/views/qso/edit_ajax.php +++ b/application/views/qso/edit_ajax.php @@ -163,7 +163,7 @@
-

Used for VUCC MultiGrids

+

diff --git a/application/views/qso/index.php b/application/views/qso/index.php index d949089ef..b54384a2b 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -17,7 +17,7 @@
- +
@@ -642,16 +642,16 @@
-

Winkey +

- + + _="on htmx:afterOnLoad wait 10ms then add .show to #modal then add .show to #modal-backdrop">

diff --git a/application/views/radio/index.php b/application/views/radio/index.php index 09a9dd1ef..c8ae8c9f1 100644 --- a/application/views/radio/index.php +++ b/application/views/radio/index.php @@ -13,18 +13,18 @@
- Active Radios +
-

Below is a list of active radios that are connected to Wavelog.

-

If you haven't connected any radios yet, see the API page to generate API keys.

+

+

/

- Info You can find out how to use the radio functions in the wiki. + ' . __("radio functions") . ''); ?>

diff --git a/application/views/satellite/create.php b/application/views/satellite/create.php index 73923b36c..0a71b7683 100644 --- a/application/views/satellite/create.php +++ b/application/views/satellite/create.php @@ -20,50 +20,50 @@
- + - Satellite name +
- + - If external services uses another name for the satellite, like LoTW +
- + - Enter which orbit the satellite has (LEO, MEO, GEO) +
- + - Enter satellite mode +
- + - Enter modulation used for uplink +
- + - Enter frequency (in Hz) used for uplink +
- + - Enter modulation used for downlink +
- + - Enter frequency (in Hz) used for downlink +
diff --git a/application/views/satellite/edit.php b/application/views/satellite/edit.php index cb915e552..3a353994f 100644 --- a/application/views/satellite/edit.php +++ b/application/views/satellite/edit.php @@ -4,25 +4,25 @@
- + name; } ?>" required> - Satellite name +
- + exportname; } ?>" required> - If external services uses another name for the satellite, like LoTW +
- + orbit; } ?>" required> - Enter which orbit the satellite has (LEO, MEO, GEO) +
- +

@@ -31,13 +31,13 @@ - - - - - - - + + + + + + + @@ -56,7 +56,7 @@
NameUplink modeUplink frequencyDownlink modeDownlink frequencyEditDelete
- + diff --git a/application/views/satellite/index.php b/application/views/satellite/index.php index 6eaaabba9..07cde5ae9 100644 --- a/application/views/satellite/index.php +++ b/application/views/satellite/index.php @@ -8,22 +8,22 @@ -

Satellites

+

- +
- - - - - - + + + + + + diff --git a/application/views/sattimers/index.php b/application/views/sattimers/index.php index 344b5db89..bd0517d44 100644 --- a/application/views/sattimers/index.php +++ b/application/views/sattimers/index.php @@ -10,9 +10,9 @@ var custom_date_format = "";

-

Satellite Timers

+

-

This data is from https://www.df2et.de/tevel/ calculated for current station location grid .

+

https://www.df2et.de/tevel/", strtoupper($gridsquare)); ?>

NameExport NameOrbitModeEditDelete