diff --git a/application/controllers/Activators.php b/application/controllers/Activators.php index 13852f0af..f50ce1c21 100644 --- a/application/controllers/Activators.php +++ b/application/controllers/Activators.php @@ -17,7 +17,7 @@ class Activators extends CI_Controller public function index() { - $data['page_title'] = "Gridsquare Activators"; + $data['page_title'] = __("Gridsquare Activators"); $this->load->model('Activators_model'); diff --git a/application/controllers/Activatorsmap.php b/application/controllers/Activatorsmap.php index c6be538cf..1399f4d0f 100644 --- a/application/controllers/Activatorsmap.php +++ b/application/controllers/Activatorsmap.php @@ -14,7 +14,7 @@ class Activatorsmap extends CI_Controller { } public function index() { - $data['page_title'] = "Activators Map"; + $data['page_title'] = __("Activators Map"); $this->load->model('stations'); $data['station_locator'] = $this->stations->find_gridsquare(); diff --git a/application/controllers/Adif.php b/application/controllers/Adif.php index 966251de5..01256ab5c 100644 --- a/application/controllers/Adif.php +++ b/application/controllers/Adif.php @@ -15,9 +15,9 @@ class adif extends CI_Controller { public function test() { if(validateADIFDate('20120228') == true){ - echo "valid date"; + echo __("valid date"); } else { - echo "date incorrect"; + echo __("date incorrect"); } @@ -26,7 +26,7 @@ class adif extends CI_Controller { /* Shows Export Views */ public function export() { - $data['page_title'] = "ADIF Export"; + $data['page_title'] = __("ADIF Export"); $this->load->view('interface_assets/header', $data); @@ -144,7 +144,7 @@ class adif extends CI_Controller { $this->load->model('stations'); - $data['page_title'] = "ADIF Import / Export"; + $data['page_title'] = __("ADIF Import / Export"); $data['max_upload'] = ini_get('upload_max_filesize'); $data['station_profile'] = $this->stations->all_of_user(); @@ -168,7 +168,7 @@ class adif extends CI_Controller { $data['active_station_info'] = $station_profile->row(); - $data['page_title'] = "ADIF Import"; + $data['page_title'] = __("ADIF Import"); $data['tab'] = "adif"; $config['upload_path'] = './uploads/'; @@ -208,7 +208,7 @@ class adif extends CI_Controller { unlink('./uploads/'.$fdata['upload_data']['file_name']); } else { unlink('./uploads/'.$fdata['upload_data']['file_name']); - $data['error'] = "Unsupported Filetype"; + $data['error'] = __("Unsupported Filetype"); $stopnow=true; } } else { @@ -244,14 +244,14 @@ class adif extends CI_Controller { return; } } else { - $custom_errors='Station Profile not valid for User'; + $custom_errors=__('Station Profile not valid for User'); } log_message("Error","ADIF End"); $data['adif_errors'] = $custom_errors; $data['skip_dupes'] = $this->input->post('skipDuplicate'); - $data['page_title'] = "ADIF Imported"; + $data['page_title'] = __("ADIF Imported"); $this->load->view('interface_assets/header', $data); $this->load->view('adif/import_success'); $this->load->view('interface_assets/footer'); @@ -262,7 +262,7 @@ class adif extends CI_Controller { $this->load->model('stations'); $data['station_profile'] = $this->stations->all_of_user(); - $data['page_title'] = "DCL Import"; + $data['page_title'] = __("DCL Import"); $data['tab'] = "dcl"; $config['upload_path'] = './uploads/'; @@ -318,7 +318,7 @@ class adif extends CI_Controller { unlink('./uploads/'.$data['upload_data']['file_name']); $data['dcl_error_count'] = $error_count; $data['dcl_errors'] = $custom_errors; - $data['page_title'] = "DCL Data Imported"; + $data['page_title'] = __("DCL Data Imported"); $this->load->view('interface_assets/header', $data); $this->load->view('adif/dcl_success'); $this->load->view('interface_assets/footer'); diff --git a/application/controllers/Api.php b/application/controllers/Api.php index b3a03ef45..acc354024 100644 --- a/application/controllers/Api.php +++ b/application/controllers/Api.php @@ -23,7 +23,7 @@ class API extends CI_Controller { $data['api_keys'] = $this->api_model->keys(); - $data['page_title'] = "API"; + $data['page_title'] = __("API"); $this->load->view('interface_assets/header', $data); $this->load->view('api/help'); @@ -47,14 +47,14 @@ class API extends CI_Controller { $this->load->library('form_validation'); - $this->form_validation->set_rules('api_desc', 'API Description', 'required'); - $this->form_validation->set_rules('api_key', 'API Key is required do not change this field', 'required'); + $this->form_validation->set_rules('api_desc', __('API Description'), 'required'); + $this->form_validation->set_rules('api_key', __('API Key is required do not change this field'), 'required'); $data['api_info'] = $this->api_model->key_description($key); if ($this->form_validation->run() == FALSE) { - $data['page_title'] = "Edit API Description"; + $data['page_title'] = __("Edit API Description"); $this->load->view('interface_assets/header', $data); $this->load->view('api/description'); @@ -66,7 +66,7 @@ class API extends CI_Controller { $this->api_model->update_key_description($this->input->post('api_key'), $this->input->post('api_desc')); - $this->session->set_flashdata('notice', 'API Key '.$this->input->post('api_key')." description has been updated."); + $this->session->set_flashdata('notice', sprintf(__("API Key %s description has been updated."), "".$this->input->post('api_key')."")); redirect('api/help'); } @@ -106,7 +106,7 @@ class API extends CI_Controller { $this->api_model->delete_key($key); - $this->session->set_flashdata('notice', 'API Key '.$key." has been deleted"); + $this->session->set_flashdata('notice', sprintf(__("API Key %s has been deleted"), "".$key."" )); redirect('api/help'); } @@ -115,13 +115,13 @@ class API extends CI_Controller { function auth($key) { $this->load->model('api_model'); header("Content-type: text/xml"); - if($this->api_model->access($key) == "No Key Found" || $this->api_model->access($key) == "Key Disabled") { + if($this->api_model->access($key) == __("No Key Found") || $this->api_model->access($key) == __("Key Disabled")) { echo ""; - echo "Key Invalid - either not found or disabled"; + echo "" . __("Key Invalid - either not found or disabled") . ""; echo ""; } else { echo ""; - echo "Valid"; + echo "" . __("Valid") . ""; echo "".$this->api_model->access($key).""; echo ""; $this->api_model->update_last_used($key); diff --git a/application/controllers/Awards.php b/application/controllers/Awards.php index b883fe20d..1c02118ba 100644 --- a/application/controllers/Awards.php +++ b/application/controllers/Awards.php @@ -19,7 +19,7 @@ class Awards extends CI_Controller { public function index() { // Render Page - $data['page_title'] = "Awards"; + $data['page_title'] = __("Awards"); $this->load->view('interface_assets/header', $data); $this->load->view('awards/index'); $this->load->view('interface_assets/footer'); @@ -89,7 +89,7 @@ class Awards extends CI_Controller { } // Render Page - $data['page_title'] = "Awards - DOK"; + $data['page_title'] = sprintf(__("Awards - %s", __("DOK"))); $this->load->view('interface_assets/header', $data); $this->load->view('awards/dok/index'); $this->load->view('interface_assets/footer'); @@ -169,7 +169,7 @@ class Awards extends CI_Controller { $data['dxcc_summary'] = $this->dxcc->get_dxcc_summary($bands, $postdata); // Render Page - $data['page_title'] = "Awards - DXCC"; + $data['page_title'] = sprintf(__("Awards - %s", __("DXCC"))); $this->load->view('interface_assets/header', $data); $this->load->view('awards/dxcc/index'); $this->load->view('interface_assets/footer'); @@ -248,7 +248,7 @@ class Awards extends CI_Controller { $data['waja_summary'] = $this->waja->get_waja_summary($bands, $postdata); // Render Page - $data['page_title'] = "Awards - WAJA"; + $data['page_title'] =__( "Awards - WAJA"); $this->load->view('interface_assets/header', $data); $this->load->view('awards/waja/index'); $this->load->view('interface_assets/footer', $footerData); @@ -324,7 +324,7 @@ class Awards extends CI_Controller { $data['jcc_summary'] = $this->jcc_model->get_jcc_summary($bands, $postdata); // Render Page - $data['page_title'] = "Awards - JCC"; + $data['page_title'] = sprintf(__("Awards - %s", __("JCC"))); $this->load->view('interface_assets/header', $data); $this->load->view('awards/jcc/index'); $this->load->view('interface_assets/footer', $footerData); @@ -372,7 +372,7 @@ class Awards extends CI_Controller { $data['vucc_array'] = $this->vucc->get_vucc_array($data); // Render Page - $data['page_title'] = "Awards - VUCC"; + $data['page_title'] = sprintf(__("Awards - %s", __("VUCC"))); $this->load->view('interface_assets/header', $data); $this->load->view('awards/vucc/index'); $this->load->view('interface_assets/footer'); @@ -402,7 +402,7 @@ class Awards extends CI_Controller { $data['results'] = $this->logbook_model->vucc_qso_details($gridsquare, $band); // Render Page - $data['page_title'] = "Log View - VUCC"; + $data['page_title'] = __("Log View - VUCC"); $data['filter'] = "vucc " . $gridsquare . " and band ".$band; $this->load->view('awards/details', $data); } @@ -450,24 +450,24 @@ class Awards extends CI_Controller { } // Render Page - $data['page_title'] = "Log View - " . $type; + $data['page_title'] = __("Log View")." - " . $type; $data['filter'] = $type." ".$searchphrase." and band ".$band; if ($band == 'SAT') { if ($sat != 'All' && $sat != null) { - $data['filter'] .= " and sat ".$sat; + $data['filter'] .= __(" and sat ").$sat; } if ($orbit != 'All' && $orbit != null) { - $data['filter'] .= " and orbit type ".$orbit; + $data['filter'] .= __(" and orbit type ").$orbit; } } if ($propagation != '' && $propagation != null) { - $data['filter'] .= " and propagation ".$propagation; + $data['filter'] .= __(" and propagation ").$propagation; } if ($mode != null && strtolower($mode) != 'all') { - $data['filter'] .= " and mode ".$mode; + $data['filter'] .= __(" and mode ").$mode; } if (!empty($qsltype)) { - $data['filter'] .= " and ".implode('/', $qsltype); + $data['filter'] .= __(" and ").implode('/', $qsltype); } $this->load->view('awards/details', $data); } @@ -483,7 +483,7 @@ class Awards extends CI_Controller { $data['sota_all'] = $this->sota->get_all(); // Render page - $data['page_title'] = "Awards - SOTA"; + $data['page_title'] = sprintf(__("Awards - %s", __("SOTA"))); $this->load->view('interface_assets/header', $data); $this->load->view('awards/sota/index'); $this->load->view('interface_assets/footer'); @@ -500,7 +500,7 @@ class Awards extends CI_Controller { $data['wwff_all'] = $this->wwff->get_all(); // Render page - $data['page_title'] = "Awards - WWFF"; + $data['page_title'] = sprintf(__("Awards - %s", __("WWFF"))); $this->load->view('interface_assets/header', $data); $this->load->view('awards/wwff/index'); $this->load->view('interface_assets/footer'); @@ -517,7 +517,7 @@ class Awards extends CI_Controller { $data['pota_all'] = $this->pota->get_all(); // Render page - $data['page_title'] = "Awards - POTA"; + $data['page_title'] = sprintf(__("Awards - %s", __("POTA"))); $this->load->view('interface_assets/header', $data); $this->load->view('awards/pota/index'); $this->load->view('interface_assets/footer'); @@ -588,7 +588,7 @@ class Awards extends CI_Controller { } // Render page - $data['page_title'] = "Awards - CQ Magazine WAZ"; + $data['page_title'] = sprintf(__("Awards - %s", __("CQ Magazine WAZ"))); $this->load->view('interface_assets/header', $data); $this->load->view('awards/cq/index'); $this->load->view('interface_assets/footer', $footerData); @@ -649,7 +649,7 @@ class Awards extends CI_Controller { $data['was_summary'] = $this->was->get_was_summary($bands, $postdata); // Render Page - $data['page_title'] = "Awards - WAS (Worked All States)"; + $data['page_title'] = sprintf(__("Awards - %s", __("Worked All States (WAS)")));; $this->load->view('interface_assets/header', $data); $this->load->view('awards/was/index'); $this->load->view('interface_assets/footer', $footerData); @@ -711,7 +711,7 @@ class Awards extends CI_Controller { $data['rac_summary'] = $this->rac->get_rac_summary($bands, $postdata); // Render Page - $data['page_title'] = "Awards - RAC"; + $data['page_title'] = sprintf(__("Awards - %s", __("RAC"))); $this->load->view('interface_assets/header', $data); $this->load->view('awards/rac/index'); $this->load->view('interface_assets/footer', $footerData); @@ -773,7 +773,7 @@ class Awards extends CI_Controller { $data['helvetia_summary'] = $this->helvetia_model->get_helvetia_summary($bands, $postdata); // Render Page - $data['page_title'] = "Awards - H26"; + $data['page_title'] =sprintf(__("Awards - %s", __("H26"))); $this->load->view('interface_assets/header', $data); $this->load->view('awards/helvetia/index'); $this->load->view('interface_assets/footer', $footerData); @@ -844,7 +844,7 @@ class Awards extends CI_Controller { $data['iota_summary'] = $this->iota->get_iota_summary($bands, $postdata); // Render Page - $data['page_title'] = "Awards - IOTA (Islands On The Air)"; + $data['page_title'] = sprintf(__("Awards - %s", __("IOTA (Island On The Air"))); $this->load->view('interface_assets/header', $data); $this->load->view('awards/iota/index'); $this->load->view('interface_assets/footer'); @@ -855,7 +855,7 @@ class Awards extends CI_Controller { $data['counties_array'] = $this->counties->get_counties_array(); // Render Page - $data['page_title'] = "Awards - US Counties"; + $data['page_title'] = sprintf(__("Awards - %s", __("US Counties"))); $this->load->view('interface_assets/header', $data); $this->load->view('awards/counties/index'); $this->load->view('interface_assets/footer'); @@ -869,7 +869,7 @@ class Awards extends CI_Controller { $data['type'] = $type; // Render Page - $data['page_title'] = "US Counties"; + $data['page_title'] = __("US Counties";) $data['filter'] = $type . " counties in state ".$state; $this->load->view('interface_assets/header', $data); $this->load->view('awards/counties/details'); @@ -884,14 +884,14 @@ class Awards extends CI_Controller { $data['results'] = $this->logbook_model->county_qso_details($state, $county); // Render Page - $data['page_title'] = "Log View - Counties"; + $data['page_title'] = __("Log View - Counties"); $data['filter'] = "county " . $state; $this->load->view('awards/details', $data); } public function gridmaster($dxcc) { $dxcc = $this->security->xss_clean($dxcc); - $data['page_title'] = "Awards - ".strtoupper($dxcc)." Gridmaster"; + $data['page_title'] = __("Awards - ").strtoupper($dxcc)." Gridmaster"; $this->load->model('bands'); $this->load->model('gridmap_model'); @@ -927,7 +927,7 @@ class Awards extends CI_Controller { } public function ffma() { - $data['page_title'] = "Awards - Fred Fish Memorial Award (FFMA)"; + $data['page_title'] = sprintf(__("Awards - %s", __("Fred Fish Memorial Award (FFMA)"))); $this->load->model('bands'); $this->load->model('ffma_model'); @@ -1122,7 +1122,7 @@ class Awards extends CI_Controller { $data['sig_types'] = $this->sig->get_all_sig_types(); // Render page - $data['page_title'] = "Awards - SIG"; + $data['page_title'] = sprintf(__("Awards - %s", __("SIG"))); $this->load->view('interface_assets/header', $data); $this->load->view('awards/sig/index'); $this->load->view('interface_assets/footer'); @@ -1140,7 +1140,7 @@ class Awards extends CI_Controller { $data['type'] = $type; // Render page - $data['page_title'] = "Awards - SIG - " . $type; + $data['page_title'] = __("Awards - SIG - ") . $type; $this->load->view('interface_assets/header', $data); $this->load->view('awards/sig/qso_list'); $this->load->view('interface_assets/footer'); @@ -1612,7 +1612,7 @@ class Awards extends CI_Controller { ]; // Render page - $data['page_title'] = "Awards - Worked All Britain"; + $data['page_title'] = sprintf(__("Awards - %s", "Worked All Britain")); $this->load->view('interface_assets/header', $data); $this->load->view('awards/wab/index'); $this->load->view('interface_assets/footer', $footerData); @@ -1752,7 +1752,7 @@ class Awards extends CI_Controller { } // Render page - $data['page_title'] = "Awards - ITU Zones"; + $data['page_title'] = sprintf(__("Awards - %s", __("ITU Zones"))); $this->load->view('interface_assets/header', $data); $this->load->view('awards/itu/index'); $this->load->view('interface_assets/footer', $footerData); diff --git a/application/controllers/Backup.php b/application/controllers/Backup.php index 60aac213d..ddd78b15e 100644 --- a/application/controllers/Backup.php +++ b/application/controllers/Backup.php @@ -12,7 +12,7 @@ class Backup extends CI_Controller { $this->load->model('user_model'); if(!$this->user_model->authorize(99)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } - $data['page_title'] = "Backup"; + $data['page_title'] = __("Backup"); $this->load->view('interface_assets/header', $data); $this->load->view('backup/main'); @@ -45,7 +45,7 @@ class Backup extends CI_Controller { $data['status'] = true; } - $data['page_title'] = "ADIF - Backup"; + $data['page_title'] = __("ADIF - Backup"); $this->load->view('interface_assets/header', $data); @@ -77,7 +77,7 @@ class Backup extends CI_Controller { $data['status'] = true; } - $data['page_title'] = "Notes - Backup"; + $data['page_title'] = __("Notes - Backup"); $this->load->view('interface_assets/header', $data); $this->load->view('backup/notes_view'); diff --git a/application/controllers/Band.php b/application/controllers/Band.php index 0bedbad6a..22c3ab3ee 100644 --- a/application/controllers/Band.php +++ b/application/controllers/Band.php @@ -22,7 +22,7 @@ class Band extends CI_Controller { $data['bands'] = $this->bands->get_all_bands_for_user(); // Render Page - $data['page_title'] = "Bands"; + $data['page_title'] = __("Bands"); $this->load->view('interface_assets/header', $data); $this->load->view('bands/index'); $this->load->view('interface_assets/footer'); @@ -37,7 +37,7 @@ class Band extends CI_Controller { if ($this->form_validation->run() == FALSE) { - $data['page_title'] = "Create Mode"; + $data['page_title'] = __("Create Mode"); $this->load->view('bands/create', $data); } else @@ -56,7 +56,7 @@ class Band extends CI_Controller { $data['my_band'] = $band_query->row(); - $data['page_title'] = "Edit Band"; + $data['page_title'] = __("Edit Band"); $this->load->view('bands/edit', $data); } diff --git a/application/controllers/Bandmap.php b/application/controllers/Bandmap.php index f93d658d6..55c7fef4c 100644 --- a/application/controllers/Bandmap.php +++ b/application/controllers/Bandmap.php @@ -25,7 +25,7 @@ class Bandmap extends CI_Controller { 'assets/js/sections/bandmap.js', ]; - $data['page_title'] = "DXCluster"; + $data['page_title'] = __("DXCluster"); $this->load->view('interface_assets/header', $data); $this->load->view('bandmap/index'); $this->load->view('interface_assets/footer', $footerData); @@ -66,7 +66,7 @@ class Bandmap extends CI_Controller { default: $pageData['custom_date_format'] = 'DD/MM/YYYY'; } - $data['page_title'] = "DXCluster"; + $data['page_title'] = __("DXCluster"); $this->load->view('interface_assets/header', $data); $this->load->view('bandmap/list',$pageData); $this->load->view('interface_assets/footer', $footerData); diff --git a/application/controllers/Cabrillo.php b/application/controllers/Cabrillo.php index 8c3032f9a..a8b77cf88 100644 --- a/application/controllers/Cabrillo.php +++ b/application/controllers/Cabrillo.php @@ -17,7 +17,7 @@ class Cabrillo extends CI_Controller { } public function index() { - $data['page_title'] = "Export Cabrillo"; + $data['page_title'] = __("Export Cabrillo"); $this->load->model('Contesting_model'); $this->load->model('stations'); diff --git a/application/controllers/Cfdexport.php b/application/controllers/Cfdexport.php index 8f9164a51..9e40c792d 100644 --- a/application/controllers/Cfdexport.php +++ b/application/controllers/Cfdexport.php @@ -17,7 +17,7 @@ class Cfdexport extends CI_Controller { if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } - $data['page_title'] = "CFD Export"; + $data['page_title'] = __("CFD Export"); $this->load->view('interface_assets/header', $data); $this->load->view('cfd/index'); diff --git a/application/controllers/Clublog.php b/application/controllers/Clublog.php index 94e9e8a1f..67e86fa96 100644 --- a/application/controllers/Clublog.php +++ b/application/controllers/Clublog.php @@ -12,7 +12,7 @@ class Clublog extends CI_Controller parent::__construct(); if (ENVIRONMENT == 'maintenance' && $this->session->userdata('user_id') == '') { - echo "Maintenance Mode is active. Try again later.\n"; + echo __("Maintenance Mode is active. Try again later.")."\n"; redirect('dashboard'); } } @@ -41,7 +41,7 @@ class Clublog extends CI_Controller $r = $this->clublog_model->uploadUser($user->user_id, $user->user_clublog_name, $user->user_clublog_password); } } else { - $r = "No user has configured Clublog."; + $r = __("No user has configured Clublog."); } echo $r; @@ -63,7 +63,7 @@ class Clublog extends CI_Controller $r = $this->clublog_model->downloadUser($user->user_id, $user->user_clublog_name, $user->user_clublog_password); } } else { - $r = "No user has configured Clublog."; + $r = __("No user has configured Clublog."); } echo $r; diff --git a/application/controllers/Contestcalendar.php b/application/controllers/Contestcalendar.php index f3f22290c..a6e512889 100644 --- a/application/controllers/Contestcalendar.php +++ b/application/controllers/Contestcalendar.php @@ -16,7 +16,7 @@ class Contestcalendar extends CI_Controller { redirect('dashboard'); } - $data['page_title'] = "Contest Calendar"; + $data['page_title'] = __("Contest Calendar"); // get the raw data and parse it $rssRawData = $this->getRssData(); diff --git a/application/controllers/Contesting.php b/application/controllers/Contesting.php index f8197a4fc..af2a928e6 100644 --- a/application/controllers/Contesting.php +++ b/application/controllers/Contesting.php @@ -33,7 +33,7 @@ class Contesting extends CI_Controller { $this->form_validation->set_rules('start_time', 'Time', 'required'); $this->form_validation->set_rules('callsign', 'Callsign', 'required'); - $data['page_title'] = "Contest Logging"; + $data['page_title'] = __("Contest Logging"); $this->load->view('interface_assets/header', $data); $this->load->view('contesting/index'); diff --git a/application/controllers/Continents.php b/application/controllers/Continents.php index 5858652d1..53237f1b8 100644 --- a/application/controllers/Continents.php +++ b/application/controllers/Continents.php @@ -22,7 +22,7 @@ class Continents extends CI_Controller { // Render User Interface // Set Page Title - $data['page_title'] = "Continents"; + $data['page_title'] = __("Continents"); // Load Views $this->load->view('interface_assets/header', $data); diff --git a/application/controllers/Cron.php b/application/controllers/Cron.php index 9e8a51eb6..a122876c1 100644 --- a/application/controllers/Cron.php +++ b/application/controllers/Cron.php @@ -9,7 +9,7 @@ class cron extends CI_Controller { parent::__construct(); if (ENVIRONMENT == 'maintenance' && $this->session->userdata('user_id') == '') { - echo "Maintenance Mode is active. Try again later.\n"; + echo __("Maintenance Mode is active. Try again later.")."\n"; redirect('user/login'); } @@ -35,7 +35,7 @@ class cron extends CI_Controller { 'assets/js/sections/cron.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/cron.js")) ]; - $data['page_title'] = "Cron Manager"; + $data['page_title'] = __("Cron Manager"); $data['crons'] = $this->cron_model->get_crons(); $mastercron = array(); @@ -134,7 +134,7 @@ class cron extends CI_Controller { $cron_query = $this->cron_model->cron(xss_clean($this->input->post('id', true))); $data['cron'] = $cron_query->row(); - $data['page_title'] = "Edit Cronjob"; + $data['page_title'] = __("Edit Cronjob"); $this->load->view('cron/edit', $data); } diff --git a/application/controllers/Csv.php b/application/controllers/Csv.php index de02ce433..9b7c4b7dd 100644 --- a/application/controllers/Csv.php +++ b/application/controllers/Csv.php @@ -17,7 +17,7 @@ class Csv extends CI_Controller { $data['modes'] = $this->modes->active(); // Used in the view for mode select $data['dxcc'] = $this->logbook_model->fetchDxcc(); // Used in the view for dxcc select - $data['page_title'] = "SOTA CSV Export"; + $data['page_title'] = __("SOTA CSV Export"); $this->load->view('interface_assets/header', $data); $this->load->view('csv/index'); diff --git a/application/controllers/Dashboard.php b/application/controllers/Dashboard.php index 85a6a1c8e..bab4e3ee3 100644 --- a/application/controllers/Dashboard.php +++ b/application/controllers/Dashboard.php @@ -100,7 +100,7 @@ class Dashboard extends CI_Controller $data['vucc'] = $this->vucc->fetchVuccSummary(); $data['vuccSAT'] = $this->vucc->fetchVuccSummary('SAT'); - $data['page_title'] = "Dashboard"; + $data['page_title'] = __("Dashboard"); $this->load->model('dxcc'); $dxcc = $this->dxcc->list_current(); diff --git a/application/controllers/Debug.php b/application/controllers/Debug.php index 63843656e..db057f2ec 100644 --- a/application/controllers/Debug.php +++ b/application/controllers/Debug.php @@ -72,7 +72,7 @@ class Debug extends CI_Controller $data['sota_update'] = $this->cron_model->cron('update_update_sota')->row(); $data['wwff_update'] = $this->cron_model->cron('update_update_wwff')->row(); - $data['page_title'] = "Debug"; + $data['page_title'] = __("Debug"); $this->load->view('interface_assets/header', $data); $this->load->view('debug/index'); diff --git a/application/controllers/Distances.php b/application/controllers/Distances.php index 4f7bf66d3..f68287ca1 100644 --- a/application/controllers/Distances.php +++ b/application/controllers/Distances.php @@ -14,7 +14,7 @@ class Distances extends CI_Controller { public function index() { // Render Page - $data['page_title'] = "Distances Worked"; + $data['page_title'] = __("Distances Worked"); $this->load->model('bands'); $data['bands_available'] = $this->bands->get_worked_bands_distances(); diff --git a/application/controllers/Dxatlas.php b/application/controllers/Dxatlas.php index 79dbf9dbb..48cbf81bf 100644 --- a/application/controllers/Dxatlas.php +++ b/application/controllers/Dxatlas.php @@ -16,7 +16,7 @@ class Dxatlas extends CI_Controller { $data['modes'] = $this->modes->active(); // Used in the view for mode select $data['dxcc'] = $this->logbook_model->fetchDxcc(); // Used in the view for dxcc select - $data['page_title'] = "DX Atlas Gridsquare Export"; + $data['page_title'] = __("DX Atlas Gridsquare Export"); $this->load->view('interface_assets/header', $data); $this->load->view('dxatlas/index'); diff --git a/application/controllers/Dxcalendar.php b/application/controllers/Dxcalendar.php index 460d9a183..a6d59c46f 100644 --- a/application/controllers/Dxcalendar.php +++ b/application/controllers/Dxcalendar.php @@ -7,7 +7,7 @@ class Dxcalendar extends CI_Controller { $this->load->model('logbook_model'); if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } - $data['page_title'] = "DX Calendar"; + $data['page_title'] = __("DX Calendar"); $this->load->driver('cache', array('adapter' => 'file', 'backup' => 'file')); $rssUrl = 'http://www.ng3k.com/adxo.xml'; diff --git a/application/controllers/Eqsl.php b/application/controllers/Eqsl.php index 160770e17..31aa5afc4 100644 --- a/application/controllers/Eqsl.php +++ b/application/controllers/Eqsl.php @@ -10,7 +10,7 @@ class eqsl extends CI_Controller { $this->load->helper(array('form', 'url')); if (ENVIRONMENT == 'maintenance' && $this->session->userdata('user_id') == '') { - echo "Maintenance Mode is active. Try again later.\n"; + echo __("Maintenance Mode is active. Try again later.")."\n"; redirect('user/login'); } } @@ -25,7 +25,7 @@ class eqsl extends CI_Controller { // Render Page - $data['page_title'] = "eQSL Cards"; + $data['page_title'] = __("eQSL Cards"); $data['qslarray'] = $this->eqsl_images->eqsl_qso_list(); @@ -115,7 +115,7 @@ class eqsl extends CI_Controller { log_message('error', $station_id4upload . " is not valid for user!"); } } else { - $data['page_title'] = "eQSL Import"; + $data['page_title'] = __("eQSL Import"); $this->load->view('interface_assets/header', $data); $this->load->view('eqsl/import'); @@ -125,7 +125,7 @@ class eqsl extends CI_Controller { } $data['eqsl_results'] = $eqsl_results; - $data['page_title'] = "eQSL Import Information"; + $data['page_title'] = __("eQSL Import Information"); $this->load->view('interface_assets/header', $data); $this->load->view('eqsl/analysis'); @@ -149,7 +149,7 @@ class eqsl extends CI_Controller { set_time_limit(0); $this->load->model('eqslmethods_model'); - $data['page_title'] = "eQSL QSO Upload"; + $data['page_title'] = __("eQSL QSO Upload"); $custom_date_format = $this->session->userdata('user_date_format'); if ((!($this->config->item('disable_manual_eqsl'))) && ($this->input->post('eqslexport') == "export")) { @@ -381,7 +381,7 @@ class eqsl extends CI_Controller { redirect('dashboard'); } - $data['page_title'] = "eQSL Tools"; + $data['page_title'] = __("eQSL Tools"); // Load frontend $this->load->view('interface_assets/header', $data); @@ -428,7 +428,7 @@ class eqsl extends CI_Controller { } } $data['eqsl_results'] = $eqsl_results; - $data['eqsl_stats'] = "Successfully downloaded: " . $i . " / Errors: " . count($eqsl_results); + $data['eqsl_stats'] = __("Successfully downloaded: ") . $i . __(" / Errors: ") . count($eqsl_results); $data['page_title'] = "eQSL Download Information"; $this->load->view('interface_assets/header', $data); @@ -437,7 +437,7 @@ class eqsl extends CI_Controller { } else { - $data['page_title'] = "eQSL Card Image Download"; + $data['page_title'] = __("eQSL Card Image Download"); $this->load->model('eqslmethods_model'); $data['custom_date_format'] = $this->session->userdata('user_date_format'); diff --git a/application/controllers/Hamsat.php b/application/controllers/Hamsat.php index 6e364da86..ae9516f99 100644 --- a/application/controllers/Hamsat.php +++ b/application/controllers/Hamsat.php @@ -56,7 +56,7 @@ class Hamsat extends CI_Controller { } // Load public view - $data['page_title'] = "Hamsat - Satellite Roving"; + $data['page_title'] = __("Hamsat - Satellite Roving"); $this->load->view('interface_assets/header', $data); $this->load->view('/hamsat/index', $pageData); $this->load->view('interface_assets/footer'); diff --git a/application/controllers/Hrdlog.php b/application/controllers/Hrdlog.php index cfa939b10..721ea69cd 100644 --- a/application/controllers/Hrdlog.php +++ b/application/controllers/Hrdlog.php @@ -16,7 +16,7 @@ class Hrdlog extends CI_Controller { parent::__construct(); if (ENVIRONMENT == 'maintenance' && $this->session->userdata('user_id') == '') { - echo "Maintenance Mode is active. Try again later.\n"; + echo __("Maintenance Mode is active. Try again later.")."\n"; redirect('user/login'); } } diff --git a/application/controllers/Kmlexport.php b/application/controllers/Kmlexport.php index bab07298e..9e714ab6a 100644 --- a/application/controllers/Kmlexport.php +++ b/application/controllers/Kmlexport.php @@ -21,7 +21,7 @@ class Kmlexport extends CI_Controller { $data['modes'] = $this->modes->active(); // Used in the view for mode select $data['dxcc'] = $this->logbook_model->fetchDxcc(); // Used in the view for dxcc select - $data['page_title'] = "KML Export"; + $data['page_title'] = __("KML Export"); $this->load->view('interface_assets/header', $data); $this->load->view('kml/index'); diff --git a/application/controllers/Labels.php b/application/controllers/Labels.php index 7d69e1e1c..022511b0f 100644 --- a/application/controllers/Labels.php +++ b/application/controllers/Labels.php @@ -37,7 +37,7 @@ class Labels extends CI_Controller { | */ public function index() { - $data['page_title'] = "QSL Card Labels"; + $data['page_title'] = __("QSL Card Labels"); $this->load->model('labels_model'); @@ -68,7 +68,7 @@ class Labels extends CI_Controller { */ public function create() { - $data['page_title'] = "Create Label Type"; + $data['page_title'] = __("Create Label Type"); $this->load->library('form_validation'); $this->load->model('labels_model'); @@ -112,7 +112,7 @@ class Labels extends CI_Controller { */ public function createpaper() { - $data['page_title'] = "Create Paper Type"; + $data['page_title'] = __("Create Paper Type"); $this->load->library('form_validation'); @@ -388,7 +388,7 @@ class Labels extends CI_Controller { $data['papertypes'] = $this->labels_model->fetchPapertypes($this->session->userdata('user_id')); - $data['page_title'] = "Edit Label"; + $data['page_title'] = __("Edit Label"); $this->load->view('interface_assets/header', $data); $this->load->view('labels/edit'); @@ -447,7 +447,7 @@ class Labels extends CI_Controller { $data['paper'] = $this->labels_model->getPaper($cleanid); - $data['page_title'] = "Edit Paper"; + $data['page_title'] = __("Edit Paper"); $this->load->view('interface_assets/header', $data); $this->load->view('labels/editpaper'); diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index ca122a399..f42e634df 100644 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -55,7 +55,7 @@ class Logbook extends CI_Controller { // load the view - $data['page_title'] = "Logbook"; + $data['page_title'] = __("Logbook"); $this->load->view('interface_assets/header', $data); $this->load->view('view_log/index'); diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php index ed54853aa..ca6165d2d 100644 --- a/application/controllers/Logbookadvanced.php +++ b/application/controllers/Logbookadvanced.php @@ -28,7 +28,7 @@ class Logbookadvanced extends CI_Controller { $this->load->model('user_options_model'); $data = []; - $data['page_title'] = "Advanced logbook"; + $data['page_title'] = __("Advanced logbook"); $data['hasDatePicker'] = true; $userOptions = $this->user_options_model->get_options('LogbookAdvanced')->result(); diff --git a/application/controllers/Lookup.php b/application/controllers/Lookup.php index 35990fb0a..e2d9403f4 100644 --- a/application/controllers/Lookup.php +++ b/application/controllers/Lookup.php @@ -19,7 +19,7 @@ class Lookup extends CI_Controller { public function index() { - $data['page_title'] = "Quick Lookup"; + $data['page_title'] = __("Quick Lookup"); $this->load->model('logbook_model'); $data['dxcc'] = $this->logbook_model->fetchDxcc(); $data['iota'] = $this->logbook_model->fetchIota(); diff --git a/application/controllers/Lotw.php b/application/controllers/Lotw.php index d8e4c2a3d..f0a330b0d 100644 --- a/application/controllers/Lotw.php +++ b/application/controllers/Lotw.php @@ -25,7 +25,7 @@ class Lotw extends CI_Controller { $this->load->helper(array('form', 'url')); if (ENVIRONMENT == 'maintenance' && $this->session->userdata('user_id') == '') { - echo "Maintenance Mode is active. Try again later.\n"; + echo __("Maintenance Mode is active. Try again later.")."\n"; redirect('user/login'); } } @@ -56,7 +56,7 @@ class Lotw extends CI_Controller { $data['lotw_cert_results'] = $this->LotwCert->lotw_certs($this->session->userdata('user_id')); // Set Page Title - $data['page_title'] = "Logbook of the World"; + $data['page_title'] = __("Logbook of the World"); // Check folder permissions $uploads_folder = $this->permissions->is_really_writable('uploads'); @@ -85,7 +85,7 @@ class Lotw extends CI_Controller { $data['dxcc_list'] = $this->dxcc->list(); // Set Page Title - $data['page_title'] = "Logbook of the World"; + $data['page_title'] = __("Logbook of the World"); // Load Views $this->load->view('interface_assets/header', $data); @@ -132,7 +132,7 @@ class Lotw extends CI_Controller { $data['dxcc_list'] = $this->dxcc->list(); // Set Page Title - $data['page_title'] = "Logbook of the World"; + $data['page_title'] = __("Logbook of the World"); // Load Views $this->load->view('interface_assets/header', $data); @@ -619,7 +619,7 @@ class Lotw extends CI_Controller { if ($this->user_model->authorize(2)) { // Only Output results if authorized User if(isset($data['lotw_table_headers'])) { if($display_view == TRUE) { - $data['page_title'] = "LoTW ADIF Information"; + $data['page_title'] = __("LoTW ADIF Information"); $this->load->view('interface_assets/header', $data); $this->load->view('lotw/analysis'); $this->load->view('interface_assets/footer'); @@ -727,7 +727,7 @@ class Lotw extends CI_Controller { } if (!($this->config->item('disable_manual_lotw'))) { - $data['page_title'] = "LoTW ADIF Import"; + $data['page_title'] = __("LoTW ADIF Import"); $config['upload_path'] = './uploads/'; $config['allowed_types'] = 'adi|ADI'; @@ -839,7 +839,7 @@ class Lotw extends CI_Controller { $this->load->model('user_model'); if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } - $data['page_title'] = "LoTW .TQ8 Upload"; + $data['page_title'] = __("LoTW .TQ8 Upload"); $config['upload_path'] = './uploads/'; $config['allowed_types'] = 'tq8|TQ8'; @@ -936,19 +936,19 @@ class Lotw extends CI_Controller { if (stristr($response, "accepted")) { $this->session->set_flashdata('lotw_status', 'accepted'); - $data['page_title'] = "LoTW .TQ8 Sent"; + $data['page_title'] = __("LoTW .TQ8 Sent"); } elseif (stristr($response, "rejected")) { $this->session->set_flashdata('lotw_status', 'rejected'); - $data['page_title'] = "LoTW .TQ8 Sent"; + $data['page_title'] = __("LoTW .TQ8 Sent"); } else { // If we're here, we didn't find what we're looking for in the ARRL response // and LoTW is probably down or broken. $this->session->set_flashdata('warning', 'Did not receive proper response from LoTW. Try again later.'); - $data['page_title'] = "LoTW .TQ8 Not Sent"; + $data['page_title'] = __("LoTW .TQ8 Not Sent"); } // Now we need to clean up diff --git a/application/controllers/Mode.php b/application/controllers/Mode.php index e3eab2e65..d0f61c120 100644 --- a/application/controllers/Mode.php +++ b/application/controllers/Mode.php @@ -22,7 +22,7 @@ class Mode extends CI_Controller { $data['modes'] = $this->modes->all(); // Render Page - $data['page_title'] = "Modes"; + $data['page_title'] = __("Modes"); $this->load->view('interface_assets/header', $data); $this->load->view('mode/index'); $this->load->view('interface_assets/footer'); @@ -38,7 +38,7 @@ class Mode extends CI_Controller { if ($this->form_validation->run() == FALSE) { - $data['page_title'] = "Create Mode"; + $data['page_title'] = __("Create Mode"); $this->load->view('mode/create', $data); } else @@ -59,7 +59,7 @@ class Mode extends CI_Controller { $data['my_mode'] = $mode_query->row(); - $data['page_title'] = "Edit Mode"; + $data['page_title'] = __("Edit Mode"); $this->form_validation->set_rules('mode', 'Mode', 'required'); $this->form_validation->set_rules('qrgmode', 'QRG-Mode', 'required'); diff --git a/application/controllers/Notes.php b/application/controllers/Notes.php index a8de4a478..580515390 100644 --- a/application/controllers/Notes.php +++ b/application/controllers/Notes.php @@ -16,7 +16,7 @@ class Notes extends CI_Controller { { $this->load->model('note'); $data['notes'] = $this->note->list_all(); - $data['page_title'] = "Notes"; + $data['page_title'] = __("Notes"); $this->load->view('interface_assets/header', $data); $this->load->view('notes/main'); $this->load->view('interface_assets/footer'); @@ -35,7 +35,7 @@ class Notes extends CI_Controller { if ($this->form_validation->run() == FALSE) { - $data['page_title'] = "Add Notes"; + $data['page_title'] = __("Add Notes"); $this->load->view('interface_assets/header', $data); $this->load->view('notes/add'); $this->load->view('interface_assets/footer'); @@ -55,7 +55,7 @@ class Notes extends CI_Controller { $data['note'] = $this->note->view($id); // Display - $data['page_title'] = "Note"; + $data['page_title'] = __("Note"); $this->load->view('interface_assets/header', $data); $this->load->view('notes/view'); $this->load->view('interface_assets/footer'); @@ -76,7 +76,7 @@ class Notes extends CI_Controller { if ($this->form_validation->run() == FALSE) { - $data['page_title'] = "Edit Note"; + $data['page_title'] = __("Edit Note"); $this->load->view('interface_assets/header', $data); $this->load->view('notes/edit'); $this->load->view('interface_assets/footer'); diff --git a/application/controllers/Oqrs.php b/application/controllers/Oqrs.php index effb3d740..e49af8d10 100644 --- a/application/controllers/Oqrs.php +++ b/application/controllers/Oqrs.php @@ -11,7 +11,7 @@ class Oqrs extends CI_Controller { $this->load->model('oqrs_model'); $data['stations'] = $this->oqrs_model->get_oqrs_stations(); - $data['page_title'] = "Log Search & OQRS"; + $data['page_title'] = __("Log Search & OQRS"); $data['global_oqrs_text'] = $this->optionslib->get_option('global_oqrs_text'); $data['groupedSearch'] = $this->optionslib->get_option('groupedSearch'); @@ -50,7 +50,7 @@ class Oqrs extends CI_Controller { } public function not_in_log() { - $data['page_title'] = "Log Search & OQRS"; + $data['page_title'] = __("Log Search & OQRS"); $this->load->model('bands'); // $data['bands'] = $this->bands->get_worked_bands_oqrs($this->security->xss_clean($this->input->post('station_id'))); @@ -81,7 +81,7 @@ class Oqrs extends CI_Controller { } public function requests() { - $data['page_title'] = "OQRS Requests"; + $data['page_title'] = __("OQRS Requests"); $this->load->model('logbooks_model'); $logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); diff --git a/application/controllers/Qrbcalc.php b/application/controllers/Qrbcalc.php index 71f4e6715..2a8253321 100644 --- a/application/controllers/Qrbcalc.php +++ b/application/controllers/Qrbcalc.php @@ -14,7 +14,7 @@ class Qrbcalc extends CI_Controller { } public function index() { - $data['page_title'] = "QRB Calculator"; + $data['page_title'] = __("QRB Calculator"); $this->load->model('stations'); $data['station_locator'] = $this->stations->find_gridsquare(); diff --git a/application/controllers/Qrz.php b/application/controllers/Qrz.php index 89af9eb74..7ef853fd1 100644 --- a/application/controllers/Qrz.php +++ b/application/controllers/Qrz.php @@ -11,7 +11,7 @@ class Qrz extends CI_Controller { parent::__construct(); if (ENVIRONMENT == 'maintenance' && $this->session->userdata('user_id') == '') { - echo "Maintenance Mode is active. Try again later.\n"; + echo __("Maintenance Mode is active. Try again later.")."\n"; redirect('user/login'); } } @@ -170,7 +170,7 @@ class Qrz extends CI_Controller { public function export() { $this->load->model('stations'); - $data['page_title'] = "QRZ Logbook"; + $data['page_title'] = __("QRZ Logbook"); $data['station_profiles'] = $this->stations->all_of_user(); $data['station_profile'] = $this->stations->stations_with_qrz_api_key(); @@ -250,7 +250,7 @@ class Qrz extends CI_Controller { $this->load->model('user_model'); if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } - $data['page_title'] = "QRZ QSL Import"; + $data['page_title'] = __("QRZ QSL Import"); $this->load->model('logbook_model'); @@ -304,7 +304,7 @@ class Qrz extends CI_Controller { $data['table'].=''; } if($show_views == TRUE) { - $data['page_title'] = "QRZ ADIF Information"; + $data['page_title'] = __("QRZ ADIF Information"); $this->load->view('interface_assets/header', $data); $this->load->view('qrz/analysis'); $this->load->view('interface_assets/footer'); diff --git a/application/controllers/Qsl.php b/application/controllers/Qsl.php index 5ada8266c..68aff8681 100644 --- a/application/controllers/Qsl.php +++ b/application/controllers/Qsl.php @@ -22,7 +22,7 @@ class Qsl extends CI_Controller { $data['storage_used'] = $this->genfunctions->sizeFormat($this->genfunctions->folderSize($folder_name)); // Render Page - $data['page_title'] = "QSL Cards"; + $data['page_title'] = __("QSL Cards"); $data['qslarray'] = $this->qsl_model->getQsoWithQslList(); $this->load->view('interface_assets/header', $data); @@ -32,7 +32,7 @@ class Qsl extends CI_Controller { public function upload() { // Render Page - $data['page_title'] = "Upload QSL Cards"; + $data['page_title'] = __("Upload QSL Cards"); $this->load->view('interface_assets/header', $data); $this->load->view('qslcard/upload'); $this->load->view('interface_assets/footer'); diff --git a/application/controllers/Qslmanagement.php b/application/controllers/Qslmanagement.php index 76db0f933..9dfa7deca 100644 --- a/application/controllers/Qslmanagement.php +++ b/application/controllers/Qslmanagement.php @@ -11,7 +11,7 @@ class Qslmanagement extends CI_Controller { public function index() { - $data['page_title'] = "QSL Card Management"; + $data['page_title'] = __("QSL Card Management"); $this->load->view('interface_assets/header', $data); $this->load->view('qslmanagement/index'); diff --git a/application/controllers/Qso.php b/application/controllers/Qso.php index f8226f956..0e28680e8 100644 --- a/application/controllers/Qso.php +++ b/application/controllers/Qso.php @@ -88,7 +88,7 @@ class QSO extends CI_Controller { $data['qslmsg'] = (isset($options_object[0]->option_value))?$options_object[0]->option_value:''; if ($this->form_validation->run() == FALSE) { - $data['page_title'] = "Add QSO"; + $data['page_title'] = __("Add QSO"); if (validation_errors() != '') { // we're coming from a failed ajax-call echo json_encode(array('message' => 'Error','errors' => validation_errors())); } else { // we're not coming from a POST diff --git a/application/controllers/Radio.php b/application/controllers/Radio.php index e88450665..6bdad93f2 100755 --- a/application/controllers/Radio.php +++ b/application/controllers/Radio.php @@ -15,7 +15,7 @@ } session_write_close(); // load the view - $data['page_title'] = "Hardware Interfaces"; + $data['page_title'] = __("Hardware Interfaces"); $this->load->view('interface_assets/header', $data); $this->load->view('radio/index'); diff --git a/application/controllers/Satellite.php b/application/controllers/Satellite.php index 60a6180ee..ef49f6ce0 100644 --- a/application/controllers/Satellite.php +++ b/application/controllers/Satellite.php @@ -34,7 +34,7 @@ class Satellite extends CI_Controller { } public function create() { - $data['page_title'] = "Create Satellite"; + $data['page_title'] = __("Create Satellite"); $this->load->view('satellite/create', $data); } @@ -57,7 +57,7 @@ class Satellite extends CI_Controller { $data['satellite'] = $satellite_query->row(); $data['satmodes'] = $mode_query->result(); - $data['page_title'] = "Edit Satellite"; + $data['page_title'] = __("Edit Satellite"); $this->load->view('satellite/edit', $data); } diff --git a/application/controllers/Search.php b/application/controllers/Search.php index 571da9343..be59f4df6 100644 --- a/application/controllers/Search.php +++ b/application/controllers/Search.php @@ -16,7 +16,7 @@ class Search extends CI_Controller { public function index() { - $data['page_title'] = "Search"; + $data['page_title'] = __("Search"); $this->load->view('interface_assets/header', $data); $this->load->view('search/main'); @@ -25,7 +25,7 @@ class Search extends CI_Controller { // Filter is for advanced searching and filtering of the logbook public function filter() { - $data['page_title'] = "Search & Filter Logbook"; + $data['page_title'] = __("Search & Filter Logbook"); $this->load->library('form_validation'); @@ -55,7 +55,7 @@ class Search extends CI_Controller { $this->load->model('stations'); $data['station_profile'] = $this->stations->all_of_user(); - $data['page_title'] = "Incorrectly logged CQ zones"; + $data['page_title'] = __("Incorrectly logged CQ zones"); $this->load->view('interface_assets/header', $data); $this->load->view('search/cqzones'); @@ -67,7 +67,7 @@ class Search extends CI_Controller { $this->load->model('stations'); $data['station_profile'] = $this->stations->all_of_user(); - $data['page_title'] = "QSOs unconfirmed on LoTW, but the callsign has uploaded to LoTW after QSO date"; + $data['page_title'] = __("QSOs unconfirmed on LoTW, but the callsign has uploaded to LoTW after QSO date"); $this->load->view('interface_assets/header', $data); $this->load->view('search/lotw_unconfirmed'); diff --git a/application/controllers/Station.php b/application/controllers/Station.php index 8cd51b4c7..427d94665 100644 --- a/application/controllers/Station.php +++ b/application/controllers/Station.php @@ -89,7 +89,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'] = "Duplicate Station Location: {$data['my_station_profile']->station_profile_name}"; + $data['page_title'] = __("Duplicate Station Location:"). "{$data['my_station_profile']->station_profile_name}"; // we NULLify station_id and station_profile_name to make sure we are creating a new station $data['copy_from'] = $data['my_station_profile']->station_id; diff --git a/application/controllers/Stationsetup.php b/application/controllers/Stationsetup.php index 34ceb7045..0c5252973 100644 --- a/application/controllers/Stationsetup.php +++ b/application/controllers/Stationsetup.php @@ -156,14 +156,14 @@ class Stationsetup extends CI_Controller { } public function newLogbook() { - $data['page_title'] = "Create Station Logbook"; + $data['page_title'] = __("Create Station Logbook"); $this->load->view('stationsetup/create', $data); } public function editContainerName() { $this->load->model('stationsetup_model'); $data['container'] = $this->stationsetup_model->getContainer(xss_clean($this->input->post('id', true)))->row(); - $data['page_title'] = "Edit container name"; + $data['page_title'] = __("Edit container name"); $this->load->view('stationsetup/edit', $data); } @@ -178,7 +178,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_linked'] = $this->logbooks_model->list_logbooks_linked($this->input->post('id', true)); - $data['page_title'] = "Edit lined locations"; + $data['page_title'] = __("Edit lined locations"); $this->load->view('stationsetup/linkedlocations', $data); } diff --git a/application/controllers/Statistics.php b/application/controllers/Statistics.php index 05d370f2b..67098d2ed 100644 --- a/application/controllers/Statistics.php +++ b/application/controllers/Statistics.php @@ -47,7 +47,7 @@ class Statistics extends CI_Controller { $this->load->model('logbook_model'); - $data['page_title'] = "Custom Statistics"; + $data['page_title'] = __("Custom Statistics"); $data['modes'] = $this->logbook_model->get_modes(); $this->load->helper(array('form', 'url')); diff --git a/application/controllers/Themes.php b/application/controllers/Themes.php index b7bddddb7..ba032823a 100644 --- a/application/controllers/Themes.php +++ b/application/controllers/Themes.php @@ -24,7 +24,7 @@ class Themes extends CI_Controller { $data['themes'] = $this->Themes_model->getThemes(); // Render Page - $data['page_title'] = "Themes"; + $data['page_title'] = __("Themes"); $this->load->view('interface_assets/header', $data); $this->load->view('themes/index.php'); $this->load->view('interface_assets/footer'); @@ -43,7 +43,7 @@ class Themes extends CI_Controller { if ($this->form_validation->run() == FALSE) { - $data['page_title'] = "Create Theme"; + $data['page_title'] = __("Create Theme"); $this->load->view('themes/add', $data); } else @@ -62,7 +62,7 @@ class Themes extends CI_Controller { $data['theme'] = $this->Themes_model->theme($item_id_clean); - $data['page_title'] = "Edit Theme"; + $data['page_title'] = __("Edit Theme"); $this->form_validation->set_rules('name', 'Theme Name', 'required|callback_character_check'); $this->form_validation->set_rules('foldername', 'Folder Name', 'required|callback_character_check'); diff --git a/application/controllers/Timeline.php b/application/controllers/Timeline.php index 0cc5e3fa6..3b8311420 100644 --- a/application/controllers/Timeline.php +++ b/application/controllers/Timeline.php @@ -14,7 +14,7 @@ class Timeline extends CI_Controller { public function index() { // Render Page - $data['page_title'] = "Timeline"; + $data['page_title'] = __("Timeline"); $this->load->model('Timeline_model'); @@ -89,19 +89,19 @@ class Timeline extends CI_Controller { switch($type) { case 'dxcc': $country = $this->logbook_model->get_entity($querystring); - $data['page_title'] = "Log View - DXCC"; + $data['page_title'] = __("Log View")." - DXCC"; $data['filter'] = "country ". $country['name']; break; - case 'was' : $data['page_title'] = "Log View - WAS"; + case 'was' : $data['page_title'] = __("Log View")." - WAS"; $data['filter'] = "state ". $querystring; break; - case 'iota': $data['page_title'] = "Log View - IOTA"; + case 'iota': $data['page_title'] = __("Log View")." - IOTA"; $data['filter'] = "iota ". $querystring; break; - case 'waz' : $data['page_title'] = "Log View - WAZ"; + case 'waz' : $data['page_title'] = __("Log View")." - WAZ"; $data['filter'] = "CQ zone ". $querystring; break; - case 'vucc' : $data['page_title'] = "Log View - VUCC"; + case 'vucc' : $data['page_title'] = __("Log View")." - VUCC"; $data['filter'] = "Gridsquare ". $querystring; break; } diff --git a/application/controllers/Timeplotter.php b/application/controllers/Timeplotter.php index 42d3aa841..9a74eb55d 100644 --- a/application/controllers/Timeplotter.php +++ b/application/controllers/Timeplotter.php @@ -14,7 +14,7 @@ class Timeplotter extends CI_Controller { public function index() { // Render Page - $data['page_title'] = "Timeplotter"; + $data['page_title'] = __("Timeplotter"); $this->load->model('bands'); diff --git a/application/controllers/Update.php b/application/controllers/Update.php index b355b0342..e8b229000 100644 --- a/application/controllers/Update.php +++ b/application/controllers/Update.php @@ -13,7 +13,7 @@ class Update extends CI_Controller { parent::__construct(); if (ENVIRONMENT == 'maintenance' && $this->session->userdata('user_id') == '') { - echo "Maintenance Mode is active. Try again later.\n"; + echo __("Maintenance Mode is active. Try again later.")."\n"; redirect('user/login'); } } @@ -23,7 +23,7 @@ class Update extends CI_Controller { $this->load->model('user_model'); if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } - $data['page_title'] = "Updates"; + $data['page_title'] = __("Updates"); $this->load->view('interface_assets/header', $data); $this->load->view('update/index'); $this->load->view('interface_assets/footer'); diff --git a/application/controllers/User.php b/application/controllers/User.php index 59ea5ce56..c54767701 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -48,7 +48,7 @@ class User extends CI_Controller { $data['user_language'] = 'english'; if ($this->form_validation->run() == FALSE) { - $data['page_title'] = "Add User"; + $data['page_title'] = __("Add User"); $data['measurement_base'] = $this->config->item('measurement_base'); $this->load->view('interface_assets/header', $data); @@ -162,7 +162,7 @@ class User extends CI_Controller { redirect('user'); return; } - $data['page_title'] = "Users"; + $data['page_title'] = __("Users"); $this->load->view('interface_assets/header', $data); $data['user_name'] = $this->input->post('user_name'); @@ -234,7 +234,7 @@ class User extends CI_Controller { if ($this->form_validation->run() == FALSE) { - $data['page_title'] = "Edit User"; + $data['page_title'] = __("Edit User"); $q = $query->row(); @@ -667,7 +667,7 @@ class User extends CI_Controller { } return; } - $data['page_title'] = "Edit User"; + $data['page_title'] = __("Edit User"); $this->load->view('interface_assets/header', $data); $data['user_name'] = $this->input->post('user_name', true); @@ -716,7 +716,7 @@ class User extends CI_Controller { if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } $query = $this->user_model->get_by_id($this->session->userdata('user_id')); $q = $query->row(); - $data['page_title'] = "Profile"; + $data['page_title'] = __("Profile"); $data['user_name'] = $q->user_name; $data['user_type'] = $q->user_type; $data['user_email'] = $q->user_email; @@ -779,7 +779,7 @@ class User extends CI_Controller { if ($this->form_validation->run() == FALSE) { - $data['page_title'] = "Login"; + $data['page_title'] = __("Login"); $this->load->view('interface_assets/mini_header', $data); $this->load->view('user/login'); $this->load->view('interface_assets/footer'); @@ -837,7 +837,7 @@ class User extends CI_Controller { if ($this->form_validation->run() == FALSE) { - $data['page_title'] = "Forgot Password"; + $data['page_title'] = __("Forgot Password"); $this->load->view('interface_assets/mini_header', $data); $this->load->view('user/forgot_password'); $this->load->view('interface_assets/footer'); @@ -997,7 +997,7 @@ class User extends CI_Controller { if ($this->form_validation->run() == FALSE) { - $data['page_title'] = "Reset Password"; + $data['page_title'] = __("Reset Password"); $this->load->view('interface_assets/mini_header', $data); $this->load->view('user/reset_password'); $this->load->view('interface_assets/footer'); diff --git a/application/controllers/Visitor.php b/application/controllers/Visitor.php index a69543ad7..d6ae9e363 100644 --- a/application/controllers/Visitor.php +++ b/application/controllers/Visitor.php @@ -129,7 +129,7 @@ class Visitor extends CI_Controller { $data['results'] = $this->logbook_model->get_qsos($this->qso_per_page,$this->uri->segment(3),$logbooks_locations_array); - $data['page_title'] = "Dashboard"; + $data['page_title'] = __("Dashboard"); $data['slug'] = $public_slug; $this->load->view('visitor/layout/header', $data); @@ -200,7 +200,7 @@ class Visitor extends CI_Controller { $this->load->model('gridmap_model'); - $data['page_title'] = "Satellite Gridsquare Map"; + $data['page_title'] = __("Satellite Gridsquare Map"); $array_grid_2char = array(); @@ -406,7 +406,7 @@ class Visitor extends CI_Controller { $callsign = trim($this->security->xss_clean($this->input->post('callsign'))); $public_slug = $this->security->xss_clean($this->input->post('public_slug')); $this->load->model('publicsearch'); - $data['page_title'] = "Public Search"; + $data['page_title'] = __("Public Search"); $data['callsign'] = $callsign; $data['slug'] = $public_slug; if ($callsign != '') { @@ -439,7 +439,7 @@ class Visitor extends CI_Controller { $data['slug'] = $slug; - $data['page_title'] = "Export Map"; + $data['page_title'] = __("Export Map"); $data['user_map_custom'] = $this->optionslib->get_map_custom(true,$slug); $this->load->view('visitor/exportmap/header', $data); diff --git a/application/controllers/Webadif.php b/application/controllers/Webadif.php index 90ded85b8..b3781adbd 100644 --- a/application/controllers/Webadif.php +++ b/application/controllers/Webadif.php @@ -87,7 +87,7 @@ class Webadif extends CI_Controller { public function export() { $this->load->model('stations'); - $data['page_title'] = "QO-100 Dx Club Upload"; + $data['page_title'] = __("QO-100 Dx Club Upload"); $data['station_profiles'] = $this->stations->stations_with_webadif_api_key(); $data['station_profile'] = $this->stations->stations_with_webadif_api_key(); @@ -134,7 +134,7 @@ class Webadif extends CI_Controller { public function mark_webadif() { // Set memory limit to unlimited to allow heavy usage ini_set('memory_limit', '-1'); - $data['page_title'] = "QO-100 Dx Club Upload"; + $data['page_title'] = __("QO-100 Dx Club Upload"); $station_id = $this->security->xss_clean($this->input->post('station_profile')); $from = $this->security->xss_clean($this->input->post('from'));