Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

$this and $ci lang fixes

Browse Source
This commit is contained in:
HB9HIL
2024-06-06 21:32:42 +02:00
parent 133191d93e
commit d7e7c8a79f
24 changed files with 179 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/Accumulated.php
View File

@@ -18,7 +18,7 @@ class Accumulated extends CI_Controller
public function index()
{
// Render Page
$data['page_title'] = $this->lang->line('menu_accumulated_statistics');
$data['page_title'] = __("Accumulated Statistics");
$this->load->model('bands');

10
application/controllers/Activated_gridmap.php
View File

@@ -7,7 +7,7 @@ class Activated_gridmap extends CI_Controller {
}
public function index() {
$data['page_title'] = "Activated Gridsquare Map";
$data['page_title'] = __("Activated Gridsquare Map");
$this->load->model('bands');
$this->load->model('activated_gridmap_model');
@@ -28,10 +28,10 @@ class Activated_gridmap extends CI_Controller {
$data['attribution'] = $this->optionslib->get_option('option_map_tile_server_copyright');
$data['gridsquares_gridsquares'] = lang('gridsquares_gridsquares');
$data['gridsquares_gridsquares_confirmed'] = lang('gridsquares_gridsquares_confirmed');
$data['gridsquares_gridsquares_not_confirmed'] = lang('gridsquares_gridsquares_not_confirmed');
$data['gridsquares_gridsquares_total_activated'] = lang('gridsquares_gridsquares_total_activated');
$data['gridsquares_gridsquares'] = __("Gridsquares");
$data['gridsquares_gridsquares_confirmed'] = __("Gridsquares confirmed");
$data['gridsquares_gridsquares_not_confirmed'] = __("Gridsquares not confirmed");
$data['gridsquares_gridsquares_total_activated'] = __("Total gridsquares activated");
$footerData = [];
$footerData['scripts'] = [

16
application/controllers/Awards.php
View File

@@ -892,10 +892,10 @@ class Awards extends CI_Controller {
$data['attribution']= $this->optionslib->get_option('option_map_tile_server_copyright');
$data['gridsquares_gridsquares']= lang('gridsquares_gridsquares');
$data['gridsquares_gridsquares_worked']= lang('gridsquares_gridsquares_worked');
$data['gridsquares_gridsquares_lotw']= lang('gridsquares_gridsquares_lotw');
$data['gridsquares_gridsquares_paper']= lang('gridsquares_gridsquares_paper');
$data['gridsquares_gridsquares']= __("Gridsquares");
$data['gridsquares_gridsquares_worked']= __("Gridsquares worked");
$data['gridsquares_gridsquares_lotw']= __("Gridsquares confirmed on LoTW");
$data['gridsquares_gridsquares_paper']= __("Gridsquares confirmed by paper QSL");
$indexData['dxcc'] = $dxcc;
@@ -924,10 +924,10 @@ class Awards extends CI_Controller {
$data['attribution']= $this->optionslib->get_option('option_map_tile_server_copyright');
$data['gridsquares_gridsquares']= lang('gridsquares_gridsquares');
$data['gridsquares_gridsquares_worked']= lang('gridsquares_gridsquares_worked');
$data['gridsquares_gridsquares_lotw']= lang('gridsquares_gridsquares_lotw');
$data['gridsquares_gridsquares_paper']= lang('gridsquares_gridsquares_paper');
$data['gridsquares_gridsquares']= __("Gridsquares");
$data['gridsquares_gridsquares_worked']= __("Gridsquares worked");
$data['gridsquares_gridsquares_lotw']= __("Gridsquares confirmed on LoTW");
$data['gridsquares_gridsquares_paper']= __("Gridsquares confirmed by paper QSL");
$data['grid_count'] = $this->ffma_model->get_grid_count();
$data['grids'] = $this->ffma_model->get_grids();

4
application/controllers/Contesting.php
View File

@@ -96,7 +96,7 @@ class Contesting extends CI_Controller {
$data['contests'] = $this->Contesting_model->getAllContests();
// Render Page
$data['page_title'] = "Contests";
$data['page_title'] = __("Contests");
$this->load->view('interface_assets/header', $data);
$this->load->view('contesting/add');
$this->load->view('interface_assets/footer');
@@ -110,7 +110,7 @@ class Contesting extends CI_Controller {
$data['contest'] = $this->Contesting_model->contest($item_id_clean);
$data['page_title'] = lang('admin_contest_edit_update_contest');
$data['page_title'] = __("Update Contest");
$this->form_validation->set_rules('name', 'Contest Name', 'required');
$this->form_validation->set_rules('adifname', 'Adif Contest Name', 'required');

2
application/controllers/Dayswithqso.php
View File

@@ -15,7 +15,7 @@ class Dayswithqso extends CI_Controller {
{
$this->load->model('dayswithqso_model');
// Render Page
$data['page_title'] = lang('statistics_days_with_qso');
$data['page_title'] = __("Number of days with QSOs each year");
$data['result'] = $this->dayswithqso_model->getDaysWithQso();
$data['streaks'] = $this->dayswithqso_model->getLongestStreak();

2
application/controllers/Distances.php
View File

@@ -79,7 +79,7 @@ class Distances extends CI_Controller {
// Render Page
$data['page_title'] = "Log View - " . $distance;
$data['filter'] = lang('statistics_distances_qsos_with') . " " . $distance . " " . lang('statistics_distances_and_band'). " " . $band;
$data['filter'] = __("QSOs with") . " " . $distance . " " . __("and band"). " " . $band;
$this->load->view('awards/details', $data);
}
}

10
application/controllers/Gridmap.php
View File

@@ -7,7 +7,7 @@ class Gridmap extends CI_Controller {
}
public function index() {
$data['page_title'] = lang('gridsquares_gridsquare_map');
$data['page_title'] = __("Gridsquare Map");
$this->load->model('bands');
$this->load->model('gridmap_model');
@@ -28,10 +28,10 @@ class Gridmap extends CI_Controller {
$data['attribution'] = $this->optionslib->get_option('option_map_tile_server_copyright');
$data['gridsquares_gridsquares'] = lang('gridsquares_gridsquares');
$data['gridsquares_gridsquares_confirmed'] = lang('gridsquares_gridsquares_confirmed');
$data['gridsquares_gridsquares_not_confirmed'] = lang('gridsquares_gridsquares_not_confirmed');
$data['gridsquares_gridsquares_total_worked'] = lang('gridsquares_gridsquares_total_worked');
$data['gridsquares_gridsquares'] = __("Gridsquares");
$data['gridsquares_gridsquares_confirmed'] = __("Gridsquares confirmed");
$data['gridsquares_gridsquares_not_confirmed'] = __("Gridsquares not confirmed");
$data['gridsquares_gridsquares_total_worked'] = __("Total gridsquares worked");
$footerData = [];
$footerData['scripts'] = [

12
application/controllers/Logbook.php
View File

@@ -34,7 +34,7 @@ class Logbook extends CI_Controller {
$data['user_map_custom'] = $this->optionslib->get_map_custom();
if(!$data['results']) {
$this->session->set_flashdata('notice', lang('error_no_logbook_found') . ' <a href="' . site_url('logbooks') . '" title="Station Logbooks">Station Logbooks</a>');
$this->session->set_flashdata('notice', __("No logbooks were found. You need to define a logbook under Station Logbooks! Do it here:") . ' <a href="' . site_url('logbooks') . '" title="Station Logbooks">' . __('Station Logbooks') . '</a>');
}
// Calculate Lat/Lng from Locator to use on Maps
@@ -664,13 +664,13 @@ class Logbook extends CI_Controller {
$html .= $this->part_table_header_col($this, $this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4'));
switch($this->session->userdata('user_previous_qsl_type')) {
case 0:
$html .= "<th>".lang('gen_hamradio_qsl')."</th>";
$html .= "<th>".__("QSL")."</th>";
break;
case 1:
$html .= "<th>".lang('lotw_short')."</th>";
$html .= "<th>".__("LoTW")."</th>";
break;
case 2:
$html .= "<th>".lang('eqsl_short')."</th>";
$html .= "<th>".__("eQSL")."</th>";
break;
case 4:
$html .= "<th>QRZ</th>";
@@ -679,7 +679,7 @@ class Logbook extends CI_Controller {
$html .= "<th>Clublog</th>";
break;
default:
$html .= "<th>".lang('gen_hamradio_qsl')."</th>";
$html .= "<th>".__("QSL")."</th>";
break;
}
$html .= "<th></th>";
@@ -1307,7 +1307,7 @@ class Logbook extends CI_Controller {
case 'Mode': $ret.= '<td>'; $ret.= $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE . '</td>'; break;
case 'RSTS': $ret.= '<td class="d-none d-sm-table-cell">' . $row->COL_RST_SENT; if ($row->COL_STX) { $ret.= ' <span data-bs-toggle="tooltip" title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; $ret.=sprintf("%03d", $row->COL_STX); $ret.= '</span>';} if ($row->COL_STX_STRING) { $ret.= ' <span data-bs-toggle="tooltip" title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_STX_STRING . '</span>';} $ret.= '</td>'; break;
case 'RSTR': $ret.= '<td class="d-none d-sm-table-cell">' . $row->COL_RST_RCVD; if ($row->COL_SRX) { $ret.= ' <span data-bs-toggle="tooltip" title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; $ret.=sprintf("%03d", $row->COL_SRX); $ret.= '</span>';} if ($row->COL_SRX_STRING) { $ret.= ' <span data-bs-toggle="tooltip" title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_SRX_STRING . '</span>';} $ret.= '</td>'; break;
case 'Country': $ret.= '<td>' . ucwords(strtolower(($row->COL_COUNTRY ?? ''))); if ($row->end ?? '' != '') $ret.= ' <span class="badge text-bg-danger">'.$ci->lang->line('gen_hamradio_deleted_dxcc').'</span>' . '</td>'; break;
case 'Country': $ret.= '<td>' . ucwords(strtolower(($row->COL_COUNTRY ?? ''))); if ($row->end ?? '' != '') $ret.= ' <span class="badge text-bg-danger">'.__("Deleted DXCC").'</span>' . '</td>'; break;
case 'IOTA': $ret.= '<td>' . ($row->COL_IOTA) . '</td>'; break;
case 'SOTA': $ret.= '<td>' . ($row->COL_SOTA_REF) . '</td>'; break;
case 'WWFF': $ret.= '<td>' . ($row->COL_WWFF_REF) . '</td>'; break;

94
application/controllers/Options.php
View File

@@ -28,7 +28,7 @@ class Options extends CI_Controller {
//echo $this->optionslib->get_option('theme');
$data['page_title'] = $this->lang->line('options_wavelog_options');
$data['page_title'] = __("Wavelog Options");
$this->load->view('interface_assets/header', $data);
$this->load->view('options/index');
@@ -42,8 +42,8 @@ class Options extends CI_Controller {
$directory = 'application/language';
$data['language_options'] = array_diff(scandir($directory), array('..', '.'));
$data['page_title'] = $this->lang->line('options_wavelog_options');
$data['sub_heading'] = $this->lang->line('options_appearance');
$data['page_title'] = __("Wavelog Options");
$data['sub_heading'] = __("Appearance");
$this->load->model('Themes_model');
@@ -61,8 +61,8 @@ class Options extends CI_Controller {
$directory = 'application/language';
$data['language_options'] = array_diff(scandir($directory), array('..', '.'));
$data['page_title'] = $this->lang->line('options_wavelog_options');
$data['sub_heading'] = $this->lang->line('options_appearance');
$data['page_title'] = __("Wavelog Options");
$data['sub_heading'] = __("Appearance");
$this->load->helper(array('form', 'url'));
@@ -83,7 +83,7 @@ class Options extends CI_Controller {
// If theme update is complete set a flashsession with a success note
if($theme_update_status == TRUE) {
$this->session->set_flashdata('success', $this->lang->line('options_saved'));
$this->session->set_flashdata('success', __("Options saved"));
}
// Update theme choice within the options system
@@ -91,7 +91,7 @@ class Options extends CI_Controller {
// If theme update is complete set a flashsession with a success note
if($search_update_status == TRUE) {
$this->session->set_flashdata('success', $this->lang->line('options_saved'));
$this->session->set_flashdata('success', __("Options saved"));
}
// Update dashboard banner within the options system
@@ -99,7 +99,7 @@ class Options extends CI_Controller {
// If dashboard banner update is complete set a flashsession with a success note
if($dasboard_banner_update_status == TRUE) {
$this->session->set_flashdata('success', $this->lang->line('options_saved'));
$this->session->set_flashdata('success', __("Options saved"));
}
// Update dashboard map within the options system
@@ -107,7 +107,7 @@ class Options extends CI_Controller {
// If dashboard map update is complete set a flashsession with a success note
if($dashboard_map_update_status == TRUE) {
$this->session->set_flashdata('success', $this->lang->line('options_saved'));
$this->session->set_flashdata('success', __("Options saved"));
}
// Update logbook map within the options system
@@ -115,7 +115,7 @@ class Options extends CI_Controller {
// If logbook map update is complete set a flashsession with a success note
if($logbook_map_update_status == TRUE) {
$this->session->set_flashdata('success', $this->lang->line('options_saved'));
$this->session->set_flashdata('success', __("Options saved"));
}
// Update public maps within the options system
@@ -123,7 +123,7 @@ class Options extends CI_Controller {
// If the option was saved successfully set a flashsession with success note
if($public_maps_update_status == TRUE) {
$this->session->set_flashdata('success', $this->lang->line('options_saved'));
$this->session->set_flashdata('success', __("Options saved"));
}
// Update public github button within the options system
@@ -131,7 +131,7 @@ class Options extends CI_Controller {
// If the option was saved successfully set a flashsession with success note
if($public_github_button_update_status == TRUE) {
$this->session->set_flashdata('success', $this->lang->line('options_saved'));
$this->session->set_flashdata('success', __("Options saved"));
}
// Redirect back to /appearance
@@ -141,8 +141,8 @@ class Options extends CI_Controller {
// function used to display the /dxcluster url
function dxcluster() {
$data['page_title'] = $this->lang->line('options_wavelog_options');
$data['sub_heading'] = $this->lang->line('options_dxcluster_settings');
$data['page_title'] = __("Wavelog Options");
$data['sub_heading'] = __("DXCluster");
$this->load->view('interface_assets/header', $data);
$this->load->view('options/dxcluster');
@@ -154,8 +154,8 @@ class Options extends CI_Controller {
// Get Language Options
$data['page_title'] = $this->lang->line('options_wavelog_options');
$data['sub_heading'] = $this->lang->line('options_dxcluster_settings');
$data['page_title'] = __("Wavelog Options");
$data['sub_heading'] = __("DXCluster");
$this->load->helper(array('form', 'url'));
@@ -172,17 +172,17 @@ class Options extends CI_Controller {
} else {
$dxcluster_decont_update = $this->optionslib->update('dxcluster_decont', $this->input->post('dxcluster_decont'), 'yes');
if($dxcluster_decont_update == TRUE) {
$this->session->set_flashdata('success', $this->lang->line('options_dxcluster_decont_changed_to').$this->input->post('dxcluster_decont'));
$this->session->set_flashdata('success', __("de continent changed to ").$this->input->post('dxcluster_decont'));
}
$dxcluster_maxage_update = $this->optionslib->update('dxcluster_maxage', $this->input->post('dxcluster_maxage'), 'yes');
if($dxcluster_maxage_update == TRUE) {
$this->session->set_flashdata('success', $this->lang->line('options_dxcluster_maxage_changed_to').$this->input->post('dxcluster_maxage'));
$this->session->set_flashdata('success', __("Maximum age of spots changed to ").$this->input->post('dxcluster_maxage'));
}
$dxcache_url_update = $this->optionslib->update('dxcache_url', $this->input->post('dxcache_url'), 'yes');
if($dxcache_url_update == TRUE) {
$this->session->set_flashdata('success', $this->lang->line('options_dxcache_url_changed_to').$this->input->post('dxcache_url'));
$this->session->set_flashdata('success', __("DXCluster Cache URL changed to ").$this->input->post('dxcache_url'));
}
redirect('/options/dxcluster');
}
@@ -191,8 +191,8 @@ class Options extends CI_Controller {
// function used to display the /radio url
function radio() {
$data['page_title'] = $this->lang->line('options_wavelog_options');
$data['sub_heading'] = $this->lang->line('options_radio_settings');
$data['page_title'] = __("Wavelog Options");
$data['sub_heading'] = __("Radio Settings");
$this->load->view('interface_assets/header', $data);
$this->load->view('options/radios');
@@ -204,8 +204,8 @@ class Options extends CI_Controller {
// Get Language Options
$data['page_title'] = $this->lang->line('options_wavelog_options');
$data['sub_heading'] = $this->lang->line('options_radio_settings');
$data['page_title'] = __("Wavelog Options");
$data['sub_heading'] = __("Radio Settings");
$this->load->helper(array('form', 'url'));
@@ -226,7 +226,7 @@ class Options extends CI_Controller {
// If theme update is complete set a flashsession with a success note
if($radioTimeout_update == TRUE) {
$this->session->set_flashdata('success', $this->lang->line('options_radio_timeout_warning_changed_to').$this->input->post('radioTimeout').' seconds');
$this->session->set_flashdata('success', __("Radio Timeout Warning changed to ").$this->input->post('radioTimeout').' seconds');
}
// Redirect back to /appearance
@@ -237,8 +237,8 @@ class Options extends CI_Controller {
// function used to display the /appearance url
function email() {
$data['page_title'] = $this->lang->line('options_wavelog_options');
$data['sub_heading'] = $this->lang->line('options_email');
$data['page_title'] = __("Wavelog Options");
$data['sub_heading'] = __("Email");
$this->load->view('interface_assets/header', $data);
$this->load->view('options/email');
@@ -250,8 +250,8 @@ class Options extends CI_Controller {
// Get Language Options
$data['page_title'] = $this->lang->line('options_wavelog_options');
$data['sub_heading'] = $this->lang->line('options_email');
$data['page_title'] = __("Wavelog Options");
$data['sub_heading'] = __("Email");
$this->load->helper(array('form', 'url'));
@@ -308,9 +308,9 @@ class Options extends CI_Controller {
// Set flash session based on update success
if ($updateSuccessful) {
$this->session->set_flashdata('success', $this->lang->line('options_mail_settings_saved'));
$this->session->set_flashdata('success', __("The settings were saved successfully."));
} else {
$this->session->set_flashdata('saveFailed', $this->lang->line('options_mail_settings_failed'));
$this->session->set_flashdata('saveFailed', __("Something went wrong with saving the settings. Try again."));
}
// Redirect back to /email
@@ -320,8 +320,8 @@ class Options extends CI_Controller {
function oqrs() {
$data['page_title'] = $this->lang->line('options_wavelog_options');
$data['sub_heading'] = $this->lang->line('options_oqrs');
$data['page_title'] = __("Wavelog Options");
$data['sub_heading'] = __("OQRS Options");
$this->load->view('interface_assets/header', $data);
$this->load->view('options/oqrs');
@@ -330,8 +330,8 @@ class Options extends CI_Controller {
function oqrs_save() {
$data['page_title'] = $this->lang->line('options_wavelog_options');
$data['sub_heading'] = $this->lang->line('options_oqrs');
$data['page_title'] = __("Wavelog Options");
$data['sub_heading'] = __("OQRS Options");
$this->load->helper(array('form', 'url'));
@@ -344,7 +344,7 @@ class Options extends CI_Controller {
$global_oqrs_text = $this->optionslib->update('groupedSearchShowStationName', $this->input->post('groupedSearchShowStationName'), null);
if($global_oqrs_text == TRUE) {
$this->session->set_flashdata('success', $this->lang->line('options_oqrs_options_have_been_saved'));
$this->session->set_flashdata('success', __("OQRS options have been saved."));
}
redirect('/options/oqrs');
@@ -384,12 +384,12 @@ class Options extends CI_Controller {
$this->email->message($message);
if (! $this->email->send()){
$this->session->set_flashdata('testmailFailed', $this->lang->line('options_send_testmail_failed'));
$this->session->set_flashdata('testmailFailed', __("Testmail failed. Something went wrong."));
} else {
$this->session->set_flashdata('testmailSuccess', $this->lang->line('options_send_testmail_success'));
$this->session->set_flashdata('testmailSuccess', __("Testmail sent. Email settings seem to be correct."));
}
} else {
$this->session->set_flashdata('testmailFailed', $this->lang->line('options_send_testmail_failed'));
$this->session->set_flashdata('testmailFailed', __("Testmail failed. Something went wrong."));
}
redirect('/options/email');
@@ -398,8 +398,8 @@ class Options extends CI_Controller {
// function used to display the /version_dialog url
function version_dialog() {
$data['page_title'] = $this->lang->line('options_wavelog_options');
$data['sub_heading'] = $this->lang->line('options_version_dialog_settings');
$data['page_title'] = __("Wavelog Options");
$data['sub_heading'] = __("Version Info Settings");
$this->load->view('interface_assets/header', $data);
$this->load->view('options/version_dialog');
@@ -410,23 +410,23 @@ class Options extends CI_Controller {
// Get Language Options
$data['page_title'] = $this->lang->line('options_wavelog_options');
$data['sub_heading'] = $this->lang->line('options_version_dialog_settings');
$data['page_title'] = __("Wavelog Options");
$data['sub_heading'] = __("Version Info Settings");
$this->load->helper(array('form', 'url'));
$version_dialog_header_update = $this->optionslib->update('version_dialog_header', $this->input->post('version_dialog_header'), 'yes');
if($version_dialog_header_update == TRUE) {
$this->session->set_flashdata('success0', $this->lang->line('options_version_dialog_header_changed_to')." "."'".$this->input->post('version_dialog_header')."'");
$this->session->set_flashdata('success0', __("Version Info Header changed to")." "."'".$this->input->post('version_dialog_header')."'");
}
$version_dialog_mode_update = $this->optionslib->update('version_dialog', $this->input->post('version_dialog_mode'), 'yes');
if($version_dialog_mode_update == TRUE) {
$this->session->set_flashdata('success1', $this->lang->line('options_version_dialog_mode_changed_to')." "."'".$this->input->post('version_dialog_mode')."'");
$this->session->set_flashdata('success1', __("Version Info Mode changed to")." "."'".$this->input->post('version_dialog_mode')."'");
}
if ($this->input->post('version_dialog_mode') == "both" || $this->input->post('version_dialog_mode') == "custom_text" ) {
$version_dialog_custom_text_update = $this->optionslib->update('version_dialog_text', $this->input->post('version_dialog_custom_text'), 'yes');
if($version_dialog_custom_text_update == TRUE) {
$this->session->set_flashdata('success2', $this->lang->line('options_version_dialog_custom_text_saved'));
$this->session->set_flashdata('success2', __("Version Info Custom Text saved!"));
}
}
@@ -437,7 +437,7 @@ class Options extends CI_Controller {
function version_dialog_show_to_all() {
$update_vd_confirmation_to_false = $this->user_options_model->set_option_at_all_users('version_dialog', 'confirmed', array('boolean' => 'false'));
if($update_vd_confirmation_to_false == TRUE) {
$this->session->set_flashdata('success_trigger', $this->lang->line('options_version_dialog_success_show_all'));
$this->session->set_flashdata('success_trigger', __("Version Info will be shown to all users again"));
}
redirect('/options/version_dialog');
}
@@ -445,7 +445,7 @@ class Options extends CI_Controller {
function version_dialog_show_to_none() {
$update_vd_confirmation_to_true = $this->user_options_model->set_option_at_all_users('version_dialog', 'confirmed', array('boolean' => 'true'));
if($update_vd_confirmation_to_true == TRUE) {
$this->session->set_flashdata('success_trigger', $this->lang->line('options_version_dialog_success_hide_all'));
$this->session->set_flashdata('success_trigger', __("Version Info will not be shown to any user"));
}
redirect('/options/version_dialog');
}

2
application/controllers/Qslprint.php
View File

@@ -43,7 +43,7 @@ class QSLPrint extends CI_Controller {
'assets/js/sections/qslprint.js',
];
$data['page_title'] = $this->lang->line('menu_print_requested_qsls');
$data['page_title'] = __("Print Requested QSLs");
$this->load->view('interface_assets/header', $data);
$this->load->view('qslprint/index');

4
application/controllers/Sattimers.php
View File

@@ -38,10 +38,10 @@ class Sattimers extends CI_Controller {
$data['gridsquare'] = strtoupper($this->stations->find_gridsquare());
if ($data['gridsquare'] == "0") {
$this->session->set_flashdata('message', lang('dashboard_locations_warning'));
$this->session->set_flashdata('message', sprintf(__("You have no station locations. Go %s to create it!"), '<a href="' . site_url('stationsetup') . '">' . __("here") . '</a>'));
}
$data['page_title'] = "Satellite Timers";
$data['page_title'] = __("Satellite Timers");
$CI =& get_instance();
if($CI->session->userdata('user_date_format')) {

8
application/controllers/Station.php
View File

@@ -32,7 +32,7 @@ class Station extends CI_Controller
$data['is_there_qsos_with_no_station_id'] = $this->Logbook_model->check_for_station_id();
// Render Page
$data['page_title'] = lang('station_location');
$data['page_title'] = __("Station Location");
$this->load->view('interface_assets/header', $data);
$this->load->view('station_profile/index');
$this->load->view('interface_assets/footer');
@@ -52,7 +52,7 @@ class Station extends CI_Controller
$this->form_validation->set_rules('station_profile_name', 'Station Profile Name', 'required');
if ($this->form_validation->run() == FALSE) {
$data['page_title'] = lang('station_location_create_header');
$data['page_title'] = __("Create Station Location");
$this->load->view('interface_assets/header', $data);
$this->load->view('station_profile/create');
$this->load->view('interface_assets/footer');
@@ -67,7 +67,7 @@ class Station extends CI_Controller
$this->load->model('stations');
if ($this->stations->check_station_is_accessible($id)) {
$data = $this->load_station_for_editing($id);
$data['page_title'] = lang('station_location_edit') . $data['my_station_profile']->station_profile_name;
$data['page_title'] = __("Edit Station Location: ") . $data['my_station_profile']->station_profile_name;
if ($this->form_validation->run() == FALSE) {
$this->load->view('interface_assets/header', $data);
@@ -75,7 +75,7 @@ class Station extends CI_Controller
$this->load->view('interface_assets/footer');
} else {
if ($this->stations->edit()) {
$data['notice'] = lang('station_location') . $this->security->xss_clean($this->input->post('station_profile_name', true)) . " Updated";
$data['notice'] = __("Station Location") . $this->security->xss_clean($this->input->post('station_profile_name', true)) . " Updated";
}
redirect('stationsetup');
}

62
application/controllers/Stationsetup.php
View File

@@ -32,7 +32,7 @@ class Stationsetup extends CI_Controller {
];
// Render Page
$data['page_title'] = "Station Setup";
$data['page_title'] = __("Station Setup");
$this->load->view('interface_assets/header', $data);
$this->load->view('stationsetup/stationsetup');
$this->load->view('interface_assets/footer', $footerData);
@@ -47,7 +47,7 @@ class Stationsetup extends CI_Controller {
$data['success']=1;
} else {
$data['success']=0;
$data['flashdata']='Not allowed';
$data['flashdata'] = __('Not allowed');
}
} else {
$data['success']=0;
@@ -65,11 +65,11 @@ class Stationsetup extends CI_Controller {
$data['success']=1;
} else {
$data['success']=0;
$data['flashdata']='Not allowed';
$data['flashdata'] = __('Not allowed');
}
} else {
$data['success']=0;
$data['flashdata']='Error';
$data['flashdata'] = __('Error');
}
echo json_encode($data);
}
@@ -83,7 +83,7 @@ class Stationsetup extends CI_Controller {
$data['success']=1;
} else {
$data['success']=0;
$data['flashdata']='Error';
$data['flashdata'] = __('Error');
}
echo json_encode($data);
}
@@ -102,7 +102,7 @@ class Stationsetup extends CI_Controller {
$data['success'] = 1;
} else {
$data['success'] = 0;
$data['flashdata'] ='Error';
$data['flashdata'] = __('Error');
}
echo json_encode($data);
}
@@ -115,7 +115,7 @@ class Stationsetup extends CI_Controller {
$data['success']=1;
} else {
$data['success']=0;
$data['flashdata']='Error';
$data['flashdata'] = __('Error');
}
echo json_encode($data);
}
@@ -128,7 +128,7 @@ class Stationsetup extends CI_Controller {
$data['success']=1;
} else {
$data['success']=0;
$data['flashdata']='Error';
$data['flashdata'] = __('Error');
}
echo json_encode($data);
}
@@ -149,7 +149,7 @@ class Stationsetup extends CI_Controller {
$data['success']=1;
} else {
$data['success']=0;
$data['flashdata']='Error';
$data['flashdata'] = __('Error');
}
echo json_encode($data);
}
@@ -187,7 +187,7 @@ class Stationsetup extends CI_Controller {
$station_logbook_details_query = $this->logbooks_model->logbook(xss_clean($this->input->post('id', true)));
$data['station_logbook_details'] = $station_logbook_details_query->row();
$data['station_locations_list'] = $this->stations->all_of_user();
$data['page_title'] = "Edit visitor site";
$data['page_title'] = __("Edit visitor site");
$this->load->view('stationsetup/visitor', $data);
}
@@ -209,7 +209,7 @@ class Stationsetup extends CI_Controller {
$data['success'] = 1;
} else {
$data['success'] = 0;
$data['flashdata'] = 'Error. Link is already in use!';
$data['flashdata'] = __('Error. Link is already in use!');
}
echo json_encode($data);
@@ -223,7 +223,7 @@ class Stationsetup extends CI_Controller {
$this->load->model('logbook_model');
$data['iota_list'] = $this->logbook_model->fetchIota();
$data['page_title'] = lang('station_location_create_header');
$data['page_title'] = __("Create Station Location");
$this->load->view('station_profile/create', $data);
}
@@ -250,7 +250,7 @@ class Stationsetup extends CI_Controller {
}
private function lbpublicsearch2html($publicsearch, $id) {
$htmret = ($publicsearch=='1' ? '<span class="badge text-bg-success">Enabled</span>' : '<span class="badge bg-dark">Disabled</span>');
$htmret = ($publicsearch=='1' ? '<span class="badge text-bg-success">Enabled</span>' : '<span class="badge bg-dark">' . __('Disabled') . '</span>');
$htmret .= '<div class="form-check" style="margin-top: -1.5em"><input id="'.$id.'" class="form-check-input publicSearchCheckbox" type="checkbox"'. ($publicsearch=='1' ? 'checked' : '') . '/></div>';
return $htmret;
@@ -258,16 +258,16 @@ class Stationsetup extends CI_Controller {
private function lbstate2html($id) {
if($this->session->userdata('active_station_logbook') != $id) {
$htmret='<button id="'.$id.'" class="setActiveLogbook btn btn-outline-primary btn-sm">'.lang('station_logbooks_set_active').'</button>';
$htmret='<button id="'.$id.'" class="setActiveLogbook btn btn-outline-primary btn-sm">'.__("Set as Active Logbook").'</button>';
} else {
$htmret="<span class='badge text-bg-success'>" . lang('station_logbooks_active_logbook') . "</span>";
$htmret="<span class='badge text-bg-success'>" . __("Active Logbook") . "</span>";
}
return $htmret;
}
private function lbdel2html($id, $logbook_name) {
if($this->session->userdata('active_station_logbook') != $id) {
$htmret='<button id="'.$id.'" class="deleteLogbook btn btn-outline-danger btn-sm" cnftext="'.lang('station_logbooks_confirm_delete').$logbook_name.'"><i class="fas fa-trash-alt"></i></button>';
$htmret='<button id="'.$id.'" class="deleteLogbook btn btn-outline-danger btn-sm" cnftext="'.__("Are you sure you want to delete the following station logbook? You must re-link any locations linked here to another logbook.: ").$logbook_name.'"><i class="fas fa-trash-alt"></i></button>';
} else {
$htmret='';
}
@@ -277,8 +277,8 @@ class Stationsetup extends CI_Controller {
private function lblnk2html($public_slug, $logbook_name, $id) {
$htmret = '<button class="btn btn-outline-primary btn-sm editVisitorLink" id="' . $id . '"><i class="fas fa-edit"></i></button> ';
if($public_slug != '') {
$htmret .= '<a target="_blank" href="'.site_url('visitor')."/".$public_slug.'" class="btn btn-outline-primary btn-sm"><i class="fas fa-globe" title="'.lang('station_logbooks_view_public') . $logbook_name.'"></i></a>';
$htmret .= ' <button id="' . $id . '" class="deletePublicSlug btn btn-outline-danger btn-sm" cnftext="Are you sure you want to delete the public slug?"><i class="fas fa-trash-alt"></i></button>';
$htmret .= '<a target="_blank" href="'.site_url('visitor')."/".$public_slug.'" class="btn btn-outline-primary btn-sm"><i class="fas fa-globe" title="'.__("View Public Page for Logbook: ") . $logbook_name.'"></i></a>';
$htmret .= ' <button id="' . $id . '" class="deletePublicSlug btn btn-outline-danger btn-sm" cnftext="' . __('Are you sure you want to delete the public slug?') . '"><i class="fas fa-trash-alt"></i></button>';
$htmret .= ' <button id="' . $id . '" class="editExportmapOptions btn btn-outline-primary btn-sm"><i class="fas fa-globe-europe"></i></button>';
}
return $htmret;
@@ -338,39 +338,39 @@ class Stationsetup extends CI_Controller {
private function stationbadge2html($station_active, $qso_total, $current_active, $station_profile_name, $id) {
$returntext = '';
if($station_active != 1) {
$returntext .= '<button id="'.$id.'" class="setActiveStation btn btn-outline-secondary btn-sm" cnftext="'. lang('station_location_confirm_active') . $station_profile_name .'">' . lang('station_location_set_active') . '</button><br/>';
$returntext .= '<button id="'.$id.'" class="setActiveStation btn btn-outline-secondary btn-sm" cnftext="'. __("Are you sure you want to make the following station the active station: ") . $station_profile_name .'">' . __("Set Active") . '</button><br/>';
} else {
$returntext .= '<span class="badge bg-success text-bg-success">' . lang('station_location_active') . '</span><br/>';
$returntext .= '<span class="badge bg-success text-bg-success">' . __("Active Station") . '</span><br/>';
}
$returntext .='<span class="badge bg-dark">' . $qso_total .' '. lang('gen_hamradio_qso') . '</span>';
$returntext .='<span class="badge bg-dark">' . $qso_total .' '. __("QSO") . '</span>';
return $returntext;
}
private function stationedit2html($id) {
return '<a href="' . site_url('station/edit')."/" . $id . '" title="' . lang('admin_edit') . '" class="btn btn-outline-primary btn-sm"><i class="fas fa-edit"></i></a>';
return '<a href="' . site_url('station/edit')."/" . $id . '" title="' . __("Edit") . '" class="btn btn-outline-primary btn-sm"><i class="fas fa-edit"></i></a>';
}
private function stationemptylog2html($id) {
return '<button id="'. $id . '" class="EmptyStation btn btn-danger btn-sm" title="' . lang('station_location_emptylog') . '" cnftext="' . lang('station_location_confirm_del_qso') . '"><i class="fas fa-trash-alt"></i></button>';
return '<button id="'. $id . '" class="EmptyStation btn btn-danger btn-sm" title="' . __("Empty Log") . '" cnftext="' . __("Are you sure you want to delete all QSOs within this station profile?") . '"><i class="fas fa-trash-alt"></i></button>';
}
private function stationcopy2html($id) {
return '<a href="' . site_url('station/copy') . "/" . $id . '" title="' . lang('admin_copy') . '" class="btn btn-outline-primary btn-sm"><i class="fas fa-copy"></i></a>';
return '<a href="' . site_url('station/copy') . "/" . $id . '" title="' . __("Copy") . '" class="btn btn-outline-primary btn-sm"><i class="fas fa-copy"></i></a>';
}
private function stationdelete2html($id, $station_profile_name, $station_active) {
if($station_active != 1) {
return '<button id="'.$id . '" class="DeleteStation btn btn-danger btn-sm" title="' . lang('admin_delete') . '" cnftext="' . lang('station_location_confirm_del_stationlocation') . $station_profile_name . lang('station_location_confirm_del_stationlocation_qso') . '"><i class="fas fa-trash-alt"></i></button>';
return '<button id="'.$id . '" class="DeleteStation btn btn-danger btn-sm" title="' . __("Delete") . '" cnftext="' . __("Are you sure you want delete station profile ") . $station_profile_name . __("This will delete all QSOs within this station profile?") . '"><i class="fas fa-trash-alt"></i></button>';
}
return '';
}
private function stationcountry2html($station_country, $dxcc_end) {
$returntext = $station_country == '' ? '- NONE -' : $station_country;
$returntext = $station_country == '' ? '- ' . __('NONE') . ' -' : $station_country;
if ($dxcc_end != NULL) {
$returntext .= ' <span class="badge badge-danger">'.lang('gen_hamradio_deleted_dxcc').'</span>';
$returntext .= ' <span class="badge badge-danger">'.__("Deleted DXCC").'</span>';
}
return $returntext;
@@ -384,7 +384,7 @@ class Stationsetup extends CI_Controller {
$data['success']=1;
} else {
$data['success']=0;
$data['flashdata']='Not allowed';
$data['flashdata'] = __('Not allowed');
}
echo json_encode($data);
}
@@ -398,7 +398,7 @@ class Stationsetup extends CI_Controller {
$data['success']=1;
} else {
$data['success']=0;
$data['flashdata']='Not allowed';
$data['flashdata'] = __('Not allowed');
}
echo json_encode($data);
}
@@ -425,7 +425,7 @@ class Stationsetup extends CI_Controller {
$data['locationdata'] = $this->stationsetup_model->locationInfo($locationid)->result();
} else {
$data['success']=0;
$data['flashdata']='Error';
$data['flashdata'] = __('Error');
}
echo json_encode($data);
}
@@ -451,7 +451,7 @@ class Stationsetup extends CI_Controller {
$data['exportmapoptions'] = $exportmapoptions;
$data['page_title'] = "Edit Export Map options";
$data['page_title'] = __("Edit Export Map options");
$this->load->view('stationsetup/exportmapoptions', $data);
}

2
application/controllers/Statistics.php
View File

@@ -24,7 +24,7 @@ class Statistics extends CI_Controller {
// Render User Interface
// Set Page Title
$data['page_title'] = $this->lang->line('statistics_statistics');
$data['page_title'] = __("Statistics");
$data['sat_active'] = array_search("SAT", $this->bands->get_user_bands(), true);
// Load Views

6
application/controllers/User.php
View File

@@ -9,7 +9,7 @@ class User extends CI_Controller {
$data['results'] = $this->user_model->users();
$data['page_title'] = $this->lang->line('admin_user_accounts');
$data['page_title'] = __("User Accounts");
$this->load->view('interface_assets/header', $data);
$this->load->view('user/main');
@@ -659,10 +659,10 @@ class User extends CI_Controller {
}
$this->user_options_model->set_option('header_menu', 'locations_quickswitch', array('boolean'=>xss_clean($this->input->post('user_locations_quickswitch', true))));
$this->user_options_model->set_option('header_menu', 'utc_headermenu', array('boolean'=>xss_clean($this->input->post('user_utc_headermenu', true))));
$this->session->set_flashdata('success', lang('account_user').' '.$this->input->post('user_name', true).' '.lang('account_word_edited'));
$this->session->set_flashdata('success', __("User").' '.$this->input->post('user_name', true).' '.__("edited"));
redirect('user/edit/'.$this->uri->segment(3));
} else {
$this->session->set_flashdata('success', lang('account_user').' '.$this->input->post('user_name', true).' '.lang('account_word_edited'));
$this->session->set_flashdata('success', __("User").' '.$this->input->post('user_name', true).' '.__("edited"));
redirect('user');
}
return;

8
application/controllers/Visitor.php
View File

@@ -369,10 +369,10 @@ class Visitor extends CI_Controller {
$data['layer'] = $this->optionslib->get_option('option_map_tile_server');
$data['attribution'] = $this->optionslib->get_option('option_map_tile_server_copyright');
$data['gridsquares_gridsquares'] = lang('gridsquares_gridsquares');
$data['gridsquares_gridsquares_confirmed'] = lang('gridsquares_gridsquares_confirmed');
$data['gridsquares_gridsquares_not_confirmed'] = lang('gridsquares_gridsquares_not_confirmed');
$data['gridsquares_gridsquares_total_worked'] = lang('gridsquares_gridsquares_total_worked');
$data['gridsquares_gridsquares'] = __("Gridsquares");
$data['gridsquares_gridsquares_confirmed'] = __("Gridsquares confirmed");
$data['gridsquares_gridsquares_not_confirmed'] = __("Gridsquares not confirmed");
$data['gridsquares_gridsquares_total_worked'] = __("Total gridsquares worked");
$data['visitor'] = true;

14
application/models/Logbook_model.php
View File

@@ -4126,30 +4126,30 @@ function lotw_last_qsl_date($user_id) {
if ($ignoreAmbiguous == '1') {
return array();
} else {
return array(2, $result['message'] = "<tr><td>".date($custom_date_format, strtotime($record['qso_date']))."</td><td>".date('H:i', strtotime($record['time_on']))."</td><td>".str_replace('0', 'Ø', $call)."</td><td>".$band."</td><td>".$mode."</td><td></td><td>".(preg_match('/^[A-Y]\d{2}$/', $darc_dok) ? '<a href="https://www.darc.de/'.$darc_dok.'" target="_blank">'.$darc_dok.'</a>' : (preg_match('/^Z\d{2}$/', $darc_dok) ? '<a href="https://'.$darc_dok.'.vfdb.org" target="_blank">'.$darc_dok.'</a>' : $darc_dok))."</td><td>".lang('dcl_no_match')."</td></tr>");
return array(2, $result['message'] = "<tr><td>".date($custom_date_format, strtotime($record['qso_date']))."</td><td>".date('H:i', strtotime($record['time_on']))."</td><td>".str_replace('0', 'Ø', $call)."</td><td>".$band."</td><td>".$mode."</td><td></td><td>".(preg_match('/^[A-Y]\d{2}$/', $darc_dok) ? '<a href="https://www.darc.de/'.$darc_dok.'" target="_blank">'.$darc_dok.'</a>' : (preg_match('/^Z\d{2}$/', $darc_dok) ? '<a href="https://'.$darc_dok.'.vfdb.org" target="_blank">'.$darc_dok.'</a>' : $darc_dok))."</td><td>".__("QSO could not be matched")."</td></tr>");
}
} else {
$dcl_qsl_status = '';
switch($record['app_dcl_status']) {
case 'c':
$dcl_qsl_status = lang('dcl_qsl_status_c');
$dcl_qsl_status = __("confirmed by LoTW/Clublog/eQSL/Contest");
break;
case 'm':
case 'n':
case 'o':
$dcl_qsl_status = lang('dcl_qsl_status_mno');
$dcl_qsl_status = __("confirmed by award manager");
break;
case 'i':
$dcl_qsl_status = lang('dcl_qsl_status_i');
$dcl_qsl_status = __("confirmed by cross-check of DCL data");
break;
case 'w':
$dcl_qsl_status = lang('dcl_qsl_status_w');
$dcl_qsl_status = __("confirmation pending");
break;
case 'x':
$dcl_qsl_status = lang('dcl_qsl_status_x');
$dcl_qsl_status = __("unconfirmed");
break;
default:
$dcl_qsl_status = lang('dcl_qsl_status_unknown');
$dcl_qsl_status = __("unknown");
}
if ($check->row()->COL_DARC_DOK != $darc_dok) {
$dcl_cnfm = array('c', 'm', 'n', 'o', 'i');

16
application/views/eqslcard/index.php
View File

@@ -2,7 +2,7 @@
<br>
<h2><?php echo $this->lang->line('general_word_eqslcards'); ?></h2>
<h2><?php echo __("eQSL Cards"); ?></h2>
<?php $userdata_dir = $this->config->item('userdata');
if (isset($userdata_dir)) { ?>
@@ -25,13 +25,13 @@
echo '<table style="width:100%" class="eqsltable table table-sm table-bordered table-hover table-striped table-condensed">
<thead>
<tr>
<th style=\'text-align: center\'>'.$this->lang->line('gen_hamradio_callsign').'</th>
<th style=\'text-align: center\'>'.$this->lang->line('gen_hamradio_mode').'</th>
<th style=\'text-align: center\'>'.$this->lang->line('general_word_date').'</th>
<th style=\'text-align: center\'>'.$this->lang->line('general_word_time').'</th>
<th style=\'text-align: center\'>'.$this->lang->line('gen_hamradio_band').'</th>
<th style=\'text-align: center\'>'.$this->lang->line('gen_hamradio_propagation_mode').'</th>
<th style=\'text-align: center\'>'.$this->lang->line('gen_hamradio_qsl').' '.$this->lang->line('general_word_date').'</th>
<th style=\'text-align: center\'>'.__("Callsign").'</th>
<th style=\'text-align: center\'>'.__("Mode").'</th>
<th style=\'text-align: center\'>'.__("Date").'</th>
<th style=\'text-align: center\'>'.__("Time").'</th>
<th style=\'text-align: center\'>'.__("Band").'</th>
<th style=\'text-align: center\'>'.__("Propagation Mode").'</th>
<th style=\'text-align: center\'>'.__("QSL").' '.__("Date").'</th>
<th style=\'text-align: center\'></th>
</tr>
</thead><tbody>';

2
application/views/interface_assets/footer.php
View File

@@ -86,7 +86,7 @@ if($this->session->userdata('user_id') != null) {
}
$versionDialogHeader = $this->optionslib->get_option('version_dialog_header');
if (empty($versionDialogHeader)) {
$this->optionslib->update('version_dialog_header', $this->lang->line('options_version_dialog'), 'yes');
$this->optionslib->update('version_dialog_header', __("Version Info"), 'yes');
}
if($versionDialog != "disabled") {
$confirmed = $this->user_options_model->get_options('version_dialog', array('option_name'=>'confirmed'))->result();

2
application/views/qso/components/previous_contacts.php
View File

@@ -56,7 +56,7 @@ function echo_table_col($row, $name) {
case 'Mode': echo '<td>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE . '</td>'; break;
case 'RSTS': echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ' <span data-bs-toggle="tooltip" title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo ' <span data-bs-toggle="tooltip" title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_STX_STRING . '</span>';} echo '</td>'; break;
case 'RSTR': echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' <span data-bs-toggle="tooltip" title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo ' <span data-bs-toggle="tooltip" title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_SRX_STRING . '</span>';} echo '</td>'; break;
case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY))); if ($row->end != NULL) echo ' <span class="badge text-bg-danger">'.$ci->lang->line('gen_hamradio_deleted_dxcc').'</span>' . '</td>'; break;
case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY))); if ($row->end != NULL) echo ' <span class="badge text-bg-danger">'.__("Deleted DXCC").'</span>' . '</td>'; break;
case 'IOTA': echo '<td>' . ($row->COL_IOTA) . '</td>'; break;
case 'SOTA': echo '<td>' . ($row->COL_SOTA_REF) . '</td>'; break;
case 'WWFF': echo '<td>' . ($row->COL_WWFF_REF) . '</td>'; break;

59
application/views/timeline/index.php
View File

@@ -106,18 +106,17 @@
<?php
function write_dxcc_timeline($timeline_array, $custom_date_format, $bandselect, $modeselect, $award) {
$ci =& get_instance();
$i = count($timeline_array);
echo '<table style="width:100%" class="table table-sm timelinetable table-bordered table-hover table-striped table-condensed text-center">
<thead>
<tr>
<td>#</td>
<td>'.$ci->lang->line('general_word_date').'</td>
<td>'.$ci->lang->line('gen_hamradio_prefix').'</td>
<td>'.$ci->lang->line('general_word_country').'</td>
<td>'.$ci->lang->line('station_logbooks_status').'</td>
<td>'.$ci->lang->line('general_word_enddate').'</td>
<td>'.$ci->lang->line('gridsquares_show_qsos').'</td>
<td>'.__("Date").'</td>
<td>'.__("Prefix").'</td>
<td>'.__("Country").'</td>
<td>'.__("Status").'</td>
<td>'.__("End Date").'</td>
<td>'.__("Show QSO's").'</td>
</tr>
</thead>
<tbody>';
@@ -130,25 +129,24 @@ function write_dxcc_timeline($timeline_array, $custom_date_format, $bandselect,
<td>' . $line->prefix . '</td>
<td>' . $line->col_country . '</td>
<td>';
if (!empty($line->end)) echo '<span class="badge text-bg-danger">'.$ci->lang->line('gen_hamradio_deleted_dxcc').'</span>';
if (!empty($line->end)) echo '<span class="badge text-bg-danger">'.__("Deleted DXCC").'</span>';
echo '</td>
<td>' . $line->end . '</td>
<td><a href=javascript:displayTimelineContacts("' . $line->adif . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>'.$ci->lang->line('filter_options_show').'</a></td>
<td><a href=javascript:displayTimelineContacts("' . $line->adif . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>'.__("Show").'</a></td>
</tr>';
}
echo '</tfoot></table></div>';
}
function write_was_timeline($timeline_array, $custom_date_format, $bandselect, $modeselect, $award) {
$ci =& get_instance();
$i = count($timeline_array);
echo '<table style="width:100%" class="table table-sm timelinetable table-bordered table-hover table-striped table-condensed text-center">
<thead>
<tr>
<td>#</td>
<td>'.$ci->lang->line('general_word_date').'</td>
<td>'.$ci->lang->line('gen_hamradio_state').'</td>
<td>'.$ci->lang->line('gridsquares_show_qsos').'</td>
<td>'.__("Date").'</td>
<td>'.__("State").'</td>
<td>'.__("Show QSO's").'</td>
</tr>
</thead>
<tbody>';
@@ -159,24 +157,23 @@ function write_was_timeline($timeline_array, $custom_date_format, $bandselect, $
<td>' . $i-- . '</td>
<td>' . date($custom_date_format, $date_as_timestamp) . '</td>
<td>' . $line->col_state . '</td>
<td><a href=javascript:displayTimelineContacts("' . $line->col_state . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>'.$ci->lang->line('filter_options_show').'</a></td>
<td><a href=javascript:displayTimelineContacts("' . $line->col_state . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>'.__("Show").'</a></td>
</tr>';
}
echo '</tfoot></table></div>';
}
function write_iota_timeline($timeline_array, $custom_date_format, $bandselect, $modeselect, $award) {
$ci =& get_instance();
$i = count($timeline_array);
echo '<table style="width:100%" class="table table-sm timelinetable table-bordered table-hover table-striped table-condensed text-center">
<thead>
<tr>
<td>#</td>
<td>'.$ci->lang->line('general_word_date').'</td>
<td>'.$ci->lang->line('gen_hamradio_iota').'</td>
<td>'.$ci->lang->line('general_word_name').'</td>
<td>'.$ci->lang->line('gen_hamradio_prefix').'</td>
<td>'.$ci->lang->line('gridsquares_show_qsos').'</td>
<td>'.__("Date").'</td>
<td>'.__("IOTA").'</td>
<td>'.__("Name").'</td>
<td>'.__("Prefix").'</td>
<td>'.__("Show QSO's").'</td>
</tr>
</thead>
<tbody>';
@@ -189,22 +186,21 @@ function write_iota_timeline($timeline_array, $custom_date_format, $bandselect,
<td>' . $line->col_iota . '</td>
<td>' . $line->name . '</td>
<td>' . $line->prefix . '</td>
<td><a href=javascript:displayTimelineContacts("' . $line->col_iota . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>'.$ci->lang->line('filter_options_show').'</a></td>
<td><a href=javascript:displayTimelineContacts("' . $line->col_iota . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>'.__("Show").'</a></td>
</tr>';
}
echo '</tfoot></table></div>';
}
function write_waz_timeline($timeline_array, $custom_date_format, $bandselect, $modeselect, $award) {
$ci =& get_instance();
$i = count($timeline_array);
echo '<table style="width:100%" class="table table-sm timelinetable table-bordered table-hover table-striped table-condensed text-center">
<thead>
<tr>
<td>#</td>
<td>'.$ci->lang->line('general_word_date').'</td>
<td>'.$ci->lang->line('gen_hamradio_cq_zone').'</td>
<td>'.$ci->lang->line('gridsquares_show_qsos').'</td>
<td>'.__("Date").'</td>
<td>'.__("CQ Zone").'</td>
<td>'.__("Show QSO's").'</td>
</tr>
</thead>
<tbody>';
@@ -215,23 +211,22 @@ function write_waz_timeline($timeline_array, $custom_date_format, $bandselect, $
<td>' . $i-- . '</td>
<td>' . date($custom_date_format, $date_as_timestamp) . '</td>
<td>' . $line->col_cqz . '</td>
<td><a href=javascript:displayTimelineContacts("' . $line->col_cqz . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>'.$ci->lang->line('filter_options_show').'</a></td>
<td><a href=javascript:displayTimelineContacts("' . $line->col_cqz . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>'.__("Show").'</a></td>
</tr>';
}
echo '</tfoot></table></div>';
}
function write_vucc_timeline($timeline_array, $custom_date_format, $bandselect, $modeselect, $award) {
$ci =& get_instance();
$i = count($timeline_array);
echo '<table style="width:100%" class="table table-sm timelinetable table-bordered table-hover table-striped table-condensed text-center">
<thead>
<tr>
<td>#</td>
<td>'.$ci->lang->line('general_word_date').'</td>
<td>'.$ci->lang->line('general_word_time').'</td>
<td>'.$ci->lang->line('gen_hamradio_gridsquare').'</td>
<td>'.$ci->lang->line('gridsquares_show_qsos').'</td>
<td>'.__("Date").'</td>
<td>'.__("Time").'</td>
<td>'.__("Gridsquare").'</td>
<td>'.__("Show QSO's").'</td>
</tr>
</thead>
<tbody>';
@@ -243,7 +238,7 @@ function write_vucc_timeline($timeline_array, $custom_date_format, $bandselect,
<td>' . date($custom_date_format, $date_as_timestamp) . '</td>
<td>' . date('H:i', $date_as_timestamp) . '</td>
<td>' . $line['gridsquare'] . '</td>
<td><a href=javascript:displayTimelineContacts("' . $line['gridsquare'] . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>'.$ci->lang->line('filter_options_show').'</a></td>
<td><a href=javascript:displayTimelineContacts("' . $line['gridsquare'] . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>'.__("Show").'</a></td>
</tr>';
}
echo '</tfoot></table></div>';

22
application/views/user/edit.php
View File

@@ -471,30 +471,30 @@
<?php if ($this->session->userdata('user_id') == $this->uri->segment(3)) { ?>
<div class="col-md">
<div class="card">
<div class="card-header"><?php echo $this->lang->line('account_map_params'); ?></div>
<div class="card-header"><?php echo __("Map Settings"); ?></div>
<div class="card-body">
<div class="row"> <!-- Station -->
<div class="mb-3 col-md-4">
<label>&nbsp;</label><br/><label><?php echo $this->lang->line('gen_hamradio_station'); ?></label>
<label>&nbsp;</label><br/><label><?php echo __("Station"); ?></label>
</div>
<div class="mb-3 col-md-3">
<label><?php echo $this->lang->line('general_word_icon'); ?></label><br/>
<label><?php echo __("Icon"); ?></label><br/>
<div class="icon_selectBox" data-boxcontent="station">
<input type="hidden" name="user_map_station_icon" value="<?php echo $user_map_station_icon; ?>">
<div class="form-select icon_overSelect"><?php echo (($user_map_station_icon=="0")?substr($this->lang->line('general_word_not_display'),0,10).'.':("<i class='".$user_map_station_icon."'></i>")); ?></div>
<div class="form-select icon_overSelect"><?php echo (($user_map_station_icon=="0")?substr(__("Not display"),0,10).'.':("<i class='".$user_map_station_icon."'></i>")); ?></div>
</div>
<div class="col-md-3 icon_selectBox_data" data-boxcontent="station">
<?php foreach($map_icon_select['station'] as $val) {
echo "<label data-value='".$val."'>".(($val=="0")?$this->lang->line('general_word_not_display'):("<i class='".$val."'></i>"))."</label>";
echo "<label data-value='".$val."'>".(($val=="0")?__("Not display"):("<i class='".$val."'></i>"))."</label>";
} ?>
</div>
</div>
<div class="mb-3 col-md-2">
<label><?php echo $this->lang->line('general_word_colors'); ?></label><br/><input type="color" class="form-control user_icon_color" name="user_map_station_color" id="user_map_station_color" value="<?php echo $user_map_station_color; ?>" style="padding:initial;<?php echo ($user_map_station_icon=="0")?'display:none;':''; ?>" data-icon="station" /></div>
<label><?php echo __("Colors"); ?></label><br/><input type="color" class="form-control user_icon_color" name="user_map_station_color" id="user_map_station_color" value="<?php echo $user_map_station_color; ?>" style="padding:initial;<?php echo ($user_map_station_icon=="0")?'display:none;':''; ?>" data-icon="station" /></div>
</div>
<div class="row"> <!-- QSO (default) -->
<div class="mb-3 col-md-4">
<label><?php echo $this->lang->line('account_map_qso_by_default'); ?></label>
<label><?php echo __("QSO (by default)"); ?></label>
</div>
<div class="mb-3 col-md-3">
<div class="icon_selectBox" data-boxcontent="qso">
@@ -513,17 +513,17 @@
</div>
<div class="row"> <!-- QSO (confirmed) -->
<div class="mb-3 col-md-4">
<label><?php echo $this->lang->line('account_map_qso_confirm'); ?></label>
<label><?php echo __("QSO (confirmed)"); ?></label>
<small class="form-text text-muted"><?= __("(If 'No', displayed as ".$lang['account_map_qso_by_default'].")"); ?></small>
</div>
<div class="mb-3 col-md-3">
<div class="icon_selectBox" data-boxcontent="qsoconfirm">
<input type="hidden" name="user_map_qsoconfirm_icon" value="<?php echo $user_map_qsoconfirm_icon; ?>">
<div class="form-select icon_overSelect"><?php echo (($user_map_qsoconfirm_icon=="0")?$this->lang->line('general_word_no'):("<i class='".$user_map_qsoconfirm_icon."'></i>")); ?></div>
<div class="form-select icon_overSelect"><?php echo (($user_map_qsoconfirm_icon=="0")?__("No"):("<i class='".$user_map_qsoconfirm_icon."'></i>")); ?></div>
</div>
<div class="col-md-3 icon_selectBox_data" data-boxcontent="qsoconfirm">
<?php foreach($map_icon_select['qsoconfirm'] as $val) {
echo "<label data-value='".$val."'>".(($val=="0")?$this->lang->line('general_word_no'):("<i class='".$val."'></i>"))."</label>";
echo "<label data-value='".$val."'>".(($val=="0")?__("No"):("<i class='".$val."'></i>"))."</label>";
} ?>
</div>
</div>
@@ -533,7 +533,7 @@
</div>
<div class="row">
<div class="md-3 col-md-4">
<label><?php echo $this->lang->line('gen_hamradio_gridsquare_show'); ?></label>
<label><?php echo __("Show Locator"); ?></label>
</div>
<div class="md-3 col-md-3">
<select class="form-select" id="user_map_gridsquare_show" name="user_map_gridsquare_show">

2
application/views/view_log/partial/log_ajax.php
View File

@@ -26,7 +26,7 @@ function echo_table_col($row, $name) {
case 'Mode': echo '<td>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE . '</td>'; break;
case 'RSTS': echo '<td>' . $row->COL_RST_SENT ?? ''; if ($row->COL_STX) { echo ' <span data-bs-toggle="tooltip" title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo ' <span data-bs-toggle="tooltip" title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_STX_STRING . '</span>';} echo '</td>'; break;
case 'RSTR': echo '<td>' . $row->COL_RST_RCVD ?? ''; if ($row->COL_SRX) { echo ' <span data-bs-toggle="tooltip" title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo ' <span data-bs-toggle="tooltip" title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_SRX_STRING . '</span>';} echo '</td>'; break;
case 'Country': echo '<td>' . ucwords(strtolower(($row->name==null?"- NONE -":$row->name))); if ($row->end != null) echo ' <span class="badge text-bg-danger">'.$ci->lang->line('gen_hamradio_deleted_dxcc').'</span>' . '</td>'; break;
case 'Country': echo '<td>' . ucwords(strtolower(($row->name==null?"- NONE -":$row->name))); if ($row->end != null) echo ' <span class="badge text-bg-danger">'.__("Deleted DXCC").'</span>' . '</td>'; break;
case 'IOTA': echo '<td>' . ($row->COL_IOTA ?? '') . '</td>'; break;
case 'SOTA': echo '<td>' . ($row->COL_SOTA_REF ?? '') . '</td>'; break;
case 'WWFF': echo '<td>' . ($row->COL_WWFF_REF ?? '') . '</td>'; break;

2
application/views/view_log/qso.php
View File

@@ -39,7 +39,7 @@
echo 'hidden ';
}
echo 'class="eqslcardtab nav-item">
<a class="nav-link" id="eqsltab" data-bs-toggle="tab" href="#eqslcard" role="tab" aria-controls="home" aria-selected="false">'. $this->lang->line('general_word_eqslcard') .'</a>
<a class="nav-link" id="eqsltab" data-bs-toggle="tab" href="#eqslcard" role="tab" aria-controls="home" aria-selected="false">'. __("eQSL Card") .'</a>
</li>';
}