From dbafdd82403e53d1825803fef7b74c27d0c98dbf Mon Sep 17 00:00:00 2001 From: phl0 Date: Mon, 16 Oct 2023 01:51:22 +0200 Subject: [PATCH 1/2] add mising lang tag --- application/language/bulgarian/options_lang.php | 1 + application/language/chinese_simplified/options_lang.php | 1 + application/language/czech/options_lang.php | 1 + application/language/dutch/options_lang.php | 1 + application/language/english/options_lang.php | 1 + application/language/finnish/options_lang.php | 1 + application/language/french/options_lang.php | 1 + application/language/german/options_lang.php | 1 + application/language/greek/options_lang.php | 1 + application/language/italian/options_lang.php | 1 + application/language/polish/options_lang.php | 1 + application/language/russian/options_lang.php | 1 + application/language/spanish/options_lang.php | 1 + application/language/swedish/options_lang.php | 1 + application/language/turkish/options_lang.php | 1 + 15 files changed, 15 insertions(+) diff --git a/application/language/bulgarian/options_lang.php b/application/language/bulgarian/options_lang.php index f41ee4a9..29199d74 100644 --- a/application/language/bulgarian/options_lang.php +++ b/application/language/bulgarian/options_lang.php @@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'The Age in Minutes of spots, that will $lang['options_dxcluster_decont'] = 'Show spots which are spotted from following continent'; $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to '; $lang['options_dxcluster_decont_changed_to']='de continent changed to '; +$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown'; $lang['options_save'] = 'Save'; diff --git a/application/language/chinese_simplified/options_lang.php b/application/language/chinese_simplified/options_lang.php index aab67a5b..878d9bc4 100644 --- a/application/language/chinese_simplified/options_lang.php +++ b/application/language/chinese_simplified/options_lang.php @@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'The Age in Minutes of spots, that will $lang['options_dxcluster_decont'] = 'Show spots which are spotted from following continent'; $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to '; $lang['options_dxcluster_decont_changed_to']='de continent changed to '; +$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown'; $lang['options_save'] = 'Save'; diff --git a/application/language/czech/options_lang.php b/application/language/czech/options_lang.php index 4608f719..95f232e0 100644 --- a/application/language/czech/options_lang.php +++ b/application/language/czech/options_lang.php @@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'The Age in Minutes of spots, that will $lang['options_dxcluster_decont'] = 'Show spots which are spotted from following continent'; $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to '; $lang['options_dxcluster_decont_changed_to']='de continent changed to '; +$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown'; $lang['options_save'] = 'Uložit'; diff --git a/application/language/dutch/options_lang.php b/application/language/dutch/options_lang.php index 58ddf7a0..5c55b09a 100644 --- a/application/language/dutch/options_lang.php +++ b/application/language/dutch/options_lang.php @@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'The Age in Minutes of spots, that will $lang['options_dxcluster_decont'] = 'Show spots which are spotted from following continent'; $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to '; $lang['options_dxcluster_decont_changed_to']='de continent changed to '; +$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown'; $lang['options_save'] = 'Save'; diff --git a/application/language/english/options_lang.php b/application/language/english/options_lang.php index da12f681..466314e2 100644 --- a/application/language/english/options_lang.php +++ b/application/language/english/options_lang.php @@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'The Age in Minutes of spots, that will $lang['options_dxcluster_decont'] = 'Show spots which are spotted from following continent'; $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to '; $lang['options_dxcluster_decont_changed_to']='de continent changed to '; +$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown'; $lang['options_save'] = 'Save'; diff --git a/application/language/finnish/options_lang.php b/application/language/finnish/options_lang.php index 99184f59..47176711 100644 --- a/application/language/finnish/options_lang.php +++ b/application/language/finnish/options_lang.php @@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'The Age in Minutes of spots, that will $lang['options_dxcluster_decont'] = 'Show spots which are spotted from following continent'; $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to '; $lang['options_dxcluster_decont_changed_to']='de continent changed to '; +$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown'; $lang['options_save'] = 'Save'; diff --git a/application/language/french/options_lang.php b/application/language/french/options_lang.php index da12f681..466314e2 100644 --- a/application/language/french/options_lang.php +++ b/application/language/french/options_lang.php @@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'The Age in Minutes of spots, that will $lang['options_dxcluster_decont'] = 'Show spots which are spotted from following continent'; $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to '; $lang['options_dxcluster_decont_changed_to']='de continent changed to '; +$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown'; $lang['options_save'] = 'Save'; diff --git a/application/language/german/options_lang.php b/application/language/german/options_lang.php index 4f64ecc5..10d8ea00 100644 --- a/application/language/german/options_lang.php +++ b/application/language/german/options_lang.php @@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'Das Alter von Spots in Minuten, welche $lang['options_dxcluster_decont'] = 'Nur Spots berücksichtigen, die in folgendem Kontinent erfasst wurden'; $lang['options_dxcluster_maxage_changed_to']='Maximales Spot-Alter geändert auf '; $lang['options_dxcluster_decont_changed_to']='Spotterkontinent geändert auf '; +$lang['options_dxcluster_decont_hint']='Nur Spots von Spottern dieses Kontinents werden angezeigt'; $lang['options_save'] = 'Speichern'; diff --git a/application/language/greek/options_lang.php b/application/language/greek/options_lang.php index da12f681..466314e2 100644 --- a/application/language/greek/options_lang.php +++ b/application/language/greek/options_lang.php @@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'The Age in Minutes of spots, that will $lang['options_dxcluster_decont'] = 'Show spots which are spotted from following continent'; $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to '; $lang['options_dxcluster_decont_changed_to']='de continent changed to '; +$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown'; $lang['options_save'] = 'Save'; diff --git a/application/language/italian/options_lang.php b/application/language/italian/options_lang.php index da12f681..466314e2 100644 --- a/application/language/italian/options_lang.php +++ b/application/language/italian/options_lang.php @@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'The Age in Minutes of spots, that will $lang['options_dxcluster_decont'] = 'Show spots which are spotted from following continent'; $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to '; $lang['options_dxcluster_decont_changed_to']='de continent changed to '; +$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown'; $lang['options_save'] = 'Save'; diff --git a/application/language/polish/options_lang.php b/application/language/polish/options_lang.php index da12f681..466314e2 100644 --- a/application/language/polish/options_lang.php +++ b/application/language/polish/options_lang.php @@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'The Age in Minutes of spots, that will $lang['options_dxcluster_decont'] = 'Show spots which are spotted from following continent'; $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to '; $lang['options_dxcluster_decont_changed_to']='de continent changed to '; +$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown'; $lang['options_save'] = 'Save'; diff --git a/application/language/russian/options_lang.php b/application/language/russian/options_lang.php index fdb50673..acea4438 100644 --- a/application/language/russian/options_lang.php +++ b/application/language/russian/options_lang.php @@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'Возраст спотов, кото $lang['options_dxcluster_decont'] = 'Отображать споты, которые присланы с континента '; $lang['options_dxcluster_maxage_changed_to']='Максимальный возраст спотов изменён на '; $lang['options_dxcluster_decont_changed_to']='континент изменён на '; +$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown'; $lang['options_save'] = 'Сохранить'; diff --git a/application/language/spanish/options_lang.php b/application/language/spanish/options_lang.php index da12f681..466314e2 100644 --- a/application/language/spanish/options_lang.php +++ b/application/language/spanish/options_lang.php @@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'The Age in Minutes of spots, that will $lang['options_dxcluster_decont'] = 'Show spots which are spotted from following continent'; $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to '; $lang['options_dxcluster_decont_changed_to']='de continent changed to '; +$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown'; $lang['options_save'] = 'Save'; diff --git a/application/language/swedish/options_lang.php b/application/language/swedish/options_lang.php index 0c68e132..dc66d2f4 100644 --- a/application/language/swedish/options_lang.php +++ b/application/language/swedish/options_lang.php @@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'Åldern i minuter av fläckar, som kom $lang['options_dxcluster_decont'] = 'Visa fläckar som ses från följande kontinent'; $lang['options_dxcluster_maxage_changed_to']='Maximal ålder för fläckar ändrad till '; $lang['options_dxcluster_decont_changed_to']='kontinenten ändrats till '; +$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown'; $lang['options_save'] = 'Spara'; diff --git a/application/language/turkish/options_lang.php b/application/language/turkish/options_lang.php index da12f681..466314e2 100644 --- a/application/language/turkish/options_lang.php +++ b/application/language/turkish/options_lang.php @@ -69,5 +69,6 @@ $lang['options_dxcluster_maxage_hint'] = 'The Age in Minutes of spots, that will $lang['options_dxcluster_decont'] = 'Show spots which are spotted from following continent'; $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to '; $lang['options_dxcluster_decont_changed_to']='de continent changed to '; +$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown'; $lang['options_save'] = 'Save'; From 23130ee5bd15c852ef39a815367f5bc1cc4338ec Mon Sep 17 00:00:00 2001 From: phl0 Date: Mon, 16 Oct 2023 09:34:29 +0200 Subject: [PATCH 2/2] We should not lie about dupes on the success page ... --- application/controllers/Adif.php | 1 + application/views/adif/import_success.php | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/application/controllers/Adif.php b/application/controllers/Adif.php index 5adbcbde..b8464d8f 100644 --- a/application/controllers/Adif.php +++ b/application/controllers/Adif.php @@ -211,6 +211,7 @@ class adif extends CI_Controller { } $data['adif_errors'] = $custom_errors; + $data['skip_dupes'] = $this->input->post('skipDuplicate'); $data['page_title'] = "ADIF Imported"; diff --git a/application/views/adif/import_success.php b/application/views/adif/import_success.php index e6909a43..6c3b8c9e 100644 --- a/application/views/adif/import_success.php +++ b/application/views/adif/import_success.php @@ -13,7 +13,13 @@

Yay, its imported!

-

The ADIF File has been imported, and any dupes skipped.

+

The ADIF File has been imported. + Dupes were inserted!'; + } else { + echo ' Dupes were skipped.'; + } ?> +

ADIF Errors

You have ADIF errors, the QSOs have still been added but these fields have not been populated.