From 778fc05496fefbd8777bbb363a445036d8b71605 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 7 Jun 2024 21:38:09 +0200 Subject: [PATCH] stringify --- application/controllers/Logbook.php | 2 +- application/controllers/Stationsetup.php | 30 ++++---- application/views/activated_gridmap/index.php | 8 +-- application/views/awards/counties/details.php | 6 +- application/views/awards/counties/index.php | 8 +-- application/views/awards/cq/index.php | 4 +- application/views/awards/dok/index.php | 18 ++--- application/views/awards/dxcc/index.php | 68 +++++++++---------- application/views/awards/gridmaster/index.php | 2 +- application/views/awards/helvetia/index.php | 44 ++++++------ application/views/awards/iota/index.php | 64 ++++++++--------- application/views/awards/itu/index.php | 2 +- application/views/awards/jcc/index.php | 48 ++++++------- application/views/awards/pota/index.php | 2 +- application/views/awards/sota/index.php | 14 ++-- application/views/awards/vucc/index.php | 8 +-- application/views/awards/wab/index.php | 12 ++-- application/views/awards/waja/index.php | 48 ++++++------- application/views/awards/was/index.php | 42 ++++++------ application/views/awards/wwff/index.php | 2 +- application/views/csv/index.php | 36 +++++----- application/views/dashboard/index.php | 2 +- application/views/dxatlas/index.php | 36 +++++----- application/views/gridmap/index.php | 36 +++++----- application/views/interface_assets/footer.php | 1 + application/views/kml/index.php | 36 +++++----- application/views/logbookadvanced/edit.php | 42 ++++++------ application/views/logbookadvanced/index.php | 48 ++++++------- .../views/logbookadvanced/qslcarousel.php | 2 +- .../views/logbookadvanced/useroptions.php | 28 ++++---- application/views/lookup/index.php | 20 +++--- application/views/lookup/lotwuser.php | 6 +- application/views/lotw/analysis.php | 2 +- application/views/lotw/import.php | 2 +- application/views/lotw_views/index.php | 4 +- application/views/mode/create.php | 20 +++--- application/views/mode/edit.php | 20 +++--- application/views/mode/index.php | 28 ++++---- application/views/options/appearance.php | 30 ++++---- application/views/options/dxcluster.php | 20 +++--- application/views/options/email.php | 2 +- application/views/options/oqrs.php | 8 +-- application/views/qso/edit_ajax.php | 40 +++++------ application/views/qso/index.php | 36 +++++----- application/views/search/result.php | 2 +- assets/js/sections/logbookadvanced_edit.js | 2 +- 46 files changed, 471 insertions(+), 470 deletions(-) diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index 7fea33e1e..ca122a399 100644 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -34,7 +34,7 @@ class Logbook extends CI_Controller { $data['user_map_custom'] = $this->optionslib->get_map_custom(); if(!$data['results']) { - $this->session->set_flashdata('notice', __("No logbooks were found. You need to define a logbook under Station Logbooks! Do it here:") . ' ' . __('Station Logbooks') . ''); + $this->session->set_flashdata('notice', __("No logbooks were found. You need to define a logbook under Station Logbooks! Do it here:") . ' ' . __("Station Logbooks") . ''); } // Calculate Lat/Lng from Locator to use on Maps diff --git a/application/controllers/Stationsetup.php b/application/controllers/Stationsetup.php index ee3d76f76..093a1c3eb 100644 --- a/application/controllers/Stationsetup.php +++ b/application/controllers/Stationsetup.php @@ -47,7 +47,7 @@ class Stationsetup extends CI_Controller { $data['success']=1; } else { $data['success']=0; - $data['flashdata'] = __('Not allowed'); + $data['flashdata'] = __("Not allowed"); } } else { $data['success']=0; @@ -65,11 +65,11 @@ class Stationsetup extends CI_Controller { $data['success']=1; } else { $data['success']=0; - $data['flashdata'] = __('Not allowed'); + $data['flashdata'] = __("Not allowed"); } } else { $data['success']=0; - $data['flashdata'] = __('Error'); + $data['flashdata'] = __("Error"); } echo json_encode($data); } @@ -83,7 +83,7 @@ class Stationsetup extends CI_Controller { $data['success']=1; } else { $data['success']=0; - $data['flashdata'] = __('Error'); + $data['flashdata'] = __("Error"); } echo json_encode($data); } @@ -102,7 +102,7 @@ class Stationsetup extends CI_Controller { $data['success'] = 1; } else { $data['success'] = 0; - $data['flashdata'] = __('Error'); + $data['flashdata'] = __("Error"); } echo json_encode($data); } @@ -115,7 +115,7 @@ class Stationsetup extends CI_Controller { $data['success']=1; } else { $data['success']=0; - $data['flashdata'] = __('Error'); + $data['flashdata'] = __("Error"); } echo json_encode($data); } @@ -128,7 +128,7 @@ class Stationsetup extends CI_Controller { $data['success']=1; } else { $data['success']=0; - $data['flashdata'] = __('Error'); + $data['flashdata'] = __("Error"); } echo json_encode($data); } @@ -149,7 +149,7 @@ class Stationsetup extends CI_Controller { $data['success']=1; } else { $data['success']=0; - $data['flashdata'] = __('Error'); + $data['flashdata'] = __("Error"); } echo json_encode($data); } @@ -209,7 +209,7 @@ class Stationsetup extends CI_Controller { $data['success'] = 1; } else { $data['success'] = 0; - $data['flashdata'] = __('Error. Link is already in use!'); + $data['flashdata'] = __("Error. Link is already in use!"); } echo json_encode($data); @@ -250,7 +250,7 @@ class Stationsetup extends CI_Controller { } private function lbpublicsearch2html($publicsearch, $id) { - $htmret = ($publicsearch=='1' ? 'Enabled' : '' . __('Disabled') . ''); + $htmret = ($publicsearch=='1' ? 'Enabled' : '' . __("Disabled") . ''); $htmret .= '
'; return $htmret; @@ -278,7 +278,7 @@ class Stationsetup extends CI_Controller { $htmret = ' '; if($public_slug != '') { $htmret .= ''; - $htmret .= ' '; + $htmret .= ' '; $htmret .= ' '; } return $htmret; @@ -368,7 +368,7 @@ class Stationsetup extends CI_Controller { } private function stationcountry2html($station_country, $dxcc_end) { - $returntext = $station_country == '' ? '- ' . __('NONE') . ' -' : $station_country; + $returntext = $station_country == '' ? '- ' . __("NONE") . ' -' : $station_country; if ($dxcc_end != NULL) { $returntext .= ' '.__("Deleted DXCC").''; } @@ -384,7 +384,7 @@ class Stationsetup extends CI_Controller { $data['success']=1; } else { $data['success']=0; - $data['flashdata'] = __('Not allowed'); + $data['flashdata'] = __("Not allowed"); } echo json_encode($data); } @@ -398,7 +398,7 @@ class Stationsetup extends CI_Controller { $data['success']=1; } else { $data['success']=0; - $data['flashdata'] = __('Not allowed'); + $data['flashdata'] = __("Not allowed"); } echo json_encode($data); } @@ -425,7 +425,7 @@ class Stationsetup extends CI_Controller { $data['locationdata'] = $this->stationsetup_model->locationInfo($locationid)->result(); } else { $data['success']=0; - $data['flashdata'] = __('Error'); + $data['flashdata'] = __("Error"); } echo json_encode($data); } diff --git a/application/views/activated_gridmap/index.php b/application/views/activated_gridmap/index.php index f18837591..62e031180 100644 --- a/application/views/activated_gridmap/index.php +++ b/application/views/activated_gridmap/index.php @@ -55,7 +55,7 @@ echo ' checked' ; } echo '>'; ?> - +
'; ?> - +
'; ?> - +
'; ?> - +
diff --git a/application/views/awards/counties/details.php b/application/views/awards/counties/details.php index 5befbeb83..5b5bd2c60 100644 --- a/application/views/awards/counties/details.php +++ b/application/views/awards/counties/details.php @@ -9,8 +9,8 @@ # - ' . __('State') . ' - ' . __('County') . ' + ' . __("State") . ' + ' . __("County") . ' '; @@ -24,6 +24,6 @@ echo ''; } else { - echo ''; + echo ''; } ?> diff --git a/application/views/awards/counties/index.php b/application/views/awards/counties/index.php index aabf5c163..05c61a981 100644 --- a/application/views/awards/counties/index.php +++ b/application/views/awards/counties/index.php @@ -17,9 +17,9 @@ - - - + + + @@ -43,7 +43,7 @@
' . __('Nothing found!') . ''; + echo ''; } ?> \ No newline at end of file diff --git a/application/views/awards/cq/index.php b/application/views/awards/cq/index.php index 08864b6b1..84b07e6bb 100644 --- a/application/views/awards/cq/index.php +++ b/application/views/awards/cq/index.php @@ -63,7 +63,7 @@
input->post('qrz')) echo ' checked="checked"'; ?> > - +
@@ -193,7 +193,7 @@ } else { - echo ''; + echo ''; } ?> diff --git a/application/views/awards/dok/index.php b/application/views/awards/dok/index.php index 1f746b6a2..10ca25307 100644 --- a/application/views/awards/dok/index.php +++ b/application/views/awards/dok/index.php @@ -17,10 +17,10 @@
- +
input->post('worked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('confirmed') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
@@ -52,19 +52,19 @@
input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('lotw') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('eqsl')) echo ' checked="checked"'; ?> > - +
input->post('qrz')) echo ' checked="checked"'; ?> > - +
input->post('clublog')) echo ' checked="checked"'; ?> > diff --git a/application/views/awards/dxcc/index.php b/application/views/awards/dxcc/index.php index 26cecb8fe..51cd86c65 100644 --- a/application/views/awards/dxcc/index.php +++ b/application/views/awards/dxcc/index.php @@ -13,7 +13,7 @@ var lang_awards_info_button = ""; var lang_award_info_ln1 = ""; var lang_award_info_ln2 = "" . __("'How to Count Countries Worked, A New DX Scoring System'") . ""); ?>"; - var lang_award_info_ln3 = "" . __('ARRL website') . ""); ?>"; + var lang_award_info_ln3 = "" . __("ARRL website") . ""); ?>"; var lang_award_info_ln4 = "";

@@ -25,30 +25,30 @@
-
+
input->post('includedeleted')) echo ' checked="checked"'; ?> > - +
-
+
input->post('worked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('confirmed') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('notworked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
@@ -58,19 +58,19 @@
input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('lotw') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('eqsl')) echo ' checked="checked"'; ?> > - +
input->post('qrz')) echo ' checked="checked"'; ?> > - +
input->post('clublog')) echo ' checked="checked"'; ?> > @@ -80,44 +80,44 @@
-
+
input->post('Antarctica') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('Africa') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('Asia') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('Europe') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('NorthAmerica') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('SouthAmerica') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('Oceania') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
- +
- + result() as $mode){ if ($mode->submode == null) { @@ -183,10 +183,10 @@
- - + + + ?>
@@ -196,10 +196,10 @@
@@ -222,8 +222,8 @@ # - ' . __('DXCC Name') . ' - ' . __('Prefix') . ''; + ' . __("DXCC Name") . ' + ' . __("Prefix") . ''; foreach($bands as $band) { echo '' . $band . ''; } @@ -245,7 +245,7 @@ echo ''; } echo ' -

' . __('Summary') . '

+

' . __("Summary") . '

@@ -254,12 +254,12 @@ foreach($bands as $band) { echo ''; } - echo ' + echo ' - '; + '; foreach ($dxcc_summary['worked'] as $dxcc) { // Fills the table with the data echo ''; @@ -277,7 +277,7 @@ } else { - echo ''; + echo ''; } ?> diff --git a/application/views/awards/gridmaster/index.php b/application/views/awards/gridmaster/index.php index 0b1485b5f..26f6fc5ea 100644 --- a/application/views/awards/gridmaster/index.php +++ b/application/views/awards/gridmaster/index.php @@ -6,7 +6,7 @@ var lang_awards_info_button = ""; var lang_award_info_ln1 = ""; var lang_award_info_ln2 = ""; - var lang_award_info_ln3 = "" . __('website') . ""); ?>"; + var lang_award_info_ln3 = "" . __("website") . ""); ?>"; var lang_award_info_ln4 = "";

diff --git a/application/views/awards/helvetia/index.php b/application/views/awards/helvetia/index.php index b351bd3f2..278965dda 100644 --- a/application/views/awards/helvetia/index.php +++ b/application/views/awards/helvetia/index.php @@ -28,19 +28,19 @@
-
+
input->post('worked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('confirmed') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('notworked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
@@ -50,28 +50,28 @@
input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('lotw') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('eqsl')) echo ' checked="checked"'; ?> > - +
input->post('qrz')) echo ' checked="checked"'; ?> > - +
- +
- + result() as $mode){ if ($mode->submode == null) { @@ -106,10 +106,10 @@
- - + + + ?>
@@ -119,10 +119,10 @@
@@ -146,7 +146,7 @@
- '; + '; foreach($bands as $band) { echo ''; } @@ -165,7 +165,7 @@ } echo '
' . $band . '' . __('Total') . '' . __("Total") . '
' . __('Total worked') . '
' . __("Total worked") . '' . $dxcc . '
#' . __('Canton') . '' . __("Canton") . '' . $band . '
-

' . __('Summary') . '

+

' . __("Summary") . '

@@ -174,11 +174,11 @@ foreach($bands as $band) { echo ''; } - echo ' + echo ' - '; + '; foreach ($helvetia_summary['worked'] as $helvetia) { // Fills the table with the data echo ''; @@ -195,7 +195,7 @@ '; } else { - echo ''; + echo ''; } ?> diff --git a/application/views/awards/iota/index.php b/application/views/awards/iota/index.php index 7337eb31a..a94e25435 100644 --- a/application/views/awards/iota/index.php +++ b/application/views/awards/iota/index.php @@ -16,7 +16,7 @@ var lang_award_info_ln1 = ""; var lang_award_info_ln2 = ""; var lang_award_info_ln3 = ""; - var lang_award_info_ln4 = "" . __('here') . ""); ?>"; + var lang_award_info_ln4 = "" . __("here") . ""); ?>";

@@ -26,29 +26,29 @@
-
+
input->post('includedeleted')) echo ' checked="checked"'; ?> > - +
-
+
input->post('worked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('confirmed') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('notworked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
@@ -58,40 +58,40 @@
input->post('Antarctica') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('Africa') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('Asia') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('Europe') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('NorthAmerica') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('SouthAmerica') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('Oceania') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
- +
- + result() as $mode){ if ($mode->submode == null) { @@ -126,10 +126,10 @@
- - + + + ?>
@@ -139,10 +139,10 @@
@@ -166,11 +166,11 @@
- - - '; + + + '; if ($this->input->post('includedeleted')) - echo ' '; + echo ' '; foreach($bands as $band) { echo ''; @@ -189,7 +189,7 @@ } echo '
' . $band . '' . __('Total') . '
' . __("Total") . '
' . __('Total worked') . '
' . __("Total worked") . '' . $helvetia . '
#' . __('IOTA') . '' . __('Prefix') . '' . __('Name') . '' . __("IOTA") . '' . __("Prefix") . '' . __("Name") . '' . __('Deleted') . '' . __("Deleted") . '' . $band . '
-

' . __('Summary') . '

+

' . __("Summary") . '

@@ -198,19 +198,19 @@ foreach($bands as $band) { echo ''; } - echo ''; + echo ''; echo ' - '; + '; foreach ($iota_summary['worked'] as $dxcc) { // Fills the table with the data echo ''; } echo ' - '; + '; foreach ($iota_summary['confirmed'] as $dxcc) { // Fills the table with the data echo ''; } @@ -221,7 +221,7 @@ } else { - echo ''; + echo ''; } ?> diff --git a/application/views/awards/itu/index.php b/application/views/awards/itu/index.php index dd674d75b..b97291bdb 100644 --- a/application/views/awards/itu/index.php +++ b/application/views/awards/itu/index.php @@ -63,7 +63,7 @@
input->post('qrz')) echo ' checked="checked"'; ?> > - +
diff --git a/application/views/awards/jcc/index.php b/application/views/awards/jcc/index.php index d84f37c7e..c9775ec5f 100644 --- a/application/views/awards/jcc/index.php +++ b/application/views/awards/jcc/index.php @@ -27,19 +27,19 @@
-
+
input->post('worked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('confirmed') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('notworked')) echo ' checked="checked"'; ?> > - +
@@ -49,19 +49,19 @@
input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('lotw') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('eqsl')) echo ' checked="checked"'; ?> > - +
input->post('qrz')) echo ' checked="checked"'; ?> > - +
input->post('clublog')) echo ' checked="checked"'; ?> > @@ -71,10 +71,10 @@
- +
- + result() as $mode){ if ($mode->submode == null) { @@ -109,11 +109,11 @@
- - + + - +
@@ -123,7 +123,7 @@
' . $band . '' . __('Total') . '
' . __("Total") . '
' . __('Total worked') . '
' . __("Total worked") . '' . $dxcc . '
' . __('Total confirmed') . '' . __("Total confirmed") . '' . $dxcc . '
- - '; + + '; foreach($bands as $band) { echo ''; @@ -165,7 +165,7 @@ echo ''; } echo '
' . __('Number') . '' . __('City') . '' . __("Number") . '' . __("City") . '' . $band . '
-

' . __('Summary') . '

+

' . __("Summary") . '

'; $sat = 0; @@ -182,9 +182,9 @@ echo ''; } } - echo ''; + echo ''; if ($sat == 1) { - echo ''; + echo ''; } } else { echo ''; @@ -192,7 +192,7 @@ echo ''; echo ' - '; + '; if (count($bands) > 2) { $len_worked = count($jcc_summary['worked']); @@ -211,7 +211,7 @@ echo ''; - echo ''; + echo ''; if (count($bands) > 2) { $len_confirmed = count($jcc_summary['confirmed']); $j = 0; @@ -233,7 +233,7 @@ } else { - echo ''; + echo ''; } ?> diff --git a/application/views/awards/pota/index.php b/application/views/awards/pota/index.php index 67382991b..49aae441e 100644 --- a/application/views/awards/pota/index.php +++ b/application/views/awards/pota/index.php @@ -64,6 +64,6 @@
' . $band . '' . __('Total') . '' . __("Total") . '' . __('SAT') . '' . __("SAT") . ''.$bands[0].'
' . __('Total worked') . '
' . __("Total worked") . '
' . __('Total confirmed') . '' . __("Total confirmed") . '
' . __('Nothing found!') . '
'; + echo ''; }?>
diff --git a/application/views/awards/sota/index.php b/application/views/awards/sota/index.php index 758a06d98..25a31a548 100644 --- a/application/views/awards/sota/index.php +++ b/application/views/awards/sota/index.php @@ -20,12 +20,12 @@ - - - - - - + + + + + + ' . __('Nothing found!') . ''; + echo ''; }?> diff --git a/application/views/awards/vucc/index.php b/application/views/awards/vucc/index.php index 40550bfb1..c123f15ec 100644 --- a/application/views/awards/vucc/index.php +++ b/application/views/awards/vucc/index.php @@ -18,9 +18,9 @@
- - - + + + @@ -36,6 +36,6 @@
' . __('Nothing found!') . '
'; + echo ''; } ?>
diff --git a/application/views/awards/wab/index.php b/application/views/awards/wab/index.php index ebdd6f83f..a2923a547 100644 --- a/application/views/awards/wab/index.php +++ b/application/views/awards/wab/index.php @@ -69,7 +69,7 @@ echo ' checked' ; } echo '>'; ?> - +
'; ?> - +
'; ?> - +
'; ?> - +
- - + +
diff --git a/application/views/awards/waja/index.php b/application/views/awards/waja/index.php index ab31fe16c..202db36e4 100644 --- a/application/views/awards/waja/index.php +++ b/application/views/awards/waja/index.php @@ -28,19 +28,19 @@
-
+
input->post('worked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('confirmed') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('notworked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
@@ -50,19 +50,19 @@
input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('lotw') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('eqsl')) echo ' checked="checked"'; ?> > - +
input->post('qrz')) echo ' checked="checked"'; ?> > - +
input->post('clublog')) echo ' checked="checked"'; ?> > @@ -72,10 +72,10 @@
- +
- + result() as $mode){ if ($mode->submode == null) { @@ -110,10 +110,10 @@
- - + + + ?>
@@ -123,10 +123,10 @@
@@ -148,8 +148,8 @@ - - '; + + '; foreach($bands as $band) { echo ''; @@ -165,7 +165,7 @@ echo ''; } echo '
' . __('Number') . '' . __('Prefecture') . '' . __("Number") . '' . __("Prefecture") . '' . $band . '
-

' . __('Summary') . '

+

' . __("Summary") . '

@@ -174,19 +174,19 @@ foreach($bands as $band) { echo ''; } - echo ' + echo ' - '; + '; foreach ($waja_summary['worked'] as $waja) { // Fills the table with the data echo ''; } echo ' - '; + '; foreach ($waja_summary['confirmed'] as $waja) { // Fills the table with the data echo ''; } @@ -197,7 +197,7 @@ } else { - echo ''; + echo ''; } ?> diff --git a/application/views/awards/was/index.php b/application/views/awards/was/index.php index 994136e9c..4ed02ee4c 100644 --- a/application/views/awards/was/index.php +++ b/application/views/awards/was/index.php @@ -32,15 +32,15 @@
input->post('worked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('confirmed') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('notworked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
@@ -50,28 +50,28 @@
input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('lotw') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - +
input->post('eqsl')) echo ' checked="checked"'; ?> > - +
input->post('qrz')) echo ' checked="checked"'; ?> > - +
- +
- + result() as $mode){ if ($mode->submode == null) { @@ -106,10 +106,10 @@
- - + + + ?>
@@ -119,10 +119,10 @@
@@ -165,7 +165,7 @@ } echo '
' . $band . '' . __('Total') . '' . __("Total") . '
' . __('Total worked') . '
' . __("Total worked") . '' . $waja . '
' . __('Total confirmed') . '' . __("Total confirmed") . '' . $waja . '
-

' . __('Summary') . '

+

' . __("Summary") . '

@@ -174,18 +174,18 @@ foreach($bands as $band) { echo ''; } - echo ' + echo ' - '; + '; foreach ($was_summary['worked'] as $was) { // Fills the table with the data echo ''; } echo ' - '; + '; foreach ($was_summary['confirmed'] as $was) { // Fills the table with the data echo ''; } @@ -195,7 +195,7 @@ '; } else { - echo ''; + echo ''; } ?> diff --git a/application/views/awards/wwff/index.php b/application/views/awards/wwff/index.php index f0fe2a3ae..c93c3a9f1 100644 --- a/application/views/awards/wwff/index.php +++ b/application/views/awards/wwff/index.php @@ -61,6 +61,6 @@
' . $band . '' . __('Total') . '
' . __("Total") . '
' . __('Total worked') . '
' . __("Total worked") . '' . $was . '
' . __('Total confirmed') . '' . __("Total confirmed") . '' . $was . '
' . __('Nothing found!') . '
'; + echo ''; }?>
diff --git a/application/views/csv/index.php b/application/views/csv/index.php index c463922b9..fcabdffa9 100644 --- a/application/views/csv/index.php +++ b/application/views/csv/index.php @@ -92,24 +92,24 @@
diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index 40ad0fe5b..d83f34aa3 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -150,7 +150,7 @@ function echo_table_col($row, $name) { config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?> - + session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1')); echo_table_header_col($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')); diff --git a/application/views/dxatlas/index.php b/application/views/dxatlas/index.php index b307ca274..e54848691 100644 --- a/application/views/dxatlas/index.php +++ b/application/views/dxatlas/index.php @@ -92,24 +92,24 @@ diff --git a/application/views/gridmap/index.php b/application/views/gridmap/index.php index dcee3588e..6dc34b29b 100644 --- a/application/views/gridmap/index.php +++ b/application/views/gridmap/index.php @@ -39,24 +39,24 @@
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 93f458ffb..66d619b9e 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -30,6 +30,7 @@ var lang_general_word_worked_not_confirmed = ""; var lang_general_word_not_worked = ""; var lang_admin_close = ""; + var lang_admin_save = ""; var lang_admin_clear = ""; diff --git a/application/views/kml/index.php b/application/views/kml/index.php index 94ae9da69..b56df9b87 100644 --- a/application/views/kml/index.php +++ b/application/views/kml/index.php @@ -77,24 +77,24 @@ diff --git a/application/views/logbookadvanced/edit.php b/application/views/logbookadvanced/edit.php index decc2fed3..5fc629381 100644 --- a/application/views/logbookadvanced/edit.php +++ b/application/views/logbookadvanced/edit.php @@ -1,23 +1,23 @@
 
@@ -58,7 +58,7 @@ ?> - + - + - + - + adif; echo '>' . $dxcc->prefix . ' - ' . ucwords(strtolower($dxcc->name), "- (/"); if ($dxcc->Enddate != null) { - echo ' - (Deleted DXCC)'; + echo ' - (' . __("Deleted DXCC") . ')'; } echo ''; } @@ -217,28 +217,28 @@ $options = json_decode($options);
- + - +
    -
    • +
diff --git a/application/views/logbookadvanced/qslcarousel.php b/application/views/logbookadvanced/qslcarousel.php index f12a61048..6d2d5472d 100644 --- a/application/views/logbookadvanced/qslcarousel.php +++ b/application/views/logbookadvanced/qslcarousel.php @@ -56,7 +56,7 @@ ?> - paths->getPathQsl() .'/' . $image->filename .'" alt="QSL picture #'. $i++.'">'; + paths->getPathQsl() .'/' . $image->filename .'" alt="' . __("QSL picture #") . $i++.'">'; echo '
'; } ?> diff --git a/application/views/logbookadvanced/useroptions.php b/application/views/logbookadvanced/useroptions.php index c78ae33df..d61671fc0 100644 --- a/application/views/logbookadvanced/useroptions.php +++ b/application/views/logbookadvanced/useroptions.php @@ -1,10 +1,10 @@
@@ -115,23 +115,23 @@
propagation->show ?? "true") == "true") { echo 'checked'; } ?>>
- Contest +
contest->show ?? "true") == "true") { echo 'checked'; } ?>>
- Gridsquare +
gridsquare->show ?? "true") == "true") { echo 'checked'; } ?>>
- DOK +
dok->show ?? "true") == "true") { echo 'checked'; } ?>>
- WWFF +
wwff->show ?? "true") == "true") { echo 'checked'; } ?>>
- SIG +
sig->show ?? "true") == "true") { echo 'checked'; } ?>>
@@ -141,29 +141,29 @@ - - + + - + - + - + - + - + diff --git a/application/views/lookup/index.php b/application/views/lookup/index.php index a20ea3a75..c1a3b55f5 100644 --- a/application/views/lookup/index.php +++ b/application/views/lookup/index.php @@ -1,13 +1,13 @@
 
@@ -43,7 +43,7 @@ $state_list = $CI->subdivisions->get_state_list('291'); // USA hardcoded ?> - + result() as $state) {?>
LayerDefault on
Path lines
option_value ?? "false") == "true") { echo 'checked'; } ?>>
Gridsquares
option_value ?? "false") == "true") { echo 'checked'; } ?>>
CQ Zones
option_value ?? "false") == "true") { echo 'checked'; } ?>>
ITU Zones
option_value ?? "false") == "true") { echo 'checked'; } ?>>
Night Shadow
option_value ?? "false") == "true") { echo 'checked'; } ?>>
- - + + - + @@ -40,19 +40,19 @@ - + @@ -73,9 +73,9 @@

- - - + + +

diff --git a/application/views/options/appearance.php b/application/views/options/appearance.php index b775c707c..3fdb81fc7 100644 --- a/application/views/options/appearance.php +++ b/application/views/options/appearance.php @@ -53,15 +53,15 @@
@@ -69,9 +69,9 @@
@@ -79,8 +79,8 @@
@@ -88,19 +88,19 @@
- + - This enables the button to Wavelog's Github page in the public view +
diff --git a/application/views/options/dxcluster.php b/application/views/options/dxcluster.php index 52867eb29..61c4f5689 100644 --- a/application/views/options/dxcluster.php +++ b/application/views/options/dxcluster.php @@ -43,22 +43,22 @@
diff --git a/application/views/options/email.php b/application/views/options/email.php index f384e9aa8..707935e04 100644 --- a/application/views/options/email.php +++ b/application/views/options/email.php @@ -53,7 +53,7 @@
diff --git a/application/views/options/oqrs.php b/application/views/options/oqrs.php index 81ee473cf..f73b786f6 100644 --- a/application/views/options/oqrs.php +++ b/application/views/options/oqrs.php @@ -43,8 +43,8 @@
@@ -52,8 +52,8 @@
diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php index 567c10e6c..04645d957 100644 --- a/application/views/qso/edit_ajax.php +++ b/application/views/qso/edit_ajax.php @@ -180,33 +180,33 @@
- +
- +
diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 80804aa3a..d949089ef 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -401,24 +401,24 @@
diff --git a/application/views/search/result.php b/application/views/search/result.php index 5b2c5e102..f46d94807 100644 --- a/application/views/search/result.php +++ b/application/views/search/result.php @@ -55,7 +55,7 @@ } elseif ($lotw_lastupload > 7) { $lotw_hint = ' lotw_info_yellow'; } - echo 'Yes last upload '.$lotw_lastupload.' days ago'; + echo '' . __("Yes") . ' ' . __("last upload") . ' '.sprintf(_ngettext("%d day ago", "%d days ago",intval($lotw_lastupload)), intval($lotw_lastupload)); } else { echo "No"; } diff --git a/assets/js/sections/logbookadvanced_edit.js b/assets/js/sections/logbookadvanced_edit.js index 2995f9006..4790ad9d6 100644 --- a/assets/js/sections/logbookadvanced_edit.js +++ b/assets/js/sections/logbookadvanced_edit.js @@ -26,7 +26,7 @@ function editQsos() { prepareEditDialog(); }, buttons: [{ - label: 'Save', + label: lang_admin_save, cssClass: 'btn-primary btn-sm', id: 'saveButton', action: function (dialogItself) {
ModeSub-Mode SSB / DATA / CWStatus mode;?> submode;?> qrgmode;?>active == 1) { echo "active";} else { echo "not active";};?>active == 1) { echo __("Active");} else { echo __("Not active");};?> active == 1) { - echo ""; + echo ""; } else { - echo ""; + echo ""; };?> - id; ?>" class="btn btn-outline-primary btn-sm"> Edit + id; ?>" class="btn btn-outline-primary btn-sm"> - Delete +