Merge pull request #718 from ofadam/patch-1

Very minor language adjustments

application/controllers/Awards.php

@@ -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');

application/views/accumulate/index.php

@@ -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>

application/views/awards/dxcc/index.php

@@ -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 '

application/views/awards/iota/index.php

@@ -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')

application/views/dayswithqso/index.php

@@ -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>';

application/views/interface_assets/footer.php

@@ -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);

application/views/timeline/index.php

@@ -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>