Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into radio_session

Browse Source
This commit is contained in:
HB9HIL
2024-07-01 10:05:14 +02:00
parent 2970355f5c dd46306877
commit e17e9ac878
20 changed files with 208 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
application/controllers/Logbookadvanced.php
View File

@@ -156,7 +156,7 @@ class Logbookadvanced extends CI_Controller {
$this->load->model('logbookadvanced_model');
$qsoID = xss_clean($this->input->post('qsoID'));
$qso = $this->qso_info($qsoID)->row_array();
$qso = $this->logbook_model->qso_info($qsoID)->row_array();
if ($qso === null) {
header("Content-Type: application/json");
echo json_encode([]);
@@ -167,7 +167,7 @@ class Logbookadvanced extends CI_Controller {
if ($callbook['callsign'] ?? "" !== "") {
$this->logbookadvanced_model->updateQsoWithCallbookInfo($qsoID, $qso, $callbook);
$qso = $this->qso_info($qsoID)->row_array();
$qso = $this->logbook_model->qso_info($qsoID)->row_array();
}
$qsoObj = new QSO($qso);
@@ -176,21 +176,6 @@ class Logbookadvanced extends CI_Controller {
echo json_encode($qsoObj->toArray());
}
/* Return QSO Info */
function qso_info($id) {
$this->load->model('logbook_model');
if ($this->logbook_model->check_qso_is_accessible($id)) {
$this->db->where('COL_PRIMARY_KEY', $id);
$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
$this->db->join('dxcc_entities', $this->config->item('table_name').'.col_dxcc = dxcc_entities.adif', 'left');
$this->db->join('lotw_users', 'lotw_users.callsign = '.$this->config->item('table_name').'.col_call', 'left outer');
return $this->db->get($this->config->item('table_name'));
} else {
return;
}
}
function export_to_adif() {
ini_set('memory_limit', '-1');
set_time_limit(0);

16
application/locale/bg_BG/LC_MESSAGES/messages.po
View File

@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-06-29 18:17+0000\n"
"POT-Creation-Date: 2024-07-01 05:31+0000\n"
"PO-Revision-Date: 2024-06-05 15:12+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -1806,31 +1806,31 @@ msgstr ""
msgid "QO-100 Dx Club Upload"
msgstr ""
#: application/models/Logbook_model.php:4135
#: application/models/Logbook_model.php:4139
msgid "QSO could not be matched"
msgstr ""
#: application/models/Logbook_model.php:4141
#: application/models/Logbook_model.php:4145
msgid "confirmed by LoTW/Clublog/eQSL/Contest"
msgstr ""
#: application/models/Logbook_model.php:4146
#: application/models/Logbook_model.php:4150
msgid "confirmed by award manager"
msgstr ""
#: application/models/Logbook_model.php:4149
#: application/models/Logbook_model.php:4153
msgid "confirmed by cross-check of DCL data"
msgstr ""
#: application/models/Logbook_model.php:4152
#: application/models/Logbook_model.php:4156
msgid "confirmation pending"
msgstr ""
#: application/models/Logbook_model.php:4155
#: application/models/Logbook_model.php:4159
msgid "unconfirmed"
msgstr ""
#: application/models/Logbook_model.php:4158
#: application/models/Logbook_model.php:4162
msgid "unknown"
msgstr ""

16
application/locale/cs_CZ/LC_MESSAGES/messages.po
View File

@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-06-29 18:17+0000\n"
"POT-Creation-Date: 2024-07-01 05:31+0000\n"
"PO-Revision-Date: 2024-06-25 13:16+0000\n"
"Last-Translator: Ondřej Koloničný <ondra@ok1cdj.com>\n"
"Language-Team: Czech <https://translate.wavelog.org/projects/wavelog/main-translation/cs/>\n"
@@ -1807,31 +1807,31 @@ msgstr ""
msgid "QO-100 Dx Club Upload"
msgstr ""
#: application/models/Logbook_model.php:4135
#: application/models/Logbook_model.php:4139
msgid "QSO could not be matched"
msgstr ""
#: application/models/Logbook_model.php:4141
#: application/models/Logbook_model.php:4145
msgid "confirmed by LoTW/Clublog/eQSL/Contest"
msgstr ""
#: application/models/Logbook_model.php:4146
#: application/models/Logbook_model.php:4150
msgid "confirmed by award manager"
msgstr ""
#: application/models/Logbook_model.php:4149
#: application/models/Logbook_model.php:4153
msgid "confirmed by cross-check of DCL data"
msgstr ""
#: application/models/Logbook_model.php:4152
#: application/models/Logbook_model.php:4156
msgid "confirmation pending"
msgstr ""
#: application/models/Logbook_model.php:4155
#: application/models/Logbook_model.php:4159
msgid "unconfirmed"
msgstr ""
#: application/models/Logbook_model.php:4158
#: application/models/Logbook_model.php:4162
msgid "unknown"
msgstr ""

16
application/locale/de_DE/LC_MESSAGES/messages.po
View File

@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-06-29 18:17+0000\n"
"POT-Creation-Date: 2024-07-01 05:31+0000\n"
"PO-Revision-Date: 2024-06-29 17:54+0000\n"
"Last-Translator: Fabian Berg <hb9hil@wavelog.org>\n"
"Language-Team: German <https://translate.wavelog.org/projects/wavelog/main-translation/de/>\n"
@@ -1811,31 +1811,31 @@ msgstr "Export Karte"
msgid "QO-100 Dx Club Upload"
msgstr "QO-100 Dx Club Upload"
#: application/models/Logbook_model.php:4135
#: application/models/Logbook_model.php:4139
msgid "QSO could not be matched"
msgstr "QSO konnte nicht gefunden werden"
#: application/models/Logbook_model.php:4141
#: application/models/Logbook_model.php:4145
msgid "confirmed by LoTW/Clublog/eQSL/Contest"
msgstr "bestätigt durch LoTW/Clublog/eQSL/Contest"
#: application/models/Logbook_model.php:4146
#: application/models/Logbook_model.php:4150
msgid "confirmed by award manager"
msgstr "bestätigt durch Diplommananger"
#: application/models/Logbook_model.php:4149
#: application/models/Logbook_model.php:4153
msgid "confirmed by cross-check of DCL data"
msgstr "bestätigt durch Cross-Check von DCL-Daten"
#: application/models/Logbook_model.php:4152
#: application/models/Logbook_model.php:4156
msgid "confirmation pending"
msgstr "Bestätigung ausstehend"
#: application/models/Logbook_model.php:4155
#: application/models/Logbook_model.php:4159
msgid "unconfirmed"
msgstr "nicht bestätigt"
#: application/models/Logbook_model.php:4158
#: application/models/Logbook_model.php:4162
msgid "unknown"
msgstr "unbekannt"

16
application/locale/el_GR/LC_MESSAGES/messages.po
View File

@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-06-29 18:17+0000\n"
"POT-Creation-Date: 2024-07-01 05:31+0000\n"
"PO-Revision-Date: 2024-06-05 15:13+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -1806,31 +1806,31 @@ msgstr ""
msgid "QO-100 Dx Club Upload"
msgstr ""
#: application/models/Logbook_model.php:4135
#: application/models/Logbook_model.php:4139
msgid "QSO could not be matched"
msgstr ""
#: application/models/Logbook_model.php:4141
#: application/models/Logbook_model.php:4145
msgid "confirmed by LoTW/Clublog/eQSL/Contest"
msgstr ""
#: application/models/Logbook_model.php:4146
#: application/models/Logbook_model.php:4150
msgid "confirmed by award manager"
msgstr ""
#: application/models/Logbook_model.php:4149
#: application/models/Logbook_model.php:4153
msgid "confirmed by cross-check of DCL data"
msgstr ""
#: application/models/Logbook_model.php:4152
#: application/models/Logbook_model.php:4156
msgid "confirmation pending"
msgstr ""
#: application/models/Logbook_model.php:4155
#: application/models/Logbook_model.php:4159
msgid "unconfirmed"
msgstr ""
#: application/models/Logbook_model.php:4158
#: application/models/Logbook_model.php:4162
msgid "unknown"
msgstr ""

16
application/locale/es_ES/LC_MESSAGES/messages.po
View File

@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-06-29 18:17+0000\n"
"POT-Creation-Date: 2024-07-01 05:31+0000\n"
"PO-Revision-Date: 2024-06-28 20:16+0000\n"
"Last-Translator: CieNTi <cienti@cienti.com>\n"
"Language-Team: Spanish <https://translate.wavelog.org/projects/wavelog/main-translation/es/>\n"
@@ -1807,31 +1807,31 @@ msgstr ""
msgid "QO-100 Dx Club Upload"
msgstr ""
#: application/models/Logbook_model.php:4135
#: application/models/Logbook_model.php:4139
msgid "QSO could not be matched"
msgstr "QSOs que no concuerdan"
#: application/models/Logbook_model.php:4141
#: application/models/Logbook_model.php:4145
msgid "confirmed by LoTW/Clublog/eQSL/Contest"
msgstr "confirmados por LoTW/Clublog/eQSL/Concurso"
#: application/models/Logbook_model.php:4146
#: application/models/Logbook_model.php:4150
msgid "confirmed by award manager"
msgstr "confirmados por el administrador del premio"
#: application/models/Logbook_model.php:4149
#: application/models/Logbook_model.php:4153
msgid "confirmed by cross-check of DCL data"
msgstr "confirmados al hacer chequeo cruzadoc on datos de DCL"
#: application/models/Logbook_model.php:4152
#: application/models/Logbook_model.php:4156
msgid "confirmation pending"
msgstr "pendiente de confirmación"
#: application/models/Logbook_model.php:4155
#: application/models/Logbook_model.php:4159
msgid "unconfirmed"
msgstr "sin confirmar"
#: application/models/Logbook_model.php:4158
#: application/models/Logbook_model.php:4162
msgid "unknown"
msgstr "desconocido"

16
application/locale/fi_FI/LC_MESSAGES/messages.po
View File

@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-06-29 18:17+0000\n"
"POT-Creation-Date: 2024-07-01 05:31+0000\n"
"PO-Revision-Date: 2024-06-05 15:14+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -1806,31 +1806,31 @@ msgstr ""
msgid "QO-100 Dx Club Upload"
msgstr "QO-100 Dx Club Lähetys"
#: application/models/Logbook_model.php:4135
#: application/models/Logbook_model.php:4139
msgid "QSO could not be matched"
msgstr ""
#: application/models/Logbook_model.php:4141
#: application/models/Logbook_model.php:4145
msgid "confirmed by LoTW/Clublog/eQSL/Contest"
msgstr ""
#: application/models/Logbook_model.php:4146
#: application/models/Logbook_model.php:4150
msgid "confirmed by award manager"
msgstr ""
#: application/models/Logbook_model.php:4149
#: application/models/Logbook_model.php:4153
msgid "confirmed by cross-check of DCL data"
msgstr ""
#: application/models/Logbook_model.php:4152
#: application/models/Logbook_model.php:4156
msgid "confirmation pending"
msgstr ""
#: application/models/Logbook_model.php:4155
#: application/models/Logbook_model.php:4159
msgid "unconfirmed"
msgstr ""
#: application/models/Logbook_model.php:4158
#: application/models/Logbook_model.php:4162
msgid "unknown"
msgstr ""

16
application/locale/fr_FR/LC_MESSAGES/messages.po
View File

@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-06-29 18:17+0000\n"
"POT-Creation-Date: 2024-07-01 05:31+0000\n"
"PO-Revision-Date: 2024-06-26 11:15+0000\n"
"Last-Translator: Aurélien Barrau <abarrau378@gmail.com>\n"
"Language-Team: French <https://translate.wavelog.org/projects/wavelog/main-translation/fr/>\n"
@@ -1807,31 +1807,31 @@ msgstr ""
msgid "QO-100 Dx Club Upload"
msgstr ""
#: application/models/Logbook_model.php:4135
#: application/models/Logbook_model.php:4139
msgid "QSO could not be matched"
msgstr "pas de correspondance pour le QSO"
#: application/models/Logbook_model.php:4141
#: application/models/Logbook_model.php:4145
msgid "confirmed by LoTW/Clublog/eQSL/Contest"
msgstr "confirmé par LoTW/Clublog/eQSL/Contest"
#: application/models/Logbook_model.php:4146
#: application/models/Logbook_model.php:4150
msgid "confirmed by award manager"
msgstr "confirmé par le manager de l'Award"
#: application/models/Logbook_model.php:4149
#: application/models/Logbook_model.php:4153
msgid "confirmed by cross-check of DCL data"
msgstr "confirmé par recoupement des données DCL"
#: application/models/Logbook_model.php:4152
#: application/models/Logbook_model.php:4156
msgid "confirmation pending"
msgstr "confirmation en attente"
#: application/models/Logbook_model.php:4155
#: application/models/Logbook_model.php:4159
msgid "unconfirmed"
msgstr "non confirmé"
#: application/models/Logbook_model.php:4158
#: application/models/Logbook_model.php:4162
msgid "unknown"
msgstr "inconnu"

16
application/locale/it_IT/LC_MESSAGES/messages.po
View File

@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-06-29 18:17+0000\n"
"POT-Creation-Date: 2024-07-01 05:31+0000\n"
"PO-Revision-Date: 2024-06-05 12:34\n"
"Last-Translator: \n"
"Language-Team: Italian\n"
@@ -1805,31 +1805,31 @@ msgstr ""
msgid "QO-100 Dx Club Upload"
msgstr ""
#: application/models/Logbook_model.php:4135
#: application/models/Logbook_model.php:4139
msgid "QSO could not be matched"
msgstr ""
#: application/models/Logbook_model.php:4141
#: application/models/Logbook_model.php:4145
msgid "confirmed by LoTW/Clublog/eQSL/Contest"
msgstr ""
#: application/models/Logbook_model.php:4146
#: application/models/Logbook_model.php:4150
msgid "confirmed by award manager"
msgstr ""
#: application/models/Logbook_model.php:4149
#: application/models/Logbook_model.php:4153
msgid "confirmed by cross-check of DCL data"
msgstr ""
#: application/models/Logbook_model.php:4152
#: application/models/Logbook_model.php:4156
msgid "confirmation pending"
msgstr ""
#: application/models/Logbook_model.php:4155
#: application/models/Logbook_model.php:4159
msgid "unconfirmed"
msgstr ""
#: application/models/Logbook_model.php:4158
#: application/models/Logbook_model.php:4162
msgid "unknown"
msgstr ""

16
application/locale/nl_NL/LC_MESSAGES/messages.po
View File

@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-06-29 18:17+0000\n"
"POT-Creation-Date: 2024-07-01 05:31+0000\n"
"PO-Revision-Date: 2024-06-05 15:15+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -1806,31 +1806,31 @@ msgstr ""
msgid "QO-100 Dx Club Upload"
msgstr ""
#: application/models/Logbook_model.php:4135
#: application/models/Logbook_model.php:4139
msgid "QSO could not be matched"
msgstr ""
#: application/models/Logbook_model.php:4141
#: application/models/Logbook_model.php:4145
msgid "confirmed by LoTW/Clublog/eQSL/Contest"
msgstr ""
#: application/models/Logbook_model.php:4146
#: application/models/Logbook_model.php:4150
msgid "confirmed by award manager"
msgstr ""
#: application/models/Logbook_model.php:4149
#: application/models/Logbook_model.php:4153
msgid "confirmed by cross-check of DCL data"
msgstr ""
#: application/models/Logbook_model.php:4152
#: application/models/Logbook_model.php:4156
msgid "confirmation pending"
msgstr ""
#: application/models/Logbook_model.php:4155
#: application/models/Logbook_model.php:4159
msgid "unconfirmed"
msgstr ""
#: application/models/Logbook_model.php:4158
#: application/models/Logbook_model.php:4162
msgid "unknown"
msgstr ""

16
application/locale/pl_PL/LC_MESSAGES/messages.po
View File

@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-06-29 18:17+0000\n"
"POT-Creation-Date: 2024-07-01 05:31+0000\n"
"PO-Revision-Date: 2024-06-05 15:16+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -1806,31 +1806,31 @@ msgstr ""
msgid "QO-100 Dx Club Upload"
msgstr ""
#: application/models/Logbook_model.php:4135
#: application/models/Logbook_model.php:4139
msgid "QSO could not be matched"
msgstr ""
#: application/models/Logbook_model.php:4141
#: application/models/Logbook_model.php:4145
msgid "confirmed by LoTW/Clublog/eQSL/Contest"
msgstr ""
#: application/models/Logbook_model.php:4146
#: application/models/Logbook_model.php:4150
msgid "confirmed by award manager"
msgstr ""
#: application/models/Logbook_model.php:4149
#: application/models/Logbook_model.php:4153
msgid "confirmed by cross-check of DCL data"
msgstr ""
#: application/models/Logbook_model.php:4152
#: application/models/Logbook_model.php:4156
msgid "confirmation pending"
msgstr ""
#: application/models/Logbook_model.php:4155
#: application/models/Logbook_model.php:4159
msgid "unconfirmed"
msgstr ""
#: application/models/Logbook_model.php:4158
#: application/models/Logbook_model.php:4162
msgid "unknown"
msgstr ""

BIN
application/locale/ru_RU/LC_MESSAGES/messages.mo
View File

Binary file not shown.

20
application/locale/ru_RU/LC_MESSAGES/messages.po
View File

@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-06-29 18:17+0000\n"
"PO-Revision-Date: 2024-06-27 15:50+0000\n"
"POT-Creation-Date: 2024-07-01 05:31+0000\n"
"PO-Revision-Date: 2024-07-01 06:37+0000\n"
"Last-Translator: Michael Skolsky <r1blh@yandex.ru>\n"
"Language-Team: Russian <https://translate.wavelog.org/projects/wavelog/main-translation/ru/>\n"
"Language: ru_RU\n"
@@ -116,7 +116,7 @@ msgstr "Описание API"
#: application/controllers/Api.php:51
msgid "API Key is required. Do not change this field"
msgstr ""
msgstr "Требуется ключ API. Пожалуйста не меняйте это поле"
#: application/controllers/Api.php:57
msgid "Edit API Description"
@@ -1807,31 +1807,31 @@ msgstr "Экспорт карты"
msgid "QO-100 Dx Club Upload"
msgstr "Загрузка в QO-100 Dx Club"
#: application/models/Logbook_model.php:4135
#: application/models/Logbook_model.php:4139
msgid "QSO could not be matched"
msgstr "QSO не может быть сопоставлено"
#: application/models/Logbook_model.php:4141
#: application/models/Logbook_model.php:4145
msgid "confirmed by LoTW/Clublog/eQSL/Contest"
msgstr "подтверждено LoTW/Clublog/eQSL/Contest"
#: application/models/Logbook_model.php:4146
#: application/models/Logbook_model.php:4150
msgid "confirmed by award manager"
msgstr "подтверждено менеджером диплома"
#: application/models/Logbook_model.php:4149
#: application/models/Logbook_model.php:4153
msgid "confirmed by cross-check of DCL data"
msgstr "подтверждено кросс-проверкой с данными DCL"
#: application/models/Logbook_model.php:4152
#: application/models/Logbook_model.php:4156
msgid "confirmation pending"
msgstr "подтверждение ожидается"
#: application/models/Logbook_model.php:4155
#: application/models/Logbook_model.php:4159
msgid "unconfirmed"
msgstr "не подтверждено"
#: application/models/Logbook_model.php:4158
#: application/models/Logbook_model.php:4162
msgid "unknown"
msgstr "неизвестно"

16
application/locale/sv_SE/LC_MESSAGES/messages.po
View File

@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-06-29 18:17+0000\n"
"POT-Creation-Date: 2024-07-01 05:31+0000\n"
"PO-Revision-Date: 2024-06-05 15:19+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -1806,31 +1806,31 @@ msgstr ""
msgid "QO-100 Dx Club Upload"
msgstr "QO-100 Dx Club Ladda upp"
#: application/models/Logbook_model.php:4135
#: application/models/Logbook_model.php:4139
msgid "QSO could not be matched"
msgstr ""
#: application/models/Logbook_model.php:4141
#: application/models/Logbook_model.php:4145
msgid "confirmed by LoTW/Clublog/eQSL/Contest"
msgstr ""
#: application/models/Logbook_model.php:4146
#: application/models/Logbook_model.php:4150
msgid "confirmed by award manager"
msgstr ""
#: application/models/Logbook_model.php:4149
#: application/models/Logbook_model.php:4153
msgid "confirmed by cross-check of DCL data"
msgstr ""
#: application/models/Logbook_model.php:4152
#: application/models/Logbook_model.php:4156
msgid "confirmation pending"
msgstr ""
#: application/models/Logbook_model.php:4155
#: application/models/Logbook_model.php:4159
msgid "unconfirmed"
msgstr ""
#: application/models/Logbook_model.php:4158
#: application/models/Logbook_model.php:4162
msgid "unknown"
msgstr ""

16
application/locale/tr_TR/LC_MESSAGES/messages.po
View File

@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-06-29 18:17+0000\n"
"POT-Creation-Date: 2024-07-01 05:31+0000\n"
"PO-Revision-Date: 2024-06-05 15:20+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -1806,31 +1806,31 @@ msgstr ""
msgid "QO-100 Dx Club Upload"
msgstr ""
#: application/models/Logbook_model.php:4135
#: application/models/Logbook_model.php:4139
msgid "QSO could not be matched"
msgstr ""
#: application/models/Logbook_model.php:4141
#: application/models/Logbook_model.php:4145
msgid "confirmed by LoTW/Clublog/eQSL/Contest"
msgstr ""
#: application/models/Logbook_model.php:4146
#: application/models/Logbook_model.php:4150
msgid "confirmed by award manager"
msgstr ""
#: application/models/Logbook_model.php:4149
#: application/models/Logbook_model.php:4153
msgid "confirmed by cross-check of DCL data"
msgstr ""
#: application/models/Logbook_model.php:4152
#: application/models/Logbook_model.php:4156
msgid "confirmation pending"
msgstr ""
#: application/models/Logbook_model.php:4155
#: application/models/Logbook_model.php:4159
msgid "unconfirmed"
msgstr ""
#: application/models/Logbook_model.php:4158
#: application/models/Logbook_model.php:4162
msgid "unknown"
msgstr ""

BIN
application/locale/zh_CN/LC_MESSAGES/messages.mo
View File

Binary file not shown.

156
application/locale/zh_CN/LC_MESSAGES/messages.po
View File

@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-06-29 18:17+0000\n"
"PO-Revision-Date: 2024-06-28 20:16+0000\n"
"POT-Creation-Date: 2024-07-01 05:31+0000\n"
"PO-Revision-Date: 2024-07-01 05:27+0000\n"
"Last-Translator: Karuru <karuru@aerodefense.co.uk>\n"
"Language-Team: Chinese (Simplified) <https://translate.wavelog.org/projects/wavelog/main-translation/zh_Hans/>\n"
"Language: zh_CN\n"
@@ -1406,7 +1406,7 @@ msgstr ""
#: application/controllers/Sattimers.php:44
#: application/views/sattimers/index.php:13
msgid "Satellite Timers"
msgstr ""
msgstr "卫星时钟"
#: application/controllers/Search.php:19
#: application/views/continents/index.php:49
@@ -1437,11 +1437,11 @@ msgstr ""
#: application/controllers/Search.php:58
msgid "Incorrectly logged CQ zones"
msgstr ""
msgstr "CQ 分区记录错误"
#: application/controllers/Search.php:70
msgid "QSOs unconfirmed on LoTW, but the callsign has uploaded to LoTW after QSO date"
msgstr ""
msgstr "QSO 尚未在 LoTW 确认，但已在 QSO 日期后上传呼号"
#: application/controllers/Station.php:35
#: application/controllers/Station.php:78 application/views/csv/index.php:19
@@ -1470,7 +1470,7 @@ msgstr "修改台站地址："
#: application/controllers/Station.php:92
msgid "Duplicate Station Location:"
msgstr ""
msgstr "台站地址重复："
#: application/controllers/Stationsetup.php:35
#: application/views/interface_assets/header.php:369
@@ -1483,7 +1483,7 @@ msgstr "设置台站"
#: application/controllers/Stationsetup.php:387
#: application/controllers/Stationsetup.php:401
msgid "Not allowed"
msgstr ""
msgstr "不允许"
#: application/controllers/Stationsetup.php:72
#: application/controllers/Stationsetup.php:86
@@ -1494,7 +1494,7 @@ msgstr ""
#: application/controllers/Stationsetup.php:428
#: application/views/qso/index.php:608
msgid "Error"
msgstr ""
msgstr "错误"
#: application/controllers/Stationsetup.php:159
#: application/views/stationsetup/stationsetup.php:22
@@ -1507,15 +1507,15 @@ msgstr ""
#: application/controllers/Stationsetup.php:181
msgid "Edit linked locations"
msgstr ""
msgstr "编辑链接的地址"
#: application/controllers/Stationsetup.php:190
msgid "Edit visitor site"
msgstr ""
msgstr "编辑访客地址"
#: application/controllers/Stationsetup.php:212
msgid "Error. Link is already in use!"
msgstr ""
msgstr "错误，链接已正在使用！"
#: application/controllers/Stationsetup.php:253
#: application/views/options/appearance.php:57
@@ -1542,7 +1542,7 @@ msgstr "设置为正在使用的日志"
#: application/views/stationsetup/stationsetup.php:46
#: application/views/view_log/index.php:4
msgid "Active Logbook"
msgstr ""
msgstr "启用的日志簿"
#: application/controllers/Stationsetup.php:270
#: application/views/stationsetup/stationsetup.php:55
@@ -1556,7 +1556,7 @@ msgstr "浏览日志公开页: "
#: application/controllers/Stationsetup.php:281
msgid "Are you sure you want to delete the public slug?"
msgstr ""
msgstr "确定要删除此公开个性标识符？"
#: application/controllers/Stationsetup.php:341
#: application/views/station_profile/index.php:69
@@ -1584,7 +1584,7 @@ msgstr "启用的台站"
#: application/views/stationsetup/stationsetup.php:157
#: application/views/user/main.php:87 application/views/user/main.php:89
msgid "QSO"
msgstr ""
msgstr "QSO"
#: application/controllers/Stationsetup.php:351
#: application/views/api/help.php:57 application/views/contesting/add.php:59
@@ -1629,7 +1629,7 @@ msgstr "复制"
#: application/views/stationsetup/stationsetup.php:186
#, php-format
msgid "Are you sure you want delete station profile '%s'? This will delete all QSOs within this station profile."
msgstr ""
msgstr "确定要删除台站 '%s' 吗？这会删除此台站下的所有 QSO。"
#: application/controllers/Stationsetup.php:364
#: application/views/api/help.php:61 application/views/contesting/add.php:62
@@ -1655,11 +1655,11 @@ msgstr "删除用户"
#: application/controllers/Stationsetup.php:371
#: application/views/qso/edit_ajax.php:220
msgid "NONE"
msgstr ""
msgstr "无"
#: application/controllers/Stationsetup.php:454
msgid "Edit Export Map options"
msgstr ""
msgstr "编辑导出地图选项"
#: application/controllers/Statistics.php:27
#: application/views/interface_assets/header.php:134
@@ -1668,7 +1668,7 @@ msgstr "统计"
#: application/controllers/Statistics.php:50
msgid "Custom Statistics"
msgstr ""
msgstr "自定义统计"
#: application/controllers/Themes.php:27
#: application/views/interface_assets/header.php:270
@@ -1677,11 +1677,11 @@ msgstr "主题"
#: application/controllers/Themes.php:46
msgid "Create Theme"
msgstr ""
msgstr "创建个性化主题"
#: application/controllers/Themes.php:65
msgid "Edit Theme"
msgstr ""
msgstr "编辑主题"
#: application/controllers/Timeline.php:17
#: application/views/interface_assets/header.php:146
@@ -1697,7 +1697,7 @@ msgstr "时间图"
#: application/controllers/Update.php:26
msgid "Updates"
msgstr ""
msgstr "更新"
#: application/controllers/Update.php:76
msgid "Preparing DXCC-Entries: "
@@ -1713,7 +1713,7 @@ msgstr ""
#: application/controllers/Update.php:222
msgid "DONE"
msgstr ""
msgstr "完成"
#: application/controllers/User.php:12
#: application/views/interface_assets/header.php:260
@@ -1722,15 +1722,15 @@ msgstr "用户账户"
#: application/controllers/User.php:51
msgid "Add User"
msgstr ""
msgstr "添加用户"
#: application/controllers/User.php:165
msgid "Users"
msgstr ""
msgstr "用户"
#: application/controllers/User.php:238 application/controllers/User.php:671
msgid "Edit User"
msgstr ""
msgstr "编辑用户"
#: application/controllers/User.php:663 application/controllers/User.php:666
#: application/views/user/main.php:3 application/views/user/main.php:46
@@ -1743,7 +1743,7 @@ msgstr "已编辑"
#: application/controllers/User.php:720
msgid "Profile"
msgstr ""
msgstr "个人资料"
#: application/controllers/User.php:783
#: application/views/interface_assets/header.php:348
@@ -1758,20 +1758,20 @@ msgstr ""
#: application/controllers/User.php:804
msgid "Sorry. This instance is currently in maintenance mode. If this message appears unexpectedly or keeps showing up, please contact an administrator. Only administrators are currently allowed to log in."
msgstr ""
msgstr "抱歉，本站正处于维护模式。如果本消息持续显示，请联系本站管理员。当前只允许管理员登入。"
#: application/controllers/User.php:807
msgid "Incorrect username or password!"
msgstr ""
msgstr "用户名或密码错误！"
#: application/controllers/User.php:821
#, php-format
msgid "User %s logged out."
msgstr ""
msgstr "用户 '%s' 已登出。"
#: application/controllers/User.php:841
msgid "Forgot Password"
msgstr ""
msgstr "忘记密码"
#: application/controllers/User.php:891 application/views/user/main.php:8
msgid "Email settings are incorrect."
@@ -1779,7 +1779,7 @@ msgstr "邮件设定出现错误"
#: application/controllers/User.php:895 application/controllers/User.php:900
msgid "Password Reset Processed."
msgstr ""
msgstr "密码重置已处理。"
#: application/controllers/User.php:1001
#: application/views/user/forgot_password.php:51
@@ -1790,7 +1790,7 @@ msgstr "重置密码"
#: application/controllers/Visitor.php:203
msgid "Satellite Gridsquare Map"
msgstr ""
msgstr "卫星网格地图"
#: application/controllers/Visitor.php:409
#: application/views/stationsetup/stationsetup.php:35
@@ -1799,7 +1799,7 @@ msgstr "公开搜索"
#: application/controllers/Visitor.php:442
msgid "Export Map"
msgstr ""
msgstr "导出地图"
#: application/controllers/Webadif.php:90
#: application/controllers/Webadif.php:137
@@ -1807,49 +1807,49 @@ msgstr ""
msgid "QO-100 Dx Club Upload"
msgstr "QO-100 Dx Club 上传"
#: application/models/Logbook_model.php:4135
#: application/models/Logbook_model.php:4139
msgid "QSO could not be matched"
msgstr "QSO 无法匹配"
#: application/models/Logbook_model.php:4141
#: application/models/Logbook_model.php:4145
msgid "confirmed by LoTW/Clublog/eQSL/Contest"
msgstr "已经通过 LoTW/Clublog/eQSL/竞赛 确认"
#: application/models/Logbook_model.php:4146
#: application/models/Logbook_model.php:4150
msgid "confirmed by award manager"
msgstr "已经通过奖项管理员确认"
#: application/models/Logbook_model.php:4149
#: application/models/Logbook_model.php:4153
msgid "confirmed by cross-check of DCL data"
msgstr "已经通过 DCL 数据交叉检查确认"
#: application/models/Logbook_model.php:4152
#: application/models/Logbook_model.php:4156
msgid "confirmation pending"
msgstr "等待确认"
#: application/models/Logbook_model.php:4155
#: application/models/Logbook_model.php:4159
msgid "unconfirmed"
msgstr "未确认"
#: application/models/Logbook_model.php:4158
#: application/models/Logbook_model.php:4162
msgid "unknown"
msgstr "未知"
#: application/views/accumulate/index.php:2
msgid "Accumulated Number of DXCCs worked"
msgstr ""
msgstr "已累计通联的 DXCC 数量"
#: application/views/accumulate/index.php:3
msgid "Accumulated Number of States worked"
msgstr ""
msgstr "已累计通联的美国州数量"
#: application/views/accumulate/index.php:4
msgid "Accumulated Number of IOTAs worked"
msgstr ""
msgstr "已累计通联的 IOTA 数量"
#: application/views/accumulate/index.php:5
msgid "Accumulated Number of CQ Zones worked"
msgstr ""
msgstr "已累计通联的 CQ 分区数量"
#: application/views/accumulate/index.php:6
#: application/views/dashboard/index.php:223
@@ -1963,17 +1963,17 @@ msgstr "奖项"
#: application/views/accumulate/index.php:52
#: application/views/timeline/index.php:44
msgid "DX Century Club (DXCC)"
msgstr ""
msgstr "DX Century Club (DXCC)"
#: application/views/accumulate/index.php:64
#: application/views/timeline/index.php:46
msgid "Islands On The Air (IOTA)"
msgstr ""
msgstr "空中岛屿（IOTA）"
#: application/views/accumulate/index.php:70
#: application/views/timeline/index.php:47
msgid "Worked All Zones (WAZ)"
msgstr ""
msgstr "通联所有区域（WAZ）"
#: application/views/accumulate/index.php:75
msgid "Period"
@@ -2050,7 +2050,7 @@ msgstr "确认"
#: application/views/awards/was/index.php:65
#: application/views/gridmap/index.php:125 application/views/user/edit.php:675
msgid "QRZ.com"
msgstr ""
msgstr "QRZ.com"
#: application/views/activated_gridmap/index.php:86
#: application/views/gridmap/index.php:130
@@ -2089,7 +2089,7 @@ msgstr "方位角"
#: application/views/activators/index.php:23
msgctxt "Orbiter LEO or GEO"
msgid "Both"
msgstr ""
msgstr "都"
#: application/views/activators/index.php:30
msgid "Minimum Count"
@@ -2117,7 +2117,7 @@ msgstr "最低数量"
#: application/views/public_search/empty.php:3
#: application/views/qrz/export.php:64 application/views/timeline/index.php:100
msgid "Nothing found!"
msgstr ""
msgstr "未找到！"
#: application/views/activators/index.php:99
#: application/views/adif/import.php:66 application/views/adif/import.php:172
@@ -2301,19 +2301,19 @@ msgstr "呼号"
#: application/views/adif/dcl_success.php:34
msgid "DOK in Log"
msgstr ""
msgstr "日志中的 DOK"
#: application/views/adif/dcl_success.php:35
msgid "DOK in DCL"
msgstr ""
msgstr "DCL 中的 DOK"
#: application/views/adif/dcl_success.php:36
msgid "DCL QSL Status"
msgstr ""
msgstr "DCL QSL 状态"
#: application/views/adif/import.php:36 application/views/adif/import.php:242
msgid "DARC DCL"
msgstr ""
msgstr "DARC DCL"
#: application/views/adif/import.php:55
#: application/views/dashboard/index.php:97
@@ -2359,7 +2359,7 @@ msgstr "向竞赛中添加 QSO"
#: application/views/adif/import.php:71
msgid "No Contest"
msgstr ""
msgstr "无竞赛"
#: application/views/adif/import.php:77
msgid "ADIF File"
@@ -2483,7 +2483,7 @@ msgstr "将 QSO 标记为导出到 LoTW"
#: application/views/adif/import.php:242
#, php-format
msgid "Go to %s and export your logbook with confirmed DOKs. To speed up the process you can select only DL QSOs to download (i.e. put 'DL' into Prefix List). The downloaded ADIF file can be uploaded here in order to update QSOs with DOK info."
msgstr ""
msgstr "前往 %s 导出已确认的 DOK，可选择仅导出 DL QSO 以加快速度。您可在此处上传已下载的 ADIF 日志，系统将以此更新 DOK 信息。"
#: application/views/adif/import.php:249
msgid "Only import DOK data from QSOs confirmed on DCL."
@@ -2495,7 +2495,7 @@ msgstr "如果您还想使用 DCL 中未经确认的 QSO 的数据更新 DOK，
#: application/views/adif/import.php:258
msgid "Overwrites exisiting DOK in log by DCL (if different)."
msgstr ""
msgstr "根据已有 DCL 覆盖 DOK 数据（如不同）。"
#: application/views/adif/import.php:260
msgid "If checked Wavelog will forcibly overwrite existing DOK with DOK from DCL log."
@@ -2519,11 +2519,11 @@ msgstr "ADIF 文件已成功导入"
#: application/views/adif/import_success.php:18
msgid "Dupes were inserted!"
msgstr ""
msgstr "已添加重复项！"
#: application/views/adif/import_success.php:20
msgid "Dupes were skipped."
msgstr ""
msgstr "已跳过重复项。"
#: application/views/adif/import_success.php:24
msgid "ADIF Errors"
@@ -2550,11 +2550,11 @@ msgstr "这些 QSO 已经被标记为已导出到 LoTW"
#: application/views/api/description.php:15
msgid "Editing Description for API Key"
msgstr ""
msgstr "编辑 API Key 说明信息"
#: application/views/api/description.php:28
msgid "Simple name to describe what you use this API for."
msgstr ""
msgstr "如用于描述用途的名字。"
#: application/views/api/description.php:33
#: application/views/bands/create.php:49 application/views/bands/edit.php:31
@@ -2581,15 +2581,15 @@ msgstr "API 密钥"
#: application/views/api/help.php:17
msgid "The Wavelog API (Application Programming Interface) lets third party systems access Wavelog in a controlled way. Access to the API is managed via API keys."
msgstr ""
msgstr "Wavelog API 允许第三方应用在受控条件下，与网站交互数据，通过创建 API Key 访问 API 资源。"
#: application/views/api/help.php:18
msgid "You will need to generate an API key for each tool you wish to use (e.g. WLgate). Generate a read-write key if the application needs to send data to Wavelog. Generate a read-only key if the application only needs to obtain data from Wavelog."
msgstr ""
msgstr "您需要为每一个应用单独生成一个 API Key，根据需要创建 读-写 或 只读 权限的 API Key。"
#: application/views/api/help.php:19
msgid "API URL"
msgstr ""
msgstr "API URL"
#: application/views/api/help.php:19 application/views/api/help.php:38
#: application/views/cron/index.php:21 application/views/debug/index.php:36
@@ -2598,7 +2598,7 @@ msgstr "复制到剪贴板"
#: application/views/api/help.php:19
msgid "The API URL for this Wavelog instance is"
msgstr ""
msgstr "本站的 API URL 是"
#: application/views/api/help.php:20 application/views/dxcalendar/index.php:15
#: application/views/eqsl/export.php:33 application/views/qso/edit_ajax.php:476
@@ -2615,25 +2615,25 @@ msgstr "消息"
#: application/views/api/help.php:20
msgid "It's good practice to delete a key if you are no longer using the associated application."
msgstr ""
msgstr "如应用不再使用，建议删除对应的 API Key。"
#: application/views/api/help.php:27
msgid "API Key"
msgstr ""
msgstr "API Key"
#: application/views/api/help.php:28 application/views/cron/edit.php:30
#: application/views/cron/index.php:51
#: application/views/search/stored_queries.php:8
msgid "Description"
msgstr ""
msgstr "说明"
#: application/views/api/help.php:29
msgid "Last Used"
msgstr ""
msgstr "上次使用"
#: application/views/api/help.php:30
msgid "Permissions"
msgstr ""
msgstr "权限"
#: application/views/api/help.php:31 application/views/cron/index.php:52
#: application/views/lotw_views/index.php:45
@@ -2654,31 +2654,31 @@ msgstr "操作"
#: application/views/api/help.php:45
msgid "Read & Write"
msgstr ""
msgstr "读 & 写"
#: application/views/api/help.php:47
msgid "Read-Only"
msgstr ""
msgstr "只读"
#: application/views/api/help.php:49
msgid "Unknown"
msgstr ""
msgstr "未知"
#: application/views/api/help.php:59
msgid "Test"
msgstr ""
msgstr "测试"
#: application/views/api/help.php:71
msgid "You have no API Keys."
msgstr ""
msgstr "无 APi Key。"
#: application/views/api/help.php:75
msgid "Create a read & write key"
msgstr ""
msgstr "创建 读&写 权限的 API Key"
#: application/views/api/help.php:76
msgid "Create a read-only key"
msgstr ""
msgstr "创建 只读 权限的 API Key"
#: application/views/awards/counties/details.php:4
#: application/views/awards/details.php:1
@@ -2689,7 +2689,7 @@ msgstr "筛选打开"
#: application/views/awards/counties/details.php:13
msgid "County"
msgstr ""
msgstr "县"
#: application/views/awards/counties/index.php:6
#: application/views/awards/counties/index.php:13

8
application/models/Logbook_model.php
View File

@@ -1621,11 +1621,15 @@ class Logbook_model extends CI_Model {
return $name;
}
/* Return QSO Info */
function qso_info($id) {
if ($this->logbook_model->check_qso_is_accessible($id)) {
if ($this->check_qso_is_accessible($id)) {
$this->db->where('COL_PRIMARY_KEY', $id);
$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
$this->db->join('dxcc_entities', $this->config->item('table_name').'.col_dxcc = dxcc_entities.adif', 'left');
$this->db->join('lotw_users', 'lotw_users.callsign = '.$this->config->item('table_name').'.col_call', 'left outer');
return $this->db->get($this->config->item('table_name'));
} else {
return;

8
assets/js/sections/qso.js
View File

@@ -63,6 +63,14 @@ $( document ).ready(function() {
}
});
// Sanitize some input data
$('#callsign').on('input', function() {
$(this).val($(this).val().replace(/\s/g, ''));
});
$('#locator').on('input', function() {
$(this).val($(this).val().replace(/\s/g, ''));
});
$('.callsign-suggest').hide();
setRst($(".mode").val());

16
assets/lang_src/messages.pot
View File

@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
"POT-Creation-Date: 2024-06-29 18:20+0000\n"
"POT-Creation-Date: 2024-07-01 06:38+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1806,31 +1806,31 @@ msgstr ""
msgid "QO-100 Dx Club Upload"
msgstr ""
#: application/models/Logbook_model.php:4135
#: application/models/Logbook_model.php:4139
msgid "QSO could not be matched"
msgstr ""
#: application/models/Logbook_model.php:4141
#: application/models/Logbook_model.php:4145
msgid "confirmed by LoTW/Clublog/eQSL/Contest"
msgstr ""
#: application/models/Logbook_model.php:4146
#: application/models/Logbook_model.php:4150
msgid "confirmed by award manager"
msgstr ""
#: application/models/Logbook_model.php:4149
#: application/models/Logbook_model.php:4153
msgid "confirmed by cross-check of DCL data"
msgstr ""
#: application/models/Logbook_model.php:4152
#: application/models/Logbook_model.php:4156
msgid "confirmation pending"
msgstr ""
#: application/models/Logbook_model.php:4155
#: application/models/Logbook_model.php:4159
msgid "unconfirmed"
msgstr ""
#: application/models/Logbook_model.php:4158
#: application/models/Logbook_model.php:4162
msgid "unknown"
msgstr ""