diff --git a/application/controllers/Awards.php b/application/controllers/Awards.php index 3f845ec5..68f51cf3 100644 --- a/application/controllers/Awards.php +++ b/application/controllers/Awards.php @@ -238,7 +238,7 @@ class Awards extends CI_Controller { $data['page_title'] = "Awards - WAJA"; $this->load->view('interface_assets/header', $data); $this->load->view('awards/waja/index'); - $this->load->view('interface_assets/footer'); + $this->load->view('interface_assets/footer', $footerData); } public function vucc() { @@ -1018,6 +1018,8 @@ class Awards extends CI_Controller { $cq_array = null; } + $zones = array(); + foreach ($cq_array as $cq => $value) { foreach ($value as $key) { if($key != "") { @@ -1041,6 +1043,60 @@ class Awards extends CI_Controller { echo json_encode($zones); } + /* + function waja_map + */ + public function waja_map() { + $prefectureString = '01,02,03,04,05,06,07,08,09,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47'; + $wajaArray = explode(',', $prefectureString); + + $this->load->model('waja'); + $this->load->model('bands'); + + $bands[] = $this->security->xss_clean($this->input->post('band')); + + $postdata['qsl'] = $this->input->post('qsl') == 0 ? NULL: 1; + $postdata['lotw'] = $this->input->post('lotw') == 0 ? NULL: 1; + $postdata['eqsl'] = $this->input->post('eqsl') == 0 ? NULL: 1; + $postdata['worked'] = $this->input->post('worked') == 0 ? NULL: 1; + $postdata['confirmed'] = $this->input->post('confirmed') == 0 ? NULL: 1; + $postdata['notworked'] = $this->input->post('notworked') == 0 ? NULL: 1; + $postdata['band'] = $this->security->xss_clean($this->input->post('band')); + $postdata['mode'] = $this->security->xss_clean($this->input->post('mode')); + + + $waja_array = $this->waja->get_waja_array($bands, $postdata); + + $prefectures = array(); + + foreach ($wajaArray as $state) { // Generating array for use in the table + $prefectures[$state] = '-'; // Inits each state's count + } + + + foreach ($waja_array as $waja => $value) { + foreach ($value as $key) { + if($key != "") { + if (strpos($key, '>W<') !== false) { + $prefectures[$waja] = 'W'; + break; + } + if (strpos($key, '>C<') !== false) { + $prefectures[$waja] = 'C'; + break; + } + if (strpos($key, '-') !== false) { + $prefectures[$waja] = '-'; + break; + } + } + } + } + + header('Content-Type: application/json'); + echo json_encode($prefectures); + } + /* function dxcc_map This displays the DXCC map diff --git a/application/controllers/Eqsl.php b/application/controllers/Eqsl.php index d5d52e9c..76c266b6 100644 --- a/application/controllers/Eqsl.php +++ b/application/controllers/Eqsl.php @@ -295,6 +295,7 @@ class eqsl extends CI_Controller { "_" = 5F "-" = 2D "." = 2E + "&" = 26 */ $adif .= "%3C"; @@ -422,12 +423,13 @@ class eqsl extends CI_Controller { // adding qslmsg if it isn't blank if ($qsl['COL_QSLMSG'] != ''){ + $qsl['COL_QSLMSG'] = str_replace(array(chr(10),chr(13)),array(' ',' '),$qsl['COL_QSLMSG']); $adif .= "%3C"; $adif .= "QSLMSG"; $adif .= "%3A"; $adif .= strlen($qsl['COL_QSLMSG']); $adif .= "%3E"; - $adif .= $qsl['COL_QSLMSG']; + $adif .= str_replace('&','%26',$qsl['COL_QSLMSG']); $adif .= "%20"; } diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php index ba7df5c1..19c60a60 100644 --- a/application/controllers/Logbookadvanced.php +++ b/application/controllers/Logbookadvanced.php @@ -124,6 +124,7 @@ class Logbookadvanced extends CI_Controller { 'wwff' => xss_clean($this->input->post('wwff')), 'qslimages' => xss_clean($this->input->post('qslimages')), 'dupes' => xss_clean($this->input->post('dupes')), + 'operator' => xss_clean($this->input->post('operator')), ); $qsos = []; @@ -286,6 +287,7 @@ class Logbookadvanced extends CI_Controller { 'pota' => '', 'wwff' => '', 'qslimages' => '', + 'operator' => '', 'ids' => xss_clean($this->input->post('ids')) ); @@ -324,6 +326,7 @@ class Logbookadvanced extends CI_Controller { 'sota' => xss_clean($this->input->post('sota')), 'pota' => xss_clean($this->input->post('pota')), 'wwff' => xss_clean($this->input->post('wwff')), + 'operator' => xss_clean($this->input->post('operator')), 'qslimages' => xss_clean($this->input->post('qslimages')), ); @@ -460,6 +463,8 @@ class Logbookadvanced extends CI_Controller { $json_string['state']['show'] = $this->input->post('state'); $json_string['cqzone']['show'] = $this->input->post('cqzone'); $json_string['iota']['show'] = $this->input->post('iota'); + $json_string['pota']['show'] = $this->input->post('pota'); + $json_string['operator']['show'] = $this->input->post('operator'); $obj['column_settings']= json_encode($json_string); diff --git a/application/language/bulgarian/awards_lang.php b/application/language/bulgarian/awards_lang.php index 00bf3286..8102d266 100644 --- a/application/language/bulgarian/awards_lang.php +++ b/application/language/bulgarian/awards_lang.php @@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - World Wide Flora and Fauna Award" $lang['awards_wwff_description_ln2'] = "WWFF, World Wide Flora and Fauna in Amateur Radio, encourages licensed ham radio operators to leave their shacks and operate portable in Protected Flora & Fauna areas (PFF) worldwide."; $lang['awards_wwff_description_ln3'] = "More than 26,000 Protected Flora & Fauna (PFF) areas worldwide are already registered in the WWFF Directory. Hunters and Activators can apply for colorful awards, both globally and nationally."; $lang['awards_wwff_description_ln4'] = "For more information, please visit: https://wwff.co/awards/."; + +/* +___________________________________________________________________________________________ +WAJA -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award"; +$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan."; +$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted."; +$lang['awards_waja_description_ln4'] = "For more information, please visit: https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm."; diff --git a/application/language/bulgarian/filter_lang.php b/application/language/bulgarian/filter_lang.php index 0a7c7df3..38b597a6 100644 --- a/application/language/bulgarian/filter_lang.php +++ b/application/language/bulgarian/filter_lang.php @@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show'; // $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php // $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php // $lang['options_save'] --> application/language/english/options_lang.php +$lang['filter_search_operator']='Search Operator'; $lang['filter_options_close'] = 'Close'; \ No newline at end of file diff --git a/application/language/bulgarian/station_lang.php b/application/language/bulgarian/station_lang.php index 44ad31fd..172d9af2 100644 --- a/application/language/bulgarian/station_lang.php +++ b/application/language/bulgarian/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info'] = "Signature Information"; $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/chinese_simplified/awards_lang.php b/application/language/chinese_simplified/awards_lang.php index a8fd9e58..2b1a7a6f 100644 --- a/application/language/chinese_simplified/awards_lang.php +++ b/application/language/chinese_simplified/awards_lang.php @@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - 世界动植物奖"; $lang['awards_wwff_description_ln2'] = "WWFF，即“业余无线电世界动植物群”，鼓励获得许可的业余无线电操作员离开棚屋，在全球动植物保护区 (PFF) 进行便携式操作。"; $lang['awards_wwff_description_ln3'] = "全球已有超过 26,000 个动植物保护区 (PFF) 已在 WWFF 名录中注册。 猎人和激活者可以申请全球和国内的丰富多彩的奖项。"; $lang['awards_wwff_description_ln4'] = "如需了解更多信息，请访问：https://wwff.co/awards/。"; + +/* +___________________________________________________________________________________________ +WAJA -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award"; +$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan."; +$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted."; +$lang['awards_waja_description_ln4'] = "For more information, please visit: https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm."; diff --git a/application/language/chinese_simplified/filter_lang.php b/application/language/chinese_simplified/filter_lang.php index f0d35a07..23a8a272 100644 --- a/application/language/chinese_simplified/filter_lang.php +++ b/application/language/chinese_simplified/filter_lang.php @@ -156,4 +156,5 @@ $lang['filter_options_show'] = '显示'; // $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php // $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php // $lang['options_save'] --> application/language/english/options_lang.php +$lang['filter_search_operator']='Search Operator'; $lang['filter_options_close'] = '关闭'; \ No newline at end of file diff --git a/application/language/chinese_simplified/station_lang.php b/application/language/chinese_simplified/station_lang.php index 44ad31fd..172d9af2 100644 --- a/application/language/chinese_simplified/station_lang.php +++ b/application/language/chinese_simplified/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info'] = "Signature Information"; $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/czech/awards_lang.php b/application/language/czech/awards_lang.php index 00bf3286..8102d266 100644 --- a/application/language/czech/awards_lang.php +++ b/application/language/czech/awards_lang.php @@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - World Wide Flora and Fauna Award" $lang['awards_wwff_description_ln2'] = "WWFF, World Wide Flora and Fauna in Amateur Radio, encourages licensed ham radio operators to leave their shacks and operate portable in Protected Flora & Fauna areas (PFF) worldwide."; $lang['awards_wwff_description_ln3'] = "More than 26,000 Protected Flora & Fauna (PFF) areas worldwide are already registered in the WWFF Directory. Hunters and Activators can apply for colorful awards, both globally and nationally."; $lang['awards_wwff_description_ln4'] = "For more information, please visit: https://wwff.co/awards/."; + +/* +___________________________________________________________________________________________ +WAJA -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award"; +$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan."; +$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted."; +$lang['awards_waja_description_ln4'] = "For more information, please visit: https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm."; diff --git a/application/language/czech/filter_lang.php b/application/language/czech/filter_lang.php index 0a7c7df3..38b597a6 100644 --- a/application/language/czech/filter_lang.php +++ b/application/language/czech/filter_lang.php @@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show'; // $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php // $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php // $lang['options_save'] --> application/language/english/options_lang.php +$lang['filter_search_operator']='Search Operator'; $lang['filter_options_close'] = 'Close'; \ No newline at end of file diff --git a/application/language/czech/station_lang.php b/application/language/czech/station_lang.php index 44ad31fd..172d9af2 100644 --- a/application/language/czech/station_lang.php +++ b/application/language/czech/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info'] = "Signature Information"; $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/dutch/awards_lang.php b/application/language/dutch/awards_lang.php index 00bf3286..8102d266 100644 --- a/application/language/dutch/awards_lang.php +++ b/application/language/dutch/awards_lang.php @@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - World Wide Flora and Fauna Award" $lang['awards_wwff_description_ln2'] = "WWFF, World Wide Flora and Fauna in Amateur Radio, encourages licensed ham radio operators to leave their shacks and operate portable in Protected Flora & Fauna areas (PFF) worldwide."; $lang['awards_wwff_description_ln3'] = "More than 26,000 Protected Flora & Fauna (PFF) areas worldwide are already registered in the WWFF Directory. Hunters and Activators can apply for colorful awards, both globally and nationally."; $lang['awards_wwff_description_ln4'] = "For more information, please visit: https://wwff.co/awards/."; + +/* +___________________________________________________________________________________________ +WAJA -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award"; +$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan."; +$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted."; +$lang['awards_waja_description_ln4'] = "For more information, please visit: https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm."; diff --git a/application/language/dutch/filter_lang.php b/application/language/dutch/filter_lang.php index 0a7c7df3..38b597a6 100644 --- a/application/language/dutch/filter_lang.php +++ b/application/language/dutch/filter_lang.php @@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show'; // $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php // $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php // $lang['options_save'] --> application/language/english/options_lang.php +$lang['filter_search_operator']='Search Operator'; $lang['filter_options_close'] = 'Close'; \ No newline at end of file diff --git a/application/language/dutch/station_lang.php b/application/language/dutch/station_lang.php index 44ad31fd..172d9af2 100644 --- a/application/language/dutch/station_lang.php +++ b/application/language/dutch/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info'] = "Signature Information"; $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/english/awards_lang.php b/application/language/english/awards_lang.php index 00bf3286..8102d266 100644 --- a/application/language/english/awards_lang.php +++ b/application/language/english/awards_lang.php @@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - World Wide Flora and Fauna Award" $lang['awards_wwff_description_ln2'] = "WWFF, World Wide Flora and Fauna in Amateur Radio, encourages licensed ham radio operators to leave their shacks and operate portable in Protected Flora & Fauna areas (PFF) worldwide."; $lang['awards_wwff_description_ln3'] = "More than 26,000 Protected Flora & Fauna (PFF) areas worldwide are already registered in the WWFF Directory. Hunters and Activators can apply for colorful awards, both globally and nationally."; $lang['awards_wwff_description_ln4'] = "For more information, please visit: https://wwff.co/awards/."; + +/* +___________________________________________________________________________________________ +WAJA -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award"; +$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan."; +$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted."; +$lang['awards_waja_description_ln4'] = "For more information, please visit: https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm."; diff --git a/application/language/english/filter_lang.php b/application/language/english/filter_lang.php index 4ddad7a0..c4108eac 100644 --- a/application/language/english/filter_lang.php +++ b/application/language/english/filter_lang.php @@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show'; // $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php // $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php // $lang['options_save'] --> application/language/english/options_lang.php +$lang['filter_search_operator']='Search Operator'; $lang['filter_options_close'] = 'Close'; diff --git a/application/language/english/station_lang.php b/application/language/english/station_lang.php index e6ab3188..d3206d8a 100644 --- a/application/language/english/station_lang.php +++ b/application/language/english/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info'] = "Signature Information"; $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/finnish/awards_lang.php b/application/language/finnish/awards_lang.php index 00bf3286..8102d266 100644 --- a/application/language/finnish/awards_lang.php +++ b/application/language/finnish/awards_lang.php @@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - World Wide Flora and Fauna Award" $lang['awards_wwff_description_ln2'] = "WWFF, World Wide Flora and Fauna in Amateur Radio, encourages licensed ham radio operators to leave their shacks and operate portable in Protected Flora & Fauna areas (PFF) worldwide."; $lang['awards_wwff_description_ln3'] = "More than 26,000 Protected Flora & Fauna (PFF) areas worldwide are already registered in the WWFF Directory. Hunters and Activators can apply for colorful awards, both globally and nationally."; $lang['awards_wwff_description_ln4'] = "For more information, please visit: https://wwff.co/awards/."; + +/* +___________________________________________________________________________________________ +WAJA -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award"; +$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan."; +$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted."; +$lang['awards_waja_description_ln4'] = "For more information, please visit: https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm."; diff --git a/application/language/finnish/filter_lang.php b/application/language/finnish/filter_lang.php index 0a7c7df3..38b597a6 100644 --- a/application/language/finnish/filter_lang.php +++ b/application/language/finnish/filter_lang.php @@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show'; // $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php // $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php // $lang['options_save'] --> application/language/english/options_lang.php +$lang['filter_search_operator']='Search Operator'; $lang['filter_options_close'] = 'Close'; \ No newline at end of file diff --git a/application/language/finnish/station_lang.php b/application/language/finnish/station_lang.php index 44ad31fd..172d9af2 100644 --- a/application/language/finnish/station_lang.php +++ b/application/language/finnish/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info'] = "Signature Information"; $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/french/awards_lang.php b/application/language/french/awards_lang.php index ed0b29d5..208a5272 100644 --- a/application/language/french/awards_lang.php +++ b/application/language/french/awards_lang.php @@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - World Wide Flora and Fauna Award" $lang['awards_wwff_description_ln2'] = "WWFF, World Wide Flora and Fauna in Amateur Radio, encourages licensed ham radio operators to leave their shacks and operate portable in Protected Flora & Fauna areas (PFF) worldwide."; $lang['awards_wwff_description_ln3'] = "More than 26,000 Protected Flora & Fauna (PFF) areas worldwide are already registered in the WWFF Directory. Hunters and Activators can apply for colorful awards, both globally and nationally."; $lang['awards_wwff_description_ln4'] = "For more information, please visit: https://wwff.co/awards/."; + +/* +___________________________________________________________________________________________ +WAJA -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award"; +$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan."; +$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted."; +$lang['awards_waja_description_ln4'] = "For more information, please visit: https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm."; diff --git a/application/language/french/filter_lang.php b/application/language/french/filter_lang.php index f2ead602..3c07d13c 100644 --- a/application/language/french/filter_lang.php +++ b/application/language/french/filter_lang.php @@ -156,4 +156,5 @@ $lang['filter_options_show'] = "Afficher"; // $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php // $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php // $lang['options_save'] --> application/language/english/options_lang.php +$lang['filter_search_operator']='Search Operator'; $lang['filter_options_close'] = "Fermer"; \ No newline at end of file diff --git a/application/language/french/station_lang.php b/application/language/french/station_lang.php index abb6e217..da43bc0d 100644 --- a/application/language/french/station_lang.php +++ b/application/language/french/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info'] = "Signature Information"; $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Message (QSLMSG) par défaut"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "Vous pouvez définir un message par défaut qui sera renseigné et envoyé pour chaque QSO pour ce lieu station. Taille max:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Vous pouvez définir un message par défaut qui sera renseigné et envoyé pour chaque QSO pour ce lieu station."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/german/awards_lang.php b/application/language/german/awards_lang.php index ea70866a..54f1b3c9 100644 --- a/application/language/german/awards_lang.php +++ b/application/language/german/awards_lang.php @@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - World Wide Flora and Fauna Award" $lang['awards_wwff_description_ln2'] = "WWFF, World Wide Flora and Fauna in Amateur Radio, ermutigt lizenzierte Funkamateure, ihre Funkstationen zu verlassen und in geschützten Flora- und Fauna-Gebieten (PFF) weltweit portabel zu funken."; $lang['awards_wwff_description_ln3'] = "Bereits mehr als 26.000 geschützte Flora- und Fauna-Gebiete (PFF) weltweit sind in dem WWFF-Verzeichnis registriert. Jäger und Aktivatoren können bunte Diplome sowohl weltweit als auch national beantragen."; $lang['awards_wwff_description_ln4'] = "Für weitere Informationen besuchen Sie bitte: https://wwff.co/awards/."; + +/* +___________________________________________________________________________________________ +WAJA -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award"; +$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan."; +$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted."; +$lang['awards_waja_description_ln4'] = "For more information, please visit: https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm."; diff --git a/application/language/german/filter_lang.php b/application/language/german/filter_lang.php index 144b4a56..aa91de90 100644 --- a/application/language/german/filter_lang.php +++ b/application/language/german/filter_lang.php @@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Anzeigen'; // $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php // $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php // $lang['options_save'] --> application/language/english/options_lang.php +$lang['filter_search_operator']='Search Operator'; $lang['filter_options_close'] = 'Schliessen'; diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php index b4defe32..38d20e14 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -26,7 +26,7 @@ $lang['qso_dok_helptext'] = 'Zum Beispiel: Q03'; $lang['qso_notes_helptext'] = 'Notizeninhalt wird nur innerhalb von Cloudlog genutzt und nicht an andere Dienste weitergegeben.'; $lang['qsl_notes_helptext'] = 'Dieser Notizeninhalt wird an QSL Services wie eqsl.cc exportiert.'; -$lang['qso_eqsl_qslmsg_helptext'] = "Get the default message for eQSL, for this station."; +$lang['qso_eqsl_qslmsg_helptext'] = "Setze die eQSL Nachricht auf den Standardtext zurück."; // Button Text on /qso Display diff --git a/application/language/german/station_lang.php b/application/language/german/station_lang.php index 4705aea4..597c95bf 100644 --- a/application/language/german/station_lang.php +++ b/application/language/german/station_lang.php @@ -94,8 +94,8 @@ $lang['station_location_signature_name_hint'] = "Signatur/Referenz der Station ( $lang['station_location_signature_info'] = "Signatur Information"; $lang['station_location_signature_info_hint'] = "Signatur/Referenz Information der Station (z.B. DA/NW-357)."; $lang['station_location_eqsl_hint'] = "Der 'QTH Nickname' wie er in deinem eQSL Profil konfiguriert ist."; -$lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg'] = "Standard QSLMSG"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Definiere eine Standard-Nachricht, welche für jedes QSO in diesem Stationsstandort an eQSL übertragen wird."; $lang['station_location_qrz_subscription'] = 'Abonnement erforderlich'; $lang['station_location_qrz_hint'] = "Finde deinen 'QRZ Logbook API Key' in den QRZ.com Logbuch Einstellungen"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbuch Echtzeit Upload'; diff --git a/application/language/greek/awards_lang.php b/application/language/greek/awards_lang.php index 00bf3286..8102d266 100644 --- a/application/language/greek/awards_lang.php +++ b/application/language/greek/awards_lang.php @@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - World Wide Flora and Fauna Award" $lang['awards_wwff_description_ln2'] = "WWFF, World Wide Flora and Fauna in Amateur Radio, encourages licensed ham radio operators to leave their shacks and operate portable in Protected Flora & Fauna areas (PFF) worldwide."; $lang['awards_wwff_description_ln3'] = "More than 26,000 Protected Flora & Fauna (PFF) areas worldwide are already registered in the WWFF Directory. Hunters and Activators can apply for colorful awards, both globally and nationally."; $lang['awards_wwff_description_ln4'] = "For more information, please visit: https://wwff.co/awards/."; + +/* +___________________________________________________________________________________________ +WAJA -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award"; +$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan."; +$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted."; +$lang['awards_waja_description_ln4'] = "For more information, please visit: https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm."; diff --git a/application/language/greek/filter_lang.php b/application/language/greek/filter_lang.php index 0a7c7df3..38b597a6 100644 --- a/application/language/greek/filter_lang.php +++ b/application/language/greek/filter_lang.php @@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show'; // $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php // $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php // $lang['options_save'] --> application/language/english/options_lang.php +$lang['filter_search_operator']='Search Operator'; $lang['filter_options_close'] = 'Close'; \ No newline at end of file diff --git a/application/language/greek/station_lang.php b/application/language/greek/station_lang.php index 44ad31fd..172d9af2 100644 --- a/application/language/greek/station_lang.php +++ b/application/language/greek/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info'] = "Signature Information"; $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/italian/awards_lang.php b/application/language/italian/awards_lang.php index 00bf3286..8102d266 100644 --- a/application/language/italian/awards_lang.php +++ b/application/language/italian/awards_lang.php @@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - World Wide Flora and Fauna Award" $lang['awards_wwff_description_ln2'] = "WWFF, World Wide Flora and Fauna in Amateur Radio, encourages licensed ham radio operators to leave their shacks and operate portable in Protected Flora & Fauna areas (PFF) worldwide."; $lang['awards_wwff_description_ln3'] = "More than 26,000 Protected Flora & Fauna (PFF) areas worldwide are already registered in the WWFF Directory. Hunters and Activators can apply for colorful awards, both globally and nationally."; $lang['awards_wwff_description_ln4'] = "For more information, please visit: https://wwff.co/awards/."; + +/* +___________________________________________________________________________________________ +WAJA -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award"; +$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan."; +$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted."; +$lang['awards_waja_description_ln4'] = "For more information, please visit: https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm."; diff --git a/application/language/italian/filter_lang.php b/application/language/italian/filter_lang.php index 0a7c7df3..38b597a6 100644 --- a/application/language/italian/filter_lang.php +++ b/application/language/italian/filter_lang.php @@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show'; // $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php // $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php // $lang['options_save'] --> application/language/english/options_lang.php +$lang['filter_search_operator']='Search Operator'; $lang['filter_options_close'] = 'Close'; \ No newline at end of file diff --git a/application/language/italian/station_lang.php b/application/language/italian/station_lang.php index 44ad31fd..172d9af2 100644 --- a/application/language/italian/station_lang.php +++ b/application/language/italian/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info'] = "Signature Information"; $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/polish/awards_lang.php b/application/language/polish/awards_lang.php index 00bf3286..8102d266 100644 --- a/application/language/polish/awards_lang.php +++ b/application/language/polish/awards_lang.php @@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - World Wide Flora and Fauna Award" $lang['awards_wwff_description_ln2'] = "WWFF, World Wide Flora and Fauna in Amateur Radio, encourages licensed ham radio operators to leave their shacks and operate portable in Protected Flora & Fauna areas (PFF) worldwide."; $lang['awards_wwff_description_ln3'] = "More than 26,000 Protected Flora & Fauna (PFF) areas worldwide are already registered in the WWFF Directory. Hunters and Activators can apply for colorful awards, both globally and nationally."; $lang['awards_wwff_description_ln4'] = "For more information, please visit: https://wwff.co/awards/."; + +/* +___________________________________________________________________________________________ +WAJA -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award"; +$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan."; +$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted."; +$lang['awards_waja_description_ln4'] = "For more information, please visit: https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm."; diff --git a/application/language/polish/filter_lang.php b/application/language/polish/filter_lang.php index 0a7c7df3..38b597a6 100644 --- a/application/language/polish/filter_lang.php +++ b/application/language/polish/filter_lang.php @@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show'; // $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php // $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php // $lang['options_save'] --> application/language/english/options_lang.php +$lang['filter_search_operator']='Search Operator'; $lang['filter_options_close'] = 'Close'; \ No newline at end of file diff --git a/application/language/polish/station_lang.php b/application/language/polish/station_lang.php index 44ad31fd..172d9af2 100644 --- a/application/language/polish/station_lang.php +++ b/application/language/polish/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info'] = "Signature Information"; $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/russian/awards_lang.php b/application/language/russian/awards_lang.php index e327de92..88dc4f9b 100644 --- a/application/language/russian/awards_lang.php +++ b/application/language/russian/awards_lang.php @@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - World Wide Flora and Fauna Award" $lang['awards_wwff_description_ln2'] = "WWFF, World Wide Flora and Fauna in Amateur Radio, encourages licensed ham radio operators to leave their shacks and operate portable in Protected Flora & Fauna areas (PFF) worldwide."; $lang['awards_wwff_description_ln3'] = "More than 26,000 Protected Flora & Fauna (PFF) areas worldwide are already registered in the WWFF Directory. Hunters and Activators can apply for colorful awards, both globally and nationally."; $lang['awards_wwff_description_ln4'] = "For more information, please visit: https://wwff.co/awards/."; + +/* +___________________________________________________________________________________________ +WAJA -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award"; +$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan."; +$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted."; +$lang['awards_waja_description_ln4'] = "For more information, please visit: https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm."; diff --git a/application/language/russian/station_lang.php b/application/language/russian/station_lang.php index 7e8cdf46..6726851e 100644 --- a/application/language/russian/station_lang.php +++ b/application/language/russian/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info'] = "Информация о подпис $lang['station_location_signature_info_hint'] = "Информация о подписис станции (т.е. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'Название профиля, который сконфигурирован в eQSL для данного QTH'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Требуется подписка'; $lang['station_location_qrz_hint'] = "Ваш ключ API находится на странице настроек журнала QRZ.com"; $lang['station_location_qrz_realtime_upload'] = 'Загрузка в журнал QRZ.com в реальном времени'; diff --git a/application/language/spanish/awards_lang.php b/application/language/spanish/awards_lang.php index 00bf3286..8102d266 100644 --- a/application/language/spanish/awards_lang.php +++ b/application/language/spanish/awards_lang.php @@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - World Wide Flora and Fauna Award" $lang['awards_wwff_description_ln2'] = "WWFF, World Wide Flora and Fauna in Amateur Radio, encourages licensed ham radio operators to leave their shacks and operate portable in Protected Flora & Fauna areas (PFF) worldwide."; $lang['awards_wwff_description_ln3'] = "More than 26,000 Protected Flora & Fauna (PFF) areas worldwide are already registered in the WWFF Directory. Hunters and Activators can apply for colorful awards, both globally and nationally."; $lang['awards_wwff_description_ln4'] = "For more information, please visit: https://wwff.co/awards/."; + +/* +___________________________________________________________________________________________ +WAJA -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award"; +$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan."; +$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted."; +$lang['awards_waja_description_ln4'] = "For more information, please visit: https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm."; diff --git a/application/language/spanish/filter_lang.php b/application/language/spanish/filter_lang.php index 0a7c7df3..38b597a6 100644 --- a/application/language/spanish/filter_lang.php +++ b/application/language/spanish/filter_lang.php @@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show'; // $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php // $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php // $lang['options_save'] --> application/language/english/options_lang.php +$lang['filter_search_operator']='Search Operator'; $lang['filter_options_close'] = 'Close'; \ No newline at end of file diff --git a/application/language/spanish/station_lang.php b/application/language/spanish/station_lang.php index 44ad31fd..172d9af2 100644 --- a/application/language/spanish/station_lang.php +++ b/application/language/spanish/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info'] = "Signature Information"; $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/swedish/awards_lang.php b/application/language/swedish/awards_lang.php index 00bf3286..8102d266 100644 --- a/application/language/swedish/awards_lang.php +++ b/application/language/swedish/awards_lang.php @@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - World Wide Flora and Fauna Award" $lang['awards_wwff_description_ln2'] = "WWFF, World Wide Flora and Fauna in Amateur Radio, encourages licensed ham radio operators to leave their shacks and operate portable in Protected Flora & Fauna areas (PFF) worldwide."; $lang['awards_wwff_description_ln3'] = "More than 26,000 Protected Flora & Fauna (PFF) areas worldwide are already registered in the WWFF Directory. Hunters and Activators can apply for colorful awards, both globally and nationally."; $lang['awards_wwff_description_ln4'] = "For more information, please visit: https://wwff.co/awards/."; + +/* +___________________________________________________________________________________________ +WAJA -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award"; +$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan."; +$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted."; +$lang['awards_waja_description_ln4'] = "For more information, please visit: https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm."; diff --git a/application/language/swedish/filter_lang.php b/application/language/swedish/filter_lang.php index 0a7c7df3..38b597a6 100644 --- a/application/language/swedish/filter_lang.php +++ b/application/language/swedish/filter_lang.php @@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show'; // $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php // $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php // $lang['options_save'] --> application/language/english/options_lang.php +$lang['filter_search_operator']='Search Operator'; $lang['filter_options_close'] = 'Close'; \ No newline at end of file diff --git a/application/language/swedish/station_lang.php b/application/language/swedish/station_lang.php index 44ad31fd..172d9af2 100644 --- a/application/language/swedish/station_lang.php +++ b/application/language/swedish/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info'] = "Signature Information"; $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/language/turkish/awards_lang.php b/application/language/turkish/awards_lang.php index 00bf3286..8102d266 100644 --- a/application/language/turkish/awards_lang.php +++ b/application/language/turkish/awards_lang.php @@ -182,3 +182,14 @@ $lang['awards_wwff_description_ln1'] = "WWFF - World Wide Flora and Fauna Award" $lang['awards_wwff_description_ln2'] = "WWFF, World Wide Flora and Fauna in Amateur Radio, encourages licensed ham radio operators to leave their shacks and operate portable in Protected Flora & Fauna areas (PFF) worldwide."; $lang['awards_wwff_description_ln3'] = "More than 26,000 Protected Flora & Fauna (PFF) areas worldwide are already registered in the WWFF Directory. Hunters and Activators can apply for colorful awards, both globally and nationally."; $lang['awards_wwff_description_ln4'] = "For more information, please visit: https://wwff.co/awards/."; + +/* +___________________________________________________________________________________________ +WAJA -- Use all 4 Lines of Text +___________________________________________________________________________________________ +*/ + +$lang['awards_waja_description_ln1'] = "WAJA - Worked All Japan prefectures Award"; +$lang['awards_waja_description_ln2'] = "WAJA, Worked All Japan prefectures in Amateur Radio, encourages licensed ham radio operators to work all the prefectures in Japan."; +$lang['awards_waja_description_ln3'] = "May be claimed for having contacted (heard) and received a QSL card from an amateur station located in each of the 47 prefectures of Japan. A list of QSL cards should be arranged in order of WAJA (HAJA) reference number, however names of prefectures may be omitted."; +$lang['awards_waja_description_ln4'] = "For more information, please visit: https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm."; diff --git a/application/language/turkish/filter_lang.php b/application/language/turkish/filter_lang.php index 0a7c7df3..38b597a6 100644 --- a/application/language/turkish/filter_lang.php +++ b/application/language/turkish/filter_lang.php @@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show'; // $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php // $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php // $lang['options_save'] --> application/language/english/options_lang.php +$lang['filter_search_operator']='Search Operator'; $lang['filter_options_close'] = 'Close'; \ No newline at end of file diff --git a/application/language/turkish/station_lang.php b/application/language/turkish/station_lang.php index 44ad31fd..172d9af2 100644 --- a/application/language/turkish/station_lang.php +++ b/application/language/turkish/station_lang.php @@ -95,7 +95,7 @@ $lang['station_location_signature_info'] = "Signature Information"; $lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357)."; $lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile'; $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; -$lang['station_location_eqsl_defaultqslmsg_hint'] = "You can define a default message that will be populated and sent for each QSO for this station location. Max length:"; +$lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; $lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index dd0bd5e2..54e35b5b 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -387,8 +387,9 @@ class Logbook_model extends CI_Model { $this->db->where('COL_DARC_DOK', $searchphrase); break; case 'WAJA': - $this->db->where('COL_STATE', $searchphrase); - $this->db->where_in('COL_DXCC', ['339']); + $state = str_pad($searchphrase, 2, '0', STR_PAD_LEFT); + $this->db->where('COL_STATE', $state); + $this->db->where('COL_DXCC', '339'); break; case 'QSLRDATE': $this->db->where('date(COL_QSLRDATE)=date(SYSDATE())'); diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index ff98b865..bb2f5b70 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -168,6 +168,11 @@ class Logbookadvanced_model extends CI_Model { $binding[] = $searchCriteria['wwff'].'%'; } + if ($searchCriteria['operator'] !== '') { + $conditions[] = "COL_OPERATOR like ?"; + $binding[] = $searchCriteria['operator'].'%'; + } + if ($searchCriteria['gridsquare'] !== '') { $conditions[] = "(COL_GRIDSQUARE like ? or COL_VUCC_GRIDS like ?)"; $binding[] = '%' . $searchCriteria['gridsquare'] . '%'; diff --git a/application/views/awards/waja/index.php b/application/views/awards/waja/index.php index a9feb370..8cc56dd7 100644 --- a/application/views/awards/waja/index.php +++ b/application/views/awards/waja/index.php @@ -1,6 +1,9 @@ +
- -
+ +
+

+
@@ -119,6 +146,9 @@
+ +
@@ -129,14 +159,17 @@
  • Table
    • +
  • + Map +

    • -
    +

    -
    +
    @@ -158,7 +191,7 @@ echo ' '; - foreach ($waja_array as $dxcc => $value) { // Fills the table with the data + foreach ($waja_array as $waja => $value) { // Fills the table with the data echo ''; foreach ($value as $name => $key) { echo '' . $key . ''; @@ -182,14 +215,14 @@ Total worked'; - foreach ($waja_summary['worked'] as $dxcc) { // Fills the table with the data - echo '' . $dxcc . ''; + foreach ($waja_summary['worked'] as $waja) { // Fills the table with the data + echo '' . $waja . ''; } echo ' Total confirmed'; - foreach ($waja_summary['confirmed'] as $dxcc) { // Fills the table with the data - echo '' . $dxcc . ''; + foreach ($waja_summary['confirmed'] as $waja) { // Fills the table with the data + echo '' . $waja . ''; } echo ' diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 91e0295c..d45ca998 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -45,6 +45,7 @@ + @@ -1270,7 +1271,10 @@ $(document).on('keypress',function(e) { qso_set_eqsl_qslmsg(stationProfile,false,'.qso_panel'); }); // [eQSL default msg] change value on clic // - $('.qso_panel .qso_eqsl_qslmsg_update').off('click').on('click',function() { qso_set_eqsl_qslmsg($('.qso_panel #stationProfile').val(),true,'.qso_panel'); }); + $('.qso_panel .qso_eqsl_qslmsg_update').off('click').on('click',function() { + qso_set_eqsl_qslmsg($('.qso_panel #stationProfile').val(),true,'.qso_panel'); + $('#charsLeft').text(" "); + }); session->userdata('user_qth_lookup') == 1) { ?> $('#qth').focusout(function() { diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index 5bd0ce84..85c0d207 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -7,9 +7,13 @@ var custom_date_format = ""; operator)) { + echo "\nvar o_template = { operator: {show: 'true'}};"; + echo "\nuser_options={...user_options, ...o_template}"; +} ?>