diff --git a/application/controllers/Activated_grids.php b/application/controllers/Activated_grids.php index 2bbbaf84..b536b9ad 100644 --- a/application/controllers/Activated_grids.php +++ b/application/controllers/Activated_grids.php @@ -14,6 +14,15 @@ class Activated_grids extends CI_Controller { * - Band page provide a band dropdown list * - Find somewhere in the main menu to add a button to it */ + function __construct() + { + parent::__construct(); + + // Load language files + $this->lang->load(array( + 'gridsquares', + )); + } public function index() { diff --git a/application/controllers/Gridsquares.php b/application/controllers/Gridsquares.php index 3defd4ba..02e67a28 100644 --- a/application/controllers/Gridsquares.php +++ b/application/controllers/Gridsquares.php @@ -14,6 +14,15 @@ class Gridsquares extends CI_Controller { * - Band page provide a band dropdown list * - Find somewhere in the main menu to add a button to it */ + function __construct() + { + parent::__construct(); + + // Load language files + $this->lang->load(array( + 'gridsquares', + )); + } public function index() { diff --git a/application/controllers/Statistics.php b/application/controllers/Statistics.php index e34801ef..495a1f84 100644 --- a/application/controllers/Statistics.php +++ b/application/controllers/Statistics.php @@ -2,10 +2,22 @@ class Statistics extends CI_Controller { + function __construct() + { + parent::__construct(); + + // Load language files + $this->lang->load(array( + 'statistics', + )); + } + + public function index() { $this->load->model('user_model'); $this->load->model('bands'); + if(!$this->user_model->authorize($this->config->item('auth_mode'))) { if($this->user_model->validate_session()) { $this->user_model->clear_session(); diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php index 03f911d1..568ba118 100644 --- a/application/language/english/general_words_lang.php +++ b/application/language/english/general_words_lang.php @@ -136,3 +136,5 @@ $lang['europe'] = 'Europe'; $lang['northamerica'] = 'North America'; $lang['oceania'] = 'Oceania'; $lang['southamerica'] = 'South America'; + +$lang['gen_band_selection'] = 'Band selection'; \ No newline at end of file diff --git a/application/language/english/gridsquares_lang.php b/application/language/english/gridsquares_lang.php new file mode 100644 index 00000000..b1977cf7 --- /dev/null +++ b/application/language/english/gridsquares_lang.php @@ -0,0 +1,15 @@ +uri->segment(1) == "activated_grids" && $this->uri->segment(2) == "band") { ?>
- +
@@ -25,14 +25,14 @@
uri->segment(2) == "satellites") { ?> uri->segment(2) == "band") { ?>
diff --git a/application/views/distances/index.php b/application/views/distances/index.php index 916ddee2..2925346e 100644 --- a/application/views/distances/index.php +++ b/application/views/distances/index.php @@ -6,7 +6,7 @@
- +
@@ -25,14 +25,14 @@
uri->segment(2) == "satellites") { ?> uri->segment(2) == "band") { ?>
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 202b8787..68c654d2 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -1408,14 +1408,14 @@ $(document).ready(function(){ if (grid_four_confirmed_count > 0) { var span = document.getElementById('confirmed_grids'); - span.innerText = span.textContent = '('+grid_four_confirmed_count+' grid square'+(grid_four_confirmed_count != 1 ? 's' : '')+') '; + span.innerText = span.textContent = '('+grid_four_confirmed_count+' '+(grid_four_confirmed_count != 1 ? 's' : '')+') '; } if ((grid_four_count-grid_four_confirmed_count) > 0) { var span = document.getElementById('worked_grids'); - span.innerText = span.textContent = '('+(grid_four_count-grid_four_confirmed_count)+' grid square'+(grid_four_count-grid_four_confirmed_count != 1 ? 's' : '')+') '; + span.innerText = span.textContent = '('+(grid_four_count-grid_four_confirmed_count)+' '+(grid_four_count-grid_four_confirmed_count != 1 ? 's' : '')+') '; } var span = document.getElementById('sum_grids'); - span.innerText = span.textContent = ' Total Count: '+grid_four_count+' grid square'+(grid_four_count != 1 ? 's' : ''); + span.innerText = span.textContent = ' '+': '+grid_four_count+' '+(grid_four_count != 1 ? 's' : ''); var maidenhead = L.maidenhead().addTo(map); @@ -1547,14 +1547,14 @@ $(document).ready(function(){ if (grid_four_confirmed_count > 0) { var span = document.getElementById('confirmed_grids'); - span.innerText = span.textContent = '('+grid_four_confirmed_count+' grid square'+(grid_four_confirmed_count != 1 ? 's' : '')+') '; + span.innerText = span.textContent = '('+grid_four_confirmed_count+' '+(grid_four_confirmed_count != 1 ? 's' : '')+') '; } if ((grid_four_count-grid_four_confirmed_count) > 0) { var span = document.getElementById('activated_grids'); - span.innerText = span.textContent = '('+(grid_four_count-grid_four_confirmed_count)+' grid square'+(grid_four_count-grid_four_confirmed_count != 1 ? 's' : '')+') '; + span.innerText = span.textContent = '('+(grid_four_count-grid_four_confirmed_count)+' '+(grid_four_count-grid_four_confirmed_count != 1 ? 's' : '')+') '; } var span = document.getElementById('sum_grids'); - span.innerText = span.textContent = ' Total Count: '+grid_four_count+' grid square'+(grid_four_count != 1 ? 's' : ''); + span.innerText = span.textContent = ' '+': '+grid_four_count+' '+(grid_four_count != 1 ? 's' : ''); var maidenhead = L.maidenhead().addTo(map); diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 824b240a..941203b1 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -89,7 +89,7 @@ session->userdata('user_show_notes') == 1) { ?> - Notes +