diff --git a/application/language/english/qslcard_lang.php b/application/language/english/qslcard_lang.php index f3806dab..daca222c 100644 --- a/application/language/english/qslcard_lang.php +++ b/application/language/english/qslcard_lang.php @@ -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'; diff --git a/application/language/german/qslcard_lang.php b/application/language/german/qslcard_lang.php index ae55a90e..a7360ba2 100644 --- a/application/language/german/qslcard_lang.php +++ b/application/language/german/qslcard_lang.php @@ -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'; diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php index c9f3220c..7a51fcda 100644 --- a/application/views/view_log/qso.php +++ b/application/views/view_log/qso.php @@ -278,7 +278,9 @@

lang->line('qslcard_sent'); ?> - COL_QSLSDATE); echo date($custom_date_format, $timestamp); ?>.

+ COL_QSLSDATE != null) { ?> + COL_QSLSDATE); echo " (".date($custom_date_format, $timestamp).")"; ?>

+ COL_QSL_RCVD == "Y") { ?> @@ -293,7 +295,9 @@

lang->line('qslcard_rcvd'); ?> - COL_QSLRDATE); echo date($custom_date_format, $timestamp); ?>.

+ COL_QSLRDATE != null) { ?> + COL_QSLRDATE); echo " (".date($custom_date_format, $timestamp).")"; ?>

+