kopia lustrzana https://github.com/magicbug/Cloudlog
[LoTW][Translate] Reformatted all the text to use lang files for translation
rodzic
f507acde67
commit
fa940894fe
|
|
@ -23,6 +23,9 @@ class Lotw extends CI_Controller {
|
|||
{
|
||||
parent::__construct();
|
||||
$this->load->helper(array('form', 'url'));
|
||||
|
||||
// Load language files
|
||||
$this->lang->load('lotw');
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -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';
|
||||
|
|
@ -0,0 +1,49 @@
|
|||
<?php
|
||||
|
||||
defined('BASEPATH') OR exit('No direct script access allowed');
|
||||
|
||||
$lang['lotw_title'] = 'Logbook of the World';
|
||||
$lang['lotw_title_available_cert'] = 'Available Certificates';
|
||||
$lang['lotw_title_information'] = 'Information';
|
||||
$lang['lotw_title_upload_p12_cert'] = 'Upload Logbook of the World .p12 Certificate';
|
||||
$lang['lotw_title_export_p12_file_instruction'] = 'Export .p12 File Instructions';
|
||||
$lang['lotw_title_adif_import'] = 'ADIF Import';
|
||||
$lang['lotw_title_adif_import_options'] = 'Import Options';
|
||||
|
||||
$lang['lotw_beta_warning'] = 'Please be aware that LoTW Sync is BETA, see wiki for help.';
|
||||
$lang['lotw_no_certs_uploaded'] = 'You need to upload some LoTW p12 certificates to use this area.';
|
||||
|
||||
$lang['lotw_date_created'] = 'Date Created';
|
||||
$lang['lotw_date_expires'] = 'Date Expires';
|
||||
$lang['lotw_status'] = 'Status';
|
||||
$lang['lotw_options'] = 'Options';
|
||||
$lang['lotw_valid'] = 'Valid';
|
||||
$lang['lotw_expired'] = 'Expired';
|
||||
$lang['lotw_not_synced'] = 'Not Synced';
|
||||
|
||||
$lang['lotw_certificate_dxcc'] = 'Certificate DXCC';
|
||||
$lang['lotw_certificate_dxcc_help_text'] = 'Certificate DXCC entity. For example: Scotland';
|
||||
|
||||
$lang['lotw_input_a_file'] = 'Upload a File';
|
||||
|
||||
$lang['lotw_upload_exported_adif_file_from_lotw'] = 'Upload the Exported ADIF file from LoTW from the <a href="https://p1k.arrl.org/lotwuser/qsos?qsoscmd=adif" target="_blank">Download Report</a> 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.';
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
<div class="container lotw">
|
||||
|
||||
<h2><?php echo $page_title; ?></h2>
|
||||
<h2><?php echo $this->lang->line('lotw_title'); ?> - <?php echo $this->lang->line('lotw_title_adif_import'); ?></h2>
|
||||
|
||||
<div class="card">
|
||||
<div class="card-header">Import Options</div>
|
||||
<div class="card-header"><?php echo $this->lang->line('lotw_title_adif_import_options'); ?></div>
|
||||
<div class="card-body">
|
||||
|
||||
<?php $this->load->view('layout/messages'); ?>
|
||||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
<div class="form-check">
|
||||
<input type="radio" id="lotwimport" name="lotwimport" class="form-check-input">
|
||||
<label class="form-check-label" for="lotwimport">Upload a file</label>
|
||||
<label class="form-check-label" for="lotwimport"><?php echo $this->lang->line('lotw_input_a_file'); ?></label>
|
||||
|
||||
<p>Upload the Exported ADIF file from LoTW from the <a href="https://p1k.arrl.org/lotwuser/qsos?qsoscmd=adif" target="_blank">Download Report</a> Area, to mark QSOs as confirmed on LOTW.</p>
|
||||
<p><span class="label important">Important</span> Log files must have the file type .adi</p>
|
||||
<p><?php echo $this->lang->line('lotw_upload_exported_adif_file_from_lotw'); ?></p>
|
||||
<p><span class="badge badge-info"><?php echo $this->lang->line('general_word_important'); ?></span> <?php echo $this->lang->line('lotw_upload_type_must_be_adi'); ?></p>
|
||||
|
||||
<div class="custom-file">
|
||||
<input type="file" class="custom-file-input" id="adiffile" name="userfile" size="20" />
|
||||
<label class="custom-file-label" for="adiffile">Choose file</label>
|
||||
<label class="custom-file-label" for="adiffile"><?php echo $this->lang->line('general_word_choose_file'); ?></label>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
|
@ -29,9 +29,9 @@
|
|||
|
||||
<div class="custom-control custom-radio">
|
||||
<input type="radio" name="lotwimport" id="fetch" class="custom-control-input" value="fetch" checked="checked" />
|
||||
<label class="custom-control-label" for="fetch">Pull LoTW data for me</label>
|
||||
<label class="custom-control-label" for="fetch"><?php echo $this->lang->line('lotw_pull_lotw_data_for_me'); ?></label>
|
||||
</div>
|
||||
<p class="card-text">From date:</p>
|
||||
<p class="card-text"><?php echo $this->lang->line('gen_from_date'); ?>:</p>
|
||||
<div class="row">
|
||||
<div class="input-group date col-md-3" id="datetimepicker1" data-target-input="nearest">
|
||||
<input name="from" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker1"/>
|
||||
|
|
@ -45,14 +45,14 @@
|
|||
<div class="col-md-10">
|
||||
<div class="form-check-inline">
|
||||
<input class="form-check-input" type="checkbox" name="importMissing" value="1" id="importMissing">
|
||||
<label class="form-check-label" for="importMissing">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.</label>
|
||||
<label class="form-check-label" for="importMissing"><?php echo $this->lang->line('lotw_import_missing_qsos_text'); ?></label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p class="form-text text-muted">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.</p>
|
||||
<p class="form-text text-muted"><?php echo $this->lang->line('lotw_report_download_overview_helptext'); ?></p>
|
||||
|
||||
<input class="btn btn-primary" type="submit" value="Import LoTW Matches" />
|
||||
<input class="btn btn-primary" type="submit" value="<?php echo $this->lang->line('lotw_btn_import_matches'); ?>" />
|
||||
|
||||
</form>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
<div class="container lotw">
|
||||
<br>
|
||||
<a class="btn btn-outline-primary btn-sm float-right" href="<?php echo site_url('/lotw/import'); ?>" role="button"><i class="fas fa-cloud-download-alt"></i> LoTW Import</a>
|
||||
<h2><?php echo $page_title; ?></h2>
|
||||
<a class="btn btn-outline-primary btn-sm float-right" href="<?php echo site_url('/lotw/import'); ?>" role="button"><i class="fas fa-cloud-download-alt"></i> <?php echo $this->lang->line('lotw_btn_lotw_import'); ?></a>
|
||||
<h2><?php echo $this->lang->line('lotw_title'); ?></h2>
|
||||
|
||||
<div class="alert alert-danger" role="alert">
|
||||
<i class="fas fa-exclamation-triangle"></i> Please be aware that LoTW Sync is BETA. You might get errors as this isn't fully production ready.
|
||||
<i class="fas fa-exclamation-triangle"></i> <?php echo $this->lang->line('lotw_beta_warning'); ?>
|
||||
</div>
|
||||
|
||||
<!-- Card Starts -->
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<a class="btn btn-outline-success btn-sm float-right" href="<?php echo site_url('/lotw/cert_upload'); ?>" role="button"><i class="fas fa-cloud-upload-alt"></i> Upload Certificate</a><i class="fab fa-expeditedssl"></i> Available Certificates
|
||||
<a class="btn btn-outline-success btn-sm float-right" href="<?php echo site_url('/lotw/cert_upload'); ?>" role="button"><i class="fas fa-cloud-upload-alt"></i> <?php echo $this->lang->line('lotw_btn_upload_certificate'); ?></a><i class="fab fa-expeditedssl"></i> <?php echo $this->lang->line('lotw_title_available_cert'); ?>
|
||||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
|
|
@ -32,12 +32,12 @@
|
|||
<table class="table table-hover">
|
||||
<thead class="thead-light">
|
||||
<tr>
|
||||
<th scope="col">Callsign</th>
|
||||
<th scope="col">DXCC</th>
|
||||
<th scope="col">Date Created</th>
|
||||
<th scope="col">Date Expires</th>
|
||||
<th scope="col">Status</th>
|
||||
<th scope="col">Options</th>
|
||||
<th scope="col"><?php echo $this->lang->line('gen_hamradio_callsign'); ?></th>
|
||||
<th scope="col"><?php echo $this->lang->line('gen_hamradio_dxcc'); ?></th>
|
||||
<th scope="col"><?php echo $this->lang->line('lotw_date_created'); ?></th>
|
||||
<th scope="col"><?php echo $this->lang->line('lotw_date_expires'); ?></th>
|
||||
<th scope="col"><?php echo $this->lang->line('lotw_status'); ?></th>
|
||||
<th scope="col"><?php echo $this->lang->line('lotw_options'); ?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
|
|
@ -62,19 +62,19 @@
|
|||
<?php $current_date = date('Y-m-d H:i:s'); ?>
|
||||
|
||||
<?php if ($current_date <= $row->date_expires) { ?>
|
||||
<span class="badge badge-success">Valid</span>
|
||||
<span class="badge badge-success"><?php echo $this->lang->line('lotw_valid'); ?></span>
|
||||
<?php } else { ?>
|
||||
<span class="badge badge-dark">Expired</span>
|
||||
<span class="badge badge-dark"><?php echo $this->lang->line('lotw_expired'); ?></span>
|
||||
<?php } ?>
|
||||
|
||||
<?php if ($row->last_upload) { ?>
|
||||
<span class="badge badge-success"><?php echo $row->last_upload; ?></span>
|
||||
<?php } else { ?>
|
||||
<span class="badge badge-warning">Not Synced</span>
|
||||
<span class="badge badge-warning"><?php echo $this->lang->line('lotw_not_synced'); ?></span>
|
||||
<?php } ?>
|
||||
</td>
|
||||
<td>
|
||||
<a class="btn btn-outline-danger btn-sm" href="<?php echo site_url('lotw/delete_cert/'.$row->lotw_cert_id); ?>" role="button"><i class="far fa-trash-alt"></i> Delete</a>
|
||||
<a class="btn btn-outline-danger btn-sm" href="<?php echo site_url('lotw/delete_cert/'.$row->lotw_cert_id); ?>" role="button"><i class="far fa-trash-alt"></i> <?php echo $this->lang->line('lotw_btn_delete'); ?></a>
|
||||
</td>
|
||||
</tr>
|
||||
<?php } ?>
|
||||
|
|
@ -85,7 +85,7 @@
|
|||
|
||||
<?php } else { ?>
|
||||
<div class="alert alert-info" role="alert">
|
||||
You need to upload some LoTW p12 certificates to use this area.
|
||||
<?php echo $this->lang->line('lotw_no_certs_uploaded'); ?>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
|
|
@ -98,13 +98,11 @@
|
|||
<!-- Card Starts -->
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
Information
|
||||
<?php echo $this->lang->line('lotw_title_information'); ?>
|
||||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
<p>You can run the LoTW upload script manually from: <a href="<?php echo site_url('lotw/lotw_upload'); ?>"><?php echo site_url('lotw/lotw_upload'); ?></a>. This should be run as a cron task on a fixed interval (no more frequently than once an hour).</p>
|
||||
|
||||
<p>We are building the help file for this at <a href="https://github.com/magicbug/Cloudlog/wiki/LoTW-Import-&-Export-Documentation" target="_blank">https://github.com/magicbug/Cloudlog/wiki/LoTW-Import-&-Export-Documentation</a></p>
|
||||
<p><a class="btn btn-outline-success" href="<?php echo site_url('lotw/lotw_upload'); ?>"><?php echo $this->lang->line('lotw_btn_manual_sync'); ?></a></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
<div class="container lotw">
|
||||
|
||||
<h2><?php echo $page_title; ?></h2>
|
||||
<h2><?php echo $this->lang->line('lotw_title'); ?></h2>
|
||||
|
||||
<!-- Card Starts -->
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
Upload Logbook of the World .p12 Certificate
|
||||
<?php echo $this->lang->line('lotw_title_upload_p12_cert'); ?>
|
||||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
|
|
@ -16,37 +16,36 @@
|
|||
<?php } ?>
|
||||
|
||||
<div class="alert alert-info" role="alert">
|
||||
<h5>Export .p12 File Instructions</h5>
|
||||
<h5><?php echo $this->lang->line('lotw_title_export_p12_file_instruction'); ?></h5>
|
||||
|
||||
<ul>
|
||||
<li>Open TQSL & go to the Callsign Certificates Tab</li>
|
||||
<li>Right click on desired Callsign</li>
|
||||
<li>Click "Save Callsign Certificate File" and do not add a password</li>
|
||||
<li>Upload File below.</li>
|
||||
<li><?php echo $this->lang->line('lotw_p12_export_step_one'); ?></li>
|
||||
<li><?php echo $this->lang->line('lotw_p12_export_step_two'); ?></li>
|
||||
<li><?php echo $this->lang->line('lotw_p12_export_step_three'); ?></li>
|
||||
<li><?php echo $this->lang->line('lotw_p12_export_step_four'); ?></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<?php echo form_open_multipart('lotw/do_cert_upload');?>
|
||||
<div class="form-group">
|
||||
<label for="exampleFormControlFile1">Upload LoTW P12 File</label>
|
||||
<label for="exampleFormControlFile1"><?php echo $this->lang->line('lotw_title_upload_p12_cert'); ?></label>
|
||||
<input type="file" name="userfile" class="form-control-file" id="exampleFormControlFile1">
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="stationDXCCInput">Certificate DXCC</label>
|
||||
<?php if ($dxcc_list->num_rows() > 0) { ?>
|
||||
<select class="form-control" id="dxcc_select" name="dxcc" aria-describedby="stationCallsignInputHelp">
|
||||
<option value=""></option>
|
||||
<?php foreach ($dxcc_list->result() as $dxcc) { ?>
|
||||
<option value="<?php echo $dxcc->name; ?>"><?php echo $dxcc->name; ?></option>
|
||||
<?php } ?>
|
||||
</select>
|
||||
<?php } ?>
|
||||
<small id="stationDXCCInputHelp" class="form-text text-muted">Certificate DXCC entity. For example: Scotland</small>
|
||||
</div>
|
||||
|
||||
<button type="submit" value="upload" class="btn btn-primary">Upload File</button>
|
||||
<div class="form-group">
|
||||
<label for="stationDXCCInput"><?php echo $this->lang->line('lotw_certificate_dxcc'); ?></label>
|
||||
<?php if ($dxcc_list->num_rows() > 0) { ?>
|
||||
<select class="form-control" id="dxcc_select" name="dxcc" aria-describedby="stationCallsignInputHelp">
|
||||
<option value=""></option>
|
||||
<?php foreach ($dxcc_list->result() as $dxcc) { ?>
|
||||
<option value="<?php echo $dxcc->name; ?>"><?php echo $dxcc->name; ?></option>
|
||||
<?php } ?>
|
||||
</select>
|
||||
<?php } ?>
|
||||
<small id="stationDXCCInputHelp" class="form-text text-muted"><?php echo $this->lang->line('lotw_certificate_dxcc_help_text'); ?></small>
|
||||
</div>
|
||||
|
||||
<button type="submit" value="upload" class="btn btn-primary"><?php echo $this->lang->line('lotw_btn_upload_file'); ?></button>
|
||||
</form>
|
||||
|
||||
</div>
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue