diff --git a/application/controllers/Satellite.php b/application/controllers/Satellite.php index 561c43b19..ed57aa1c6 100644 --- a/application/controllers/Satellite.php +++ b/application/controllers/Satellite.php @@ -187,6 +187,7 @@ class Satellite extends CI_Controller { 'assets/js/sections/three-orbit-controls.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/three-orbit-controls.js")), 'assets/js/sections/satellite_functions.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/satellite_functions.js")), 'assets/js/sections/flightpath.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/flightpath.js")), + 'assets/js/leaflet/L.Maidenhead.js', ]; $homegrid = explode(',', $this->stations->find_gridsquare()); diff --git a/application/controllers/Search.php b/application/controllers/Search.php index ed6ccbc7d..a643b0477 100644 --- a/application/controllers/Search.php +++ b/application/controllers/Search.php @@ -306,6 +306,7 @@ class Search extends CI_Controller { $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->where('station_profile.user_id', $this->session->userdata('user_id')); + $this->db->limit(5000); if ($returnquery) { $query = $this->db->get_compiled_select($this->config->item('table_name')); diff --git a/application/locale/bg_BG/LC_MESSAGES/messages.po b/application/locale/bg_BG/LC_MESSAGES/messages.po index 4ac4eb6fb..140f6cac1 100644 --- a/application/locale/bg_BG/LC_MESSAGES/messages.po +++ b/application/locale/bg_BG/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2025-01-17 12:23+0000\n" +"POT-Creation-Date: 2025-01-17 13:10+0000\n" "PO-Revision-Date: 2024-11-01 08:53+0000\n" "Last-Translator: Plamen Panteleev \n" "Language-Team: Bulgarian \n" "Language-Team: Bosnian \n" "Language-Team: Montenegrin \n" "Language-Team: Czech \n" "Language-Team: German \n" "Language-Team: Greek \n" "Language-Team: Spanish \n" "Language-Team: Estonian \n" "Language-Team: Finnish \n" "Language-Team: French \n" "Language-Team: Croatian \n" "Language-Team: Italian \n" "Language-Team: Lithuanian \n" "Language-Team: Latvian \n" "Language-Team: Dutch \n" "Language-Team: Polish \n" "Language-Team: Portuguese (Portugal) \n" @@ -97,13 +97,13 @@ msgstr "" #: application/controllers/Satellite.php:150 #: application/controllers/Satellite.php:161 #: application/controllers/Satellite.php:177 -#: application/controllers/Satellite.php:205 -#: application/controllers/Satellite.php:216 -#: application/controllers/Satellite.php:238 -#: application/controllers/Satellite.php:258 -#: application/controllers/Satellite.php:271 -#: application/controllers/Satellite.php:279 -#: application/controllers/Satellite.php:350 +#: application/controllers/Satellite.php:206 +#: application/controllers/Satellite.php:217 +#: application/controllers/Satellite.php:239 +#: application/controllers/Satellite.php:259 +#: application/controllers/Satellite.php:272 +#: application/controllers/Satellite.php:280 +#: application/controllers/Satellite.php:351 #: application/controllers/Sattimers.php:9 #: application/controllers/Search.php:13 #: application/controllers/Simplefle.php:7 @@ -209,7 +209,7 @@ msgid "date incorrect" msgstr "data incorrecta" #: application/controllers/Adif.php:134 -#: application/views/interface_assets/header.php:428 +#: application/views/interface_assets/header.php:426 msgid "ADIF Import / Export" msgstr "Importação / Exportação ADIF" @@ -547,7 +547,7 @@ msgid "WAE" msgstr "WAE" #: application/controllers/Backup.php:15 application/views/backup/main.php:14 -#: application/views/interface_assets/header.php:293 +#: application/views/interface_assets/header.php:291 msgid "Backup" msgstr "Backup" @@ -561,7 +561,7 @@ msgstr "Notas - Backup" #: application/controllers/Band.php:25 application/views/bands/index.php:28 #: application/views/bands/index.php:32 -#: application/views/interface_assets/header.php:400 +#: application/views/interface_assets/header.php:398 #: application/views/statistics/index.php:16 #: application/views/statistics/index.php:65 msgid "Bands" @@ -588,7 +588,7 @@ msgid "Export Cabrillo" msgstr "Exportar Cabrillo" #: application/controllers/Cfdexport.php:20 -#: application/views/interface_assets/header.php:442 +#: application/views/interface_assets/header.php:440 msgid "CFD Export" msgstr "Exportar CFD" @@ -681,7 +681,7 @@ msgid "Contest Logging" msgstr "Registo de concurso" #: application/controllers/Contesting.php:123 -#: application/views/interface_assets/header.php:287 +#: application/views/interface_assets/header.php:285 msgid "Contests" msgstr "Concursos" @@ -697,7 +697,7 @@ msgid "Continents" msgstr "Continentes" #: application/controllers/Cron.php:38 -#: application/views/interface_assets/header.php:297 +#: application/views/interface_assets/header.php:295 msgid "Cron Manager" msgstr "Gestor Cron" @@ -764,7 +764,7 @@ msgid "Not running" msgstr "Não está a funcionar" #: application/controllers/Csv.php:20 application/views/csv/index.php:3 -#: application/views/interface_assets/header.php:436 +#: application/views/interface_assets/header.php:434 msgid "SOTA CSV Export" msgstr "Exportar CSV SOTA" @@ -848,7 +848,7 @@ msgid "and propagation" msgstr "e propagação" #: application/controllers/Dxatlas.php:19 -#: application/views/interface_assets/header.php:434 +#: application/views/interface_assets/header.php:432 msgid "DX Atlas Gridsquare Export" msgstr "Exportar Gridsquare DX Atlas" @@ -926,7 +926,7 @@ msgid "No QSOs found to upload." msgstr "Não foram encontrados QSOs para carregar." #: application/controllers/Kmlexport.php:24 -#: application/views/interface_assets/header.php:432 +#: application/views/interface_assets/header.php:430 #: application/views/kml/index.php:3 msgid "KML Export" msgstr "Exportação KML" @@ -1630,7 +1630,7 @@ msgstr "Consulta rápida" #: application/controllers/Lotw.php:53 application/controllers/Lotw.php:85 #: application/controllers/Lotw.php:125 application/views/adif/import.php:27 -#: application/views/interface_assets/header.php:469 +#: application/views/interface_assets/header.php:467 #: application/views/lotw/import.php:3 application/views/lotw_views/index.php:9 #: application/views/lotw_views/upload_cert.php:3 #: application/views/user/edit.php:725 application/views/visitor/index.php:328 @@ -1709,7 +1709,7 @@ msgid "LoTW .TQ8 Not Sent" msgstr ".TQ8 LoTW não enviado" #: application/controllers/Mode.php:25 -#: application/views/interface_assets/header.php:285 +#: application/views/interface_assets/header.php:283 #: application/views/mode/index.php:27 msgid "Modes" msgstr "Modos" @@ -1892,7 +1892,7 @@ msgid "Invalid Station ID" msgstr "ID de estação inválido" #: application/controllers/Oqrs.php:134 -#: application/views/interface_assets/header.php:459 +#: application/views/interface_assets/header.php:457 msgid "OQRS Requests" msgstr "Pedidos OQRS" @@ -1941,7 +1941,7 @@ msgstr "" "oeste de Greenwich." #: application/controllers/Qrz.php:204 -#: application/views/interface_assets/header.php:472 +#: application/views/interface_assets/header.php:470 msgid "QRZ Logbook" msgstr "Logbook QRZ" @@ -1989,7 +1989,7 @@ msgid "No callsign provided." msgstr "Nenhum indicativo fornecido." #: application/controllers/Radio.php:17 -#: application/views/interface_assets/header.php:481 +#: application/views/interface_assets/header.php:479 msgid "Hardware Interfaces" msgstr "Interfaces hardware" @@ -2124,8 +2124,8 @@ msgstr "Tempos dos satélite" #: application/controllers/Search.php:19 #: application/views/continents/index.php:49 #: application/views/interface_assets/footer.php:40 -#: application/views/interface_assets/header.php:349 -#: application/views/interface_assets/header.php:356 +#: application/views/interface_assets/header.php:347 +#: application/views/interface_assets/header.php:354 #: application/views/logbookadvanced/index.php:601 #: application/views/oqrs/index.php:28 #: application/views/oqrs/showrequests.php:67 @@ -2219,8 +2219,8 @@ msgid "Duplicate Station Location:" msgstr "Localização da estação duplicada:" #: application/controllers/Stationsetup.php:35 -#: application/views/interface_assets/header.php:398 -#: application/views/interface_assets/header.php:544 +#: application/views/interface_assets/header.php:396 +#: application/views/interface_assets/header.php:542 msgid "Station Setup" msgstr "Configuração da estação" @@ -2287,7 +2287,7 @@ msgid "Set as Active Logbook" msgstr "Definir como logbook ativo" #: application/controllers/Stationsetup.php:263 -#: application/views/interface_assets/header.php:542 +#: application/views/interface_assets/header.php:540 #: application/views/stationsetup/stationsetup.php:46 #: application/views/view_log/index.php:4 msgid "Active Logbook" @@ -2399,7 +2399,7 @@ msgid "Antenna Analytics" msgstr "Análise da Antena" #: application/controllers/Themes.php:27 -#: application/views/interface_assets/header.php:291 +#: application/views/interface_assets/header.php:289 msgid "Themes" msgstr "Temas" @@ -2464,7 +2464,7 @@ msgid "LoTW SAT Update" msgstr "Atualização SAT LoTW" #: application/controllers/User.php:44 -#: application/views/interface_assets/header.php:281 +#: application/views/interface_assets/header.php:279 msgid "User Accounts" msgstr "Contas de utilizadores" @@ -2535,7 +2535,7 @@ msgid "Login failed. Try again." msgstr "O login falhou. Tente novamente." #: application/controllers/User.php:986 -#: application/views/interface_assets/header.php:369 +#: application/views/interface_assets/header.php:367 #: application/views/user/login.php:91 #: application/views/visitor/layout/header.php:87 msgid "Login" @@ -2735,7 +2735,7 @@ msgstr "Exportar mapa" #: application/controllers/Webadif.php:95 #: application/controllers/Webadif.php:142 -#: application/views/interface_assets/header.php:473 +#: application/views/interface_assets/header.php:471 msgid "QO-100 Dx Club Upload" msgstr "Transferência QO-100 Dx Club" @@ -3494,7 +3494,7 @@ msgstr "Mostrar" #: application/views/gridmap/index.php:25 application/views/hamsat/index.php:32 #: application/views/logbookadvanced/edit.php:19 #: application/views/logbookadvanced/index.php:253 -#: application/views/satellite/flightpath.php:34 +#: application/views/satellite/flightpath.php:38 #: application/views/satellite/pass.php:496 #: application/views/satellite/passtable.php:5 #: application/views/satellite/skedtable.php:7 @@ -3546,7 +3546,7 @@ msgstr "QRZ.com" #: application/views/activated_gridmap/index.php:86 #: application/views/gridmap/index.php:130 -#: application/views/satellite/flightpath.php:42 +#: application/views/satellite/flightpath.php:46 msgid "Plot" msgstr "Traçar" @@ -4158,7 +4158,7 @@ msgid "Save" msgstr "Guardar" #: application/views/api/index.php:8 -#: application/views/interface_assets/header.php:480 +#: application/views/interface_assets/header.php:478 msgid "API Keys" msgstr "Chaves API" @@ -6509,7 +6509,7 @@ msgstr "Nome ADIF" #: application/views/contesting/add.php:44 #: application/views/contesting/edit.php:43 #: application/views/contesting/edit.php:46 -#: application/views/interface_assets/header.php:522 +#: application/views/interface_assets/header.php:520 #: application/views/mode/create.php:46 application/views/mode/create.php:48 #: application/views/mode/edit.php:57 application/views/mode/edit.php:60 #: application/views/mode/index.php:8 application/views/mode/index.php:55 @@ -8010,7 +8010,7 @@ msgstr "" #: application/views/eqslcard/index.php:34 #: application/views/view_log/qso.php:544 msgid "QSL Message" -msgstr "" +msgstr "Mensagem QSL" #: application/views/eqsl/download.php:44 msgid "eQSL Receive Date" @@ -8340,7 +8340,7 @@ msgid "deprecated" msgstr "obsoleto" #: application/views/interface_assets/footer.php:138 -#: application/views/interface_assets/header.php:483 +#: application/views/interface_assets/header.php:481 #: application/views/options/sidebar.php:12 msgid "Version Info" msgstr "Informação da Versão" @@ -8621,24 +8621,24 @@ msgstr "Mapa de Bandas" msgid "SAT Timers" msgstr "Tempos satélite" -#: application/views/interface_assets/header.php:269 +#: application/views/interface_assets/header.php:268 msgid "Satellite Flightpath" msgstr "Trajectória de Satélite" -#: application/views/interface_assets/header.php:272 +#: application/views/interface_assets/header.php:270 msgid "Satellite Pass" msgstr "Passagem de Satélite" -#: application/views/interface_assets/header.php:278 +#: application/views/interface_assets/header.php:276 #: application/views/stationsetup/stationsetup.php:113 msgid "Admin" msgstr "Administrador" -#: application/views/interface_assets/header.php:283 +#: application/views/interface_assets/header.php:281 msgid "Global Options" msgstr "Opções Globais" -#: application/views/interface_assets/header.php:289 +#: application/views/interface_assets/header.php:287 #: application/views/notes/add.php:38 application/views/notes/edit.php:39 #: application/views/satellite/index.php:11 #: application/views/statistics/index.php:48 @@ -8646,118 +8646,118 @@ msgstr "Opções Globais" msgid "Satellites" msgstr "Satélites" -#: application/views/interface_assets/header.php:295 +#: application/views/interface_assets/header.php:293 msgid "Update Country Files" msgstr "Atualizar ficheiros de países" -#: application/views/interface_assets/header.php:299 +#: application/views/interface_assets/header.php:297 msgid "Debug Information" msgstr "Informações de debug" -#: application/views/interface_assets/header.php:346 +#: application/views/interface_assets/header.php:344 msgid "Add/Search Callsign" msgstr "Adicionar/Pesquisar Indicativo" -#: application/views/interface_assets/header.php:348 +#: application/views/interface_assets/header.php:346 msgid "Log" msgstr "Log" -#: application/views/interface_assets/header.php:355 +#: application/views/interface_assets/header.php:353 #: application/views/logbookadvanced/index.php:528 #: application/views/oqrs/index.php:27 application/views/user/edit.php:461 #: application/views/visitor/layout/header.php:95 msgid "Search Callsign" msgstr "Pesquisar Indicativo" -#: application/views/interface_assets/header.php:382 +#: application/views/interface_assets/header.php:380 #, php-format msgctxt "Operator: Callsign" msgid "Op: %s" msgstr "Op: %s" -#: application/views/interface_assets/header.php:393 +#: application/views/interface_assets/header.php:391 #: application/views/user/edit.php:54 msgid "Account" msgstr "Conta" -#: application/views/interface_assets/header.php:405 +#: application/views/interface_assets/header.php:403 msgid "Switch to Clubstation:" msgstr "Mudar para estação do clube:" -#: application/views/interface_assets/header.php:409 +#: application/views/interface_assets/header.php:407 #, php-format msgid "Switch to %s" msgstr "Mudar para %s" -#: application/views/interface_assets/header.php:413 +#: application/views/interface_assets/header.php:411 #, php-format msgctxt "Managing a Club Callsign" msgid "Manage %s" msgstr "Gerir %s" -#: application/views/interface_assets/header.php:422 +#: application/views/interface_assets/header.php:420 msgid "No Clubstations available" msgstr "Nenhuma estação do clube disponível" -#: application/views/interface_assets/header.php:430 +#: application/views/interface_assets/header.php:428 msgid "Other Export Options" msgstr "Outras opções de exportação" -#: application/views/interface_assets/header.php:438 +#: application/views/interface_assets/header.php:436 msgid "Cabrillo Export" msgstr "Exportação Cabrillo" -#: application/views/interface_assets/header.php:440 +#: application/views/interface_assets/header.php:438 msgid "EDI Export" msgstr "Exportação EDI" -#: application/views/interface_assets/header.php:464 +#: application/views/interface_assets/header.php:462 msgid "QSL Queue" msgstr "Fila de QSLs" -#: application/views/interface_assets/header.php:465 +#: application/views/interface_assets/header.php:463 msgid "Labels" msgstr "Etiquetas" -#: application/views/interface_assets/header.php:467 +#: application/views/interface_assets/header.php:465 msgid "Third-Party Services" msgstr "Serviços de terceiros" -#: application/views/interface_assets/header.php:470 +#: application/views/interface_assets/header.php:468 msgid "eQSL Import / Export" msgstr "Importação / Exportação de eQSL" -#: application/views/interface_assets/header.php:471 +#: application/views/interface_assets/header.php:469 msgid "HRDLog Logbook" msgstr "Logbook HRDLog" -#: application/views/interface_assets/header.php:484 +#: application/views/interface_assets/header.php:482 msgid "Help" msgstr "Ajuda" -#: application/views/interface_assets/header.php:485 +#: application/views/interface_assets/header.php:483 msgid "Forum" msgstr "Fórum" -#: application/views/interface_assets/header.php:489 +#: application/views/interface_assets/header.php:487 #, php-format msgid "Stop impersonate and switch back to %s" msgstr "Parar a representação e voltar a mudar para %s" -#: application/views/interface_assets/header.php:490 +#: application/views/interface_assets/header.php:488 #, php-format msgid "Switch back to %s" msgstr "Mudar de volta para %s" -#: application/views/interface_assets/header.php:494 +#: application/views/interface_assets/header.php:492 msgid "Logout" msgstr "Terminar sessão" -#: application/views/interface_assets/header.php:502 +#: application/views/interface_assets/header.php:500 msgid "Select a Location" msgstr "Selecionar uma localização" -#: application/views/interface_assets/header.php:581 +#: application/views/interface_assets/header.php:579 msgid "Extras" msgstr "Extras" @@ -9168,6 +9168,7 @@ msgstr "Sicília" #: application/views/logbookadvanced/index.php:11 #: application/views/logbookadvanced/useroptions.php:194 +#: application/views/satellite/flightpath.php:11 msgctxt "Map Options" msgid "Gridsquares" msgstr "Gridsquares" @@ -9573,13 +9574,15 @@ msgstr "QRZ" #: application/views/logbookadvanced/index.php:691 #: application/views/logbookadvanced/useroptions.php:82 +#: application/views/qso/edit_ajax.php:524 msgid "QSL Msg (S)" -msgstr "" +msgstr "Msg QSL (E)" #: application/views/logbookadvanced/index.php:694 #: application/views/logbookadvanced/useroptions.php:86 +#: application/views/qso/edit_ajax.php:533 msgid "QSL Msg (R)" -msgstr "" +msgstr "Msg QSL (R)" #: application/views/logbookadvanced/index.php:742 #: application/views/logbookadvanced/useroptions.php:150 @@ -10998,17 +11001,9 @@ msgstr "Método de receção" msgid "Get the default message for eQSL, for this station." msgstr "Obtém a mensagem padrão para eQSL, para esta estação." -#: application/views/qso/edit_ajax.php:524 -msgid "QSL MSG (S)" -msgstr "" - -#: application/views/qso/edit_ajax.php:533 -msgid "QSL MSG (R)" -msgstr "" - #: application/views/qso/edit_ajax.php:536 msgid "Note: Not editable. Only displayed here." -msgstr "" +msgstr "Nota: Não editável. Apenas exibido aqui." #: application/views/qso/edit_ajax.php:580 #: application/views/view_log/partial/log_ajax.php:353 @@ -14058,6 +14053,12 @@ msgstr "Submeter pedido" msgid "Rcvd" msgstr "Recebido" +#~ msgid "QSL MSG (S)" +#~ msgstr "MSG QSL (E)" + +#~ msgid "QSL MSG (R)" +#~ msgstr "MSG QSL (R)" + #~ msgid "QSL Msg" #~ msgstr "Mensagem QSL" diff --git a/application/locale/ru_RU/LC_MESSAGES/messages.po b/application/locale/ru_RU/LC_MESSAGES/messages.po index 49e581563..e438c6964 100644 --- a/application/locale/ru_RU/LC_MESSAGES/messages.po +++ b/application/locale/ru_RU/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2025-01-17 12:23+0000\n" +"POT-Creation-Date: 2025-01-17 13:10+0000\n" "PO-Revision-Date: 2025-01-13 08:04+0000\n" "Last-Translator: Michael Skolsky \n" "Language-Team: Russian \n" "Language-Team: Albanian \n" "Language-Team: Serbian \n" "Language-Team: Swedish \n" "Language-Team: Turkish \n" +"POT-Creation-Date: 2025-01-17 13:10+0000\n" +"PO-Revision-Date: 2025-01-17 12:23+0000\n" +"Last-Translator: hellofinch <543933756@qq.com>\n" "Language-Team: Chinese (Simplified Han script) \n" "Language: zh_CN\n" @@ -100,13 +100,13 @@ msgstr "" #: application/controllers/Satellite.php:150 #: application/controllers/Satellite.php:161 #: application/controllers/Satellite.php:177 -#: application/controllers/Satellite.php:205 -#: application/controllers/Satellite.php:216 -#: application/controllers/Satellite.php:238 -#: application/controllers/Satellite.php:258 -#: application/controllers/Satellite.php:271 -#: application/controllers/Satellite.php:279 -#: application/controllers/Satellite.php:350 +#: application/controllers/Satellite.php:206 +#: application/controllers/Satellite.php:217 +#: application/controllers/Satellite.php:239 +#: application/controllers/Satellite.php:259 +#: application/controllers/Satellite.php:272 +#: application/controllers/Satellite.php:280 +#: application/controllers/Satellite.php:351 #: application/controllers/Sattimers.php:9 #: application/controllers/Search.php:13 #: application/controllers/Simplefle.php:7 @@ -212,7 +212,7 @@ msgid "date incorrect" msgstr "日期有误" #: application/controllers/Adif.php:134 -#: application/views/interface_assets/header.php:428 +#: application/views/interface_assets/header.php:426 msgid "ADIF Import / Export" msgstr "ADIF 导入/导出" @@ -550,7 +550,7 @@ msgid "WAE" msgstr "WAE" #: application/controllers/Backup.php:15 application/views/backup/main.php:14 -#: application/views/interface_assets/header.php:293 +#: application/views/interface_assets/header.php:291 msgid "Backup" msgstr "备份" @@ -564,7 +564,7 @@ msgstr "笔记 - 备份" #: application/controllers/Band.php:25 application/views/bands/index.php:28 #: application/views/bands/index.php:32 -#: application/views/interface_assets/header.php:400 +#: application/views/interface_assets/header.php:398 #: application/views/statistics/index.php:16 #: application/views/statistics/index.php:65 msgid "Bands" @@ -591,7 +591,7 @@ msgid "Export Cabrillo" msgstr "导出 Cabrillo" #: application/controllers/Cfdexport.php:20 -#: application/views/interface_assets/header.php:442 +#: application/views/interface_assets/header.php:440 msgid "CFD Export" msgstr "CFD 导出" @@ -681,7 +681,7 @@ msgid "Contest Logging" msgstr "比赛日志" #: application/controllers/Contesting.php:123 -#: application/views/interface_assets/header.php:287 +#: application/views/interface_assets/header.php:285 msgid "Contests" msgstr "比赛" @@ -697,7 +697,7 @@ msgid "Continents" msgstr "大陆" #: application/controllers/Cron.php:38 -#: application/views/interface_assets/header.php:297 +#: application/views/interface_assets/header.php:295 msgid "Cron Manager" msgstr "Cron 管理器" @@ -764,7 +764,7 @@ msgid "Not running" msgstr "未运行" #: application/controllers/Csv.php:20 application/views/csv/index.php:3 -#: application/views/interface_assets/header.php:436 +#: application/views/interface_assets/header.php:434 msgid "SOTA CSV Export" msgstr "SOTA CSV 导出" @@ -847,7 +847,7 @@ msgid "and propagation" msgstr "和传播方式" #: application/controllers/Dxatlas.php:19 -#: application/views/interface_assets/header.php:434 +#: application/views/interface_assets/header.php:432 msgid "DX Atlas Gridsquare Export" msgstr "DX Atlas Gridsquare 导出" @@ -924,7 +924,7 @@ msgid "No QSOs found to upload." msgstr "无 QSO 可供上传。" #: application/controllers/Kmlexport.php:24 -#: application/views/interface_assets/header.php:432 +#: application/views/interface_assets/header.php:430 #: application/views/kml/index.php:3 msgid "KML Export" msgstr "KML 导出" @@ -1621,7 +1621,7 @@ msgstr "快速查找" #: application/controllers/Lotw.php:53 application/controllers/Lotw.php:85 #: application/controllers/Lotw.php:125 application/views/adif/import.php:27 -#: application/views/interface_assets/header.php:469 +#: application/views/interface_assets/header.php:467 #: application/views/lotw/import.php:3 application/views/lotw_views/index.php:9 #: application/views/lotw_views/upload_cert.php:3 #: application/views/user/edit.php:725 application/views/visitor/index.php:328 @@ -1699,7 +1699,7 @@ msgid "LoTW .TQ8 Not Sent" msgstr "LoTW .TQ8 未发送" #: application/controllers/Mode.php:25 -#: application/views/interface_assets/header.php:285 +#: application/views/interface_assets/header.php:283 #: application/views/mode/index.php:27 msgid "Modes" msgstr "模式" @@ -1878,7 +1878,7 @@ msgid "Invalid Station ID" msgstr "无效站台ID" #: application/controllers/Oqrs.php:134 -#: application/views/interface_assets/header.php:459 +#: application/views/interface_assets/header.php:457 msgid "OQRS Requests" msgstr "OQRS" @@ -1922,7 +1922,7 @@ msgid "" msgstr "负数纬度表示南纬，负数经度表示西经。" #: application/controllers/Qrz.php:204 -#: application/views/interface_assets/header.php:472 +#: application/views/interface_assets/header.php:470 msgid "QRZ Logbook" msgstr "QRZ 日志簿" @@ -1970,7 +1970,7 @@ msgid "No callsign provided." msgstr "未提供呼号。" #: application/controllers/Radio.php:17 -#: application/views/interface_assets/header.php:481 +#: application/views/interface_assets/header.php:479 msgid "Hardware Interfaces" msgstr "硬件接口" @@ -2105,8 +2105,8 @@ msgstr "卫星时钟" #: application/controllers/Search.php:19 #: application/views/continents/index.php:49 #: application/views/interface_assets/footer.php:40 -#: application/views/interface_assets/header.php:349 -#: application/views/interface_assets/header.php:356 +#: application/views/interface_assets/header.php:347 +#: application/views/interface_assets/header.php:354 #: application/views/logbookadvanced/index.php:601 #: application/views/oqrs/index.php:28 #: application/views/oqrs/showrequests.php:67 @@ -2198,8 +2198,8 @@ msgid "Duplicate Station Location:" msgstr "台站地址重复：" #: application/controllers/Stationsetup.php:35 -#: application/views/interface_assets/header.php:398 -#: application/views/interface_assets/header.php:544 +#: application/views/interface_assets/header.php:396 +#: application/views/interface_assets/header.php:542 msgid "Station Setup" msgstr "设置台站" @@ -2266,7 +2266,7 @@ msgid "Set as Active Logbook" msgstr "设置为正在使用的日志" #: application/controllers/Stationsetup.php:263 -#: application/views/interface_assets/header.php:542 +#: application/views/interface_assets/header.php:540 #: application/views/stationsetup/stationsetup.php:46 #: application/views/view_log/index.php:4 msgid "Active Logbook" @@ -2370,7 +2370,7 @@ msgid "Antenna Analytics" msgstr "天线分析" #: application/controllers/Themes.php:27 -#: application/views/interface_assets/header.php:291 +#: application/views/interface_assets/header.php:289 msgid "Themes" msgstr "主题" @@ -2435,7 +2435,7 @@ msgid "LoTW SAT Update" msgstr "LoTW 卫星数据更新" #: application/controllers/User.php:44 -#: application/views/interface_assets/header.php:281 +#: application/views/interface_assets/header.php:279 msgid "User Accounts" msgstr "用户账户" @@ -2504,7 +2504,7 @@ msgid "Login failed. Try again." msgstr "登录失败，请重试。" #: application/controllers/User.php:986 -#: application/views/interface_assets/header.php:369 +#: application/views/interface_assets/header.php:367 #: application/views/user/login.php:91 #: application/views/visitor/layout/header.php:87 msgid "Login" @@ -2686,7 +2686,7 @@ msgstr "导出地图" #: application/controllers/Webadif.php:95 #: application/controllers/Webadif.php:142 -#: application/views/interface_assets/header.php:473 +#: application/views/interface_assets/header.php:471 msgid "QO-100 Dx Club Upload" msgstr "QO-100 Dx Club 上传" @@ -3432,7 +3432,7 @@ msgstr "显示" #: application/views/gridmap/index.php:25 application/views/hamsat/index.php:32 #: application/views/logbookadvanced/edit.php:19 #: application/views/logbookadvanced/index.php:253 -#: application/views/satellite/flightpath.php:34 +#: application/views/satellite/flightpath.php:38 #: application/views/satellite/pass.php:496 #: application/views/satellite/passtable.php:5 #: application/views/satellite/skedtable.php:7 @@ -3484,7 +3484,7 @@ msgstr "QRZ.com" #: application/views/activated_gridmap/index.php:86 #: application/views/gridmap/index.php:130 -#: application/views/satellite/flightpath.php:42 +#: application/views/satellite/flightpath.php:46 msgid "Plot" msgstr "绘制" @@ -4074,7 +4074,7 @@ msgid "Save" msgstr "保存" #: application/views/api/index.php:8 -#: application/views/interface_assets/header.php:480 +#: application/views/interface_assets/header.php:478 msgid "API Keys" msgstr "API 密钥" @@ -6309,7 +6309,7 @@ msgstr "ADIF 名称" #: application/views/contesting/add.php:44 #: application/views/contesting/edit.php:43 #: application/views/contesting/edit.php:46 -#: application/views/interface_assets/header.php:522 +#: application/views/interface_assets/header.php:520 #: application/views/mode/create.php:46 application/views/mode/create.php:48 #: application/views/mode/edit.php:57 application/views/mode/edit.php:60 #: application/views/mode/index.php:8 application/views/mode/index.php:55 @@ -7760,7 +7760,7 @@ msgstr "以下是已在eQSL上确认但尚未下载QSL卡片图像的QSO表。" #: application/views/eqslcard/index.php:34 #: application/views/view_log/qso.php:544 msgid "QSL Message" -msgstr "" +msgstr "QSL 消息" #: application/views/eqsl/download.php:44 msgid "eQSL Receive Date" @@ -8067,7 +8067,7 @@ msgid "deprecated" msgstr "已废弃" #: application/views/interface_assets/footer.php:138 -#: application/views/interface_assets/header.php:483 +#: application/views/interface_assets/header.php:481 #: application/views/options/sidebar.php:12 msgid "Version Info" msgstr "版本信息" @@ -8346,24 +8346,24 @@ msgstr "波段地图" msgid "SAT Timers" msgstr "卫星过境时钟" -#: application/views/interface_assets/header.php:269 +#: application/views/interface_assets/header.php:268 msgid "Satellite Flightpath" msgstr "卫星轨迹" -#: application/views/interface_assets/header.php:272 +#: application/views/interface_assets/header.php:270 msgid "Satellite Pass" msgstr "卫星过境" -#: application/views/interface_assets/header.php:278 +#: application/views/interface_assets/header.php:276 #: application/views/stationsetup/stationsetup.php:113 msgid "Admin" msgstr "管理员" -#: application/views/interface_assets/header.php:283 +#: application/views/interface_assets/header.php:281 msgid "Global Options" msgstr "全局选项" -#: application/views/interface_assets/header.php:289 +#: application/views/interface_assets/header.php:287 #: application/views/notes/add.php:38 application/views/notes/edit.php:39 #: application/views/satellite/index.php:11 #: application/views/statistics/index.php:48 @@ -8371,118 +8371,118 @@ msgstr "全局选项" msgid "Satellites" msgstr "卫星" -#: application/views/interface_assets/header.php:295 +#: application/views/interface_assets/header.php:293 msgid "Update Country Files" msgstr "更新国家文件" -#: application/views/interface_assets/header.php:299 +#: application/views/interface_assets/header.php:297 msgid "Debug Information" msgstr "调试信息" -#: application/views/interface_assets/header.php:346 +#: application/views/interface_assets/header.php:344 msgid "Add/Search Callsign" msgstr "添加/搜索 呼号" -#: application/views/interface_assets/header.php:348 +#: application/views/interface_assets/header.php:346 msgid "Log" msgstr "日志" -#: application/views/interface_assets/header.php:355 +#: application/views/interface_assets/header.php:353 #: application/views/logbookadvanced/index.php:528 #: application/views/oqrs/index.php:27 application/views/user/edit.php:461 #: application/views/visitor/layout/header.php:95 msgid "Search Callsign" msgstr "查询呼号" -#: application/views/interface_assets/header.php:382 +#: application/views/interface_assets/header.php:380 #, php-format msgctxt "Operator: Callsign" msgid "Op: %s" msgstr "操作员：%s" -#: application/views/interface_assets/header.php:393 +#: application/views/interface_assets/header.php:391 #: application/views/user/edit.php:54 msgid "Account" msgstr "账户信息" -#: application/views/interface_assets/header.php:405 +#: application/views/interface_assets/header.php:403 msgid "Switch to Clubstation:" msgstr "切换到集体台站：" -#: application/views/interface_assets/header.php:409 +#: application/views/interface_assets/header.php:407 #, php-format msgid "Switch to %s" msgstr "切换到 %s" -#: application/views/interface_assets/header.php:413 +#: application/views/interface_assets/header.php:411 #, php-format msgctxt "Managing a Club Callsign" msgid "Manage %s" msgstr "管理 %s" -#: application/views/interface_assets/header.php:422 +#: application/views/interface_assets/header.php:420 msgid "No Clubstations available" msgstr "没有可用的集体台站" -#: application/views/interface_assets/header.php:430 +#: application/views/interface_assets/header.php:428 msgid "Other Export Options" msgstr "其它导出选项" -#: application/views/interface_assets/header.php:438 +#: application/views/interface_assets/header.php:436 msgid "Cabrillo Export" msgstr "Cabrillo 导出" -#: application/views/interface_assets/header.php:440 +#: application/views/interface_assets/header.php:438 msgid "EDI Export" msgstr "EDI 导出" -#: application/views/interface_assets/header.php:464 +#: application/views/interface_assets/header.php:462 msgid "QSL Queue" msgstr "QSL 队列" -#: application/views/interface_assets/header.php:465 +#: application/views/interface_assets/header.php:463 msgid "Labels" msgstr "标签" -#: application/views/interface_assets/header.php:467 +#: application/views/interface_assets/header.php:465 msgid "Third-Party Services" msgstr "第三方服务" -#: application/views/interface_assets/header.php:470 +#: application/views/interface_assets/header.php:468 msgid "eQSL Import / Export" msgstr "eQSL 导入/导出" -#: application/views/interface_assets/header.php:471 +#: application/views/interface_assets/header.php:469 msgid "HRDLog Logbook" msgstr "HRDLog 日志簿" -#: application/views/interface_assets/header.php:484 +#: application/views/interface_assets/header.php:482 msgid "Help" msgstr "帮助" -#: application/views/interface_assets/header.php:485 +#: application/views/interface_assets/header.php:483 msgid "Forum" msgstr "论坛" -#: application/views/interface_assets/header.php:489 +#: application/views/interface_assets/header.php:487 #, php-format msgid "Stop impersonate and switch back to %s" msgstr "登出并返回到 %s" -#: application/views/interface_assets/header.php:490 +#: application/views/interface_assets/header.php:488 #, php-format msgid "Switch back to %s" msgstr "切换回 %s" -#: application/views/interface_assets/header.php:494 +#: application/views/interface_assets/header.php:492 msgid "Logout" msgstr "注销" -#: application/views/interface_assets/header.php:502 +#: application/views/interface_assets/header.php:500 msgid "Select a Location" msgstr "选择电台站位置" -#: application/views/interface_assets/header.php:581 +#: application/views/interface_assets/header.php:579 msgid "Extras" msgstr "额外" @@ -8885,6 +8885,7 @@ msgstr "西西里岛" #: application/views/logbookadvanced/index.php:11 #: application/views/logbookadvanced/useroptions.php:194 +#: application/views/satellite/flightpath.php:11 msgctxt "Map Options" msgid "Gridsquares" msgstr "网格" @@ -9289,13 +9290,15 @@ msgstr "QRZ" #: application/views/logbookadvanced/index.php:691 #: application/views/logbookadvanced/useroptions.php:82 +#: application/views/qso/edit_ajax.php:524 msgid "QSL Msg (S)" -msgstr "" +msgstr "QSL 消息（发送）" #: application/views/logbookadvanced/index.php:694 #: application/views/logbookadvanced/useroptions.php:86 +#: application/views/qso/edit_ajax.php:533 msgid "QSL Msg (R)" -msgstr "" +msgstr "QSL 消息（接收）" #: application/views/logbookadvanced/index.php:742 #: application/views/logbookadvanced/useroptions.php:150 @@ -10624,17 +10627,9 @@ msgstr "接收方式" msgid "Get the default message for eQSL, for this station." msgstr "获取该站的 eQSL 默认消息。" -#: application/views/qso/edit_ajax.php:524 -msgid "QSL MSG (S)" -msgstr "" - -#: application/views/qso/edit_ajax.php:533 -msgid "QSL MSG (R)" -msgstr "" - #: application/views/qso/edit_ajax.php:536 msgid "Note: Not editable. Only displayed here." -msgstr "" +msgstr "注意：这里不可编辑，只是用来在这里显示。" #: application/views/qso/edit_ajax.php:580 #: application/views/view_log/partial/log_ajax.php:353 @@ -13536,6 +13531,12 @@ msgstr "提交请求" msgid "Rcvd" msgstr "收" +#~ msgid "QSL MSG (S)" +#~ msgstr "QSL 消息（发送）" + +#~ msgid "QSL MSG (R)" +#~ msgstr "QSL 消息（接收）" + #~ msgid "QSL Msg" #~ msgstr "QSL 信息" diff --git a/application/migrations/134_create_label_paper_types_table.php b/application/migrations/134_create_label_paper_types_table.php index 6159628e7..660d1b739 100644 --- a/application/migrations/134_create_label_paper_types_table.php +++ b/application/migrations/134_create_label_paper_types_table.php @@ -21,7 +21,7 @@ class Migration_create_label_paper_types_table extends CI_Migration { 'paper_name' => array( 'type' => 'VARCHAR', - 'constraint' => '250', + 'constraint' => '191', ), 'metric' => array( diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index 331a60546..8b6abf873 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -102,7 +102,7 @@ class Logbookadvanced_model extends CI_Model { } $conditions[] = "qsos.station_id in (".$stationids.")"; } - if ($searchCriteria['dx'] !== '*') { + if ($searchCriteria['dx'] !== '*' && $searchCriteria['dx'] !== '') { $conditions[] = "COL_CALL LIKE ?"; $binding[] = '%' . trim($searchCriteria['dx']) . '%'; } @@ -228,7 +228,7 @@ class Logbookadvanced_model extends CI_Model { $binding[] = $searchCriteria['dxcc']; } - if ($searchCriteria['state'] !== '*') { + if ($searchCriteria['state'] !== '*' && $searchCriteria['state'] !== '') { $conditions[] = "COL_STATE = ?"; $binding[] = $searchCriteria['state']; } @@ -246,7 +246,7 @@ class Logbookadvanced_model extends CI_Model { $binding[] = $searchCriteria['ituzone']; } - if ($searchCriteria['qslvia'] !== '*') { + if ($searchCriteria['qslvia'] !== '*' && $searchCriteria['qslvia'] !== '') { $conditions[] = "COL_QSL_VIA like ?"; $binding[] = $searchCriteria['qslvia'].'%'; } @@ -255,7 +255,7 @@ class Logbookadvanced_model extends CI_Model { $conditions[] = "coalesce(COL_QSL_VIA, '') = ''"; } - if ($searchCriteria['sota'] !== '*') { + if ($searchCriteria['sota'] !== '*' && $searchCriteria['sota'] !== '') { $conditions[] = "COL_SOTA_REF like ?"; $binding[] = $searchCriteria['sota'].'%'; } @@ -263,7 +263,7 @@ class Logbookadvanced_model extends CI_Model { $conditions[] = "coalesce(COL_SOTA_REF, '') = ''"; } - if ($searchCriteria['pota'] !== '*') { + if ($searchCriteria['pota'] !== '*' && $searchCriteria['pota'] !== '') { $conditions[] = "COL_POTA_REF like ?"; $binding[] = $searchCriteria['pota'].'%'; } @@ -271,7 +271,7 @@ class Logbookadvanced_model extends CI_Model { $conditions[] = "coalesce(COL_POTA_REF, '') = ''"; } - if ($searchCriteria['wwff'] !== '*') { + if ($searchCriteria['wwff'] !== '*' && $searchCriteria['wwff'] !== '') { $conditions[] = "COL_WWFF_REF like ?"; $binding[] = $searchCriteria['wwff'].'%'; } @@ -279,7 +279,7 @@ class Logbookadvanced_model extends CI_Model { $conditions[] = "coalesce(COL_WWFF_REF, '') = ''"; } - if ($searchCriteria['operator'] !== '*') { + if ($searchCriteria['operator'] !== '*' && $searchCriteria['operator'] !== '') { $conditions[] = "COL_OPERATOR like ?"; $binding[] = $searchCriteria['operator'].'%'; } @@ -287,7 +287,7 @@ class Logbookadvanced_model extends CI_Model { $conditions[] = "coalesce(COL_OPERATOR, '') = ''"; } - if ($searchCriteria['gridsquare'] !== '*') { + if ($searchCriteria['gridsquare'] !== '*' && $searchCriteria['gridsquare'] !== '') { $conditions[] = "(COL_GRIDSQUARE like ? or COL_VUCC_GRIDS like ?)"; $binding[] = '%' . $searchCriteria['gridsquare'] . '%'; $binding[] = '%' . $searchCriteria['gridsquare'] . '%'; @@ -310,7 +310,7 @@ class Logbookadvanced_model extends CI_Model { } } - if ($searchCriteria['contest'] !== '*') { + if ($searchCriteria['contest'] !== '*' && $searchCriteria['contest'] !== '') { $conditions[] = "COL_CONTEST_ID like ?"; $binding[] = '%'.$searchCriteria['contest'].'%'; } diff --git a/application/models/Update_model.php b/application/models/Update_model.php index c3f0c6940..39b6627c9 100644 --- a/application/models/Update_model.php +++ b/application/models/Update_model.php @@ -271,7 +271,7 @@ class Update_model extends CI_Model { $result=curl_exec($ch); curl_close($ch); $json = json_decode($result, true); - $latest_tag = $json[0]['tag_name']; + $latest_tag = $json[0]['tag_name'] ?? 'Unknown'; return $latest_tag; } diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 8b14b3ffb..e9acae54d 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -264,12 +264,10 @@
    • - -
    -
  • Beta
    • - -
    -
    • +
    +
    • +
    +
    • diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php index 5364e4371..4b2f00ad3 100644 --- a/application/views/qso/edit_ajax.php +++ b/application/views/qso/edit_ajax.php @@ -521,7 +521,7 @@
    - +
    @@ -530,7 +530,7 @@
    - +
    diff --git a/application/views/satellite/flightpath.php b/application/views/satellite/flightpath.php index a40c66301..ecb7ce93b 100644 --- a/application/views/satellite/flightpath.php +++ b/application/views/satellite/flightpath.php @@ -7,6 +7,10 @@ const homelon = ""; var icon_home_url = "assets/images/dot.png"; + +