Merge pull request #718 from ofadam/patch-1

Very minor language adjustments
这个提交包含在:
Peter Goodhall 2020-11-28 19:43:36 +00:00 提交者 GitHub
当前提交 49c0ea4e92
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 7 个文件被更改,包括 18 次插入18 次删除

查看文件

@ -344,7 +344,7 @@ class Awards extends CI_Controller {
$data['was_summary'] = $this->was->get_was_summary($bands);
// Render Page
$data['page_title'] = "Awards - WAS (Worked all states)";
$data['page_title'] = "Awards - WAS (Worked All States)";
$this->load->view('interface_assets/header', $data);
$this->load->view('awards/was/index');
$this->load->view('interface_assets/footer');

查看文件

@ -45,19 +45,19 @@
<div class="form-check">
<input class="form-check-input" type="radio" name="awardradio" id="was" value="was">
<label class="form-check-label" for="was">
Worked all states (WAS)
Worked All States (WAS)
</label>
</div>
<div class="form-check">
<input class="form-check-input" type="radio" name="awardradio" id="iota" value="iota">
<label class="form-check-label" for="iota">
Islands on the air (IOTA)
Islands On The Air (IOTA)
</label>
</div>
<div class="form-check">
<input class="form-check-input" type="radio" name="awardradio" id="waz" value="waz">
<label class="form-check-label" for="waz">
Worked all zones (WAZ)
Worked All Zones (WAZ)
</label>
</div>
</div>

查看文件

@ -10,7 +10,7 @@
<div class="col-md-10">
<div class="form-check-inline">
<input class="form-check-input" type="checkbox" name="includedeleted" id="includedeleted" value="1" <?php if ($this->input->post('includedeleted') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
<label class="form-check-label" for="includedeleted">Include Deleted</label>
<label class="form-check-label" for="includedeleted">Include deleted</label>
</div>
</div>
</div>
@ -116,7 +116,7 @@
<thead>
<tr>
<td>#</td>
<td>DXCCName</td>
<td>DXCC Name</td>
<td>Prefix</td>';
if ($this->input->post('includedeleted') || $this->input->method() !== 'post')
echo '

查看文件

@ -11,7 +11,7 @@
<div class="col-md-10">
<div class="form-check-inline">
<input class="form-check-input" type="checkbox" name="includedeleted" id="includedeleted" value="1" <?php if ($this->input->post('includedeleted') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
<label class="form-check-label" for="includedeleted">Include Deleted</label>
<label class="form-check-label" for="includedeleted">Include deleted</label>
</div>
</div>
</div>
@ -104,7 +104,7 @@
<thead>
<tr>
<td>#</td>
<td>Iota</td>
<td>IOTA</td>
<td>Prefix</td>
<td>Name</td>';
if ($this->input->post('includedeleted') || $this->input->method() !== 'post')
@ -162,4 +162,4 @@
echo '<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
}
?>
</div>
</div>

查看文件

@ -49,7 +49,7 @@
echo '<div id="streaks" class="table-responsive"><table class="qsotable table table-sm table-bordered table-hover table-striped table-condensed">';
echo '<tr>';
echo '<th style=\'text-align: center\'>Streak (Continues days with QSOs)</th>';
echo '<th style=\'text-align: center\'>Streak (continuous days with QSOs)</th>';
echo '<th style=\'text-align: center\'>Begin date</th>';
echo '<th style=\'text-align: center\'>End date</th>';
echo '</tr>';
@ -77,7 +77,7 @@
echo '<div id="streaks" class="table-responsive"><table class="qsotable table table-sm table-bordered table-hover table-striped table-condensed">';
echo '<tr>';
echo '<th style=\'text-align: center\'>Current Streak (Continues days with QSOs)</th>';
echo '<th style=\'text-align: center\'>Current streak (continuous days with QSOs)</th>';
echo '<th style=\'text-align: center\'>Begin date</th>';
echo '<th style=\'text-align: center\'>End date</th>';
echo '</tr>';
@ -94,12 +94,12 @@
}
elseif (is_array($almostcurrentstreak)) {
?>
<p>If you make a QSO today, you can continue to extend your streak, else your current streak will be broken!</p>
<p>If you make a QSO today, you can continue to extend your streak... or else your current streak will be broken!</p>
<?php
echo '<div id="streaks" class="table-responsive"><table class="qsotable table table-sm table-bordered table-hover table-striped table-condensed">';
echo '<tr>';
echo '<th style=\'text-align: center\'>Current Streak (Continues days with QSOs)</th>';
echo '<th style=\'text-align: center\'>Current streak (continuous days with QSOs)</th>';
echo '<th style=\'text-align: center\'>Begin date</th>';
echo '<th style=\'text-align: center\'>End date</th>';
echo '</tr>';

查看文件

@ -1330,7 +1330,7 @@ $(document).ready(function(){
$('#information').html(tmp.qrb.Qsoes + " contacts were plotted.<br /> Your furthest contact was with " + tmp.qrb.Callsign
+ " in gridsquare "+ tmp.qrb.Grid
+" the distance was "
+"; the distance was "
+tmp.qrb.Distance + tmp.unit +".");
var chart = new Highcharts.Chart(options);

查看文件

@ -50,19 +50,19 @@
<div class="form-check">
<input class="form-check-input" type="radio" name="awardradio" id="was" value="was" <?php if ($this->input->post('awardradio') == 'was') echo ' checked'?>>
<label class="form-check-label" for="was">
Worked all states (WAS)
Worked All States (WAS)
</label>
</div>
<div class="form-check">
<input class="form-check-input" type="radio" name="awardradio" id="iota" value="iota" <?php if ($this->input->post('awardradio') == 'iota') echo ' checked'?>>
<label class="form-check-label" for="iota">
Islands on the air (IOTA)
Islands On The Air (IOTA)
</label>
</div>
<div class="form-check">
<input class="form-check-input" type="radio" name="awardradio" id="waz" value="waz" <?php if ($this->input->post('awardradio') == 'waz') echo ' checked'?>>
<label class="form-check-label" for="waz">
Worked all zones (WAZ)
Worked All Zones (WAZ)
</label>
</div>
</div>
@ -217,4 +217,4 @@ function write_waz_timeline($timeline_array, $custom_date_format, $bandselect, $
</tr>';
}
echo '</tfoot></table></div>';
}
}