Merge pull request #1852 from phl0/hideUnknownQslDates

Only show QSL dates if those are set
这个提交包含在:
Peter Goodhall 2022-12-22 11:22:51 +00:00 提交者 GitHub
当前提交 aec9e96748
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 3 个文件被更改,包括 26 次插入22 次删除

查看文件

@ -7,16 +7,16 @@ $lang['qslcard_string_your_are_using'] = 'You are using';
$lang['qslcard_string_disk_space'] = 'of disk space to store QSL Card assets';
$lang['qslcard_info'] = 'QSL Info';
$lang['qslcard_sent'] = 'QSL Card has been sent on';
$lang['qslcard_sent_bureau'] = 'QSL Card has been sent via the bureau on';
$lang['qslcard_sent_direct'] = 'QSL Card has been sent via direct on';
$lang['qslcard_sent_electronic'] = 'QSL Card has been sent electronically on';
$lang['qslcard_sent_manager'] = 'QSL Card has been sent via manager on';
$lang['qslcard_rcvd'] = 'QSL Card has been received on';
$lang['qslcard_rcvd_bureau'] = 'QSL Card has been received via the bureau on';
$lang['qslcard_rcvd_direct'] = 'QSL Card has been received via direct on';
$lang['qslcard_rcvd_electronic'] = 'QSL Card has been received electronically on';
$lang['qslcard_rcvd_manager'] = 'QSL Card has been received via manager on';
$lang['qslcard_sent'] = 'QSL Card has been sent';
$lang['qslcard_sent_bureau'] = 'QSL Card has been sent via the bureau';
$lang['qslcard_sent_direct'] = 'QSL Card has been sent via direct';
$lang['qslcard_sent_electronic'] = 'QSL Card has been sent electronically';
$lang['qslcard_sent_manager'] = 'QSL Card has been sent via manager';
$lang['qslcard_rcvd'] = 'QSL Card has been received';
$lang['qslcard_rcvd_bureau'] = 'QSL Card has been received via the bureau';
$lang['qslcard_rcvd_direct'] = 'QSL Card has been received via direct';
$lang['qslcard_rcvd_electronic'] = 'QSL Card has been received electronically';
$lang['qslcard_rcvd_manager'] = 'QSL Card has been received via manager';
$lang['qslcard_upload_front'] = 'Uploaded QSL Card front image';
$lang['qslcard_upload_back'] = 'Uploaded QSL Card back image';

查看文件

@ -6,16 +6,16 @@ defined('BASEPATH') OR exit('Direkter Zugriff auf Skripte ist nicht erlaubt');
$lang['qslcard_string_your_are_using'] = 'Du benutzt';
$lang['qslcard_string_disk_space'] = 'an Speicherplatz, um QSL-Karteninformationen zu speichern';
$lang['qslcard_info'] = 'QSL Info';
$lang['qslcard_sent'] = 'QSL Karte wurde gesendet am';
$lang['qslcard_sent_bureau'] = 'QSL Karte wurde via Büro gesendet am';
$lang['qslcard_sent_direct'] = 'QSL Karte wurde direkt gesendet am';
$lang['qslcard_sent_electronic'] = 'QSL Karte wurde elektronisch gesendet am';
$lang['qslcard_sent_manager'] = 'QSL Karte wurde via Manager gesendet am';
$lang['qslcard_rcvd'] = 'QSL Karte wurde empfangen am';
$lang['qslcard_rcvd_bureau'] = 'QSL Karte wurde via Büro empfangen am';
$lang['qslcard_rcvd_direct'] = 'QSL Karte wurde direkt empfangen am';
$lang['qslcard_rcvd_electronic'] = 'QSL Karte wurde elektronisch empfangen am';
$lang['qslcard_rcvd_manager'] = 'QSL Karte wurde via Manager empfangen am';
$lang['qslcard_sent'] = 'QSL Karte wurde gesendet';
$lang['qslcard_sent_bureau'] = 'QSL Karte wurde via Büro gesendet';
$lang['qslcard_sent_direct'] = 'QSL Karte wurde direkt gesendet';
$lang['qslcard_sent_electronic'] = 'QSL Karte wurde elektronisch gesendet';
$lang['qslcard_sent_manager'] = 'QSL Karte wurde via Manager gesendet';
$lang['qslcard_rcvd'] = 'QSL Karte wurde empfangen';
$lang['qslcard_rcvd_bureau'] = 'QSL Karte wurde via Büro empfangen';
$lang['qslcard_rcvd_direct'] = 'QSL Karte wurde direkt empfangen';
$lang['qslcard_rcvd_electronic'] = 'QSL Karte wurde elektronisch empfangen';
$lang['qslcard_rcvd_manager'] = 'QSL Karte wurde via Manager empfangen';
$lang['qslcard_upload_front'] = 'QSL Kartenfront hochgeladen';
$lang['qslcard_upload_back'] = 'QSL Kartenrückseite hochgeladen';

查看文件

@ -278,7 +278,9 @@
<?php } else { ?>
<p><?php echo $this->lang->line('qslcard_sent'); ?>
<?php } ?>
<?php $timestamp = strtotime($row->COL_QSLSDATE); echo date($custom_date_format, $timestamp); ?>.</p>
<?php if ($row->COL_QSLSDATE != null) { ?>
<?php $timestamp = strtotime($row->COL_QSLSDATE); echo " (".date($custom_date_format, $timestamp).")"; ?></p>
<?php } ?>
<?php } ?>
<?php if($row->COL_QSL_RCVD == "Y") { ?>
@ -293,7 +295,9 @@
<?php } else { ?>
<p><?php echo $this->lang->line('qslcard_rcvd'); ?>
<?php } ?>
<?php $timestamp = strtotime($row->COL_QSLRDATE); echo date($custom_date_format, $timestamp); ?>.</p>
<?php if ($row->COL_QSLRDATE != null) { ?>
<?php $timestamp = strtotime($row->COL_QSLRDATE); echo " (".date($custom_date_format, $timestamp).")"; ?></p>
<?php } ?>
<?php } ?>
<?php } ?>