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/Options.php b/application/controllers/Options.php index 091c790c..849f8d8a 100644 --- a/application/controllers/Options.php +++ b/application/controllers/Options.php @@ -13,9 +13,18 @@ class Options 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'); } + + // Load language files + $this->lang->load(array( + 'options', + )); + + } + + // Default /options view just gives some text to explain the options area function index() { @@ -24,7 +33,7 @@ class Options extends CI_Controller { //echo $this->optionslib->get_option('theme'); - $data['page_title'] = "Cloudlog Options"; + $data['page_title'] = $this->lang->line('options_cloudlog_options'); $this->load->view('interface_assets/header', $data); $this->load->view('options/index'); @@ -38,8 +47,8 @@ class Options extends CI_Controller { $directory = 'application/language'; $data['language_options'] = array_diff(scandir($directory), array('..', '.')); - $data['page_title'] = "Cloudlog Options"; - $data['sub_heading'] = "Appearance"; + $data['page_title'] = $this->lang->line('options_cloudlog_options'); + $data['sub_heading'] = $this->lang->line('options_appearance'); $this->load->model('Themes_model'); @@ -57,8 +66,8 @@ class Options extends CI_Controller { $directory = 'application/language'; $data['language_options'] = array_diff(scandir($directory), array('..', '.')); - $data['page_title'] = "Cloudlog Options"; - $data['sub_heading'] = "Appearance"; + $data['page_title'] = $this->lang->line('options_cloudlog_options'); + $data['sub_heading'] = $this->lang->line('options_appearance'); $this->load->helper(array('form', 'url')); @@ -79,7 +88,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', 'Theme changed to '.$this->input->post('theme')); + $this->session->set_flashdata('success', $this->lang->line('options_theme_changed_to').$this->input->post('theme')); } // Update theme choice within the options system @@ -87,7 +96,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', 'Global Search changed to '.$this->input->post('globalSearch')); + $this->session->set_flashdata('success', $this->lang->line('options_global_search_changed_to').$this->input->post('globalSearch')); } // Update dashboard banner within the options system @@ -95,7 +104,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', 'Dashboard banner changed to '.$this->input->post('dashboardBanner')); + $this->session->set_flashdata('success', $this->lang->line('options_dashboard_banner_changed_to').$this->input->post('dashboardBanner')); } // Update dashboard map within the options system @@ -103,7 +112,7 @@ class Options extends CI_Controller { // If dashboard map update is complete set a flashsession with a success note if($ldashboard_map_update_status == TRUE) { - $this->session->set_flashdata('success', 'Dashboard map changed to '.$this->input->post('dashboardMap')); + $this->session->set_flashdata('success', $this->lang->line('options_dashboard_map_changed_to').$this->input->post('dashboardMap')); } // Update logbook map within the options system @@ -111,7 +120,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', 'Logbook map changed to '.$this->input->post('logbookMap')); + $this->session->set_flashdata('success', $this->lang->line('options_logbook_map_changed_to').$this->input->post('logbookMap')); } // Update Lang choice within the options system @@ -130,8 +139,8 @@ class Options extends CI_Controller { // function used to display the /radio url function radio() { - $data['page_title'] = "Cloudlog Options"; - $data['sub_heading'] = "Radio Settings"; + $data['page_title'] = $this->lang->line('options_cloudlog_options'); + $data['sub_heading'] = $this->lang->line('options_radio_settings'); $this->load->view('interface_assets/header', $data); $this->load->view('options/radios'); @@ -143,8 +152,8 @@ class Options extends CI_Controller { // Get Language Options - $data['page_title'] = "Cloudlog Options"; - $data['sub_heading'] = "Radio Settings"; + $data['page_title'] = $this->lang->line('options_cloudlog_options'); + $data['sub_heading'] = $this->lang->line('options_radio_settings'); $this->load->helper(array('form', 'url')); @@ -165,7 +174,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', 'Radio Timeout Warning changed to '.$this->input->post('radioTimeout').' seconds'); + $this->session->set_flashdata('success', $this->lang->line('options_radio_timeout_warning_changed_to').$this->input->post('radioTimeout').' seconds'); } // Redirect back to /appearance @@ -176,8 +185,8 @@ class Options extends CI_Controller { // function used to display the /appearance url function email() { - $data['page_title'] = "Cloudlog Options"; - $data['sub_heading'] = "Email"; + $data['page_title'] = $this->lang->line('options_cloudlog_options'); + $data['sub_heading'] = $this->lang->line('options_email'); $this->load->view('interface_assets/header', $data); $this->load->view('options/email'); @@ -189,8 +198,8 @@ class Options extends CI_Controller { // Get Language Options - $data['page_title'] = "Cloudlog Options"; - $data['sub_heading'] = "Email"; + $data['page_title'] = $this->lang->line('options_cloudlog_options'); + $data['sub_heading'] = $this->lang->line('options_email'); $this->load->helper(array('form', 'url')); @@ -212,7 +221,7 @@ class Options extends CI_Controller { // If emailProtocolupdate update is complete set a flashsession with a success note if($emailProtocolupdate == TRUE) { - $this->session->set_flashdata('success', 'Outgoing Email Protocol changed to '.$this->input->post('emailProtocol')); + $this->session->set_flashdata('success', $this->lang->line('options_outgoing_email_protocol_changed_to').$this->input->post('emailProtocol')); } // Update smtpEncryption choice within the options system @@ -220,7 +229,7 @@ class Options extends CI_Controller { // If smtpEncryption update is complete set a flashsession with a success note if($smtpEncryptionupdate == TRUE) { - $this->session->set_flashdata('success', 'SMTP Encryption changed to '.$this->input->post('smtpEncryption')); + $this->session->set_flashdata('success', $this->lang->line('options_smtp_encryption_changed_to').$this->input->post('smtpEncryption')); } // Update smtpHost choice within the options system @@ -228,7 +237,7 @@ class Options extends CI_Controller { // If smtpHost update is complete set a flashsession with a success note if($smtpHostupdate == TRUE) { - $this->session->set_flashdata('success', 'SMTP Host changed to '.$this->input->post('smtpHost')); + $this->session->set_flashdata('success', $this->lang->line('options_smtp_host_changed_to').$this->input->post('smtpHost')); } // Update smtpPort choice within the options system @@ -236,7 +245,7 @@ class Options extends CI_Controller { // If smtpPort update is complete set a flashsession with a success note if($smtpPortupdate == TRUE) { - $this->session->set_flashdata('success', 'SMTP Port changed to '.$this->input->post('smtpPort')); + $this->session->set_flashdata('success', $this->lang->line('options_smtp_port_changed_to').$this->input->post('smtpPort')); } // Update smtpUsername choice within the options system @@ -244,7 +253,7 @@ class Options extends CI_Controller { // If smtpUsername update is complete set a flashsession with a success note if($smtpUsernameupdate == TRUE) { - $this->session->set_flashdata('success', 'SMTP Username changed to '.$this->input->post('smtpUsername')); + $this->session->set_flashdata('success', $this->lang->line('options_smtp_username_changed_to').$this->input->post('smtpUsername')); } // Update smtpPassword choice within the options system @@ -252,7 +261,7 @@ class Options extends CI_Controller { // If smtpPassword update is complete set a flashsession with a success note if($smtpPasswordupdate == TRUE) { - $this->session->set_flashdata('success', 'SMTP Password changed to '.$this->input->post('smtpPassword')); + $this->session->set_flashdata('success', $this->lang->line('options_smtp_password_changed_to').$this->input->post('smtpPassword')); } // Update emailcrlf choice within the options system @@ -260,7 +269,7 @@ class Options extends CI_Controller { // If emailcrlf update is complete set a flashsession with a success note if($emailcrlfupdate == TRUE) { - $this->session->set_flashdata('success', 'Email CRLF changed to '.$this->input->post('emailcrlf')); + $this->session->set_flashdata('success', $this->lang->line('options_email_crlf_changed_to').$this->input->post('emailcrlf')); } // Update emailnewline choice within the options system @@ -268,7 +277,7 @@ class Options extends CI_Controller { // If emailnewline update is complete set a flashsession with a success note if($emailnewlineupdate == TRUE) { - $this->session->set_flashdata('success', 'Email Newline changed to '.$this->input->post('emailnewline')); + $this->session->set_flashdata('success', $this->lang->line('options_email_newline_changed_to').$this->input->post('emailnewline')); } // Redirect back to /appearance @@ -278,8 +287,8 @@ class Options extends CI_Controller { function oqrs() { - $data['page_title'] = "Cloudlog Options"; - $data['sub_heading'] = "OQRS Options"; + $data['page_title'] = $this->lang->line('options_cloudlog_options'); + $data['sub_heading'] = $this->lang->line('options_oqrs'); $this->load->view('interface_assets/header', $data); $this->load->view('options/oqrs'); @@ -288,8 +297,8 @@ class Options extends CI_Controller { function oqrs_save() { - $data['page_title'] = "Cloudlog Options"; - $data['sub_heading'] = "OQRS Options"; + $data['page_title'] = $this->lang->line('options_cloudlog_options'); + $data['sub_heading'] = $this->lang->line('options_oqrs'); $this->load->helper(array('form', 'url')); @@ -300,7 +309,7 @@ class Options extends CI_Controller { $global_oqrs_text = $this->optionslib->update('groupedSearch', $this->input->post('groupedSearch'), null); if($global_oqrs_text == TRUE) { - $this->session->set_flashdata('success', 'OQRS options have been saved.'); + $this->session->set_flashdata('success', $this->lang->line('options_oqrs_options_have_been_saved')); } redirect('/options/oqrs'); diff --git a/application/controllers/Statistics.php b/application/controllers/Statistics.php index e34801ef..2647c8fc 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(); @@ -17,7 +29,7 @@ class Statistics extends CI_Controller { // Render User Interface // Set Page Title - $data['page_title'] = "Statistics"; + $data['page_title'] = $this->lang->line('statistics_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 e34e91f1..bdddf958 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -11,6 +11,7 @@ class User extends CI_Controller { 'account', 'lotw', 'eqsl', + 'admin', )); } @@ -21,7 +22,7 @@ class User extends CI_Controller { $data['results'] = $this->user_model->users(); - $data['page_title'] = "User Accounts"; + $data['page_title'] = $this->lang->line('admin_user_accounts'); $this->load->view('interface_assets/header', $data); $this->load->view('user/main'); diff --git a/application/language/english/account_lang.php b/application/language/english/account_lang.php index 7db5d0ed..f73f79bb 100644 --- a/application/language/english/account_lang.php +++ b/application/language/english/account_lang.php @@ -8,3 +8,84 @@ $lang['account_column2_text'] = 'Choose column 2'; $lang['account_column3_text'] = 'Choose column 3'; $lang['account_column4_text'] = 'Choose column 4'; $lang['account_column5_text'] = 'Choose column 5 (only for logbook)'; + +$lang['account_create_user_account'] = 'Create User Account'; +$lang['account_edit_account'] = 'Edit Account'; + +$lang['account_account_information'] = 'Account Information'; +$lang['account_username'] = 'Username'; +$lang['account_email_address'] = 'Email Address'; +$lang['account_password'] = 'Password'; + +$lang['account_roles'] = 'Roles'; +$lang['account_user_role'] = 'User Role'; + +$lang['account_theme'] = 'Theme'; +$lang['account_stylesheet'] = 'Stylesheet'; + +$lang['account_personal_iformation'] = 'Personal Information'; +$lang['account_first_name'] = 'First Name'; +$lang['account_last_name'] = 'Last Name'; +$lang['account_callsign'] = 'Callsign'; +$lang['account_gridsquare'] = 'Gridsquare'; + +$lang['account_cloudlog_preferences'] = 'Cloudlog Preferences'; +$lang['account_timezone'] = 'Timezone'; +$lang['account_date_format'] = 'Date Format'; +$lang['account_measurement_preference'] = 'Measurement preference'; +$lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; +$lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; + +$lang['account_main_menu'] = 'Main Menu'; +$lang['account_show_notes_in_the_main_menu'] = 'Show notes in the main menu.'; + +$lang['account_gridsquare_and_location_autocomplete'] = 'Gridsquare and Location Autocomplete'; +$lang['account_location_auto_lookup'] = 'Location auto lookup.'; +$lang['account_if_set_gridsquare_is_fetched_based_on_location_name'] = 'If set, gridsquare is fetched based on location name.'; +$lang['account_sota_auto_lookup_gridsquare_and_name_for_summit'] = 'SOTA auto lookup gridsquare and name for summit.'; +$lang['account_wwff_auto_lookup_gridsquare_and_name_for_reference'] = 'WWFF auto lookup gridsquare and name for reference.'; +$lang['account_pota_auto_lookup_gridsquare_and_name_for_park'] = 'POTA auto lookup gridsquare and name for park.'; +$lang['account_if_set_name_and_gridsquare_is_fetched_from_the_api_and_filled_in_location_and_locator'] = 'If set, name and gridsquare is fetched from the API and filled in location and locator.'; + +$lang['account_previous_qsl_type'] = 'Previous QSL Type'; +$lang['account_select_the_type_of_qsl_to_show_in_the_previous_qsos_section'] = 'Select the type of QSL to show in the previous QSOs section.'; + +$lang['account_qrzcom_hamqthcom_images'] = 'qrz.com/hamqth.com Images'; +$lang['account_show_profile_picture_of_qso_partner_from_qrzcom_hamqthcom_profile_in_the_log_qso_section'] = 'Show profile picture of QSO partner from qrz.com/hamqth.com profile in the log QSO section.'; +$lang['account_please_set_your_qrzcom_hamqthcom_credentials_in_the_general_config_file'] = 'Please set your qrz.com/hamqth.com credentials in the general config file.'; + +$lang['account_amsat_status_upload'] = 'AMSAT Status Upload'; +$lang['account_upload_status_of_sat_qsos_to'] = 'Upload status of SAT QSOs to'; + +$lang['account_logbook_of_the_world'] = 'Logbook of the World'; +$lang['account_logbook_of_the_world_lotw_username'] = 'Logbook of The World (LoTW) Username'; +$lang['account_logbook_of_the_world_lotw_password'] = 'Logbook of The World (LoTW) Password'; +$lang['account_leave_blank_to_keep_existing_password'] = 'Leave blank to keep existing password'; + +$lang['account_clublog'] = 'Club Log'; +$lang['account_clublog_email_callsign'] = 'Club Log Email/Callsign'; +$lang['account_clublog_password'] = 'Club Log Password'; +$lang['account_the_email_or_callsign_you_use_to_login_to_club_log'] = 'The Email or Callsign you use to login to Club Log'; + +$lang['account_eqsl'] = 'eQSL'; +$lang['account_eqsl_username'] = 'eQSL.cc Username'; +$lang['account_eqsl_password'] = 'eQSL.cc Password'; + +$lang['account_save_account_changes'] = 'Save Account Changes'; +$lang['account_create_account'] = 'Create Account'; + +$lang['account_delete_user_account'] = 'Delete User Account'; +$lang['account_are_you_sure_you_want_to_delete_the_user_account'] = 'Are you sure you want to delete the user account'; +$lang['account_yes_delete_this_user'] = 'Yes, delete this user'; +$lang['account_no_do_not_delete_this_user'] = 'No, do not delete this user'; + +$lang['account_forgot_password'] = 'Forgot Password?'; +$lang['account_you_can_reset_your_password_here'] = 'You can reset your password here.'; +$lang['account_reset_password'] = 'Reset Password'; +$lang['account_the_email_field_is_required'] = 'The Email field is required'; +$lang['account_confirm_password'] = 'Confirm Password'; + +$lang['account_forgot_your_password'] = 'Forgot your password?'; + +$lang['account_login_to_cloudlog'] = 'Login to Cloudlog'; +$lang['account_login'] = 'Login'; diff --git a/application/language/english/admin_lang.php b/application/language/english/admin_lang.php new file mode 100644 index 00000000..5b3568c8 --- /dev/null +++ b/application/language/english/admin_lang.php @@ -0,0 +1,18 @@ +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 9f57bc47..6b723293 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 +
  • diff --git a/application/views/options/appearance.php b/application/views/options/appearance.php index 84c94691..eaf229fa 100644 --- a/application/views/options/appearance.php +++ b/application/views/options/appearance.php @@ -45,7 +45,7 @@
    - + - Global Theme Choice, this is used when users arent logged in. +
    - + - This allows non logged in users to access the search functions. +
    - + - This allows to disable the global notification banner on the dashboard. +
    - + - This allows the map on the dashboard to be disabled or placed on the right. +
    - + - This allows to disable the map in the logbook. +
    - +
    • diff --git a/application/views/options/email.php b/application/views/options/email.php index 248bfa0b..1204c1f3 100644 --- a/application/views/options/email.php +++ b/application/views/options/email.php @@ -35,7 +35,7 @@
    - + @@ -53,49 +53,49 @@
    - +
    optionslib->get_option('smtpHost'); } ?>">
    - +
    optionslib->get_option('smtpPort'); } ?>">
    - +
    optionslib->get_option('smtpUsername'); } ?>">
    - +
    optionslib->get_option('smtpPassword'); } ?>">
    - +
    optionslib->get_option('emailcrlf'); } ?>">
    - +
    optionslib->get_option('emailnewline'); } ?>">
    - +
    diff --git a/application/views/options/index.php b/application/views/options/index.php index 072e24cd..b5272d0f 100644 --- a/application/views/options/index.php +++ b/application/views/options/index.php @@ -10,7 +10,7 @@

    -

    Cloudlog Options are global settings used for all users of the installation, which are overriddden if there's a setting on a user level.

    +

    diff --git a/application/views/options/oqrs.php b/application/views/options/oqrs.php index 9af9404a..9b2b3f1b 100644 --- a/application/views/options/oqrs.php +++ b/application/views/options/oqrs.php @@ -35,22 +35,22 @@
    - + - This text is an optional text that can be displayed on top of the OQRS page. +
    - + - When this is on, all station locations with OQRS active, will be searched at once. +
    - + diff --git a/application/views/options/radios.php b/application/views/options/radios.php index f695993b..efd4d63e 100644 --- a/application/views/options/radios.php +++ b/application/views/options/radios.php @@ -35,14 +35,14 @@
    - -

    The Radio Timeout Warning is used on the QSO entry panel to alert you to radio interface disconnects.

    + +

    - This number is in seconds. +
    - + diff --git a/application/views/options/sidebar.php b/application/views/options/sidebar.php index 09a63230..84d0e42d 100644 --- a/application/views/options/sidebar.php +++ b/application/views/options/sidebar.php @@ -1,10 +1,10 @@
    \ No newline at end of file diff --git a/application/views/statistics/index.php b/application/views/statistics/index.php index 07172327..c0a36793 100644 --- a/application/views/statistics/index.php +++ b/application/views/statistics/index.php @@ -11,7 +11,7 @@

    - Explore the logbook. +


    @@ -33,19 +33,19 @@
    diff --git a/application/views/statistics/qsotable.php b/application/views/statistics/qsotable.php index 049e002c..7f963fb3 100644 --- a/application/views/statistics/qsotable.php +++ b/application/views/statistics/qsotable.php @@ -7,7 +7,7 @@ if ($qsoarray) { foreach($bands as $band) { echo '' . $band . ''; } - echo 'Total'; + echo ''.lang('statistics_total').''; echo ' '; @@ -20,7 +20,7 @@ if ($qsoarray) { echo '' . $modetotal[$mode] . ''; echo ''; } - echo 'Total'; + echo ''.lang('statistics_total').''; $grandtotal = 0; foreach ($bandtotal as $band => $value) { diff --git a/application/views/statistics/uniquetable.php b/application/views/statistics/uniquetable.php index 93dc84aa..0a25b170 100644 --- a/application/views/statistics/uniquetable.php +++ b/application/views/statistics/uniquetable.php @@ -7,7 +7,7 @@ if ($qsoarray) { foreach($bands as $band) { echo '' . $band . ''; } - echo 'Total'; + echo ''.lang('statistics_total').''; echo ' '; @@ -20,7 +20,7 @@ if ($qsoarray) { echo '' . $modeunique[$mode] . ''; echo ''; } - echo 'Total'; + echo ''.lang('statistics_total').''; foreach($bands as $band) { echo '' . $bandunique[$band] . ''; diff --git a/application/views/user/add.php b/application/views/user/add.php index b922e371..0f3cf3ca 100644 --- a/application/views/user/add.php +++ b/application/views/user/add.php @@ -1,6 +1,6 @@

    - Create User Account +

    session->flashdata('notice')) { ?>
    @@ -16,26 +16,26 @@
    - Account Information +
    - + ".$username_error."
    "; } ?>
    - + ".$email_error."
    "; } ?>
    - + ".$password_error."
    "; } ?> @@ -48,11 +48,11 @@
    - Roles +
    - +
    - Personal Information +
    - + ".$firstname_error."
    "; } ?>
    - + ".$lastname_error."
    "; } ?>
    - + ".$callsign_error."
    "; } ?>
    - + ".$locator_error."
    "; } ?> @@ -144,12 +144,12 @@
    - Cloudlog Preferences +
    - +
    - + - Select how you would - like dates shown when logged into your account. +
    - + - Choose which - unit distances will be shown in. +
    @@ -203,11 +201,11 @@
    - Main Menu +
    - + -
    If set, gridsquare is fetched based on - location name.
    +
    - + -
    If set, name and gridsquare is fetched - from the API and filled in location and locator.
    +
    - + -
    If set, name and gridsquare is fetched - from the API and filled in location and locator.
    +
    - + -
    If set, name and gridsquare is fetched - from the API and filled in location and locator.
    +
    @@ -291,7 +283,7 @@
    - Logbook fields +
    @@ -456,13 +448,12 @@
    - Previous QSL Type +
    - + -
    Please set your qrz.com/hamqth.com - credentials in the general config file.
    +
    @@ -501,12 +490,12 @@
    - AMSAT Status Upload +
    - + - No, do not delete this user +
    diff --git a/application/views/user/edit.php b/application/views/user/edit.php index 4f775eb0..ee9a8522 100644 --- a/application/views/user/edit.php +++ b/application/views/user/edit.php @@ -1,6 +1,6 @@

    - Edit Account +

    @@ -32,23 +32,23 @@
    - Account Information +
    - + ".$username_error."
    "; } ?>
    - + ".$email_error."
    "; } ?>
    - + ".$password_error."
    "; } else { ?>
    Leave blank to keep existing password
    @@ -61,11 +61,11 @@
    - Roles +
    - + session->userdata('user_type') == 99) { ?>
    - Personal Information +
    - + ".$firstname_error."
    "; } else { ?>
    - + ".$lastname_error."
    "; } else { ?>
    - + ".$callsign_error."
    "; } else { ?>
    - + ".$locator_error."
    "; } else { ?> @@ -157,16 +157,16 @@
    - Cloudlog Preferences +
    - +
    - + - Select how you would like dates shown when logged into your account. +
    - + - Choose which unit distances will be shown in. +
    @@ -202,20 +202,20 @@
    - Logbook of the World +
    - + ".$userlotwname_error."
    "; } ?>
    - + ".$lotwpassword_error."
    "; } else { ?> -
    Leave blank to keep existing password
    +
    @@ -226,20 +226,20 @@
    - eQSL +
    - + ".$eqslusername_error."
    "; } ?>
    - + ".$eqslpassword_error."
    "; } else { ?> -
    Leave blank to keep existing password
    +
    @@ -253,22 +253,22 @@
    - Club Log +
    - + -
    The Email or Callsign you use to login to Club Log
    +
    ".$userclublogname_error."
    "; } ?>
    - + ".$clublogpassword_error."
    "; } else { ?> -
    Leave blank to keep existing password
    +
    @@ -277,11 +277,11 @@
    - Main menu +
    - + -
    If set, gridsquare is fetched based on location name.
    +
    - + -
    If set, name and gridsquare is fetched from the API and filled in location and locator.
    +
    - + -
    If set, name and gridsquare is fetched from the API and filled in location and locator.
    +
    - + -
    If set, name and gridsquare is fetched from the API and filled in location and locator.
    +
    @@ -451,7 +451,7 @@
    - Previous QSL Type +
    @@ -471,16 +471,16 @@
    - qrz.com/hamqth.com Images +
    - + -
    Please set your qrz.com/hamqth.com credentials in the general config file.
    +
    @@ -493,11 +493,11 @@
    - AMSAT Status Upload +
    - +
    - +

    diff --git a/application/views/user/forgot_password.php b/application/views/user/forgot_password.php index 6f8003d3..e26a5131 100644 --- a/application/views/user/forgot_password.php +++ b/application/views/user/forgot_password.php @@ -30,8 +30,8 @@ input[type="email"] {
    -

    Forgot Password?

    -

    You can reset your password here.

    +

    +

    @@ -44,11 +44,11 @@ input[type="email"] {
    - +
    - +
    diff --git a/application/views/user/login.php b/application/views/user/login.php index f5aaba68..3847cb66 100644 --- a/application/views/user/login.php +++ b/application/views/user/login.php @@ -33,26 +33,26 @@ body {
    -

    Login to Cloudlog

    +

    form_validation->set_error_delimiters('', ''); ?>
    - - +
    - + + placeholder="">
    load->view('layout/messages'); ?> - +
    diff --git a/application/views/user/main.php b/application/views/user/main.php index 15d67aea..8dc9ddd2 100644 --- a/application/views/user/main.php +++ b/application/views/user/main.php @@ -14,20 +14,20 @@
    - User List +
    -

    Cloudlog needs at least one user configured in order to operate.

    -

    Users can be assigned roles which give them different permissions, such as adding QSOs to the logbook and accessing Cloudlog APIs.

    -

    The currently logged-in user is displayed at the upper-right of each page.

    +

    +

    +

    - - - - + + + + @@ -41,10 +41,10 @@ @@ -54,7 +54,7 @@
    UserE-mailTypeOptions
    user_email; ?> config->item('auth_level'); echo $l[$row->user_type]; ?> - user_id; ?>" class="btn btn-outline-primary btn-sm"> Edit + user_id; ?>" class="btn btn-outline-primary btn-sm"> user_id) { - echo "user_id . " class=\"btn btn-danger btn-sm\"> Delete"; + echo "user_id . " class=\"btn btn-danger btn-sm\"> ".lang('admin_delete').""; } ?>

    - Create user +

    diff --git a/application/views/user/reset_password.php b/application/views/user/reset_password.php index f5e84bb4..23184ce7 100644 --- a/application/views/user/reset_password.php +++ b/application/views/user/reset_password.php @@ -5,8 +5,8 @@

    -

    Reset Password?

    -

    You can reset your password here.

    +

    ?

    +

    @@ -18,21 +18,21 @@
    - +
    - +
    - +
    - +
    - +