diff --git a/application/locale/bg_BG/LC_MESSAGES/messages.po b/application/locale/bg_BG/LC_MESSAGES/messages.po index 65295c9db..b79185258 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: 2026-03-05 15:20+0000\n" +"POT-Creation-Date: 2026-03-11 11:45+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: Hungarian \n" "Language-Team: Armenian \n" "Language-Team: Italian \n" "Language-Team: Japanese \n" "Language-Team: Lithuanian \n" "Language-Team: Latvian \n" "Language-Team: Dutch \n" "Language-Team: Polish \n" "Language-Team: Portuguese (Portugal) \n" "Language-Team: Slovak \n" "Language-Team: Albanian \n" "Language-Team: Serbian \n" "Language-Team: Swedish \n" "Language-Team: Turkish \n" -"Language-Team: Chinese (Simplified Han script) \n" +"Language-Team: Chinese (Simplified Han script) \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -3662,7 +3662,7 @@ msgstr "QSO已上传" msgid "Bearing" msgstr "方位角" -#: application/models/Logbookadvanced_model.php:1730 +#: application/models/Logbookadvanced_model.php:1740 msgid "VuccGrids table is empty. Please import the VUCC grids data first." msgstr "VuccGrids 表为空。请先导入 VUCC 网格数据。" diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index 9b1cdf026..a2fd23a87 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -1128,19 +1128,29 @@ class Logbookadvanced_model extends CI_Model { $potaRef = $station_profile->station_pota ?? ''; $sig = $station_profile->station_sig ?? ''; $sigInfo = $station_profile->station_sig_info ?? ''; + $gridsquare = ''; + $vuccGrids = ''; + + if (strpos($station_profile->station_gridsquare, ',') !== false) { + $vuccGrids = $station_profile->station_gridsquare ?? ''; + } else { + $gridsquare = $station_profile->station_gridsquare ?? ''; + } $sql = "UPDATE ".$this->config->item('table_name')." JOIN station_profile ON ". $this->config->item('table_name').".station_id = station_profile.station_id" . " SET " . $this->config->item('table_name').".STATION_ID = ?" . - ", " . $this->config->item('table_name').".COL_MY_IOTA = ?" . - ", " . $this->config->item('table_name').".COL_MY_SOTA_REF = ?" . - ", " . $this->config->item('table_name').".COL_MY_WWFF_REF = ?" . - ", " . $this->config->item('table_name').".COL_MY_POTA_REF = ?" . - ", " . $this->config->item('table_name').".COL_MY_SIG = ?" . - ", " . $this->config->item('table_name').".COL_MY_SIG_INFO = ?" . - ", " . $this->config->item('table_name').".COL_STATION_CALLSIGN = ?" . + ", " . $this->config->item('table_name') . ".COL_MY_IOTA = ?" . + ", " . $this->config->item('table_name') . ".COL_MY_SOTA_REF = ?" . + ", " . $this->config->item('table_name') . ".COL_MY_WWFF_REF = ?" . + ", " . $this->config->item('table_name') . ".COL_MY_POTA_REF = ?" . + ", " . $this->config->item('table_name') . ".COL_MY_SIG = ?" . + ", " . $this->config->item('table_name') . ".COL_MY_SIG_INFO = ?" . + ", " . $this->config->item('table_name') . ".COL_STATION_CALLSIGN = ?" . + ", " . $this->config->item('table_name') . ".COL_MY_GRIDSQUARE = ?" . + ", " . $this->config->item('table_name') . ".COL_MY_VUCC_GRIDS = ?" . " WHERE " . $this->config->item('table_name').".col_primary_key in ? and station_profile.user_id = ?"; - $query = $this->db->query($sql, array($stationid, $iotaRef, $sotaRef, $wwffRef, $potaRef, $sig, $sigInfo, $stationCallsign, json_decode($ids, true), $this->session->userdata('user_id'))); + $query = $this->db->query($sql, array($stationid, $iotaRef, $sotaRef, $wwffRef, $potaRef, $sig, $sigInfo, $stationCallsign, $gridsquare, $vuccGrids, json_decode($ids, true), $this->session->userdata('user_id'))); } else if ($column == 'COL_BAND') { if ($value == '') return; @@ -1163,8 +1173,8 @@ class Logbookadvanced_model extends CI_Model { $vucc_value = null; } else { if(!$this->load->is_loaded('Qra')) { - $this->load->library('Qra'); - } + $this->load->library('Qra'); + } $latlng=$this->qra->qra2latlong(trim(xss_clean($value) ?? '')); if ($latlng[1] ?? '--' != '--') { if (strpos(trim(xss_clean($value) ?? ''), ',') !== false) { diff --git a/assets/lang_src/messages.pot b/assets/lang_src/messages.pot index deaa3b39c..372d20622 100644 --- a/assets/lang_src/messages.pot +++ b/assets/lang_src/messages.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2026-03-05 15:20+0000\n" +"POT-Creation-Date: 2026-03-11 11:45+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3624,7 +3624,7 @@ msgstr "" msgid "Bearing" msgstr "" -#: application/models/Logbookadvanced_model.php:1730 +#: application/models/Logbookadvanced_model.php:1740 msgid "VuccGrids table is empty. Please import the VUCC grids data first." msgstr ""