diff --git a/application/controllers/Lotw.php b/application/controllers/Lotw.php index 6d41f74a..ea5688c8 100644 --- a/application/controllers/Lotw.php +++ b/application/controllers/Lotw.php @@ -23,6 +23,9 @@ class Lotw extends CI_Controller { { parent::__construct(); $this->load->helper(array('form', 'url')); + + // Load language files + $this->lang->load('lotw'); } /* diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php index 2561ab45..dc0c1406 100644 --- a/application/language/english/general_words_lang.php +++ b/application/language/english/general_words_lang.php @@ -8,6 +8,7 @@ $lang['notice_turn_the_radio_on'] = 'You have made no QSOs today; time to turn o $lang['general_word_important'] = 'Important'; $lang['general_word_info'] = 'Info'; +$lang['general_word_choose_file'] = 'Choose file'; $lang['general_word_date'] = 'Date'; $lang['general_word_time'] = 'Time'; @@ -94,3 +95,5 @@ $lang['dashboard_you_have_had'] = 'You have had'; $lang['dashboard_qsos_today'] = 'QSOs Today!'; $lang['dashboard_qso_breakdown'] = 'QSOs Breakdown'; $lang['dashboard_countries_breakdown'] = 'Countries Breakdown'; + +$lang['gen_from_date'] = 'From date'; \ No newline at end of file diff --git a/application/language/english/lotw_lang.php b/application/language/english/lotw_lang.php new file mode 100644 index 00000000..3887f497 --- /dev/null +++ b/application/language/english/lotw_lang.php @@ -0,0 +1,49 @@ +Download Report Area, to mark QSOs as confirmed on LOTW.'; +$lang['lotw_upload_type_must_be_adi'] = 'Log files must have the file type .adi'; + +$lang['lotw_pull_lotw_data_for_me'] = 'Pull LoTW data for me'; +$lang['lotw_import_missing_qsos_text'] = 'Import missing QSOs into the log. Call and gridsquare will be checked to try to find the correct profile to import the QSO into. If not found, the QSO will be skipped.'; + +$lang['lotw_report_download_overview_helptext'] ='Cloudlog will use the LoTW username and password stored in your user profile to download a report from LoTW for you. The report Cloudlog downloads will have all confirmations since chosen date, or since your last LoTW confirmation (fetched from your log), up until now.'; + +// Buttons +$lang['lotw_btn_lotw_import'] = 'LoTW Import'; +$lang['lotw_btn_upload_certificate'] = 'Upload Certificate'; +$lang['lotw_btn_delete'] = 'Delete'; +$lang['lotw_btn_manual_sync'] = 'Manual Sync'; +$lang['lotw_btn_upload_file'] = 'Upload File'; +$lang['lotw_btn_import_matches'] = 'Import LoTW Matches'; + +// P12 Export Text +$lang['lotw_p12_export_step_one'] = 'Open TQSL & go to the Callsign Certificates Tab'; +$lang['lotw_p12_export_step_two'] = 'Right click on desired Callsign'; +$lang['lotw_p12_export_step_three'] = 'Click "Save Callsign Certificate File" and do not add a password'; +$lang['lotw_p12_export_step_four'] = 'Upload File below.'; \ No newline at end of file diff --git a/application/views/lotw/import.php b/application/views/lotw/import.php index ee8a71ed..ceda94e4 100644 --- a/application/views/lotw/import.php +++ b/application/views/lotw/import.php @@ -1,9 +1,9 @@
-

+

lang->line('lotw_title'); ?> - lang->line('lotw_title_adif_import'); ?>

-
Import Options
+
lang->line('lotw_title_adif_import_options'); ?>
load->view('layout/messages'); ?> @@ -12,14 +12,14 @@
- + -

Upload the Exported ADIF file from LoTW from the Download Report Area, to mark QSOs as confirmed on LOTW.

-

Important Log files must have the file type .adi

+

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

+

lang->line('general_word_important'); ?> lang->line('lotw_upload_type_must_be_adi'); ?>

- +
@@ -29,9 +29,9 @@
- +
-

From date:

+

lang->line('gen_from_date'); ?>:

@@ -45,14 +45,14 @@
- +
-

Cloudlog will use the LoTW username and password stored in your user profile to download a report from LoTW for you. The report Cloudlog downloads will have all confirmations since chosen date, or since your last LoTW confirmation (fetched from your log), up until now.

+

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

- +
diff --git a/application/views/lotw_views/index.php b/application/views/lotw_views/index.php index c60b0b07..5120da91 100644 --- a/application/views/lotw_views/index.php +++ b/application/views/lotw_views/index.php @@ -1,16 +1,16 @@

- LoTW Import -

+ lang->line('lotw_btn_lotw_import'); ?> +

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

- Upload Certificate Available Certificates + lang->line('lotw_btn_upload_certificate'); ?> lang->line('lotw_title_available_cert'); ?>
@@ -32,12 +32,12 @@ - - - - - - + + + + + + @@ -62,19 +62,19 @@ date_expires) { ?> - Valid + lang->line('lotw_valid'); ?> - Expired + lang->line('lotw_expired'); ?>last_upload) { ?> last_upload; ?> - Not Synced + lang->line('lotw_not_synced'); ?> @@ -85,7 +85,7 @@ @@ -98,13 +98,11 @@
- Information + lang->line('lotw_title_information'); ?>
-

You can run the LoTW upload script manually from: . This should be run as a cron task on a fixed interval (no more frequently than once an hour).

- -

We are building the help file for this at https://github.com/magicbug/Cloudlog/wiki/LoTW-Import-&-Export-Documentation

+

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

diff --git a/application/views/lotw_views/upload_cert.php b/application/views/lotw_views/upload_cert.php index 24ac7ca2..78018d41 100644 --- a/application/views/lotw_views/upload_cert.php +++ b/application/views/lotw_views/upload_cert.php @@ -1,11 +1,11 @@
-

+

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

- Upload Logbook of the World .p12 Certificate + lang->line('lotw_title_upload_p12_cert'); ?>
@@ -16,37 +16,36 @@
- +
-
- - num_rows() > 0) { ?> - - - Certificate DXCC entity. For example: Scotland -
- - +
+ + num_rows() > 0) { ?> + + + lang->line('lotw_certificate_dxcc_help_text'); ?> +
+
CallsignDXCCDate CreatedDate ExpiresStatusOptionslang->line('gen_hamradio_callsign'); ?>lang->line('gen_hamradio_dxcc'); ?>lang->line('lotw_date_created'); ?>lang->line('lotw_date_expires'); ?>lang->line('lotw_status'); ?>lang->line('lotw_options'); ?>
- Delete + lang->line('lotw_btn_delete'); ?>