diff --git a/README.md b/README.md index 76900284..ff83c790 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ When submitting PRs please make sure code is commented and includes one feature ## Credits -Thanks to Andy (VE7CXZ), Gavin (M1BXF), Graham (W5ISP), Robert (M0VFC), Corby (K0SKW), Andy (GI0VGV), Tobias (DL4TMA), Tony (G0WFV), Kim (DG9VH), Michael (G7VJR), Andreas (LA8AJA), Matthias (DL9MJ), Thomas (DO2TWE), Pat (KT3PJ), Flo (DF2ET) and Joerg (DJ7NT) for contributing code or help to Cloudlog. +Thanks to Andy (VE7CXZ), Gavin (M1BXF), Graham (W5ISP), Robert (M0VFC), Corby (K0SKW), Andy (GI0VGV), Tobias (DL4TMA), Tony (G0WFV), Kim (DG9VH), Michael (G7VJR), Andreas (LA8AJA), Matthias (DL9MJ), Thomas (DO2TWE), Pat (KT3PJ), Flo (DF2ET), Joerg (DJ7NT) and Fabian (HB9HIL) for contributing code or help to Cloudlog. ## Patreons & Donors diff --git a/application/config/migration.php b/application/config/migration.php index e53b120a..7756a324 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE; | */ -$config['migration_version'] = 149; +$config['migration_version'] = 150; /* |-------------------------------------------------------------------------- diff --git a/application/controllers/User.php b/application/controllers/User.php index 8d6769a2..7bb77a03 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -500,10 +500,10 @@ class User extends CI_Controller { $this->input->set_cookie($cookie); } if($this->session->userdata('user_id') == $this->input->post('id', true)) { - $this->session->set_flashdata('success', 'User '.$this->input->post('user_name', true).' edited'); + $this->session->set_flashdata('success', lang('account_user').' '.$this->input->post('user_name', true).' '.lang('account_word_edited')); redirect('user/edit/'.$this->uri->segment(3)); } else { - $this->session->set_flashdata('success', 'User '.$this->input->post('user_name', true).' edited'); + $this->session->set_flashdata('success', lang('account_user').' '.$this->input->post('user_name', true).' '.lang('account_word_edited')); redirect('user'); } return; diff --git a/application/language/bulgarian/account_lang.php b/application/language/bulgarian/account_lang.php index 7a6b97e4..71f8718b 100644 --- a/application/language/bulgarian/account_lang.php +++ b/application/language/bulgarian/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = 'Create User Account'; $lang['account_edit_account'] = 'Edit Account'; $lang['account_account_information'] = 'Account Information'; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Username'; $lang['account_email_address'] = 'Email Address'; $lang['account_password'] = 'Password'; diff --git a/application/language/bulgarian/qso_lang.php b/application/language/bulgarian/qso_lang.php index f7acf26d..2b407ba0 100644 --- a/application/language/bulgarian/qso_lang.php +++ b/application/language/bulgarian/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; @@ -52,10 +53,13 @@ $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; +$lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; $lang['qso_simplefle_error_band'] = "Band is missing!"; $lang['qso_simplefle_error_mode'] = "Mode is missing!"; @@ -64,6 +68,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; diff --git a/application/language/chinese_simplified/account_lang.php b/application/language/chinese_simplified/account_lang.php index 3ca0c89c..069c0a14 100644 --- a/application/language/chinese_simplified/account_lang.php +++ b/application/language/chinese_simplified/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = '创建用户账户i'; $lang['account_edit_account'] = '编辑账户'; $lang['account_account_information'] = '账户信息'; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = '用户名'; $lang['account_email_address'] = '电子邮件'; $lang['account_password'] = '密码'; diff --git a/application/language/chinese_simplified/qso_lang.php b/application/language/chinese_simplified/qso_lang.php index 1f6af442..a5efba4d 100644 --- a/application/language/chinese_simplified/qso_lang.php +++ b/application/language/chinese_simplified/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; @@ -52,10 +53,13 @@ $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; +$lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; $lang['qso_simplefle_error_band'] = "Band is missing!"; $lang['qso_simplefle_error_mode'] = "Mode is missing!"; @@ -64,6 +68,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; diff --git a/application/language/czech/account_lang.php b/application/language/czech/account_lang.php index 9992b46b..c295f5d1 100644 --- a/application/language/czech/account_lang.php +++ b/application/language/czech/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = 'Vytvořit uživatelský účet'; $lang['account_edit_account'] = 'Upravit účet'; $lang['account_account_information'] = 'Informace o účtu'; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Uživatelské jméno'; $lang['account_email_address'] = 'Emailová adresa'; $lang['account_password'] = 'Heslo'; diff --git a/application/language/czech/qso_lang.php b/application/language/czech/qso_lang.php index b0b1a64e..10778550 100644 --- a/application/language/czech/qso_lang.php +++ b/application/language/czech/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; @@ -52,10 +53,13 @@ $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; +$lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; $lang['qso_simplefle_error_band'] = "Band is missing!"; $lang['qso_simplefle_error_mode'] = "Mode is missing!"; @@ -64,6 +68,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; diff --git a/application/language/dutch/account_lang.php b/application/language/dutch/account_lang.php index 8206f834..32280eb6 100644 --- a/application/language/dutch/account_lang.php +++ b/application/language/dutch/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = 'Create User Account'; $lang['account_edit_account'] = 'Edit Account'; $lang['account_account_information'] = 'Account Information'; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Username'; $lang['account_email_address'] = 'Email Address'; $lang['account_password'] = 'Password'; diff --git a/application/language/dutch/qso_lang.php b/application/language/dutch/qso_lang.php index 1ef1f502..0eb9e3d5 100644 --- a/application/language/dutch/qso_lang.php +++ b/application/language/dutch/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; @@ -52,10 +53,13 @@ $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; +$lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; $lang['qso_simplefle_error_band'] = "Band is missing!"; $lang['qso_simplefle_error_mode'] = "Mode is missing!"; @@ -64,6 +68,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; diff --git a/application/language/english/account_lang.php b/application/language/english/account_lang.php index 8f4f7be2..753a3165 100644 --- a/application/language/english/account_lang.php +++ b/application/language/english/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = 'Create User Account'; $lang['account_edit_account'] = 'Edit Account'; $lang['account_account_information'] = 'Account Information'; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Username'; $lang['account_email_address'] = 'Email Address'; $lang['account_password'] = 'Password'; diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index d800cfe1..ccec36be 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; @@ -52,10 +53,13 @@ $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; +$lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; $lang['qso_simplefle_error_band'] = "Band is missing!"; $lang['qso_simplefle_error_mode'] = "Mode is missing!"; @@ -64,6 +68,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; diff --git a/application/language/finnish/account_lang.php b/application/language/finnish/account_lang.php index 9337afa1..c680f524 100644 --- a/application/language/finnish/account_lang.php +++ b/application/language/finnish/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = 'Luo käyttäjätili'; $lang['account_edit_account'] = 'Muokkaa käyttäjätiliä'; $lang['account_account_information'] = 'Account Information'; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'käyttäjänimi'; $lang['account_email_address'] = 'Email'; $lang['account_password'] = 'Salasana'; diff --git a/application/language/finnish/qso_lang.php b/application/language/finnish/qso_lang.php index 1ef7188a..b84dcf8b 100644 --- a/application/language/finnish/qso_lang.php +++ b/application/language/finnish/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; @@ -52,10 +53,13 @@ $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; +$lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; $lang['qso_simplefle_error_band'] = "Band is missing!"; $lang['qso_simplefle_error_mode'] = "Mode is missing!"; @@ -64,6 +68,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; diff --git a/application/language/french/account_lang.php b/application/language/french/account_lang.php index e5819c11..db4d2c02 100644 --- a/application/language/french/account_lang.php +++ b/application/language/french/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = 'Creer un compte'; $lang['account_edit_account'] = 'Editer un compte'; $lang['account_account_information'] = 'Informations du compte'; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Utilisateur'; $lang['account_email_address'] = 'Email'; $lang['account_password'] = 'Mot de passe'; diff --git a/application/language/french/qso_lang.php b/application/language/french/qso_lang.php index 822ef5ef..1519c7d2 100644 --- a/application/language/french/qso_lang.php +++ b/application/language/french/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; @@ -52,10 +53,13 @@ $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; +$lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; $lang['qso_simplefle_error_band'] = "Band is missing!"; $lang['qso_simplefle_error_mode'] = "Mode is missing!"; @@ -64,6 +68,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; diff --git a/application/language/german/account_lang.php b/application/language/german/account_lang.php index b7cc58f0..10e65ccf 100644 --- a/application/language/german/account_lang.php +++ b/application/language/german/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = 'Benutzerkonto anlegen'; $lang['account_edit_account'] = 'Benutzerkonto editieren'; $lang['account_account_information'] = 'Bnutzerkonto Informationen'; +$lang['account_user'] = "Benutzer"; +$lang['account_word_edited'] = "bearbeitet"; $lang['account_username'] = 'Benutzername'; $lang['account_email_address'] = 'Emailadresse'; $lang['account_password'] = 'Passwort'; diff --git a/application/language/german/general_words_lang.php b/application/language/german/general_words_lang.php index 09911984..a5d64700 100644 --- a/application/language/german/general_words_lang.php +++ b/application/language/german/general_words_lang.php @@ -194,3 +194,8 @@ $lang['southamerica'] = 'Südamerika'; $lang['gen_band_selection'] = 'Bandauswahl'; $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_logbooks_warning'] = 'Es wurde kein Stationslogbuch angelegt. Klicke hier, um das zu tun!'; diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php index cc553da9..9e86c42b 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry' oder einfach 'FLE' ist ein S $lang['qso_simplefle_info_ln3'] = "FLE wurde ursprünglich von DF3CB geschrieben. Auf seiner Website bietet er ein Programm für Windows an. Simple FLE wurde von OK2CQR auf Basis des FLE von DF3CB geschrieben und bietet eine Webapplikation zum Erfassen von QSOs."; $lang['qso_simplefle_info_ln4'] = "Ein üblicher Anwendungsfall ist, wenn Sie Ihre Papier-Logbücher von einer Outdoor-Aktion erfassen müssen und SimpleFLE nun auch in Cloudlog verfügbar. Informationen über die allgemeine Syntax und Handhabung gibt es hier."; $lang['qso_simplefle_qso_data'] = "QSO Daten"; +$lang['qso_simplefle_qso_date_hint'] = "Wenn du kein Datum auswählst, wird das heutige Datum verwendet."; $lang['qso_simplefle_qso_list'] = "QSO Liste"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Datum"; @@ -52,10 +53,13 @@ $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "z.B. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Stationsstandort"; $lang['qso_simplefle_station_call_location_hint'] = "Falls du von einem neuen Standort oder mit einem neuen Rufzeichen gefunkt hast, erstelle erst einen neuen Stationsstandort"; +$lang['qso_simplefle_utc_time'] = "Aktuelle UTC Zeit"; $lang['qso_simplefle_enter_the_data'] = "Gibt hier die Daten ein"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Schliesse und Lade Beispiel Daten"; $lang['qso_simplefle_reload'] = "Aktualisiere QSO Liste"; $lang['qso_simplefle_save'] = "Speichere in Cloudlog"; $lang['qso_simplefle_clear'] = "Lösche QSO Daten"; +$lang['qso_simplefle_refs_hint'] = "Die Ref. kann entweder SOTA, IOTA, POTA oder WWFF sein."; $lang['qso_simplefle_error_band'] = "Band fehlt!"; $lang['qso_simplefle_error_mode'] = "Mode fehlt!"; @@ -64,6 +68,7 @@ $lang['qso_simplefle_error_stationcall'] = "Stationsstandort nicht ausgewählt"; $lang['qso_simplefle_error_operator'] = "'Operator' Feld ist leer"; $lang['qso_simplefle_warning_reset'] = "Warnung! Willst du wirklich alles zurücksetzen?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warnung! Du kannst die QSO Liste nicht loggen, da bei manchen QSO das Band und/oder der Mode fehlt!"; +$lang['qso_simplefle_warning_example_data'] = "Achtung! Das Daten Feld enthält Beispiel Daten. Lösche zuerst die QSO Daten!"; $lang['qso_simplefle_confirm_save_to_log'] = "Bist du dir sicher, dass du diese QSO loggen und die Eingabe zurücksetzen willst?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO geloggt!"; $lang['qso_simplefle_success_save_to_log'] = "Die QSO wurden erfolgreich im Logbuch gespeichert!"; diff --git a/application/language/greek/account_lang.php b/application/language/greek/account_lang.php index a030ad78..a4f5d22b 100644 --- a/application/language/greek/account_lang.php +++ b/application/language/greek/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = 'Create User Account'; $lang['account_edit_account'] = 'Edit Account'; $lang['account_account_information'] = 'Account Information'; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Username'; $lang['account_email_address'] = 'Email Address'; $lang['account_password'] = 'Password'; diff --git a/application/language/greek/qso_lang.php b/application/language/greek/qso_lang.php index 4bce9503..31d11350 100644 --- a/application/language/greek/qso_lang.php +++ b/application/language/greek/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; @@ -52,10 +53,13 @@ $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; +$lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; $lang['qso_simplefle_error_band'] = "Band is missing!"; $lang['qso_simplefle_error_mode'] = "Mode is missing!"; @@ -64,6 +68,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; diff --git a/application/language/italian/account_lang.php b/application/language/italian/account_lang.php index 70930ce1..65cad6b6 100644 --- a/application/language/italian/account_lang.php +++ b/application/language/italian/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = 'Create User Account'; $lang['account_edit_account'] = 'Edit Account'; $lang['account_account_information'] = 'Account Information'; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Username'; $lang['account_email_address'] = 'Email Address'; $lang['account_password'] = 'Password'; diff --git a/application/language/italian/qso_lang.php b/application/language/italian/qso_lang.php index cda18464..4d28e9ee 100644 --- a/application/language/italian/qso_lang.php +++ b/application/language/italian/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; @@ -52,10 +53,13 @@ $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; +$lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; $lang['qso_simplefle_error_band'] = "Band is missing!"; $lang['qso_simplefle_error_mode'] = "Mode is missing!"; @@ -64,6 +68,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; diff --git a/application/language/polish/account_lang.php b/application/language/polish/account_lang.php index e5b6a2b5..873da71e 100644 --- a/application/language/polish/account_lang.php +++ b/application/language/polish/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = 'Create User Account'; $lang['account_edit_account'] = 'Edit Account'; $lang['account_account_information'] = 'Account Information'; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Username'; $lang['account_email_address'] = 'Email Address'; $lang['account_password'] = 'Password'; diff --git a/application/language/polish/qso_lang.php b/application/language/polish/qso_lang.php index 296a8810..f56812d6 100644 --- a/application/language/polish/qso_lang.php +++ b/application/language/polish/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; @@ -52,10 +53,13 @@ $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; +$lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; $lang['qso_simplefle_error_band'] = "Band is missing!"; $lang['qso_simplefle_error_mode'] = "Mode is missing!"; @@ -64,6 +68,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; diff --git a/application/language/russian/account_lang.php b/application/language/russian/account_lang.php index 73c6140c..51497241 100644 --- a/application/language/russian/account_lang.php +++ b/application/language/russian/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = ' Создать аккаунт поль $lang['account_edit_account'] = 'Редактировать аккаунт'; $lang['account_account_information'] = 'Информация об аккаунте'; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Имя пользователя'; $lang['account_email_address'] = 'Адрес электронной почты'; $lang['account_password'] = 'Пароль'; diff --git a/application/language/russian/qso_lang.php b/application/language/russian/qso_lang.php index 98efa973..0d5acd81 100644 --- a/application/language/russian/qso_lang.php +++ b/application/language/russian/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; @@ -52,10 +53,13 @@ $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; +$lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; $lang['qso_simplefle_error_band'] = "Band is missing!"; $lang['qso_simplefle_error_mode'] = "Mode is missing!"; @@ -64,6 +68,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; diff --git a/application/language/spanish/account_lang.php b/application/language/spanish/account_lang.php index 2187231a..f5d04adf 100644 --- a/application/language/spanish/account_lang.php +++ b/application/language/spanish/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = 'Create User Account'; $lang['account_edit_account'] = 'Edit Account'; $lang['account_account_information'] = 'Account Information'; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Username'; $lang['account_email_address'] = 'Email Address'; $lang['account_password'] = 'Password'; diff --git a/application/language/spanish/qso_lang.php b/application/language/spanish/qso_lang.php index 336acbb5..091150cd 100644 --- a/application/language/spanish/qso_lang.php +++ b/application/language/spanish/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; @@ -52,10 +53,13 @@ $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; +$lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; $lang['qso_simplefle_error_band'] = "Band is missing!"; $lang['qso_simplefle_error_mode'] = "Mode is missing!"; @@ -64,6 +68,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; diff --git a/application/language/swedish/account_lang.php b/application/language/swedish/account_lang.php index 344de1cd..b9e40395 100644 --- a/application/language/swedish/account_lang.php +++ b/application/language/swedish/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = 'Skapa användarkonto'; $lang['account_edit_account'] = 'Redigera användarkonto'; $lang['account_account_information'] = 'Användarkontoinformation'; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Användarnamn'; $lang['account_email_address'] = 'E-postadress'; $lang['account_password'] = 'Lösenord'; diff --git a/application/language/swedish/qso_lang.php b/application/language/swedish/qso_lang.php index 36bed414..a8ba6b0d 100644 --- a/application/language/swedish/qso_lang.php +++ b/application/language/swedish/qso_lang.php @@ -45,29 +45,34 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; -$lang['qso_simplefle_qso_list_total'] = "Total"; +$lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; - -$lang['qso_simplefle_error_band'] = "Band is missing!"; -$lang['qso_simplefle_error_mode'] = "Mode is missing!"; -$lang['qso_simplefle_error_time'] = "Time is not set!"; -$lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; -$lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; -$lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; -$lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; -$lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; -$lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; -$lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; -$lang['qso_simplefle_error_date'] = "Invalid date"; +$lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; + +$lang['qso_simplefle_error_band'] = "Band is missing!"; +$lang['qso_simplefle_error_mode'] = "Mode is missing!"; +$lang['qso_simplefle_error_time'] = "Time is not set!"; +$lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; +$lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; +$lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; +$lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; +$lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; +$lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; +$lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; +$lang['qso_simplefle_error_date'] = "Invalid date"; $lang['qso_simplefle_syntax_help_button'] = "Syntax Help"; $lang['qso_simplefle_syntax_help_title'] = "Syntax for FLE"; diff --git a/application/language/turkish/account_lang.php b/application/language/turkish/account_lang.php index 6a66ff6e..8dbffce2 100644 --- a/application/language/turkish/account_lang.php +++ b/application/language/turkish/account_lang.php @@ -13,6 +13,8 @@ $lang['account_create_user_account'] = 'Create User Account'; $lang['account_edit_account'] = 'Edit Account'; $lang['account_account_information'] = 'Account Information'; +$lang['account_user'] = "User"; +$lang['account_word_edited'] = "edited"; $lang['account_username'] = 'Username'; $lang['account_email_address'] = 'Email Address'; $lang['account_password'] = 'Password'; diff --git a/application/language/turkish/qso_lang.php b/application/language/turkish/qso_lang.php index 118f7239..b0d8bdd8 100644 --- a/application/language/turkish/qso_lang.php +++ b/application/language/turkish/qso_lang.php @@ -45,6 +45,7 @@ $lang['qso_simplefle_info_ln2'] = "'Fast Log Entry', or simply 'FLE' is a system $lang['qso_simplefle_info_ln3'] = "FLE was originally written by DF3CB. He offers a program for Windows on his website. Simple FLE was written by OK2CQR based on DF3CB's FLE and provides a web interface to log QSOs."; $lang['qso_simplefle_info_ln4'] = "A common use-case is if you have to import your paperlogs from a outdoor session and now SimpleFLE is also available in Cloudlog. Information about the syntax and how FLE works can be found here."; $lang['qso_simplefle_qso_data'] = "QSO Data"; +$lang['qso_simplefle_qso_date_hint'] = "If you don't choose a date, today's date will be used."; $lang['qso_simplefle_qso_list'] = "QSO List"; $lang['qso_simplefle_qso_list_total'] = "Total"; $lang['qso_simplefle_qso_date'] = "QSO Date"; @@ -52,10 +53,13 @@ $lang['qso_simplefle_operator'] = "Operator"; $lang['qso_simplefle_operator_hint'] = "e.g. OK2CQR"; $lang['qso_simplefle_station_call_location'] = "Station Call/Location"; $lang['qso_simplefle_station_call_location_hint'] = "If you did operate from a new location, first create a new Station Location"; +$lang['qso_simplefle_utc_time'] = "Current UTC Time"; $lang['qso_simplefle_enter_the_data'] = "Enter the Data"; +$lang['qso_simplefle_syntax_help_close_w_sample'] = "Close and Load Sample Data"; $lang['qso_simplefle_reload'] = "Reload QSO List"; $lang['qso_simplefle_save'] = "Save in Cloudlog"; $lang['qso_simplefle_clear'] = "Clear Logging Session"; +$lang['qso_simplefle_refs_hint'] = "The Refs can be either SOTA, IOTA, POTA or WWFF"; $lang['qso_simplefle_error_band'] = "Band is missing!"; $lang['qso_simplefle_error_mode'] = "Mode is missing!"; @@ -64,6 +68,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; $lang['qso_simplefle_success_save_to_log'] = "The QSO were successfully logged in the logbook!"; diff --git a/application/libraries/AdifHelper.php b/application/libraries/AdifHelper.php index a639896c..d167077a 100644 --- a/application/libraries/AdifHelper.php +++ b/application/libraries/AdifHelper.php @@ -198,7 +198,13 @@ class AdifHelper { $line .= $this->getAdifFieldLine("MY_ITU_ZONE", $qso->station_itu); - $line .= $this->getAdifFieldLine("MY_CNTY", $qso->station_cnty); + if($qso->state) { + $county = trim($qso->state) . "," . trim($qso->station_cnty); + } else { + $county = trim($qso->station_cnty); + } + + $line .= $this->getAdifFieldLine("MY_CNTY", $county); $line .= $this->getAdifFieldLine("MY_SIG", $qso->station_sig); diff --git a/application/migrations/150_tag_2_5_0.php b/application/migrations/150_tag_2_5_0.php new file mode 100644 index 00000000..2adab425 --- /dev/null +++ b/application/migrations/150_tag_2_5_0.php @@ -0,0 +1,24 @@ +db->where('option_name', 'version'); + $this->db->update('options', array('option_value' => '2.5.0')); + } + + public function down() + { + $this->db->where('option_name', 'version'); + $this->db->update('options', array('option_value' => '2.4.11')); + } +} \ No newline at end of file diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index c7143344..8b12884a 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -1005,6 +1005,19 @@ $(document).on('keypress',function(e) { var utc = localTime + (now.getTimezoneOffset() * 60000); $('#start_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)+':'+("0" + now.getUTCSeconds()).slice(-2)); }); + $('#reset_start_time').click(function() { + var now = new Date(); + var localTime = now.getTime(); + var utc = localTime + (now.getTimezoneOffset() * 60000); + $('#start_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)); + $('#end_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)); + }); + $('#reset_end_time').click(function() { + var now = new Date(); + var localTime = now.getTime(); + var utc = localTime + (now.getTimezoneOffset() * 60000); + $('#end_time').val(("0" + now.getUTCHours()).slice(-2)+':'+("0" + now.getUTCMinutes()).slice(-2)); + }); }); diff --git a/application/views/qso/index.php b/application/views/qso/index.php index cc97f357..3222af4b 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -59,12 +59,20 @@
- + + + + + + required pattern="[0-2][0-9]:[0-5][0-9]">
+ + + required pattern="[0-2][0-9]:[0-5][0-9]">
@@ -84,6 +92,9 @@
+ + + required pattern="[0-2][0-9]:[0-5][0-9]">
diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index 544b0d97..8975a3f4 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -14,6 +14,8 @@ var lang_qso_simplefle_info_ln4 = ""; var lang_qso_simplefle_syntax_help = ""; var lang_qso_simplefle_syntax_help_title = ""; + var lang_qso_simplefle_syntax_help_close_w_sample = ""; + var lang_admin_close = ""; var lang_qso_simplefle_error_band = ""; var lang_qso_simplefle_error_mode = ""; var lang_qso_simplefle_error_time = ""; @@ -24,9 +26,11 @@ var lang_qso_simplefle_error_operator = ""; var lang_qso_simplefle_warning_reset = ""; var lang_qso_simplefle_warning_missing_band_mode = ""; + var lang_qso_simplefle_warning_example_data = ""; var lang_qso_simplefle_confirm_save_to_log = ""; var lang_qso_simplefle_success_save_to_log_header = ""; var lang_qso_simplefle_success_save_to_log = ""; + var lang_qso_simplefle_sample_data = "";

@@ -64,14 +68,12 @@
+
-
-
- - - -
+
+ +

@@ -94,6 +96,13 @@
+
+
+ + + +
+
@@ -113,7 +122,7 @@
- +
@@ -124,7 +133,8 @@ - + + @@ -132,7 +142,14 @@
SOTA | IOTA | POTA | WWFF*
- +
+
+ +
+
+ +
+
@@ -150,4 +167,4 @@
- + \ No newline at end of file diff --git a/assets/css/general.css b/assets/css/general.css index 5e101bb5..2d75a9d5 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -554,4 +554,26 @@ div#station_logbooks_linked_table_paginate { input:invalid { border-color: red; - } +} + +.sfletable{ + height: 470px; + } + +.sfletable.table { + width: 100%; +} + +.sfletable.table thead, .sfletable.table tbody tr { + display: block; + width: 100%; + table-layout: fixed; + display: inline-table; +} + +.sfletable.table tbody { + width: 95%; + overflow-y: scroll; + max-height: 440px; + position: absolute; +} diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index d68257ef..a29284ba 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -27,19 +27,71 @@ $('#simpleFleInfoButton').click(function (event) { $('#js-syntax').click(function (event) { $('#js-syntax').prop("disabled", false); $.ajax({ - url: base_url + 'index.php/simplefle/displaySyntax', - type: 'post', - success: function (html) { - BootstrapDialog.alert({ - title: "

"+lang_qso_simplefle_syntax_help_title+"

", - size: BootstrapDialog.SIZE_WIDE, - nl2br: false, - message: html, - }); - } - }); + url: base_url + "index.php/simplefle/displaySyntax", + type: "post", + success: function (html) { + BootstrapDialog.show({ + title: "

" + lang_qso_simplefle_syntax_help_title + "

", + type: BootstrapDialog.TYPE_INFO, + size: BootstrapDialog.SIZE_WIDE, + nl2br: false, + message: html, + buttons: [ + { + label: lang_qso_simplefle_syntax_help_close_w_sample, + action: function () { + BootstrapDialog.confirm({ + title: lang_general_word_warning, + message: lang_qso_simplefle_warning_reset, + type: BootstrapDialog.TYPE_DANGER, + btnCancelLabel: lang_general_word_cancel, + btnOKLabel: lang_general_word_ok, + btnOKClass: "btn-warning", + callback: function (result) { + if (result) { + clearSession(); + + const logData = ` +*example-data* +80m cw +1212 m0abc okff-1234 +3 hb9hil +4 ok1tn +20 dl6kva 7 8 +5 dl5cw +ssb +32 ok7wa ol/zl-071 5 8 +33 ok1xxx 4 3 + `; + + $textarea.val(logData.trim()); + handleInput(); + BootstrapDialog.closeAll(); + } + }, + }); + }, + }, + { + label: lang_admin_close, + cssClass: "btn-primary", + action: function (dialogItself) { + dialogItself.close(); + }, + }, + ], + }); + }, + }); }); +function updateUTCTime() { + const utcTimeElement = document.getElementById("utc-time"); + const now = new Date(); + const utcTimeString = now.toISOString().split("T")[1].split(".")[0]; + utcTimeElement.textContent = utcTimeString; +} + function handleInput() { var qsodate = ""; if ($("#qsodate").val()) { @@ -58,7 +110,7 @@ function handleInput() { var mode = ""; var freq = ""; var callsign = ""; - var sotaWff = ""; + var sotaWwff = ""; qsoList = []; $("#qsoTable tbody").empty(); @@ -113,7 +165,7 @@ function handleInput() { /^[A-Z0-9]{1,3}\/[A-Z]{2}-\d{3}|[AENOS]*[FNSUACA]-\d{3}|(?!.*FF)[A-Z0-9]{1,3}-\d{4}|[A-Z0-9]{1,3}[F]{2}-\d{4}$/i ) ) { - sotaWff = item.toUpperCase(); + sotaWwff = item.toUpperCase(); } else if ( item.match( /([a-zA-Z0-9]{1,3}[0123456789][a-zA-Z0-9]{0,3}[a-zA-Z])|.*\/([a-zA-Z0-9]{1,3}[0123456789][a-zA-Z0-9]{0,3}[a-zA-Z])|([a-zA-Z0-9]{1,3}[0123456789][a-zA-Z0-9]{0,3}[a-zA-Z])\/.*/ @@ -168,20 +220,32 @@ function handleInput() { mode, rst_s, rst_r, - sotaWff, + sotaWwff, ]); + let sotaWwffText = ""; + + if (isSOTA(sotaWwff)) { + sotaWwffText = `S: ${sotaWwff}`; + } else if (isPOTA(sotaWwff)) { + sotaWwffText = `P: ${sotaWwff}`; + } else if (isIOTA(sotaWwff)) { + sotaWwffText = `I: ${sotaWwff}`; + } else if (isWWFF(sotaWwff)) { + sotaWwffText = `W: ${sotaWwff}`; + } + const tableRow = $(` - ${extraQsoDate} - ${qsotime} - ${callsign} - ${band} - ${mode} - ${rst_s} - ${rst_r} - ${operator} - ${sotaWff} - `); + ${extraQsoDate} + ${qsotime} + ${callsign} + ${band} + ${mode} + ${rst_s} + ${rst_r} + ${operator} + ${sotaWwffText} + `); $("#qsoTable > tbody:last-child").append(tableRow); @@ -195,7 +259,7 @@ function handleInput() { localStorage.setItem(`user_${user_id}_my-grid`, $("#my-grid").val()); callsign = ""; - sotaWff = ""; + sotaWwff = ""; } showErrors(); @@ -418,6 +482,16 @@ function isBandModeEntered() { return isBandModeOK; } +function isExampleDataEntered() { + let isExampleData = false; + if (textarea.value.startsWith("*example-data*")) { + isExampleData = true; + + }; + return isExampleData; + +} + function getAdifTag(tagName, value) { return "<" + tagName + ":" + value.length + ">" + value + " "; } @@ -481,23 +555,10 @@ function isWWFF(value) { return false; } -function download(filename, text) { - var element = document.createElement("a"); - element.setAttribute( - "href", - "data:text/plain;charset=utf-8," + encodeURIComponent(text) - ); - element.setAttribute("download", filename); - - element.style.display = "none"; - document.body.appendChild(element); - - element.click(); - - document.body.removeChild(element); -} $(document).ready(function () { + setInterval(updateUTCTime, 1000); + updateUTCTime(); var tabledata = localStorage.getItem(`user_${user_id}_tabledata`); var mycall = localStorage.getItem(`user_${user_id}_my-call`); var operator = localStorage.getItem(`user_${user_id}_operator`); @@ -547,6 +608,7 @@ $(".js-save-to-log").click(function () { setTimeout(function() { $('#textarea').css('border', ''); }, 2000); + return false; } if (false === isBandModeEntered()) { BootstrapDialog.alert({ @@ -559,6 +621,17 @@ $(".js-save-to-log").click(function () { }); return false; } + if (true === isExampleDataEntered()) { + BootstrapDialog.alert({ + title: lang_general_word_warning, + message: lang_qso_simplefle_warning_example_data, + type: BootstrapDialog.TYPE_DANGER, + btnCancelLabel: lang_general_word_cancel, + btnOKLabel: lang_general_word_ok, + btnOKClass: "btn-warning", + }); + return false; + } else { handleInput(); BootstrapDialog.confirm({