From a3963fb9fb0614ecf0ff2e030e34c29a060dfdd2 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 31 Dec 2023 23:21:23 +0100 Subject: [PATCH 1/2] typo --- application/language/german/general_words_lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/language/german/general_words_lang.php b/application/language/german/general_words_lang.php index 95dbcd29..3032fbfc 100644 --- a/application/language/german/general_words_lang.php +++ b/application/language/german/general_words_lang.php @@ -213,7 +213,7 @@ $lang['general_word_today'] = 'Heute'; $lang['dashboard_php_version_warning'] = 'Die PHP Version is zu alt. Benötigt wird mindestens die Version 7.4. Die installierte Version ist'; $lang['dashboard_country_files_warning'] = 'Die Länderlisten müssen aktualisiert werden! Klicke hier, um das zu tun!'; -$lang['dashboard_locations_warning'] = 'Ea wurde kein Stationsstandort angelegt! Klicke hier, um das zu tun!'; +$lang['dashboard_locations_warning'] = 'Es wurde kein Stationsstandort angelegt! Klicke hier, um das zu tun!'; $lang['dashboard_logbooks_warning'] = 'Es wurde kein Stationslogbuch angelegt. Klicke hier, um das zu tun!'; $lang['hams_at_no_activations_found'] = 'Keine bevorstehenden Aktivierungen gefunden. Bitte später noch einmal vorbeischauen.'; From eee64ee8e8b91a2e8842c529f99c639a5061fdc6 Mon Sep 17 00:00:00 2001 From: phl0 Date: Mon, 1 Jan 2024 01:06:04 +0100 Subject: [PATCH 2/2] Fix details for grids with DXCC none --- application/models/Timeline_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/models/Timeline_model.php b/application/models/Timeline_model.php index 74411911..b34866d9 100644 --- a/application/models/Timeline_model.php +++ b/application/models/Timeline_model.php @@ -217,7 +217,7 @@ class Timeline_model extends CI_Model $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); $this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id'); - $this->db->join('dxcc_entities', 'dxcc_entities.adif = '.$this->config->item('table_name').'.COL_DXCC'); + $this->db->join('dxcc_entities', 'dxcc_entities.adif = '.$this->config->item('table_name').'.COL_DXCC', 'left outer'); $this->db->join('lotw_users', 'lotw_users.callsign = '.$this->config->item('table_name').'.col_call', 'left outer'); if ($band != 'All') {