From 0284e6ce19467e07494d9c2d5349afd90d4785e4 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 6 Jun 2024 15:41:03 +0200 Subject: [PATCH] first big change --- application/views/accumulate/index.php | 34 +- application/views/activated_gridmap/index.php | 34 +- application/views/activators/index.php | 20 +- application/views/adif/dcl_success.php | 12 +- application/views/adif/import.php | 104 ++--- application/views/adif/import_success.php | 14 +- application/views/adif/mark_lotw.php | 6 +- application/views/api/help.php | 4 +- application/views/awards/counties/details.php | 2 +- application/views/awards/counties/index.php | 10 +- application/views/awards/cq/index.php | 56 +-- application/views/awards/details.php | 2 +- application/views/awards/dok/index.php | 12 +- application/views/awards/dxcc/index.php | 20 +- application/views/awards/ffma/index.php | 20 +- application/views/awards/gridmaster/index.php | 20 +- application/views/awards/helvetia/index.php | 12 +- application/views/awards/iota/index.php | 10 +- application/views/awards/itu/index.php | 52 +-- application/views/awards/jcc/index.php | 16 +- application/views/awards/pota/index.php | 24 +- application/views/awards/rac/index.php | 2 +- application/views/awards/sig/index.php | 12 +- application/views/awards/sota/index.php | 10 +- application/views/awards/vucc/band.php | 2 +- application/views/awards/vucc/index.php | 10 +- application/views/awards/wab/index.php | 28 +- application/views/awards/waja/index.php | 12 +- application/views/awards/was/index.php | 12 +- application/views/awards/wwff/index.php | 24 +- application/views/bandmap/index.php | 6 +- application/views/bandmap/list.php | 24 +- application/views/bands/create.php | 22 +- application/views/bands/edit.php | 22 +- application/views/bands/index.php | 68 +-- application/views/cabrillo/index.php | 68 +-- application/views/cfd/index.php | 6 +- application/views/components/hamsat/table.php | 2 +- application/views/contesting/add.php | 46 +-- application/views/contesting/create.php | 10 +- application/views/contesting/edit.php | 18 +- application/views/contesting/index.php | 108 ++--- application/views/cron/edit.php | 4 +- application/views/cron/index.php | 2 +- application/views/csv/index.php | 40 +- application/views/dayswithqso/index.php | 34 +- application/views/debug/index.php | 2 +- application/views/distances/index.php | 32 +- application/views/dxatlas/index.php | 40 +- application/views/eqslcard/index.php | 2 +- application/views/gridmap/index.php | 34 +- application/views/hrdlog/export.php | 4 +- application/views/interface_assets/footer.php | 48 +-- application/views/interface_assets/header.php | 208 +++++----- application/views/kml/index.php | 34 +- application/views/logbookadvanced/index.php | 310 +++++++------- .../views/logbookadvanced/qslcarousel.php | 24 +- .../views/logbookadvanced/startatform.php | 10 +- .../views/logbookadvanced/useroptions.php | 52 +-- application/views/lookup/index.php | 2 +- application/views/lotw/import.php | 20 +- application/views/lotw_views/index.php | 44 +- application/views/lotw_views/upload_cert.php | 18 +- application/views/mode/index.php | 2 +- application/views/notes/add.php | 20 +- application/views/notes/edit.php | 20 +- application/views/notes/main.php | 10 +- application/views/notes/view.php | 10 +- application/views/options/appearance.php | 22 +- application/views/options/dxcluster.php | 12 +- application/views/options/email.php | 38 +- application/views/options/index.php | 2 +- application/views/options/oqrs.php | 14 +- application/views/options/radios.php | 8 +- application/views/options/sidebar.php | 12 +- application/views/options/version_dialog.php | 32 +- application/views/oqrs/qsolist.php | 50 +-- application/views/public_search/result.php | 8 +- application/views/qrz/export.php | 6 +- application/views/qslcard/index.php | 16 +- application/views/qslcard/searchresult.php | 126 +++--- application/views/qslprint/index.php | 12 +- application/views/qslprint/qslprint.php | 44 +- application/views/qslprint/qsolist.php | 76 ++-- .../qso/components/previous_contacts.php | 4 +- application/views/qso/edit_ajax.php | 22 +- application/views/qso/index.php | 186 ++++----- application/views/satellite/create.php | 2 +- application/views/search/cqzones_result.php | 10 +- .../views/search/lotw_unconfirmed_result.php | 8 +- .../views/search/search_result_ajax.php | 106 ++--- application/views/simplefle/index.php | 98 ++--- application/views/simplefle/syntax_help.php | 16 +- application/views/station_profile/create.php | 130 +++--- application/views/station_profile/edit.php | 154 +++---- application/views/station_profile/index.php | 46 +-- application/views/stationsetup/create.php | 4 +- .../views/stationsetup/exportmapoptions.php | 2 +- .../views/stationsetup/linkedlocations.php | 16 +- .../views/stationsetup/stationsetup.php | 74 ++-- application/views/stationsetup/visitor.php | 10 +- application/views/statistics/index.php | 32 +- application/views/statistics/qsotable.php | 4 +- application/views/statistics/satqsotable.php | 4 +- .../views/statistics/satuniquetable.php | 4 +- application/views/statistics/uniquetable.php | 4 +- application/views/timeline/details.php | 2 +- application/views/timeline/index.php | 22 +- application/views/timeplotter/index.php | 30 +- application/views/user/delete.php | 6 +- application/views/user/edit.php | 390 +++++++++--------- application/views/user/forgot_password.php | 8 +- application/views/user/login.php | 12 +- application/views/user/main.php | 52 +-- application/views/user/reset_password.php | 14 +- application/views/version_dialog/index.php | 4 +- application/views/view_log/index.php | 4 +- application/views/view_log/partial/log.php | 34 +- .../views/view_log/partial/log_ajax.php | 74 ++-- application/views/view_log/qso.php | 164 ++++---- application/views/visitor/index.php | 42 +- application/views/visitor/layout/footer.php | 2 +- application/views/visitor/layout/header.php | 6 +- application/views/webadif/export.php | 4 +- 124 files changed, 2153 insertions(+), 2153 deletions(-) diff --git a/application/views/accumulate/index.php b/application/views/accumulate/index.php index bdada2cde..e1c63327e 100644 --- a/application/views/accumulate/index.php +++ b/application/views/accumulate/index.php @@ -1,12 +1,12 @@

@@ -15,20 +15,20 @@
- +
- +
@@ -72,18 +72,18 @@
- +
@@ -93,7 +93,7 @@
- +
diff --git a/application/views/activated_gridmap/index.php b/application/views/activated_gridmap/index.php index 0c2da4145..5da73f969 100644 --- a/application/views/activated_gridmap/index.php +++ b/application/views/activated_gridmap/index.php @@ -2,12 +2,12 @@
-

+

- + - + - + - + - +
- - + + session->flashdata('message')) { ?> @@ -99,15 +99,15 @@
-
: 
+
: 
-
: 
+
: 
-
: 
+
: 
-
: 
+
: 
-
: 
+
: 

- +
diff --git a/application/views/awards/cq/index.php b/application/views/awards/cq/index.php index 6cb55db2c..ddc11efb4 100644 --- a/application/views/awards/cq/index.php +++ b/application/views/awards/cq/index.php @@ -14,14 +14,14 @@
-

- +

+
@@ -29,37 +29,37 @@
-
+
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"'; ?> > - +
-
+
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"'; ?> > @@ -69,10 +69,10 @@
- +
- + result() as $mode){ if ($mode->submode == null) { @@ -107,10 +107,10 @@
- - + + + ?>
@@ -119,10 +119,10 @@
@@ -145,7 +145,7 @@ # - " . lang('gen_hamradio_cq_zone') . ""; + " . __("CQ Zone") . ""; foreach($bands as $band) { echo '' . $band . ''; } @@ -162,7 +162,7 @@ echo ''; } echo " -

" . lang('awards_summary') . "

+

" . __("Summary") . "

@@ -171,18 +171,18 @@ foreach($bands as $band) { echo ''; } - echo " + echo " - "; + "; foreach ($cq_summary['worked'] as $dxcc) { // Fills the table with the data echo ''; } echo " - "; + "; foreach ($cq_summary['confirmed'] as $dxcc) { // Fills the table with the data echo ''; } diff --git a/application/views/awards/details.php b/application/views/awards/details.php index f656d5272..d66632a32 100644 --- a/application/views/awards/details.php +++ b/application/views/awards/details.php @@ -1,3 +1,3 @@ -
+
load->view('view_log/partial/log_ajax'); ?> \ No newline at end of file diff --git a/application/views/awards/dok/index.php b/application/views/awards/dok/index.php index 4b3908103..bfaef588d 100644 --- a/application/views/awards/dok/index.php +++ b/application/views/awards/dok/index.php @@ -3,14 +3,14 @@

- +
@@ -48,7 +48,7 @@
-
+
input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > diff --git a/application/views/awards/dxcc/index.php b/application/views/awards/dxcc/index.php index ba552d188..15191768b 100644 --- a/application/views/awards/dxcc/index.php +++ b/application/views/awards/dxcc/index.php @@ -10,14 +10,14 @@

- +
@@ -54,7 +54,7 @@
-
+
input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > @@ -124,10 +124,10 @@
input->post('band') != 'SAT' && $this->input->post('band') != 'All') echo "style=\"display: none\""; ?>> - +
- + '. $i++ .''; foreach ($value as $name => $key) { if (isset($value['Deleted']) && $value['Deleted'] == 1 && $name == "name") { - echo '
'; + echo ''; } else if ($name == "Deleted") { continue; } else { diff --git a/application/views/awards/ffma/index.php b/application/views/awards/ffma/index.php index e9baf3c0b..a711dbc11 100644 --- a/application/views/awards/ffma/index.php +++ b/application/views/awards/ffma/index.php @@ -4,14 +4,14 @@

- +
@@ -27,15 +27,15 @@
-
:
+
:
-
:
+
:
-
:
+
:
-
:
+
:
-
:
+
:

- + session->flashdata('message')) { ?> @@ -26,15 +26,15 @@
-
:
+
:
-
:
+
:
-
:
+
:
-
:
+
:
-
:
+
:

- + @@ -46,7 +46,7 @@
-
+
input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > diff --git a/application/views/awards/iota/index.php b/application/views/awards/iota/index.php index 54f53a851..66409abf7 100644 --- a/application/views/awards/iota/index.php +++ b/application/views/awards/iota/index.php @@ -12,14 +12,14 @@

- +
diff --git a/application/views/awards/itu/index.php b/application/views/awards/itu/index.php index 6e93d411b..f53120e69 100644 --- a/application/views/awards/itu/index.php +++ b/application/views/awards/itu/index.php @@ -14,14 +14,14 @@
-

- +

+
@@ -29,37 +29,37 @@
-
+
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"'; ?> > - +
-
+
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"'; ?> > @@ -69,10 +69,10 @@
- +
- + result() as $mode){ if ($mode->submode == null) { @@ -107,10 +107,10 @@
- - + + + ?>
@@ -119,10 +119,10 @@
@@ -162,7 +162,7 @@ echo '
'; } echo "
' . $band . '" . lang('awards_total') . "
" . __("Total") . "
" . lang('awards_total_worked') . "
" . __("Total worked") . "' . $dxcc . '
" . lang('awards_total_confirmed') . "" . __("Total confirmed") . "' . $dxcc . ' ' . $key . ' '.lang('gen_hamradio_deleted_dxcc').'' . $key . ' '.__("Deleted DXCC").'
-

" . lang('awards_summary') . "

+

" . __("Summary") . "

@@ -171,18 +171,18 @@ foreach($bands as $band) { echo ''; } - echo " + echo " - "; + "; foreach ($itu_summary['worked'] as $dxcc) { // Fills the table with the data echo ''; } echo " - "; + "; foreach ($itu_summary['confirmed'] as $dxcc) { // Fills the table with the data echo ''; } diff --git a/application/views/awards/jcc/index.php b/application/views/awards/jcc/index.php index 17fdd5a6f..8170998d6 100644 --- a/application/views/awards/jcc/index.php +++ b/application/views/awards/jcc/index.php @@ -12,14 +12,14 @@

- +
@@ -45,7 +45,7 @@
-
+
input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > @@ -108,7 +108,7 @@ - +
@@ -122,7 +122,7 @@ Results
  • - +

    • diff --git a/application/views/awards/pota/index.php b/application/views/awards/pota/index.php index cac3e77fd..b3a76e97a 100644 --- a/application/views/awards/pota/index.php +++ b/application/views/awards/pota/index.php @@ -3,14 +3,14 @@

    - +
    - - - - - - - + + + + + + + diff --git a/application/views/awards/rac/index.php b/application/views/awards/rac/index.php index bc5668ad5..726100ad5 100644 --- a/application/views/awards/rac/index.php +++ b/application/views/awards/rac/index.php @@ -38,7 +38,7 @@
    -
    +
    input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > diff --git a/application/views/awards/sig/index.php b/application/views/awards/sig/index.php index d12e4ade6..e4b3606c7 100644 --- a/application/views/awards/sig/index.php +++ b/application/views/awards/sig/index.php @@ -3,14 +3,14 @@

    - +
    diff --git a/application/views/awards/sota/index.php b/application/views/awards/sota/index.php index bbb80ff70..7c004d7fa 100644 --- a/application/views/awards/sota/index.php +++ b/application/views/awards/sota/index.php @@ -3,14 +3,14 @@

    - +

    -

    +

    - +
    diff --git a/application/views/awards/wab/index.php b/application/views/awards/wab/index.php index 858d69c89..98990e95a 100644 --- a/application/views/awards/wab/index.php +++ b/application/views/awards/wab/index.php @@ -8,20 +8,20 @@

    - +
    - + - + - + - + - +

    - +
    @@ -46,7 +46,7 @@
    -
    +
    input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > diff --git a/application/views/awards/was/index.php b/application/views/awards/was/index.php index 72a7c48af..dfeb2802b 100644 --- a/application/views/awards/was/index.php +++ b/application/views/awards/was/index.php @@ -14,14 +14,14 @@

    - +
    @@ -46,7 +46,7 @@
    -
    +
    input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > diff --git a/application/views/awards/wwff/index.php b/application/views/awards/wwff/index.php index 4fa084ae7..0cf666270 100644 --- a/application/views/awards/wwff/index.php +++ b/application/views/awards/wwff/index.php @@ -3,14 +3,14 @@

    - +
    - - - - - - - + + + + + + + diff --git a/application/views/bandmap/index.php b/application/views/bandmap/index.php index 2c14b09d7..b5262199c 100644 --- a/application/views/bandmap/index.php +++ b/application/views/bandmap/index.php @@ -22,9 +22,9 @@
    - + - + - + result() as $row) { ?>
    ' . $band . '" . lang('awards_total') . "
    " . __("Total") . "
    " . lang('awards_total_worked') . "
    " . __("Total worked") . "' . $dxcc . '
    " . lang('awards_total_confirmed') . "" . __("Total confirmed") . "' . $dxcc . '
    - - - + + + - + diff --git a/application/views/bands/create.php b/application/views/bands/create.php index 1481f6cf3..ca0a90807 100644 --- a/application/views/bands/create.php +++ b/application/views/bands/create.php @@ -21,32 +21,32 @@
    - + - +
    - + - +
    - + - +
    - + - +
    - + - +
    - + \ No newline at end of file diff --git a/application/views/bands/edit.php b/application/views/bands/edit.php index 60f740ba7..9bb447aa5 100644 --- a/application/views/bands/edit.php +++ b/application/views/bands/edit.php @@ -3,32 +3,32 @@
    - + band; } ?>" required> - +
    - + bandgroup; } ?>" required> - +
    - + - +
    - + - +
    - + - +
    - + \ No newline at end of file diff --git a/application/views/bands/index.php b/application/views/bands/index.php index 85bf0e3d8..35be9d9c7 100644 --- a/application/views/bands/index.php +++ b/application/views/bands/index.php @@ -25,18 +25,18 @@ $wwff = 0; -

    +

    - +

    - +

    - +

    @@ -44,26 +44,26 @@ $wwff = 0;
    - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + session->userdata('user_type') == '99') { ?> @@ -107,7 +107,7 @@ $wwff = 0; - + @@ -139,16 +139,16 @@ $wwff = 0;

    session->userdata('user_type') == '99') { ?> - - - + + +

    diff --git a/application/views/cabrillo/index.php b/application/views/cabrillo/index.php index 2b74cd062..0c4afd07e 100644 --- a/application/views/cabrillo/index.php +++ b/application/views/cabrillo/index.php @@ -1,9 +1,9 @@
    @@ -13,7 +13,7 @@
    - +
    @@ -25,13 +25,13 @@
    -
    +
    - +
    @@ -45,24 +45,24 @@
    diff --git a/application/views/cfd/index.php b/application/views/cfd/index.php index 597611d9e..555ad0f02 100644 --- a/application/views/cfd/index.php +++ b/application/views/cfd/index.php @@ -12,17 +12,17 @@
    - +
    - +

    - +
    diff --git a/application/views/components/hamsat/table.php b/application/views/components/hamsat/table.php index 0b9344ecd..d30cda16f 100644 --- a/application/views/components/hamsat/table.php +++ b/application/views/components/hamsat/table.php @@ -16,7 +16,7 @@
    - +
    // DXCC Spotter
    0) echo 'checked';?>> 0) echo 'checked';?>>
    diff --git a/application/views/contesting/add.php b/application/views/contesting/add.php index 4665c50e8..5d8d99631 100644 --- a/application/views/contesting/add.php +++ b/application/views/contesting/add.php @@ -13,18 +13,18 @@

    - +

    - +

    - - - + + + @@ -36,30 +36,30 @@ - + @@ -70,12 +70,12 @@

    - - - + + +

    diff --git a/application/views/contesting/create.php b/application/views/contesting/create.php index 37624405b..8e84aa378 100644 --- a/application/views/contesting/create.php +++ b/application/views/contesting/create.php @@ -21,18 +21,18 @@
    - + - +
    - + - +
    - + diff --git a/application/views/contesting/edit.php b/application/views/contesting/edit.php index 7c9327055..de81ce6d9 100644 --- a/application/views/contesting/edit.php +++ b/application/views/contesting/edit.php @@ -28,31 +28,31 @@
    - + name; } ?>" required> - +
    - + adifname; } ?>"> - +
    - + - +
    - + diff --git a/application/views/contesting/index.php b/application/views/contesting/index.php index 972bb64c2..e657bb515 100644 --- a/application/views/contesting/index.php +++ b/application/views/contesting/index.php @@ -1,6 +1,6 @@
    - -

    LIVE" : " POST"); ?> + +

    LIVE" : " POST"); ?>
    @@ -8,20 +8,20 @@
    - +
    - +
    - +
    ' required>
    @@ -39,12 +39,12 @@
    - + >
    - + >
    @@ -54,7 +54,7 @@
    - + $bandgroup) { @@ -84,14 +84,14 @@
    - +
    - +
    - +
    - +
    - +
    - +
    - - + +
    - +
    - "> + + + + + + +
    @@ -184,31 +184,31 @@
    -
    +
    -
    +

    '>'> " . lang('admin_contest_menu_deactivate') . ""; + echo ""; } else { - echo ""; + echo ""; };?> - " class="btn btn-outline-primary btn-sm"> + " class="btn btn-outline-primary btn-sm"> - +
    - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/application/views/cron/edit.php b/application/views/cron/edit.php index d69afe2c7..143ce14b3 100644 --- a/application/views/cron/edit.php +++ b/application/views/cron/edit.php @@ -70,8 +70,8 @@
    - - + +
    diff --git a/application/views/cron/index.php b/application/views/cron/index.php index b68cc5a50..55a60181d 100644 --- a/application/views/cron/index.php +++ b/application/views/cron/index.php @@ -18,7 +18,7 @@ To execute cron jobs based on the data below, remove all old cron jobs and create a new one:

    - 
    * * * * * curl --silent index.php/cron/run &>/dev/null
    + 
    * * * * * curl --silent index.php/cron/run &>/dev/null" onclick='copyCron("main_cronjob")'>
    diff --git a/application/views/csv/index.php b/application/views/csv/index.php index c7d9c419c..4c755d6dc 100644 --- a/application/views/csv/index.php +++ b/application/views/csv/index.php @@ -1,14 +1,14 @@

    -

    +

    - +
    @@ -16,11 +16,11 @@
    - +
    @@ -28,9 +28,9 @@
    - +
    - + - + adif . '>' . $d->prefix . ' - ' . ucwords(strtolower($d->name), "- (/"); if ($d->Enddate != null) { - echo ' ('.lang('gen_hamradio_deleted_dxcc').')'; + echo ' ('.__("Deleted DXCC").')'; } echo ''; } @@ -77,9 +77,9 @@
    - + - + @@ -115,17 +115,17 @@
    - +
    - +

    - +
    diff --git a/application/views/dayswithqso/index.php b/application/views/dayswithqso/index.php index c4f578b72..16008c8f1 100644 --- a/application/views/dayswithqso/index.php +++ b/application/views/dayswithqso/index.php @@ -1,5 +1,5 @@
    @@ -13,7 +13,7 @@ echo '
    //
    '; echo ''; - echo ''; + echo ''; foreach ($result as $master) { echo ''; @@ -22,7 +22,7 @@ echo ''; echo ''; - echo ''; + echo ''; foreach ($result as $master) { echo ''; @@ -34,8 +34,8 @@ } ?> -

    -

    +

    +

    ' . lang('general_word_year') . '' . __("Year") . '' . $master->Year . '
    ' . lang('general_word_days') . '' . __("Days") . '' . $master->Days . '
    '; echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; echo ''; foreach ($streaks as $streak) { @@ -75,15 +75,15 @@ } ?> -

    +

    ' . lang('statistics_dwq_streak_continuous_days') . '' . lang('general_word_startdate') . '' . lang('general_word_enddate') . '' . __("Streak (continuous days with QSOs)") . '' . __("Start Date") . '' . __("End Date") . '
    '; echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; echo ''; echo ''; @@ -98,14 +98,14 @@ } elseif (is_array($almostcurrentstreak)) { ?> - +
    ' . lang('statistics_dwq_current_streak_continuous_days') . '' . lang('general_word_startdate') . '' . lang('general_word_enddate') . '' . __("Current streak (continuous days with QSOs)") . '' . __("Start Date") . '' . __("End Date") . '
    '; echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; echo ''; echo ''; @@ -119,7 +119,7 @@ echo '
    ' . lang('statistics_dwq_current_streak_continuous_days') . '' . lang('general_word_startdate') . '' . lang('general_word_enddate') . '' . __("Current streak (continuous days with QSOs)") . '' . __("Start Date") . '' . __("End Date") . '
    '; } else { - echo ''; + echo ''; } ?>
    diff --git a/application/views/debug/index.php b/application/views/debug/index.php index 086ac8ae5..198e6cc96 100644 --- a/application/views/debug/index.php +++ b/application/views/debug/index.php @@ -33,7 +33,7 @@ Base URL - config->item('base_url'); ?> ")'> + config->item('base_url'); ?> " onclick='copyURL("config->item('base_url'); ?>")'> Migration diff --git a/application/views/distances/index.php b/application/views/distances/index.php index 2ce536e5d..0ed7f2f14 100644 --- a/application/views/distances/index.php +++ b/application/views/distances/index.php @@ -2,21 +2,21 @@
    -

    +

    - + - + - + - +
    diff --git a/application/views/dxatlas/index.php b/application/views/dxatlas/index.php index ee134d5d8..ced35866d 100644 --- a/application/views/dxatlas/index.php +++ b/application/views/dxatlas/index.php @@ -1,14 +1,14 @@

    -

    +

    - +
    @@ -16,11 +16,11 @@
    - +
    @@ -28,9 +28,9 @@
    - +
    - + - + adif . '>' . $d->prefix . ' - ' . ucwords(strtolower($d->name), "- (/"); if ($d->Enddate != null) { - echo ' ('.lang('gen_hamradio_deleted_dxcc').')'; + echo ' ('.__("Deleted DXCC").')'; } echo ''; } @@ -77,9 +77,9 @@
    - + - + @@ -115,17 +115,17 @@
    - +
    - +

    - +
    diff --git a/application/views/eqslcard/index.php b/application/views/eqslcard/index.php index 3b0562a3a..f02258387 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/gridmap/index.php b/application/views/gridmap/index.php index d9c46718f..a38175765 100644 --- a/application/views/gridmap/index.php +++ b/application/views/gridmap/index.php @@ -7,10 +7,10 @@
    - +
    - + ' . $sat . '' . "\n"; } ?> @@ -38,7 +38,7 @@
    - + submode ?? '' == '') { @@ -75,10 +75,10 @@ ?>
    - +
    style="display: none;" >
    - +
    @@ -125,8 +125,8 @@
    - - + + @@ -143,15 +143,15 @@
    -
    : 
    +
    : 
    -
    : 
    +
    : 
    -
    : 
    +
    : 
    -
    : 
    +
    : 
    -
    : 
    +
    : 
    @@ -70,7 +70,7 @@
    - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
    - + dx->show ?? "true") == "true") { ?> - dxcc->show ?? "true") == "true") { ?> - state->show ?? "true") == "true") { ?> - gridsquare->show ?? "true") == "true") { ?> - cqzone->show ?? "true") == "true") { ?> - ituzone->show ?? "true") == "true") { ?> - mode->show ?? "true") == "true") { ?> - band->show ?? "true") == "true") { ?> - iota->show ?? "true") == "true") { ?> - sota->show ?? "true") == "true") { ?> - pota->show ?? "true") == "true") { ?> - wwff->show ?? "true") == "true") { ?> - operator->show ?? "true") == "true") { ?> -
    + data-bs-target=".quickfilterbody"> + data-bs-target=".qslfilterbody"> + data-bs-target=".filterbody"> - + data-bs-target=".actionbody"> + - + - - + + - +
    - +
    - - + +
    @@ -503,37 +503,37 @@ $options = json_decode($options);
    datetime->show ?? "true") == "true") { - echo '' . lang('general_word_datetime') . ''; + echo '' . __("Date/Time") . ''; } ?> de->show ?? "true") == "true") { - echo '' . lang('gen_hamradio_de') . ''; + echo '' . __("De") . ''; } ?> dx->show ?? "true") == "true") { - echo '' . lang('gen_hamradio_dx') . ''; + echo '' . __("Dx") . ''; } ?> mode->show ?? "true") == "true") { - echo '' . lang('gen_hamradio_mode') . ''; + echo '' . __("Mode") . ''; } ?> rsts->show ?? "true") == "true") { - echo '' . lang('gen_hamradio_rsts') . ''; + echo '' . __("RST (S)") . ''; } ?> rstr->show ?? "true") == "true") { - echo '' . lang('gen_hamradio_rstr') . ''; + echo '' . __("RST (R)") . ''; } ?> band->show ?? "true") == "true") { - echo '' . lang('gen_hamradio_band') . ''; + echo '' . __("Band") . ''; } ?> gridsquare->show ?? "true") == "true") { echo 'Gridsquare'; } ?> name->show ?? "true") == "true") { - echo '' . lang('general_word_name') . ''; + echo '' . __("Name") . ''; } ?> qslvia->show ?? "true") == "true") { - echo '' . lang('gen_hamradio_qslvia') . ''; + echo '' . __("QSL via") . ''; } ?> qsl->show ?? "true") == "true") { - echo '' . lang('gen_hamradio_qsl') . ''; + echo '' . __("QSL") . ''; } ?> session->userdata('user_eqsl_name') != "" && ($options->eqsl->show ?? "true") == "true") { echo 'eQSL'; @@ -542,34 +542,34 @@ $options = json_decode($options); echo 'LoTW'; } ?> qslmsg->show ?? "true") == "true") { - echo '' . lang('gen_hamradio_qslmsg') . ''; + echo '' . __("QSL Msg") . ''; } ?> dxcc->show ?? "true") == "true") { - echo '' . lang('gen_hamradio_dxcc') . ''; + echo '' . __("DXCC") . ''; } ?> state->show ?? "true") == "true") { - echo '' . lang('gen_hamradio_state') . ''; + echo '' . __("State") . ''; } ?> cqzone->show ?? "true") == "true") { - echo '' . lang('gen_hamradio_cq_zone') . ''; + echo '' . __("CQ Zone") . ''; } ?> ituzone->show ?? "true") == "true") { - echo '' . lang('gen_hamradio_itu_zone') . ''; + echo '' . __("ITU Zone") . ''; } ?> iota->show ?? "true") == "true") { - echo '' . lang('gen_hamradio_iota') . ''; + echo '' . __("IOTA") . ''; } ?> pota->show ?? "true") == "true") { - echo '' . lang('gen_hamradio_pota') . ''; + echo '' . __("POTA") . ''; } ?> operator->show ?? "true") == "true") { - echo '' . lang('gen_hamradio_operator') . ''; + echo '' . __("Operator") . ''; } ?> comment->show ?? "true") == "true") { - echo '' . lang('general_word_comment') . ''; + echo '' . __("Comment") . ''; } ?> propagation->show ?? "true") == "true") { - echo '' . lang('filter_general_propagation') . ''; + echo '' . __("Propagation") . ''; } ?> contest->show ?? "true") == "true") { echo 'Contest'; @@ -578,7 +578,7 @@ $options = json_decode($options); echo 'SOTA'; } ?> dok->show ?? "true") == "true") { - echo '' . lang('gen_hamradio_dok') . ''; + echo '' . __("DOK") . ''; } ?> wwff->show ?? "true") == "true") { echo 'WWFF'; @@ -587,7 +587,7 @@ $options = json_decode($options); echo 'SIG'; } ?> myrefs->show ?? "true") == "true") { - echo '' . lang('gen_hamradio_myrefs') . ''; + echo '' . __("My Refs") . ''; } ?> diff --git a/application/views/logbookadvanced/qslcarousel.php b/application/views/logbookadvanced/qslcarousel.php index 2af2961e5..449502c2c 100644 --- a/application/views/logbookadvanced/qslcarousel.php +++ b/application/views/logbookadvanced/qslcarousel.php @@ -27,16 +27,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -64,11 +64,11 @@ 1) { ?> - + - + diff --git a/application/views/logbookadvanced/startatform.php b/application/views/logbookadvanced/startatform.php index 0aac7c7b4..847f115a6 100644 --- a/application/views/logbookadvanced/startatform.php +++ b/application/views/logbookadvanced/startatform.php @@ -1,29 +1,29 @@
    - +
    - +
    - +
    - +
    - +
    diff --git a/application/views/logbookadvanced/useroptions.php b/application/views/logbookadvanced/useroptions.php index becc79acb..347a86775 100644 --- a/application/views/logbookadvanced/useroptions.php +++ b/application/views/logbookadvanced/useroptions.php @@ -13,105 +13,105 @@
    - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/application/views/lookup/index.php b/application/views/lookup/index.php index c454e729b..a20ea3a75 100644 --- a/application/views/lookup/index.php +++ b/application/views/lookup/index.php @@ -28,7 +28,7 @@ foreach ($dxcc as $d) { echo ''; } diff --git a/application/views/lotw/import.php b/application/views/lotw/import.php index fd9ffa5b3..17946afd5 100644 --- a/application/views/lotw/import.php +++ b/application/views/lotw/import.php @@ -1,6 +1,6 @@
    -

    -

    +

    -

    datetime->show ?? "true") == "true") { echo 'checked'; } ?>>
    de->show ?? "true") == "true") { echo 'checked'; } ?>>
    dx->show ?? "true") == "true") { echo 'checked'; } ?>>
    mode->show ?? "true") == "true") { echo 'checked'; } ?>>
    rsts->show ?? "true") == "true") { echo 'checked'; } ?>>
    rstr->show ?? "true") == "true") { echo 'checked'; } ?>>
    band->show ?? "true") == "true") { echo 'checked'; } ?>>
    myrefs->show ?? "true") == "true") { echo 'checked'; } ?>>
    name->show ?? "true") == "true") { echo 'checked'; } ?>>
    qslvia->show ?? "true") == "true") { echo 'checked'; } ?>>
    qsl->show ?? "true") == "true") { echo 'checked'; } ?>>
    lotw->show ?? "true") == "true") { echo 'checked'; } ?>>
    eqsl->show ?? "true") == "true") { echo 'checked'; } ?>>
    qslmsg->show ?? "true") == "true") { echo 'checked'; } ?>>
    dxcc->show ?? "true") == "true") { echo 'checked'; } ?>>
    state->show ?? "true") == "true") { echo 'checked'; } ?>>
    cqzone->show ?? "true") == "true") { echo 'checked'; } ?>>
    ituzone->show ?? "true") == "true") { echo 'checked'; } ?>>
    sota->show ?? "true") == "true") { echo 'checked'; } ?>>
    iota->show ?? "true") == "true") { echo 'checked'; } ?>>
    pota->show ?? "true") == "true") { echo 'checked'; } ?>>
    operator->show ?? "true") == "true") { echo 'checked'; } ?>>
    comment->show ?? "true") == "true") { echo 'checked'; } ?>>
    propagation->show ?? "true") == "true") { echo 'checked'; } ?>>
    - - - - - - - - - + + + + + + + + + @@ -53,7 +53,7 @@ result() as $row) { ?> - + @@ -126,7 +126,7 @@ @@ -141,12 +141,12 @@ if (!($this->config->item('disable_manual_lotw'))) { ?>
    - +
    diff --git a/application/views/lotw_views/upload_cert.php b/application/views/lotw_views/upload_cert.php index cef2ff4a5..cc139b487 100644 --- a/application/views/lotw_views/upload_cert.php +++ b/application/views/lotw_views/upload_cert.php @@ -1,11 +1,11 @@
    -

    +

    - +
    @@ -16,23 +16,23 @@
    - +
    - +
    diff --git a/application/views/mode/index.php b/application/views/mode/index.php index 3ac01c4c1..cc51abf18 100644 --- a/application/views/mode/index.php +++ b/application/views/mode/index.php @@ -65,7 +65,7 @@
    - + diff --git a/application/views/notes/add.php b/application/views/notes/add.php index fb329a6e0..da75d9c25 100644 --- a/application/views/notes/add.php +++ b/application/views/notes/add.php @@ -3,13 +3,13 @@
    -

    +

    • - +
    • - +
    @@ -26,26 +26,26 @@
    - +
    - +
    - +
    - +
    diff --git a/application/views/notes/edit.php b/application/views/notes/edit.php index e7235c78c..2bfcce5e7 100644 --- a/application/views/notes/edit.php +++ b/application/views/notes/edit.php @@ -4,13 +4,13 @@ result() as $row) { ?>
    -

    +

    • - +
    • - +
    @@ -27,27 +27,27 @@
    - +
    - +
    - +
    note; ?>
    - +
    diff --git a/application/views/notes/main.php b/application/views/notes/main.php index ad4d23435..4091544e0 100644 --- a/application/views/notes/main.php +++ b/application/views/notes/main.php @@ -2,13 +2,13 @@
    -

    +

    • - +
    • - +
    @@ -19,7 +19,7 @@ if ($notes->num_rows() > 0) { - echo "

    ".lang('notes_your_notes')."

    "; + echo "

    ".__("Your Notes")."

    "; echo "
      "; foreach ($notes->result() as $row) { @@ -29,7 +29,7 @@ } echo "
    "; } else { - echo "

    ".lang('notes_welcome')."

    "; + echo "

    ".__("You don't currently have any notes, these are a fantastic way of storing data like ATU settings, beacons and general station notes and its better than paper as you can't lose them!")."

    "; } ?> diff --git a/application/views/notes/view.php b/application/views/notes/view.php index c6848abef..06d9aca8c 100644 --- a/application/views/notes/view.php +++ b/application/views/notes/view.php @@ -3,22 +3,22 @@
    result() as $row) { ?>
    -

    - title; ?>

    +

    - title; ?>

    • - +
    • - +

    note); ?>

    - + - +
    diff --git a/application/views/options/appearance.php b/application/views/options/appearance.php index 40efca628..f90876637 100644 --- a/application/views/options/appearance.php +++ b/application/views/options/appearance.php @@ -45,7 +45,7 @@
    - + - +
    @@ -67,40 +67,40 @@
    - + - +
    - + - +
    - + - +
    - + - +
    @@ -113,7 +113,7 @@
    - + " />
    diff --git a/application/views/options/dxcluster.php b/application/views/options/dxcluster.php index c248e8a1e..72740e1a0 100644 --- a/application/views/options/dxcluster.php +++ b/application/views/options/dxcluster.php @@ -35,22 +35,22 @@
    - +

    - + - +
    - + - +
    - + " /> diff --git a/application/views/options/email.php b/application/views/options/email.php index 41b2e8a2e..74773216c 100644 --- a/application/views/options/email.php +++ b/application/views/options/email.php @@ -42,79 +42,79 @@
    - + - +
    - + - +
    - +
    optionslib->get_option('emailSenderName'); } ?>"> - +
    - +
    optionslib->get_option('emailAddress'); } ?>"> - +
    - +
    optionslib->get_option('smtpHost'); } ?>"> - +
    - +
    optionslib->get_option('smtpPort'); } ?>"> - + '587', if SSL is used -> '465'"); ?>
    - +
    optionslib->get_option('smtpUsername'); } ?>"> - +
    - +
    optionslib->get_option('smtpPassword'); } ?>"> - +
    - + " />
    - - + " /> + diff --git a/application/views/options/index.php b/application/views/options/index.php index b5272d0f8..8829add31 100644 --- a/application/views/options/index.php +++ b/application/views/options/index.php @@ -10,7 +10,7 @@

    -

    +

    diff --git a/application/views/options/oqrs.php b/application/views/options/oqrs.php index 82664daaf..5b3b3b8ed 100644 --- a/application/views/options/oqrs.php +++ b/application/views/options/oqrs.php @@ -35,31 +35,31 @@
    - + - +
    - + - +
    - + - +
    - + " /> diff --git a/application/views/options/radios.php b/application/views/options/radios.php index 0f705b4ee..46b2db686 100644 --- a/application/views/options/radios.php +++ b/application/views/options/radios.php @@ -35,14 +35,14 @@
    - -

    + +

    - +
    - + " /> diff --git a/application/views/options/sidebar.php b/application/views/options/sidebar.php index 902bd3968..f1cc774ae 100644 --- a/application/views/options/sidebar.php +++ b/application/views/options/sidebar.php @@ -1,12 +1,12 @@
      -
      • -
      • -
      • -
      • -
      • -
      • +
      • +
      • +
      • +
      • +
      • +
    diff --git a/application/views/options/version_dialog.php b/application/views/options/version_dialog.php index 992459f1a..1d94b4f5a 100644 --- a/application/views/options/version_dialog.php +++ b/application/views/options/version_dialog.php @@ -44,44 +44,44 @@
    - + - +
    - + - +
    - + " />
    -
    +
    session->flashdata('success_trigger')) { ?> @@ -94,16 +94,16 @@
    - + - +
    - + - +
    diff --git a/application/views/oqrs/qsolist.php b/application/views/oqrs/qsolist.php index c832407f1..f93164ab4 100644 --- a/application/views/oqrs/qsolist.php +++ b/application/views/oqrs/qsolist.php @@ -3,12 +3,12 @@ if ($qsos->result() != NULL) { echo '
    callsign; ?>cert_dxcc == '' ? '- NONE -' : ucfirst($row->cert_dxcc); if ($row->cert_dxcc_end != NULL) { echo ' '.lang('gen_hamradio_deleted_dxcc').''; } ?>cert_dxcc == '' ? '- NONE -' : ucfirst($row->cert_dxcc); if ($row->cert_dxcc_end != NULL) { echo ' '.__("Deleted DXCC").''; } ?> qso_start_date)) { $valid_qso_start = strtotime( $row->qso_start_date ); @@ -88,11 +88,11 @@ date_expires.'-30 days')); ?> $row->date_expires) { ?> - + date_expires && $current_date > $warning_date) { ?> - + - + @@ -111,11 +111,11 @@ - + - +
    <---
    - - - - - - + + + + + + '; if ($this->session->userdata('user_eqsl_name') != "") { echo ''; @@ -47,16 +47,16 @@ if ($qsos->result() != NULL) { } switch ($qsl->COL_QSL_SENT) { case "Y": - echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_sent').$timestamp; + echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".__("Sent").$timestamp; break; case "Q": - echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_queued').$timestamp; + echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Queued").$timestamp; break; case "R": - echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_requested').$timestamp; + echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Requested").$timestamp; break; case "I": - echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_invalid_ignore').$timestamp; + echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".__("Invalid (Ignore)").$timestamp; break; default: echo "class=\"qsl-red"; @@ -66,16 +66,16 @@ if ($qsos->result() != NULL) { if ($qsl->COL_QSL_SENT_VIA != "") { switch ($qsl->COL_QSL_SENT_VIA) { case "B": - echo " (".lang('general_word_qslcard_bureau').")"; + echo " (".__("Bureau").")"; break; case "D": - echo " (".lang('general_word_qslcard_direct').")"; + echo " (".__("Direct").")"; break; case "M": - echo " (".lang('general_word_qslcard_via').": ".($qsl->COL_QSL_VIA!="" ? $qsl->COL_QSL_VIA:"n/a").")"; + echo " (".__("Via").": ".($qsl->COL_QSL_VIA!="" ? $qsl->COL_QSL_VIA:"n/a").")"; break; case "E": - echo " (".lang('general_word_qslcard_electronic').")"; + echo " (".__("Electronic").")"; break; } } @@ -89,16 +89,16 @@ if ($qsos->result() != NULL) { } switch ($qsl->COL_QSL_RCVD) { case "Y": - echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_received').$timestamp; + echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".__("Received").$timestamp; break; case "Q": - echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_queued').$timestamp; + echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Queued").$timestamp; break; case "R": - echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_requested').$timestamp; + echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Requested").$timestamp; break; case "I": - echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_invalid_ignore').$timestamp; + echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".__("Invalid (Ignore)").$timestamp; break; default: echo "class=\"qsl-red"; @@ -108,16 +108,16 @@ if ($qsos->result() != NULL) { if ($qsl->COL_QSL_RCVD_VIA != "") { switch ($qsl->COL_QSL_RCVD_VIA) { case "B": - echo " (".lang('general_word_qslcard_bureau').")"; + echo " (".__("Bureau").")"; break; case "D": - echo " (".lang('general_word_qslcard_direct').")"; + echo " (".__("Direct").")"; break; case "M": echo " (Manager)"; break; case "E": - echo " (".lang('general_word_qslcard_electronic').")"; + echo " (".__("Electronic").")"; break; } } @@ -127,7 +127,7 @@ if ($qsos->result() != NULL) { echo '
    '.lang('gen_hamradio_callsign').'' . lang('general_word_date') . ''. lang('general_word_time') .'' . lang('gen_hamradio_mode') . '' . lang('gen_hamradio_band') . '' . lang('gen_hamradio_station') . ''.__("Callsign").'' . __("Date") . ''. __("Time") .'' . __("Mode") . '' . __("Band") . '' . __("Station") . ' QSLeQSL'; echo 'COL_EQSL_QSL_SENT == "Y") { - echo "title=\"".lang('eqsl_short')." ".lang('general_word_sent'); + echo "title=\"".__("eQSL")." ".__("Sent"); if ($qsl->COL_EQSL_QSLSDATE != null) { $timestamp = strtotime($qsl->COL_EQSL_QSLSDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -140,7 +140,7 @@ if ($qsos->result() != NULL) { echo 'COL_EQSL_QSL_RCVD == "Y") { - echo "title=\"".lang('eqsl_short')." ".lang('general_word_received'); + echo "title=\"".__("eQSL")." ".__("Received"); if ($qsl->COL_EQSL_QSLRDATE != null) { $timestamp = strtotime($qsl->COL_EQSL_QSLRDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -156,7 +156,7 @@ if ($qsos->result() != NULL) { echo ''; echo 'COL_LOTW_QSL_SENT == "Y") { - echo "title=\"".lang('lotw_short')." ".lang('general_word_sent'); + echo "title=\"".__("LoTW")." ".__("Sent"); if ($qsl->COL_LOTW_QSLSDATE != null) { $timestamp = strtotime($qsl->COL_LOTW_QSLSDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -169,7 +169,7 @@ if ($qsos->result() != NULL) { echo 'COL_LOTW_QSL_RCVD == "Y") { - echo "title=\"".lang('lotw_short')." ".lang('general_word_received'); + echo "title=\"".__("LoTW")." ".__("Received"); if ($qsl->COL_LOTW_QSLRDATE != null) { $timestamp = strtotime($qsl->COL_LOTW_QSLRDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); diff --git a/application/views/public_search/result.php b/application/views/public_search/result.php index 0297f8271..ed16f8456 100644 --- a/application/views/public_search/result.php +++ b/application/views/public_search/result.php @@ -10,10 +10,10 @@ if ($results) { ?> - - - - + + + + diff --git a/application/views/qrz/export.php b/application/views/qrz/export.php index 87bc481f1..b6669384a 100644 --- a/application/views/qrz/export.php +++ b/application/views/qrz/export.php @@ -73,7 +73,7 @@

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

    - +
    @@ -94,12 +94,12 @@

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

    - +
    - +
    diff --git a/application/views/qslcard/index.php b/application/views/qslcard/index.php index 0ba0e814b..82d886f36 100644 --- a/application/views/qslcard/index.php +++ b/application/views/qslcard/index.php @@ -2,12 +2,12 @@
    -

    +

    config->item('userdata'); if (isset($userdata_dir)) { ?> @@ -25,12 +25,12 @@ echo '
    Station Callsign
    - - - - - - + + + + + + diff --git a/application/views/qslcard/searchresult.php b/application/views/qslcard/searchresult.php index 24d7d7fc5..6f82613bc 100644 --- a/application/views/qslcard/searchresult.php +++ b/application/views/qslcard/searchresult.php @@ -1,90 +1,90 @@
    '.lang('gen_hamradio_callsign').''.lang('gen_hamradio_mode').''.lang('general_word_date').''.lang('general_word_time').''.lang('gen_hamradio_band').''.lang('gen_hamradio_qsl').' '.lang('general_word_date').''.__("Callsign").''.__("Mode").''.__("Date").''.__("Time").''.__("Band").''.__("QSL").' '.__("Date").'
    - + config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?> - + - + '; switch($this->session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1')) { - case 'Mode': echo lang('gen_hamradio_mode'); break; - case 'RSTS': echo lang('gen_hamradio_rsts'); break; - case 'RSTR': echo lang('gen_hamradio_rstr'); break; - case 'Country': echo lang('general_word_country'); break; - case 'IOTA': echo lang('gen_hamradio_iota'); break; - case 'SOTA': echo lang('gen_hamradio_sota'); break; - case 'State': echo lang('gen_hamradio_state'); break; - case 'Grid': echo lang('gen_hamradio_gridsquare'); break; - case 'Distance': echo lang('gen_hamradio_distance'); break; - case 'Band': echo lang('gen_hamradio_band'); break; - case 'Frequency': echo lang('gen_hamradio_frequency'); break; - case 'Operator': echo lang('gen_hamradio_operator'); break; + case 'Mode': echo __("Mode"); break; + case 'RSTS': echo __("RST (S)"); break; + case 'RSTR': echo __("RST (R)"); break; + case 'Country': echo __("Country"); break; + case 'IOTA': echo __("IOTA"); break; + case 'SOTA': echo __("SOTA"); break; + case 'State': echo __("State"); break; + case 'Grid': echo __("Gridsquare"); break; + case 'Distance': echo __("Distance"); break; + case 'Band': echo __("Band"); break; + case 'Frequency': echo __("Frequency"); break; + case 'Operator': echo __("Operator"); break; } echo ''; echo ''; echo ''; echo ''; echo ''; diff --git a/application/views/qslprint/index.php b/application/views/qslprint/index.php index 69efcf1a1..363d74d2b 100644 --- a/application/views/qslprint/index.php +++ b/application/views/qslprint/index.php @@ -13,21 +13,21 @@
    - +
    - : + : -

    -

    +

    +

    result() != NULL) {
    - - - - - - - - - - - - - + + + + + + + + + + + + +'; @@ -64,18 +64,18 @@ if ($qsos->result() != NULL) { echo '
    '; switch($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')) { - case 'Mode': echo lang('gen_hamradio_mode'); break; - case 'RSTS': echo lang('gen_hamradio_rsts'); break; - case 'RSTR': echo lang('gen_hamradio_rstr'); break; - case 'Country': echo lang('general_word_country'); break; - case 'IOTA': echo lang('gen_hamradio_iota'); break; - case 'SOTA': echo lang('gen_hamradio_sota'); break; - case 'State': echo lang('gen_hamradio_state'); break; - case 'Grid': echo lang('gen_hamradio_gridsquare'); break; - case 'Distance': echo lang('gen_hamradio_distance'); break; - case 'Band': echo lang('gen_hamradio_band'); break; - case 'Frequency': echo lang('gen_hamradio_frequency'); break; - case 'Operator': echo lang('gen_hamradio_band'); break; + case 'Mode': echo __("Mode"); break; + case 'RSTS': echo __("RST (S)"); break; + case 'RSTR': echo __("RST (R)"); break; + case 'Country': echo __("Country"); break; + case 'IOTA': echo __("IOTA"); break; + case 'SOTA': echo __("SOTA"); break; + case 'State': echo __("State"); break; + case 'Grid': echo __("Gridsquare"); break; + case 'Distance': echo __("Distance"); break; + case 'Band': echo __("Band"); break; + case 'Frequency': echo __("Frequency"); break; + case 'Operator': echo __("Band"); break; } echo ''; switch($this->session->userdata('user_column3')==""?'RSTR':$this->session->userdata('user_column3')) { - case 'Mode': echo lang('gen_hamradio_mode'); break; - case 'RSTS': echo lang('gen_hamradio_rsts'); break; - case 'RSTR': echo lang('gen_hamradio_rstr'); break; - case 'Country': echo lang('general_word_country'); break; - case 'IOTA': echo lang('gen_hamradio_iota'); break; - case 'SOTA': echo lang('gen_hamradio_sota'); break; - case 'State': echo lang('gen_hamradio_state'); break; - case 'Grid': echo lang('gen_hamradio_gridsquare'); break; - case 'Distance': echo lang('gen_hamradio_distance'); break; - case 'Band': echo lang('gen_hamradio_band'); break; - case 'Frequency': echo lang('gen_hamradio_frequency'); break; - case 'Operator': echo lang('gen_hamradio_operator'); break; + case 'Mode': echo __("Mode"); break; + case 'RSTS': echo __("RST (S)"); break; + case 'RSTR': echo __("RST (R)"); break; + case 'Country': echo __("Country"); break; + case 'IOTA': echo __("IOTA"); break; + case 'SOTA': echo __("SOTA"); break; + case 'State': echo __("State"); break; + case 'Grid': echo __("Gridsquare"); break; + case 'Distance': echo __("Distance"); break; + case 'Band': echo __("Band"); break; + case 'Frequency': echo __("Frequency"); break; + case 'Operator': echo __("Operator"); break; } echo ''; switch($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')) { - case 'Mode': echo lang('gen_hamradio_mode'); break; - case 'RSTS': echo lang('gen_hamradio_rsts'); break; - case 'RSTR': echo lang('gen_hamradio_rstr'); break; - case 'Country': echo lang('general_word_country'); break; - case 'IOTA': echo lang('gen_hamradio_iota'); break; - case 'SOTA': echo lang('gen_hamradio_sota'); break; - case 'State': echo lang('gen_hamradio_state'); break; - case 'Grid': echo lang('gen_hamradio_gridsquare'); break; - case 'Distance': echo lang('gen_hamradio_distance'); break; - case 'Band': echo lang('gen_hamradio_band'); break; - case 'Frequency': echo lang('gen_hamradio_frequency'); break; - case 'Operator': echo lang('gen_hamradio_operator'); break; + case 'Mode': echo __("Mode"); break; + case 'RSTS': echo __("RST (S)"); break; + case 'RSTR': echo __("RST (R)"); break; + case 'Country': echo __("Country"); break; + case 'IOTA': echo __("IOTA"); break; + case 'SOTA': echo __("SOTA"); break; + case 'State': echo __("State"); break; + case 'Grid': echo __("Gridsquare"); break; + case 'Distance': echo __("Distance"); break; + case 'Band': echo __("Band"); break; + case 'Frequency': echo __("Frequency"); break; + case 'Operator': echo __("Operator"); break; } echo ''; switch($this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5')) { - case 'Mode': echo lang('gen_hamradio_mode'); break; - case 'RSTS': echo lang('gen_hamradio_rsts'); break; - case 'RSTR': echo lang('gen_hamradio_rstr'); break; - case 'Country': echo lang('general_word_country'); break; - case 'IOTA': echo lang('gen_hamradio_iota'); break; - case 'SOTA': echo lang('gen_hamradio_sota'); break; - case 'State': echo lang('gen_hamradio_state'); break; - case 'Grid': echo lang('gen_hamradio_gridsquare'); break; - case 'Distance': echo lang('gen_hamradio_distance'); break; - case 'Band': echo lang('gen_hamradio_band'); break; - case 'Frequency': echo lang('gen_hamradio_frequency'); break; - case 'Operator': echo lang('gen_hamradio_operator'); break; + case 'Mode': echo __("Mode"); break; + case 'RSTS': echo __("RST (S)"); break; + case 'RSTR': echo __("RST (R)"); break; + case 'Country': echo __("Country"); break; + case 'IOTA': echo __("IOTA"); break; + case 'SOTA': echo __("SOTA"); break; + case 'State': echo __("State"); break; + case 'Grid': echo __("Gridsquare"); break; + case 'Distance': echo __("Distance"); break; + case 'Band': echo __("Band"); break; + case 'Frequency': echo __("Frequency"); break; + case 'Operator': echo __("Operator"); break; } echo '
    		'.lang('gen_hamradio_callsign').'' . lang('general_word_date') . ''. lang('general_word_time') .'' . lang('gen_hamradio_mode') . '' . lang('gen_hamradio_band') . '' . lang('gen_hamradio_rsts') . '' . lang('gen_hamradio_rstr') . '' . lang('gen_hamradio_qsl') . ' ' . lang('general_word_qslcard_via') . '' . lang('gen_hamradio_station') . '' . lang('qslcard_qslprint_send_method') . '' . lang('qslcard_qslprint_mark_as_sent') . '' . lang('admin_remove') . '' . lang('qso_simplefle_qso_list') . ''.__("Callsign").'' . __("Date") . ''. __("Time") .'' . __("Mode") . '' . __("Band") . '' . __("RST (S)") . '' . __("RST (R)") . '' . __("QSL") . ' ' . __("Via") . '' . __("Station") . '' . __("Send Method") . '' . __("Mark as sent") . '' . __("Remove") . '' . __("QSO List") . '
    '; ?> -

    +

    -

    +

    -

    +

    - + -

    +

    ' . lang('qslcard_qslprint_no_qsls_found') . ''; + echo '
    ' . __("No QSLs to print were found!") . '
    '; } ?> diff --git a/application/views/qslprint/qsolist.php b/application/views/qslprint/qsolist.php index 8198764a2..4a59defee 100644 --- a/application/views/qslprint/qsolist.php +++ b/application/views/qslprint/qsolist.php @@ -3,22 +3,22 @@ if ($qsos->result() != NULL) { echo ' - - - - - - - - - - - '; + + + + + + + + + + + '; if ($this->session->userdata('user_eqsl_name') != "") { - echo ''; + echo ''; } if($this->session->userdata('user_lotw_name') != "") { - echo ''; + echo ''; } echo ' @@ -55,16 +55,16 @@ if ($qsos->result() != NULL) { } switch ($qsl->COL_QSL_SENT) { case "Y": - echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_sent').$timestamp; + echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".__("Sent").$timestamp; break; case "Q": - echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_queued').$timestamp; + echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Queued").$timestamp; break; case "R": - echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_requested').$timestamp; + echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Requested").$timestamp; break; case "I": - echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_invalid_ignore').$timestamp; + echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".__("Invalid (Ignore)").$timestamp; break; default: echo "class=\"qsl-red"; @@ -74,16 +74,16 @@ if ($qsos->result() != NULL) { if ($qsl->COL_QSL_SENT_VIA != "") { switch ($qsl->COL_QSL_SENT_VIA) { case "B": - echo " (".lang('general_word_qslcard_bureau').")"; + echo " (".__("Bureau").")"; break; case "D": - echo " (".lang('general_word_qslcard_direct').")"; + echo " (".__("Direct").")"; break; case "M": - echo " (".lang('general_word_qslcard_via').": ".($qsl->COL_QSL_VIA!="" ? $qsl->COL_QSL_VIA:"n/a").")"; + echo " (".__("Via").": ".($qsl->COL_QSL_VIA!="" ? $qsl->COL_QSL_VIA:"n/a").")"; break; case "E": - echo " (".lang('general_word_qslcard_electronic').")"; + echo " (".__("Electronic").")"; break; } } @@ -97,16 +97,16 @@ if ($qsos->result() != NULL) { } switch ($qsl->COL_QSL_RCVD) { case "Y": - echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_received').$timestamp; + echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".__("Received").$timestamp; break; case "Q": - echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_queued').$timestamp; + echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Queued").$timestamp; break; case "R": - echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_requested').$timestamp; + echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Requested").$timestamp; break; case "I": - echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_invalid_ignore').$timestamp; + echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".__("Invalid (Ignore)").$timestamp; break; default: echo "class=\"qsl-red"; @@ -116,16 +116,16 @@ if ($qsos->result() != NULL) { if ($qsl->COL_QSL_RCVD_VIA != "") { switch ($qsl->COL_QSL_RCVD_VIA) { case "B": - echo " (".lang('general_word_qslcard_bureau').")"; + echo " (".__("Bureau").")"; break; case "D": - echo " (".lang('general_word_qslcard_direct').")"; + echo " (".__("Direct").")"; break; case "M": - echo " (".lang('general_word_qslcard_manager').")"; + echo " (".__("Manager").")"; break; case "E": - echo " (".lang('general_word_qslcard_electronic').")"; + echo " (".__("Electronic").")"; break; } } @@ -135,7 +135,7 @@ if ($qsos->result() != NULL) { echo ''; } - echo ''; + echo ''; echo ''; } @@ -198,14 +198,14 @@ if ($qsos->result() != NULL) { ' . lang('qslcard_qslprint_no_additional_qso_found') . ''; + echo '
    ' . __("No additional QSO's were found. That means they are probably already in the queue.") . '
    '; } function echo_qsl_sent_via($method) { switch($method) { - case 'B': echo lang('general_word_qslcard_bureau'); break; - case 'D': echo lang('general_word_qslcard_direct'); break; - case 'E': echo lang('general_word_qslcard_electronic'); break; + case 'B': echo __("Bureau"); break; + case 'D': echo __("Direct"); break; + case 'E': echo __("Electronic"); break; } } ?> diff --git a/application/views/qso/components/previous_contacts.php b/application/views/qso/components/previous_contacts.php index 283818269..1331fa153 100644 --- a/application/views/qso/components/previous_contacts.php +++ b/application/views/qso/components/previous_contacts.php @@ -3,8 +3,8 @@
    '.lang('gen_hamradio_callsign').'' . lang('general_word_date') . ''. lang('general_word_time') .'' . lang('gen_hamradio_mode') . '' . lang('gen_hamradio_band') . '' . lang('gen_hamradio_rsts') . '' . lang('gen_hamradio_rstr') . '' . lang('gen_hamradio_station') . '' . lang('gen_hamradio_qsl') . ' ' . lang('general_word_qslcard_via') . '' . lang('qslcard_qslprint_send_method') . '' . lang('gen_hamradio_qsl') . ''.__("Callsign").'' . __("Date") . ''. __("Time") .'' . __("Mode") . '' . __("Band") . '' . __("RST (S)") . '' . __("RST (R)") . '' . __("Station") . '' . __("QSL") . ' ' . __("Via") . '' . __("Send Method") . '' . __("QSL") . '' . lang('eqsl_short') . '' . __("eQSL") . '' . lang('lotw_short') . '' . __("LoTW") . '
    '; echo 'COL_EQSL_QSL_SENT == "Y") { - echo "title=\"".lang('eqsl_short')." ".lang('general_word_sent'); + echo "title=\"".__("eQSL")." ".__("Sent"); if ($qsl->COL_EQSL_QSLSDATE != null) { $timestamp = strtotime($qsl->COL_EQSL_QSLSDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -148,7 +148,7 @@ if ($qsos->result() != NULL) { echo 'COL_EQSL_QSL_RCVD == "Y") { - echo "title=\"".lang('eqsl_short')." ".lang('general_word_received'); + echo "title=\"".__("eQSL")." ".__("Received"); if ($qsl->COL_EQSL_QSLRDATE != null) { $timestamp = strtotime($qsl->COL_EQSL_QSLRDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -164,7 +164,7 @@ if ($qsos->result() != NULL) { echo ''; echo 'COL_LOTW_QSL_SENT == "Y") { - echo "title=\"".lang('lotw_short')." ".lang('general_word_sent'); + echo "title=\"".__("LoTW")." ".__("Sent"); if ($qsl->COL_LOTW_QSLSDATE != null) { $timestamp = strtotime($qsl->COL_LOTW_QSLSDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -177,7 +177,7 @@ if ($qsos->result() != NULL) { echo 'COL_LOTW_QSL_RCVD == "Y") { - echo "title=\"".lang('lotw_short')." ".lang('general_word_received'); + echo "title=\"".__("LoTW")." ".__("Received"); if ($qsl->COL_LOTW_QSLRDATE) { $timestamp = strtotime($qsl->COL_LOTW_QSLRDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -189,7 +189,7 @@ if ($qsos->result() != NULL) { echo '">▼'; echo '
    - - + + session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1')); echo_table_header_col($this, $this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')); diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php index 215564831..94c0eb781 100644 --- a/application/views/qso/edit_ajax.php +++ b/application/views/qso/edit_ajax.php @@ -226,7 +226,7 @@ } echo '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))); if ($d->Enddate != null) { - echo ' ('.lang('gen_hamradio_deleted_dxcc').')'; + echo ' ('.__("Deleted DXCC").')'; } echo ''; } @@ -235,16 +235,16 @@
    - +
    @@ -473,11 +473,11 @@
    - + diff --git a/application/views/qso/index.php b/application/views/qso/index.php index f28f6ed8a..b1795b753 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -1,10 +1,10 @@
    @@ -17,35 +17,35 @@
    - - - - + + + + - + '; diff --git a/application/views/search/lotw_unconfirmed_result.php b/application/views/search/lotw_unconfirmed_result.php index 9b5c468d9..2445c09d8 100644 --- a/application/views/search/lotw_unconfirmed_result.php +++ b/application/views/search/lotw_unconfirmed_result.php @@ -3,12 +3,12 @@ if ($qsos->result() != NULL) { echo '
    //
    Date Time'.lang('gen_hamradio_callsign').'' . lang('gen_hamradio_mode') . '' . lang('gen_hamradio_band') . '' . lang('gen_hamradio_gridsquare') . ''.__("Callsign").'' . __("Mode") . '' . __("Band") . '' . __("Gridsquare") . ' CQ Zone DXCC CQ Zone DXCC' . lang('gen_hamradio_station') . '' . __("Station") . '
    - + - - + + - + '; diff --git a/application/views/search/search_result_ajax.php b/application/views/search/search_result_ajax.php index ff976fdc1..31c4a1c44 100644 --- a/application/views/search/search_result_ajax.php +++ b/application/views/search/search_result_ajax.php @@ -1,22 +1,22 @@ - + config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?> - + - + '; @@ -124,7 +124,7 @@ $ci =& get_instance(); - + config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?> @@ -177,16 +177,16 @@ $ci =& get_instance(); } switch ($row->COL_QSL_SENT) { case "Y": - echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_sent').$timestamp; + echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".__("Sent").$timestamp; break; case "Q": - echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_queued').$timestamp; + echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Queued").$timestamp; break; case "R": - echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_requested').$timestamp; + echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Requested").$timestamp; break; case "I": - echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_invalid_ignore').$timestamp; + echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".__("Invalid (Ignore)").$timestamp; break; default: echo "class=\"qsl-red"; @@ -196,16 +196,16 @@ $ci =& get_instance(); if ($row->COL_QSL_SENT_VIA != "") { switch ($row->COL_QSL_SENT_VIA) { case "B": - echo " (".lang('general_word_qslcard_bureau').")"; + echo " (".__("Bureau").")"; break; case "D": - echo " (".lang('general_word_qslcard_direct').")"; + echo " (".__("Direct").")"; break; case "M": - echo " (".lang('general_word_qslcard_via').": ".($row->COL_QSL_VIA!="" ? $row->COL_QSL_VIA:"n/a").")"; + echo " (".__("Via").": ".($row->COL_QSL_VIA!="" ? $row->COL_QSL_VIA:"n/a").")"; break; case "E": - echo " (".lang('general_word_qslcard_electronic').")"; + echo " (".__("Electronic").")"; break; } } @@ -219,16 +219,16 @@ $ci =& get_instance(); } switch ($row->COL_QSL_RCVD) { case "Y": - echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_received').$timestamp; + echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".__("Received").$timestamp; break; case "Q": - echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_queued').$timestamp; + echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Queued").$timestamp; break; case "R": - echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_requested').$timestamp; + echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Requested").$timestamp; break; case "I": - echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".lang('general_word_invalid_ignore').$timestamp; + echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".__("Invalid (Ignore)").$timestamp; break; default: echo "class=\"qsl-red"; @@ -238,16 +238,16 @@ $ci =& get_instance(); if ($row->COL_QSL_RCVD_VIA != "") { switch ($row->COL_QSL_RCVD_VIA) { case "B": - echo " (".lang('general_word_qslcard_bureau').")"; + echo " (".__("Bureau").")"; break; case "D": - echo " (".lang('general_word_qslcard_direct').")"; + echo " (".__("Direct").")"; break; case "M": echo " (Manager)"; break; case "E": - echo " (".lang('general_word_qslcard_electronic').")"; + echo " (".__("Electronic").")"; break; } } @@ -257,7 +257,7 @@ $ci =& get_instance(); echo ' diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index df555657c..a4114718a 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -9,34 +9,34 @@

    - +
    session->flashdata('message')) { ?> @@ -60,19 +60,19 @@
    - +
    - + - +
    -

    +

    @@ -80,7 +80,7 @@
    - + Station Location"); ?>
    - +
    @@ -109,7 +109,7 @@
    -

    +

    @@ -117,22 +117,22 @@
    - +
    '.lang('gen_hamradio_callsign').''.__("Callsign").' Date / time' . lang('gen_hamradio_mode') . '' . lang('gen_hamradio_band') . '' . __("Mode") . '' . __("Band") . ' Last LoTW upload' . lang('gen_hamradio_station') . '' . __("Station") . '
    Clublog '; echo 'COL_EQSL_QSL_SENT == "Y") { - echo "title=\"".lang('eqsl_short')." ".lang('general_word_sent'); + echo "title=\"".__("eQSL")." ".__("Sent"); if ($row->COL_EQSL_QSLSDATE != null) { $timestamp = strtotime($row->COL_EQSL_QSLSDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -270,7 +270,7 @@ $ci =& get_instance(); echo 'COL_EQSL_QSL_RCVD == "Y") { - echo "title=\"".lang('eqsl_short')." ".lang('general_word_received'); + echo "title=\"".__("eQSL")." ".__("Received"); if ($row->COL_EQSL_QSLRDATE != null) { $timestamp = strtotime($row->COL_EQSL_QSLRDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -295,7 +295,7 @@ $ci =& get_instance(); echo ''; echo 'COL_LOTW_QSL_SENT == "Y") { - echo "title=\"".lang('lotw_short')." ".lang('general_word_sent'); + echo "title=\"".__("LoTW")." ".__("Sent"); if ($row->COL_LOTW_QSLSDATE != null) { $timestamp = strtotime($row->COL_LOTW_QSLSDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -308,7 +308,7 @@ $ci =& get_instance(); echo 'COL_LOTW_QSL_RCVD == "Y") { - echo "title=\"".lang('lotw_short')." ".lang('general_word_received'); + echo "title=\"".__("LoTW")." ".__("Received"); if ($row->COL_LOTW_QSLRDATE != null) { $timestamp = strtotime($row->COL_LOTW_QSLRDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -325,7 +325,7 @@ $ci =& get_instance(); echo ''; echo 'COL_QRZCOM_QSO_UPLOAD_STATUS == "Y") { - echo "title=\"QRZ ".lang('general_word_sent'); + echo "title=\"QRZ ".__("Sent"); if ($row->COL_QRZCOM_QSO_UPLOAD_DATE != null) { $timestamp = strtotime($row->COL_QRZCOM_QSO_UPLOAD_DATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -338,7 +338,7 @@ $ci =& get_instance(); echo 'COL_QRZCOM_QSO_DOWNLOAD_STATUS == "Y") { - echo "title=\"QRZ ".lang('general_word_received'); + echo "title=\"QRZ ".__("Received"); if ($row->COL_QRZCOM_QSO_DOWNLOAD_DATE != null) { $timestamp = strtotime($row->COL_QRZCOM_QSO_DOWNLOAD_DATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -355,7 +355,7 @@ $ci =& get_instance(); echo ''; echo 'COL_CLUBLOG_QSO_UPLOAD_STATUS == "Y") { - echo "title=\"Clublog ".lang('general_word_sent'); + echo "title=\"Clublog ".__("Sent"); if ($row->COL_CLUBLOG_QSO_UPLOAD_DATE != null) { $timestamp = strtotime($row->COL_CLUBLOG_QSO_UPLOAD_DATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -368,7 +368,7 @@ $ci =& get_instance(); echo 'COL_CLUBLOG_QSO_DOWNLOAD_STATUS == "Y") { - echo "title=\"Clublog ".lang('general_word_received'); + echo "title=\"Clublog ".__("Received"); if ($row->COL_CLUBLOG_QSO_DOWNLOAD_DATE != null) { $timestamp = strtotime($row->COL_CLUBLOG_QSO_DOWNLOAD_DATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -397,35 +397,35 @@ $ci =& get_instance();
    - + COL_QSL_SENT !='Y') { ?>
    - - + +
    COL_QSL_RCVD !='Y') { ?>
    - - - - + + + +
    - + - +
    - +
    - - - - - - - - - + + + + + + + + + @@ -144,18 +144,18 @@
    - + SOTA, IOTA, POTA or WWFF"); ?>
    - - - - - + + + + +
    diff --git a/application/views/simplefle/syntax_help.php b/application/views/simplefle/syntax_help.php index d4c3cda48..369e69ad1 100644 --- a/application/views/simplefle/syntax_help.php +++ b/application/views/simplefle/syntax_help.php @@ -1,20 +1,20 @@ -

    :

    -

    -

    -

    +

    :

    +

    +

    +

         20m ssb
     2134 2m0sql
    -

    -

    +

    +

         20m ssb
     2134 2m0sql
     6 la8aja 47 46
    -

    -

    +

    +

         20m ssb
     2134 2m0sql
diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php
index 58e531b10..58536bb34 100644
--- a/application/views/station_profile/create.php
+++ b/application/views/station_profile/create.php
@@ -29,41 +29,41 @@
 
 		
    
 		  
    
-		    
+		    
 		    
-		    
+		    
 		  
    
 
 			
    
-		    
+		    
 		    
-		    
+		    
 		  
    
 
 			
    
-		    
+		    
 		    
-		    
+		    
 		  
    
 		  
    
-		    
+		    
 				num_rows() > 0) { ?>
 				
 				
-		    
+		    
 			
 		  
    
 
 		  
    
-		    
+		    
 		    
-		    
+		    
 		  
    
 
         
@@ -72,19 +72,19 @@
 			
-			
+			
 		
 
 		
 		
    
-			
+			
 			
-			
+			
 		
    
 
 		
    
 			
    
-				
+				
 				
-				".lang("gen_find_zone_part2")." ".lang("gen_find_zone_part3"); ?>
+				".__("click here")." ".__("to find it!"); ?>
 			
    
 
 			
    
-				
+				
 				
-				".lang("gen_find_zone_part2")." ".lang("gen_find_zone_part3"); ?>
+				".__("click here")." ".__("to find it!"); ?>
 			
    
 		
    
 
 		  
    
-		    
+		    
 
 			
    
 			
 			
    
-				
+				
 			
    
 			
    
 
 		    
-		    
+		    
 		  
    
 
             
    
-                
+                
                 
-                
+                
                 
             
    
 
 		  
    
-		    
+		    
 		    
 		    
 		  
    
 
 		  
    
-		    
+		    
 		    
 		    
 		  
    
 
 		  
    
-		    
+		    
 		    
 		    
 		  
    
 
 		  
    
-		    
+		    
 		    
-		    
+		    
 		  
    
 
 		  
    
-		    
+		    
 		    
-		    
+		    
 		  
    
 
             
    
                  
                 
-                
+                
             
    
 
 			
    
-				
+				
 				
 				
-				
+				
 			
    
 			
    
-				
+				
 				
-				
+				
 			
    
             
    
-				
+				
 				
 			
    
 
             
    
 				
                                                                                                                                                        
-					 
+					 
                     
-                    
+                    
                 
    
                 
                                                                                                                                                        
-					
+					
                     
                     
                 
    
                 
    
-                                                                                                                                     
+                                                                                                                                     
 					
                 
    
             
    
 
 			
 
             
    
@@ -235,11 +235,11 @@
                     
                 
    
                 
    
-                    
+                    
                     
                 
    
             
@@ -251,36 +251,36 @@
 					
 				
 				
    
-					
+					
 					
 				
    
 			
 
 			
    
-				
+				
 				
 			
    
 			
    
-						
+						
 						
-						
+						
 					
    
 			
    
-				
+				
 				
-				
+				
 			
    
 
-			
+			
 
 		
   
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php
index 7667a59cf..df4e20450 100644
--- a/application/views/station_profile/edit.php
+++ b/application/views/station_profile/edit.php
@@ -19,13 +19,13 @@
 	
 
 	station_id != NULL) {
-		$form_action = lang("admin_update");
+		$form_action = __("Update");
 	?>
 		
    
 			
 
 	
 		
 	
@@ -33,25 +33,25 @@
 	
    
 		
    
 			
    
-				
      station_callsign; ?>)
    
+				
      station_callsign; ?>)
    
 				
    
 
 					
    
-						
+						
 						station_profile_name; } ?>" required>
-						
+						
 					
    
 
 					
    
-						
+						
 						station_callsign; } ?>" required>
-						
+						
 					
    
 
 					
    
-						
+						
 						station_power; } ?>">
-						
+						
 					
    
 				
    
 			
    
@@ -62,35 +62,35 @@
 		
 		
    
 			
    
-				
    
+				
    
 				
    
 					
 					
    
-					    
+					    
 					    num_rows() > 0) { ?>
 					        
 					        
-					    
+					    
 						
 					
    
 
 					
 					
    
-						
+						
 						station_city; } ?>">
-		    			
+		    			
 		  			
    
 
 					
@@ -102,14 +102,14 @@
 						
-						
+						
 					
    
 
 					
 					
    
-						
+						
 						station_cnty; } ?>">
-						
+						
 					
    
 				
    
 			
    
@@ -119,11 +119,11 @@
 		
 		
    
 			
    
-				
    
+				
    
 				
    
 					
 					
    
-						
+						
 						
-						".lang("gen_find_zone_part2")." ".lang("gen_find_zone_part3"); ?>
+						".__("click here")." ".__("to find it!"); ?>
 					
    
 
 					
 					
    
-                    	
+                    	
                     	
-                    	".lang("gen_find_zone_part2")." ".lang("gen_find_zone_part3"); ?>
+                    	".__("click here")." ".__("to find it!"); ?>
                 	
    
 
 				
    
@@ -164,20 +164,20 @@
 	
    
 		
    
 			
    
-				
    
+				
    
 				
    
 					
    
-		    			
+		    			
 
 						
    
 						station_gridsquare; } ?>" required>
 							
    
-								
+								
 							
    
 						
    
 
 		    			
-		    			
+		    			
 		  			
    
 				
    
 			
    
@@ -185,10 +185,10 @@
 
 		
    
 			
    
-				
    
+				
    
 				
    
 					
    
-                		
+                		
                 		
 
-						
+						
                 		
             		
    
 				
    
@@ -213,10 +213,10 @@
 	
    
 		
    
 			
    
-				
    
+				
    
 				
    
 					
    
-		    			
+		    			
 		    			station_sota; } ?>">
 		    			
 		  			
    
@@ -226,10 +226,10 @@
 
 		
    
 			
    
-				
    
+				
    
 				
    
 					
    
-						
+						
 						station_wwff; } ?>">
 						
 					
    
@@ -239,10 +239,10 @@
 
 		
    
 			
    
-				
    
+				
    
 				
    
 					
    
-						
+						
 						station_pota; } ?>">
 						
 					
    
@@ -254,18 +254,18 @@
 	
    
 		
    
 			
    
-				
    
+				
    
 				
    
 					
    
-		    			
+		    			
 		    			station_sig; } ?>">
-		    			
+		    			
 					
    
 
 					
    
-		    			
+		    			
 		    			station_sig_info; } ?>">
-		    			
+		    			
 					
    
 				
    
 			
    
@@ -275,18 +275,18 @@
 	
    
 		
    
 			
    
-				
    
+				
    
 				
    
 					
    
 		    			 
 		    			eqslqthnickname; } ?>">
-		    			
+		    			
 		  			
    
 					
    
-		    			
+		    			
 						
 		    			
-		    			
+		    			
 		  			
    
 				
    
 			
    
@@ -294,7 +294,7 @@
 
 		
    
 			
    
-				
    QRZ.com  
     
+				
    QRZ.com  
     
 				
    
 					
    
 						 
@@ -307,11 +307,11 @@
 					
    
 
 					
    
-						
+						
 						
 					
    
 				
    
@@ -325,18 +325,18 @@
 				
    ClubLog
     
 				
    
 					
    
-						
+						
 						
-						
+						
 					
    
 					
    
-						
+						
 						
 					
    
 				
    
@@ -349,20 +349,20 @@
 				
    HRDLog.net
     
 				
    
 					
    
-						
+						
 						hrdlog_username; } ?>">
-						
+						
 					
    
 					
    
-						 
+						 
 						hrdlog_code; } ?>">
 						
 					
    
 					
    
-						
+						
 						
 					
    
 				
    
@@ -380,10 +380,10 @@
 						
 					
    
 					
    
-						
+						
 						
 					
    
 				
    
@@ -396,24 +396,24 @@
 				
    OQRS
     
 				
    
 					
    
-						
+						
 						
 					
    
 					
    
-						
+						
 						
-						
+						
 					
    
 					
    
-						
+						
 						oqrs_text; } ?>">
-						
+						
 					
    
 
 				
    
@@ -421,7 +421,7 @@
 		
    
 	
    
 
-	
+	
 
 	
 
diff --git a/application/views/station_profile/index.php b/application/views/station_profile/index.php
index 6e6c09a30..fb5a4055e 100644
--- a/application/views/station_profile/index.php
+++ b/application/views/station_profile/index.php
@@ -12,25 +12,25 @@
 
 
    
   
    
-    
    
-	
    
-	
    
+    
    
+	
    
+	
    
 
-	  
     
    
+	  
     
    
 
 		num_rows() > 0) { ?>
 
 		
 		
 		
 
 		= 1) && ($is_admin)) { ?>
 			
 		
 
@@ -38,21 +38,21 @@
    **
    - - - - + + + + - - + + user_options_model->get_options('header_menu', array('option_name'=>'locations_quickswitch'))->row()->option_value ?? 'false'); if ($quickswitch_enabled == 'true') { ?> - - + + @@ -62,24 +62,24 @@ station_profile_name;?>
    - + + station_id; ?>" class="btn btn-danger btn-sm" title= onclick="return confirm('');"> diff --git a/application/views/stationsetup/create.php b/application/views/stationsetup/create.php index 2b208b4d6..0fa83c17a 100644 --- a/application/views/stationsetup/create.php +++ b/application/views/stationsetup/create.php @@ -14,9 +14,9 @@ load->helper('form'); ?>
    - + - +
    diff --git a/application/views/stationsetup/exportmapoptions.php b/application/views/stationsetup/exportmapoptions.php index 45e4414d2..60e623cb6 100644 --- a/application/views/stationsetup/exportmapoptions.php +++ b/application/views/stationsetup/exportmapoptions.php @@ -3,7 +3,7 @@ - + diff --git a/application/views/stationsetup/linkedlocations.php b/application/views/stationsetup/linkedlocations.php index 4bf17d311..6cbd4db72 100644 --- a/application/views/stationsetup/linkedlocations.php +++ b/application/views/stationsetup/linkedlocations.php @@ -10,11 +10,11 @@ ?>
    - + @@ -22,16 +22,16 @@ - +

    Favorite
    station_callsign;?>station_country == '' ? '- NONE -' : $row->station_country; if ($row->dxcc_end != NULL) { echo ' '.lang('gen_hamradio_deleted_dxcc').''; } ?>station_country == '' ? '- NONE -' : $row->station_country; if ($row->dxcc_end != NULL) { echo ' '.__("Deleted DXCC").''; } ?> station_gridsquare;?> station_active != 1) { ?> - station_id; ?>" class="btn btn-outline-secondary btn-sm" onclick="return confirm(' station_profile_name; ?>');"> + station_id; ?>" class="btn btn-outline-secondary btn-sm" onclick="return confirm(' station_profile_name; ?>');"> - +
    ID: station_id;?> - qso_total;?> + qso_total;?>     		- station_id; ?>" title= class="btn btn-outline-primary btn-sm"> + station_id; ?>" title= class="btn btn-outline-primary btn-sm"> - station_id; ?>" title= class="btn btn-outline-primary btn-sm"> + station_id; ?>" title= class="btn btn-outline-primary btn-sm"> - station_id; ?>" class="btn btn-danger btn-sm" title= onclick="return confirm('');"> station_active != 1) { ?> - station_id; ?>" class="btn btn-danger btn-sm" title= onclick="return confirm(' station_profile_name; ?> ');"> + station_id; ?>" class="btn btn-danger btn-sm" title= onclick="return confirm(' station_profile_name; ?> ');">
    Options
    - - - - + + + + @@ -42,7 +42,7 @@ - +
    - +
    -

    - +

    + @@ -27,12 +27,12 @@
    station_profile_name;?> station_callsign;?>station_country; if ($row->end != NULL) { echo ' '.lang('gen_hamradio_deleted_dxcc').''; } ?>station_country; if ($row->end != NULL) { echo ' '.__("Deleted DXCC").''; } ?>
    - - + + - + - + @@ -41,9 +41,9 @@ @@ -62,7 +62,7 @@ public_slug; ?>" class="btn btn-outline-primary btn-sm"> + title="logbook_name;?>"> @@ -70,10 +70,10 @@ @@ -91,23 +91,23 @@ Station Locations
    -

    -

    -

    +

    +

    +

    -

    +

    = 1) && ($is_admin)) { ?> @@ -115,22 +115,22 @@
    Linked locations Visitor site
    logbook_name;?> session->userdata('active_station_logbook') != $row->logbook_id) { ?> - + " . lang('station_logbooks_active_logbook') . ""; + echo "" . __("Active Logbook") . ""; }?> @@ -52,7 +52,7 @@ session->userdata('active_station_logbook') != $row->logbook_id) { ?> public_search == 1) { - echo "" . lang('general_word_enabled') . "";?> + echo "" . __("Enabled") . "";?>
    " . lang('general_word_disabled') . ""; ?> + echo "" . __("Disabled") . ""; ?>
    - - - - - + + + + + - - + + user_options_model->get_options('header_menu', array('option_name'=>'locations_quickswitch'))->row()->option_value ?? 'false'); if ($quickswitch_enabled == 'true') { ?> - - + + @@ -143,24 +143,24 @@ station_profile_name;?>
    - + + station_id; ?>" class="btn btn-danger btn-sm" title= onclick="return confirm('');"> diff --git a/application/views/stationsetup/visitor.php b/application/views/stationsetup/visitor.php index 77b04e5a0..200b5e6a2 100644 --- a/application/views/stationsetup/visitor.php +++ b/application/views/stationsetup/visitor.php @@ -1,20 +1,20 @@ -

    -


    - /

    +

    +


    + /

    - +
    public_slug != "") { ?> diff --git a/application/views/statistics/index.php b/application/views/statistics/index.php index 05880c92d..eb4379839 100644 --- a/application/views/statistics/index.php +++ b/application/views/statistics/index.php @@ -11,21 +11,21 @@

    - +


    @@ -47,19 +47,19 @@
    @@ -93,10 +93,10 @@ Satellites
  • - +
  • - +
    • diff --git a/application/views/statistics/qsotable.php b/application/views/statistics/qsotable.php index 7f963fb3c..01d37d24a 100644 --- a/application/views/statistics/qsotable.php +++ b/application/views/statistics/qsotable.php @@ -7,7 +7,7 @@ if ($qsoarray) { foreach($bands as $band) { echo '
    '; } - echo ''; + echo ''; echo ''; @@ -20,7 +20,7 @@ if ($qsoarray) { echo ''; echo ''; } - echo ''; + echo ''; $grandtotal = 0; foreach ($bandtotal as $band => $value) { diff --git a/application/views/statistics/satqsotable.php b/application/views/statistics/satqsotable.php index a1efade3c..b5d44670f 100644 --- a/application/views/statistics/satqsotable.php +++ b/application/views/statistics/satqsotable.php @@ -7,7 +7,7 @@ if ($qsoarray) { foreach($modes as $mode) { echo ''; } - echo ''; + echo ''; echo ''; @@ -19,7 +19,7 @@ if ($qsoarray) { echo ''; echo ''; } - echo ''; + echo ''; $grandtotal=0; foreach($modes as $mode) { echo ''; diff --git a/application/views/statistics/satuniquetable.php b/application/views/statistics/satuniquetable.php index 855a477a0..711b9fe81 100644 --- a/application/views/statistics/satuniquetable.php +++ b/application/views/statistics/satuniquetable.php @@ -7,7 +7,7 @@ if ($qsoarray) { foreach($modes as $mode) { echo ''; } - echo ''; + echo ''; echo ''; @@ -19,7 +19,7 @@ if ($qsoarray) { echo ''; echo ''; } - echo ''; + echo ''; foreach($modes as $mode) { echo ''; } diff --git a/application/views/statistics/uniquetable.php b/application/views/statistics/uniquetable.php index 0a25b170d..af7f15c0f 100644 --- a/application/views/statistics/uniquetable.php +++ b/application/views/statistics/uniquetable.php @@ -7,7 +7,7 @@ if ($qsoarray) { foreach($bands as $band) { echo ''; } - echo ''; + echo ''; echo ''; @@ -20,7 +20,7 @@ if ($qsoarray) { echo ''; echo ''; } - echo ''; + echo ''; foreach($bands as $band) { echo ''; diff --git a/application/views/timeline/details.php b/application/views/timeline/details.php index 52b59c929..e641b0227 100644 --- a/application/views/timeline/details.php +++ b/application/views/timeline/details.php @@ -1,4 +1,4 @@
    -
    +
    load->view('view_log/partial/log_ajax') ?> diff --git a/application/views/timeline/index.php b/application/views/timeline/index.php index 8bb2ce5d4..6ae994ddd 100644 --- a/application/views/timeline/index.php +++ b/application/views/timeline/index.php @@ -1,13 +1,13 @@
    -

    +

    - +
    - +
    @@ -48,19 +48,19 @@
    -
    +
    input->post('qsl')) echo ' checked="checked"'; ?> > - +
    input->post('lotw')) echo ' checked="checked"'; ?> > - +
    input->post('eqsl')) echo ' checked="checked"'; ?> > - +
    @@ -68,7 +68,7 @@
    - +
    diff --git a/application/views/timeplotter/index.php b/application/views/timeplotter/index.php index e613f1e81..208caa455 100644 --- a/application/views/timeplotter/index.php +++ b/application/views/timeplotter/index.php @@ -1,36 +1,36 @@
    -

    -

    +

    +

    - +
    - +
    - + '. $i .''; @@ -56,7 +56,7 @@
    - +
    diff --git a/application/views/user/delete.php b/application/views/user/delete.php index 91587efed..49f352b84 100644 --- a/application/views/user/delete.php +++ b/application/views/user/delete.php @@ -2,16 +2,16 @@
    - +
    -

    ?

    +

    ?

    uri->segment(3); ?>" name="users"> - + " />
    diff --git a/application/views/user/edit.php b/application/views/user/edit.php index 8a3ddab46..c1d656be4 100644 --- a/application/views/user/edit.php +++ b/application/views/user/edit.php @@ -1,9 +1,9 @@

    ".$user_name.""; + echo __("Edit Account")." ".$user_name.""; } ?> @@ -38,7 +38,7 @@

    +

    @@ -46,22 +46,22 @@
    -
    +
    - + ".$username_error.""; } ?>
    - + ".$email_error.""; } ?>
    - +
    @@ -74,7 +74,7 @@
    - + session->userdata('user_type') == 99) { ?> ".$firstname_error.""; } else { ?>
    - + ".$lastname_error.""; } else { ?> @@ -117,17 +117,17 @@
    -
    +
    - + ".$callsign_error.""; } else { ?>
    - + ".$locator_error.""; } else { ?> @@ -143,7 +143,7 @@

    +

    @@ -151,10 +151,10 @@
    -
    +
    - + @@ -197,11 +197,11 @@ - +
    - + - +
    @@ -218,117 +218,117 @@
    -
    +
    - +
    - +
    - +
    - +
    - +
    @@ -338,68 +338,68 @@
    -
    +
    - + - +
    - + - +
    - + - +
    - + - +
    - + - +
    - + - +
    @@ -410,37 +410,37 @@
    -
    +
    - +
    - + - +
    - + - +
    session->userdata('user_id') == $this->uri->segment(3)) { ?>
    @@ -514,7 +514,7 @@
    - +
    @@ -537,8 +537,8 @@
    @@ -552,16 +552,16 @@
    -
    +
    - + @@ -573,34 +573,34 @@
    -
    +
    - +
    > - +
    > - +
    > - +
    > - +
    > - +
    > - +
    @@ -616,7 +616,7 @@

    +

    @@ -624,10 +624,10 @@
    - +
    - +
    - +
    '; ?> - +
    '; ?> - +
    '; ?> - +

    +

    @@ -702,16 +702,16 @@
    -
    +
    - + ".$userlotwname_error.""; } ?>
    - +
    @@ -728,16 +728,16 @@
    -
    +
    - + ".$eqslusername_error.""; } ?>
    - +
    @@ -754,17 +754,17 @@
    -
    +
    - + - + ".$userclublogname_error.""; } ?>
    - +
    @@ -785,7 +785,7 @@

    +

    @@ -793,14 +793,14 @@
    -
    +
    - +
    @@ -810,10 +810,10 @@
    -
    +
    - +
    @@ -824,14 +824,14 @@
    -
    +
    - +
    @@ -844,21 +844,21 @@
    -
    +
    - +
    - + - +
    @@ -870,6 +870,6 @@
    - +
    diff --git a/application/views/user/forgot_password.php b/application/views/user/forgot_password.php index be92c5529..ce2da3c5e 100644 --- a/application/views/user/forgot_password.php +++ b/application/views/user/forgot_password.php @@ -30,8 +30,8 @@ input[type="email"] {
    -

    -

    +

    +

    @@ -44,11 +44,11 @@ input[type="email"] {
    - + " class="form-control" type="email" autofocus>
    - + " type="submit">
    diff --git a/application/views/user/login.php b/application/views/user/login.php index f939ef97a..33f3e0b7c 100644 --- a/application/views/user/login.php +++ b/application/views/user/login.php @@ -42,21 +42,21 @@ body { form_validation->set_error_delimiters('', ''); ?>
    - - + " value="input->post('user_name'); ?>" autofocus>
    - + + placeholder="">
    -

    +

    load->view('layout/messages'); ?> - +
    diff --git a/application/views/user/main.php b/application/views/user/main.php index d098e60dc..1a0196465 100644 --- a/application/views/user/main.php +++ b/application/views/user/main.php @@ -1,12 +1,12 @@
    @@ -27,31 +27,31 @@
    - +
    -

    -

    -

    -

    +

    +

    +

    +

    - - + +

    Favorite
    station_callsign;?>station_country == '' ? '- NONE -' : $row->station_country; if ($row->dxcc_end != NULL) { echo ' '.lang('gen_hamradio_deleted_dxcc').''; } ?>station_country == '' ? '- NONE -' : $row->station_country; if ($row->dxcc_end != NULL) { echo ' '.__("Deleted DXCC").''; } ?> station_gridsquare;?> station_active != 1) { ?> - station_id; ?>" class="btn btn-outline-secondary btn-sm" onclick="return confirm(' station_profile_name; ?>');"> + station_id; ?>" class="btn btn-outline-secondary btn-sm" onclick="return confirm(' station_profile_name; ?>');"> - +
    ID: station_id;?> - qso_total;?> + qso_total;?>     		- station_id; ?>" title= class="btn btn-outline-primary btn-sm"> + station_id; ?>" title= class="btn btn-outline-primary btn-sm"> - station_id; ?>" title= class="btn btn-outline-primary btn-sm"> + station_id; ?>" title= class="btn btn-outline-primary btn-sm"> - station_id; ?>" class="btn btn-danger btn-sm" title= onclick="return confirm('');"> station_active != 1) { ?> - station_id; ?>" class="btn btn-danger btn-sm" title= onclick="return confirm(' station_profile_name; ?> ');"> + station_id; ?>" class="btn btn-danger btn-sm" title= onclick="return confirm(' station_profile_name; ?> ');">
    ' . $band . ''.lang('statistics_total').''.__("Total").'
    ' . $modetotal[$mode] . '
    '.lang('statistics_total').'
    '.__("Total").'' . $mode . ''.lang('statistics_total').''.__("Total").'
    ' . $sattotal[$sat] . '
    '.lang('statistics_total').'
    '.__("Total").'' . $modetotal[$mode] . '' . $mode . ''.lang('statistics_total').''.__("Total").'
    ' . $satunique[$sat] . '
    '.lang('statistics_total').'
    '.__("Total").'' . $modeunique[$mode] . '' . $band . ''.lang('statistics_total').''.__("Total").'
    ' . $modeunique[$mode] . '
    '.lang('statistics_total').'
    '.__("Total").'' . $bandunique[$band] . '
    - - - - - + + + + + - - - + + + @@ -76,17 +76,17 @@ echo " " . $row->last_seen . ""; } } else { - echo lang('general_word_never'); + echo __("Never"); }?>
    - : stationcount; ?> + : stationcount; ?>
    - : logbookcount; ?> + : logbookcount; ?> qsocount > 0) { ?> - qsocount; ?> +
    lastqso; ?>">qsocount; ?>     - qsocount; ?> + ">qsocount; ?>     		user_id; ?>" class="btn btn-outline-primary btn-sm"> diff --git a/application/views/user/reset_password.php b/application/views/user/reset_password.php index e83184c29..6f406ac43 100644 --- a/application/views/user/reset_password.php +++ b/application/views/user/reset_password.php @@ -5,8 +5,8 @@

    -

    ?

    -

    +

    ?

    +

    @@ -18,21 +18,21 @@
    - +
    - + ">
    - +
    - + ">
    - + " type="submit">
    diff --git a/application/views/version_dialog/index.php b/application/views/version_dialog/index.php index 4ac806cef..0c78e8789 100644 --- a/application/views/version_dialog/index.php +++ b/application/views/version_dialog/index.php @@ -72,11 +72,11 @@ - + - +
    diff --git a/application/views/view_log/index.php b/application/views/view_log/index.php index 965df3f6a..b4d489a23 100644 --- a/application/views/view_log/index.php +++ b/application/views/view_log/index.php @@ -1,14 +1,14 @@
    -

    +

    session->flashdata('notice')) { ?>