mirror of
https://github.com/wavelog/wavelog.git
synced 2026-03-22 10:24:14 +00:00
Harmonize spelling of QSOs (was QSO's)
This commit is contained in:
@@ -21,7 +21,7 @@ class Clublog_model extends CI_Model
|
|||||||
$clean_passord = $this->security->xss_clean($password);
|
$clean_passord = $this->security->xss_clean($password);
|
||||||
$clean_userid = $this->security->xss_clean($userid);
|
$clean_userid = $this->security->xss_clean($userid);
|
||||||
|
|
||||||
$return = "No QSO's to upload";
|
$return = "No QSOs to upload";
|
||||||
|
|
||||||
$this->config->load('config');
|
$this->config->load('config');
|
||||||
|
|
||||||
@@ -196,7 +196,7 @@ class Clublog_model extends CI_Model
|
|||||||
$return .= $log."<br>";
|
$return .= $log."<br>";
|
||||||
}
|
}
|
||||||
|
|
||||||
$log = "QSO's for Callsign: '" . $station_row->station_callsign . "' were successfully downloaded";
|
$log = "QSOs for Callsign: '" . $station_row->station_callsign . "' were successfully downloaded";
|
||||||
log_message('info', $log);
|
log_message('info', $log);
|
||||||
$return .= $log."<br>";
|
$return .= $log."<br>";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ function write_activators($activators_array, $vucc_grids, $custom_date_format, $
|
|||||||
<td>' . __("Callsign") . '</td>
|
<td>' . __("Callsign") . '</td>
|
||||||
<td>' . __("Count") . '</td>
|
<td>' . __("Count") . '</td>
|
||||||
<td>' . __("Gridsquares") . '</td>
|
<td>' . __("Gridsquares") . '</td>
|
||||||
<td>' . __("Show QSO's") . '</td>
|
<td>' . __("Show QSOs") . '</td>
|
||||||
<td>' . __("Show Map") . '</td>
|
<td>' . __("Show Map") . '</td>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
|
|||||||
@@ -189,7 +189,7 @@
|
|||||||
<input class="form-check-input" type="checkbox" name="skipStationCheck" value="1" id="skipStationCheck">
|
<input class="form-check-input" type="checkbox" name="skipStationCheck" value="1" id="skipStationCheck">
|
||||||
<label class="form-check-label" for="skipStationCheck"><span class="badge text-bg-warning"><?= __("DANGER") ?></span> <?= __("Ignore Stationcallsign on import") ?></label>
|
<label class="form-check-label" for="skipStationCheck"><span class="badge text-bg-warning"><?= __("DANGER") ?></span> <?= __("Ignore Stationcallsign on import") ?></label>
|
||||||
</div>
|
</div>
|
||||||
<div class="small form-text text-muted"><?= sprintf(__("If selected, Wavelog will try to import %sall%s QSO's of the ADIF, regardless if they match to the chosen station-location."), '<b>', '</b>'); ?></div>
|
<div class="small form-text text-muted"><?= sprintf(__("If selected, Wavelog will try to import %sall%s QSOs of the ADIF, regardless if they match to the chosen station-location."), '<b>', '</b>'); ?></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -237,7 +237,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<button type="submit" class="btn btn-sm btn-primary" value="Export"><?= __("Export QSO's") ?></button>
|
<button type="submit" class="btn btn-sm btn-primary" value="Export"><?= __("Export QSOs") ?></button>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<br><br>
|
<br><br>
|
||||||
|
|||||||
@@ -147,7 +147,7 @@ function write_activators($activators_array, $band, $mode, $sat, $orbit, $propag
|
|||||||
<td>#</td>
|
<td>#</td>
|
||||||
<td>' . __("Callsign") . '</td>
|
<td>' . __("Callsign") . '</td>
|
||||||
<td>' . __("#QSOs") . '</td>
|
<td>' . __("#QSOs") . '</td>
|
||||||
<td>' . __("Show QSO's") . '</td>
|
<td>' . __("Show QSOs") . '</td>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>';
|
<tbody>';
|
||||||
|
|||||||
@@ -60,7 +60,7 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<th>#</th>
|
<th>#</th>
|
||||||
<th><?= __("Continent"); ?></th>
|
<th><?= __("Continent"); ?></th>
|
||||||
<th><?= __("# of QSO's worked"); ?></th>
|
<th><?= __("# of QSOs worked"); ?></th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody></tbody>
|
<tbody></tbody>
|
||||||
|
|||||||
@@ -194,6 +194,6 @@ if ($qsos->result() != NULL) {
|
|||||||
|
|
||||||
<?php
|
<?php
|
||||||
} else {
|
} else {
|
||||||
echo '<div class="alert alert-danger">' . __("No QSO's were found. It seems you were not active at this time.") . '</div>';
|
echo '<div class="alert alert-danger">' . __("No QSOs were found. It seems you were not active at this time.") . '</div>';
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|||||||
@@ -204,7 +204,7 @@ if ($qsos->result() != NULL) {
|
|||||||
|
|
||||||
<?php
|
<?php
|
||||||
} else {
|
} else {
|
||||||
echo '<div class="alert alert-danger">' . __("No additional QSO's were found. That means they are probably already in the queue.") . '</div>';
|
echo '<div class="alert alert-danger">' . __("No additional QSOs were found. That means they are probably already in the queue.") . '</div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
function echo_qsl_sent_via($method) {
|
function echo_qsl_sent_via($method) {
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
var lang_statistics_operators = "<?= __("Operators")?>";
|
var lang_statistics_operators = "<?= __("Operators")?>";
|
||||||
var lang_statistics_number_of_qso_worked_each_year = "<?= __("Number of QSOs worked each year")?>";
|
var lang_statistics_number_of_qso_worked_each_year = "<?= __("Number of QSOs worked each year")?>";
|
||||||
var lang_statistics_year = "<?= __("Year")?>";
|
var lang_statistics_year = "<?= __("Year")?>";
|
||||||
var lang_statistics_number_of_qso_worked = "<?= __("# of QSO's worked")?>";
|
var lang_statistics_number_of_qso_worked = "<?= __("# of QSOs worked")?>";
|
||||||
var lang_gen_hamradio_mode = "<?= __("Mode")?>";
|
var lang_gen_hamradio_mode = "<?= __("Mode")?>";
|
||||||
var lang_gen_hamradio_band = "<?= __("Band")?>";
|
var lang_gen_hamradio_band = "<?= __("Band")?>";
|
||||||
var lang_gen_hamradio_operator = "<?= __("Operator")?>";
|
var lang_gen_hamradio_operator = "<?= __("Operator")?>";
|
||||||
|
|||||||
@@ -200,7 +200,7 @@ function write_dxcc_timeline($timeline_array, $custom_date_format, $bandselect,
|
|||||||
<td>' . __("Country") . '</td>
|
<td>' . __("Country") . '</td>
|
||||||
<td>' . __("Status") . '</td>
|
<td>' . __("Status") . '</td>
|
||||||
<td>' . __("End Date") . '</td>
|
<td>' . __("End Date") . '</td>
|
||||||
<td>' . __("Show QSO's") . '</td>
|
<td>' . __("Show QSOs") . '</td>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>';
|
<tbody>';
|
||||||
@@ -235,7 +235,7 @@ function write_waja_timeline($timeline_array, $custom_date_format, $bandselect,
|
|||||||
<td>#</td>
|
<td>#</td>
|
||||||
<td>'.__("Date").'</td>
|
<td>'.__("Date").'</td>
|
||||||
<td>'.__("Prefecture").'</td>
|
<td>'.__("Prefecture").'</td>
|
||||||
<td>'.__("Show QSO's").'</td>
|
<td>'.__("Show QSOs").'</td>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>';
|
<tbody>';
|
||||||
@@ -263,7 +263,7 @@ function write_was_timeline($timeline_array, $custom_date_format, $bandselect, $
|
|||||||
<td>#</td>
|
<td>#</td>
|
||||||
<td>' . __("Date") . '</td>
|
<td>' . __("Date") . '</td>
|
||||||
<td>' . __("State") . '</td>
|
<td>' . __("State") . '</td>
|
||||||
<td>' . __("Show QSO's") . '</td>
|
<td>' . __("Show QSOs") . '</td>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>';
|
<tbody>';
|
||||||
@@ -295,7 +295,7 @@ function write_iota_timeline($timeline_array, $custom_date_format, $bandselect,
|
|||||||
<td>'.__("IOTA").'</td>
|
<td>'.__("IOTA").'</td>
|
||||||
<td>'.__("Name").'</td>
|
<td>'.__("Name").'</td>
|
||||||
<td>'.__("Prefix").'</td>
|
<td>'.__("Prefix").'</td>
|
||||||
<td>'.__("Show QSO's").'</td>
|
<td>'.__("Show QSOs").'</td>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>';
|
<tbody>';
|
||||||
@@ -325,7 +325,7 @@ function write_waz_timeline($timeline_array, $custom_date_format, $bandselect, $
|
|||||||
<td>#</td>
|
<td>#</td>
|
||||||
<td>'.__("Date").'</td>
|
<td>'.__("Date").'</td>
|
||||||
<td>'.__("CQ Zone").'</td>
|
<td>'.__("CQ Zone").'</td>
|
||||||
<td>'.__("Show QSO's").'</td>
|
<td>'.__("Show QSOs").'</td>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>';
|
<tbody>';
|
||||||
@@ -354,7 +354,7 @@ function write_vucc_timeline($timeline_array, $custom_date_format, $bandselect,
|
|||||||
<td>'.__("Date").'</td>
|
<td>'.__("Date").'</td>
|
||||||
<td>'.__("Time").'</td>
|
<td>'.__("Time").'</td>
|
||||||
<td>'.__("Gridsquare").'</td>
|
<td>'.__("Gridsquare").'</td>
|
||||||
<td>'.__("Show QSO's").'</td>
|
<td>'.__("Show QSOs").'</td>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>';
|
<tbody>';
|
||||||
|
|||||||
Reference in New Issue
Block a user