diff --git a/application/controllers/Accumulated.php b/application/controllers/Accumulated.php index df442d870..3f024d14b 100644 --- a/application/controllers/Accumulated.php +++ b/application/controllers/Accumulated.php @@ -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'); diff --git a/application/controllers/Activated_gridmap.php b/application/controllers/Activated_gridmap.php index 34945a730..f3d93c5bc 100644 --- a/application/controllers/Activated_gridmap.php +++ b/application/controllers/Activated_gridmap.php @@ -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'] = [ diff --git a/application/controllers/Awards.php b/application/controllers/Awards.php index 47fe74f17..b97049ba4 100644 --- a/application/controllers/Awards.php +++ b/application/controllers/Awards.php @@ -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(); diff --git a/application/controllers/Contesting.php b/application/controllers/Contesting.php index 011836341..f8197a4fc 100644 --- a/application/controllers/Contesting.php +++ b/application/controllers/Contesting.php @@ -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'); diff --git a/application/controllers/Dayswithqso.php b/application/controllers/Dayswithqso.php index a2906cc50..9e1bb0862 100644 --- a/application/controllers/Dayswithqso.php +++ b/application/controllers/Dayswithqso.php @@ -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(); diff --git a/application/controllers/Distances.php b/application/controllers/Distances.php index e04bef0b9..4f7bf66d3 100644 --- a/application/controllers/Distances.php +++ b/application/controllers/Distances.php @@ -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); } } diff --git a/application/controllers/Gridmap.php b/application/controllers/Gridmap.php index 9d41c360f..0bd18981b 100644 --- a/application/controllers/Gridmap.php +++ b/application/controllers/Gridmap.php @@ -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'] = [ diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index 149d207af..d873a2aa9 100644 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -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') . ' Station Logbooks'); + $this->session->set_flashdata('notice', __("No logbooks were found. You need to define a logbook under Station Logbooks! Do it here:") . ' ' . __('Station Logbooks') . ''); } // 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 .= "".lang('gen_hamradio_qsl').""; + $html .= "".__("QSL").""; break; case 1: - $html .= "".lang('lotw_short').""; + $html .= "".__("LoTW").""; break; case 2: - $html .= "".lang('eqsl_short').""; + $html .= "".__("eQSL").""; break; case 4: $html .= "QRZ"; @@ -679,7 +679,7 @@ class Logbook extends CI_Controller { $html .= "Clublog"; break; default: - $html .= "".lang('gen_hamradio_qsl').""; + $html .= "".__("QSL").""; break; } $html .= ""; @@ -1307,7 +1307,7 @@ class Logbook extends CI_Controller { case 'Mode': $ret.= ''; $ret.= $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE . ''; break; case 'RSTS': $ret.= '' . $row->COL_RST_SENT; if ($row->COL_STX) { $ret.= ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; $ret.=sprintf("%03d", $row->COL_STX); $ret.= '';} if ($row->COL_STX_STRING) { $ret.= ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_STX_STRING . '';} $ret.= ''; break; case 'RSTR': $ret.= '' . $row->COL_RST_RCVD; if ($row->COL_SRX) { $ret.= ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; $ret.=sprintf("%03d", $row->COL_SRX); $ret.= '';} if ($row->COL_SRX_STRING) { $ret.= ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_SRX_STRING . '';} $ret.= ''; break; - case 'Country': $ret.= '' . ucwords(strtolower(($row->COL_COUNTRY ?? ''))); if ($row->end ?? '' != '') $ret.= ' '.$ci->lang->line('gen_hamradio_deleted_dxcc').'' . ''; break; + case 'Country': $ret.= '' . ucwords(strtolower(($row->COL_COUNTRY ?? ''))); if ($row->end ?? '' != '') $ret.= ' '.__("Deleted DXCC").'' . ''; break; case 'IOTA': $ret.= '' . ($row->COL_IOTA) . ''; break; case 'SOTA': $ret.= '' . ($row->COL_SOTA_REF) . ''; break; case 'WWFF': $ret.= '' . ($row->COL_WWFF_REF) . ''; break; diff --git a/application/controllers/Options.php b/application/controllers/Options.php index 988449446..3749009bd 100644 --- a/application/controllers/Options.php +++ b/application/controllers/Options.php @@ -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'); } diff --git a/application/controllers/Qslprint.php b/application/controllers/Qslprint.php index be69cf90e..81392bef3 100644 --- a/application/controllers/Qslprint.php +++ b/application/controllers/Qslprint.php @@ -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'); diff --git a/application/controllers/Sattimers.php b/application/controllers/Sattimers.php index 7de010f91..00934b866 100644 --- a/application/controllers/Sattimers.php +++ b/application/controllers/Sattimers.php @@ -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!"), '' . __("here") . '')); } - $data['page_title'] = "Satellite Timers"; + $data['page_title'] = __("Satellite Timers"); $CI =& get_instance(); if($CI->session->userdata('user_date_format')) { diff --git a/application/controllers/Station.php b/application/controllers/Station.php index ef5ffcc1e..8cd51b4c7 100644 --- a/application/controllers/Station.php +++ b/application/controllers/Station.php @@ -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'); } diff --git a/application/controllers/Stationsetup.php b/application/controllers/Stationsetup.php index 33e030414..ee3d76f76 100644 --- a/application/controllers/Stationsetup.php +++ b/application/controllers/Stationsetup.php @@ -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' ? 'Enabled' : 'Disabled'); + $htmret = ($publicsearch=='1' ? 'Enabled' : '' . __('Disabled') . ''); $htmret .= '
'; return $htmret; @@ -258,16 +258,16 @@ class Stationsetup extends CI_Controller { private function lbstate2html($id) { if($this->session->userdata('active_station_logbook') != $id) { - $htmret=''; + $htmret=''; } else { - $htmret="" . lang('station_logbooks_active_logbook') . ""; + $htmret="" . __("Active Logbook") . ""; } return $htmret; } private function lbdel2html($id, $logbook_name) { if($this->session->userdata('active_station_logbook') != $id) { - $htmret=''; + $htmret=''; } else { $htmret=''; } @@ -277,8 +277,8 @@ class Stationsetup extends CI_Controller { private function lblnk2html($public_slug, $logbook_name, $id) { $htmret = ' '; if($public_slug != '') { - $htmret .= ''; - $htmret .= ' '; + $htmret .= ''; + $htmret .= ' '; $htmret .= ' '; } 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 .= '
'; + $returntext .= '
'; } else { - $returntext .= '' . lang('station_location_active') . '
'; + $returntext .= '' . __("Active Station") . '
'; } - $returntext .='' . $qso_total .' '. lang('gen_hamradio_qso') . ''; + $returntext .='' . $qso_total .' '. __("QSO") . ''; return $returntext; } private function stationedit2html($id) { - return ''; + return ''; } private function stationemptylog2html($id) { - return ''; + return ''; } private function stationcopy2html($id) { - return ''; + return ''; } private function stationdelete2html($id, $station_profile_name, $station_active) { if($station_active != 1) { - return ''; + return ''; } 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 .= ' '.lang('gen_hamradio_deleted_dxcc').''; + $returntext .= ' '.__("Deleted DXCC").''; } 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); } diff --git a/application/controllers/Statistics.php b/application/controllers/Statistics.php index a2487f8a1..05d370f2b 100644 --- a/application/controllers/Statistics.php +++ b/application/controllers/Statistics.php @@ -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 diff --git a/application/controllers/User.php b/application/controllers/User.php index a763b1a3d..59ea5ce56 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -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; diff --git a/application/controllers/Visitor.php b/application/controllers/Visitor.php index 2f19ee3d8..a69543ad7 100644 --- a/application/controllers/Visitor.php +++ b/application/controllers/Visitor.php @@ -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; diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 744243de1..7c83aab1b 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -4126,30 +4126,30 @@ function lotw_last_qsl_date($user_id) { if ($ignoreAmbiguous == '1') { return array(); } else { - return array(2, $result['message'] = "".date($custom_date_format, strtotime($record['qso_date']))."".date('H:i', strtotime($record['time_on']))."".str_replace('0', 'Ø', $call)."".$band."".$mode."".(preg_match('/^[A-Y]\d{2}$/', $darc_dok) ? ''.$darc_dok.'' : (preg_match('/^Z\d{2}$/', $darc_dok) ? ''.$darc_dok.'' : $darc_dok))."".lang('dcl_no_match').""); + return array(2, $result['message'] = "".date($custom_date_format, strtotime($record['qso_date']))."".date('H:i', strtotime($record['time_on']))."".str_replace('0', 'Ø', $call)."".$band."".$mode."".(preg_match('/^[A-Y]\d{2}$/', $darc_dok) ? ''.$darc_dok.'' : (preg_match('/^Z\d{2}$/', $darc_dok) ? ''.$darc_dok.'' : $darc_dok))."".__("QSO could not be matched").""); } } 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'); diff --git a/application/views/eqslcard/index.php b/application/views/eqslcard/index.php index cb16160f7..025644a4d 100644 --- a/application/views/eqslcard/index.php +++ b/application/views/eqslcard/index.php @@ -2,7 +2,7 @@
-

lang->line('general_word_eqslcards'); ?>

+

config->item('userdata'); if (isset($userdata_dir)) { ?> @@ -25,13 +25,13 @@ echo ' - - - - - - - + + + + + + + '; diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 292b7a635..59fd40491 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -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(); diff --git a/application/views/qso/components/previous_contacts.php b/application/views/qso/components/previous_contacts.php index eba36f513..31125c197 100644 --- a/application/views/qso/components/previous_contacts.php +++ b/application/views/qso/components/previous_contacts.php @@ -56,7 +56,7 @@ function echo_table_col($row, $name) { case 'Mode': echo ''; break; case 'RSTS': echo ''; break; case 'RSTR': echo ''; break; - case 'Country': echo ''; break; + case 'Country': echo ''; break; case 'IOTA': echo ''; break; case 'SOTA': echo ''; break; case 'WWFF': echo ''; break; diff --git a/application/views/timeline/index.php b/application/views/timeline/index.php index 89aea36bb..0995c3f41 100644 --- a/application/views/timeline/index.php +++ b/application/views/timeline/index.php @@ -106,18 +106,17 @@ - - - - - - + + + + + + '; @@ -130,25 +129,24 @@ function write_dxcc_timeline($timeline_array, $custom_date_format, $bandselect, - + '; } echo '
'.$this->lang->line('gen_hamradio_callsign').''.$this->lang->line('gen_hamradio_mode').''.$this->lang->line('general_word_date').''.$this->lang->line('general_word_time').''.$this->lang->line('gen_hamradio_band').''.$this->lang->line('gen_hamradio_propagation_mode').''.$this->lang->line('gen_hamradio_qsl').' '.$this->lang->line('general_word_date').''.__("Callsign").''.__("Mode").''.__("Date").''.__("Time").''.__("Band").''.__("Propagation Mode").''.__("QSL").' '.__("Date").'
'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE . '' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_STX); echo '';} if ($row->COL_STX_STRING) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_STX_STRING . '';} echo '' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_SRX); echo '';} if ($row->COL_SRX_STRING) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_SRX_STRING . '';} echo '' . ucwords(strtolower(($row->COL_COUNTRY))); if ($row->end != NULL) echo ' '.$ci->lang->line('gen_hamradio_deleted_dxcc').'' . '' . ucwords(strtolower(($row->COL_COUNTRY))); if ($row->end != NULL) echo ' '.__("Deleted DXCC").'' . '' . ($row->COL_IOTA) . '' . ($row->COL_SOTA_REF) . '' . ($row->COL_WWFF_REF) . '
#'.$ci->lang->line('general_word_date').''.$ci->lang->line('gen_hamradio_prefix').''.$ci->lang->line('general_word_country').''.$ci->lang->line('station_logbooks_status').''.$ci->lang->line('general_word_enddate').''.$ci->lang->line('gridsquares_show_qsos').''.__("Date").''.__("Prefix").''.__("Country").''.__("Status").''.__("End Date").''.__("Show QSO's").'
' . $line->prefix . ' ' . $line->col_country . ' '; - if (!empty($line->end)) echo ''.$ci->lang->line('gen_hamradio_deleted_dxcc').''; + if (!empty($line->end)) echo ''.__("Deleted DXCC").''; echo ' ' . $line->end . 'adif . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>'.$ci->lang->line('filter_options_show').'adif . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>'.__("Show").'
'; } function write_was_timeline($timeline_array, $custom_date_format, $bandselect, $modeselect, $award) { - $ci =& get_instance(); $i = count($timeline_array); echo ' - - - + + + '; @@ -159,24 +157,23 @@ function write_was_timeline($timeline_array, $custom_date_format, $bandselect, $ - + '; } echo '
#'.$ci->lang->line('general_word_date').''.$ci->lang->line('gen_hamradio_state').''.$ci->lang->line('gridsquares_show_qsos').''.__("Date").''.__("State").''.__("Show QSO's").'
' . $i-- . ' ' . date($custom_date_format, $date_as_timestamp) . ' ' . $line->col_state . 'col_state . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>'.$ci->lang->line('filter_options_show').'col_state . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>'.__("Show").'
'; } function write_iota_timeline($timeline_array, $custom_date_format, $bandselect, $modeselect, $award) { - $ci =& get_instance(); $i = count($timeline_array); echo ' - - - - - + + + + + '; @@ -189,22 +186,21 @@ function write_iota_timeline($timeline_array, $custom_date_format, $bandselect, - + '; } echo '
#'.$ci->lang->line('general_word_date').''.$ci->lang->line('gen_hamradio_iota').''.$ci->lang->line('general_word_name').''.$ci->lang->line('gen_hamradio_prefix').''.$ci->lang->line('gridsquares_show_qsos').''.__("Date").''.__("IOTA").''.__("Name").''.__("Prefix").''.__("Show QSO's").'
' . $line->col_iota . ' ' . $line->name . ' ' . $line->prefix . 'col_iota . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>'.$ci->lang->line('filter_options_show').'col_iota . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>'.__("Show").'
'; } function write_waz_timeline($timeline_array, $custom_date_format, $bandselect, $modeselect, $award) { - $ci =& get_instance(); $i = count($timeline_array); echo ' - - - + + + '; @@ -215,23 +211,22 @@ function write_waz_timeline($timeline_array, $custom_date_format, $bandselect, $ - + '; } echo '
#'.$ci->lang->line('general_word_date').''.$ci->lang->line('gen_hamradio_cq_zone').''.$ci->lang->line('gridsquares_show_qsos').''.__("Date").''.__("CQ Zone").''.__("Show QSO's").'
' . $i-- . ' ' . date($custom_date_format, $date_as_timestamp) . ' ' . $line->col_cqz . 'col_cqz . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>'.$ci->lang->line('filter_options_show').'col_cqz . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>'.__("Show").'
'; } function write_vucc_timeline($timeline_array, $custom_date_format, $bandselect, $modeselect, $award) { - $ci =& get_instance(); $i = count($timeline_array); echo ' - - - - + + + + '; @@ -243,7 +238,7 @@ function write_vucc_timeline($timeline_array, $custom_date_format, $bandselect, - + '; } echo '
#'.$ci->lang->line('general_word_date').''.$ci->lang->line('general_word_time').''.$ci->lang->line('gen_hamradio_gridsquare').''.$ci->lang->line('gridsquares_show_qsos').''.__("Date").''.__("Time").''.__("Gridsquare").''.__("Show QSO's").'
' . date($custom_date_format, $date_as_timestamp) . ' ' . date('H:i', $date_as_timestamp) . ' ' . $line['gridsquare'] . ''.$ci->lang->line('filter_options_show').''.__("Show").'
'; diff --git a/application/views/user/edit.php b/application/views/user/edit.php index 27a4f7309..d42cf3243 100644 --- a/application/views/user/edit.php +++ b/application/views/user/edit.php @@ -471,30 +471,30 @@ session->userdata('user_id') == $this->uri->segment(3)) { ?>
-
lang->line('account_map_params'); ?>
+
-
+
-
+
-
lang->line('general_word_not_display'),0,10).'.':("")); ?>
+
")); ?>
".(($val=="0")?$this->lang->line('general_word_not_display'):("")).""; + echo ""; } ?>
-
" data-icon="station" />
+
" data-icon="station" />
- +
@@ -513,17 +513,17 @@
- +
-
lang->line('general_word_no'):("")); ?>
+
")); ?>
".(($val=="0")?$this->lang->line('general_word_no'):("")).""; + echo ""; } ?>
@@ -533,7 +533,7 @@
- +