From f7c172ca3c01cb8f0acbb651c19d55d99373eb4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Gonz=C3=A1lez?= Date: Thu, 3 Sep 2015 01:13:28 +0200 Subject: [PATCH 1/5] small German language improvements --- resources/lang/de/texts.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/lang/de/texts.php b/resources/lang/de/texts.php index 76457d1a8901..9c9ae49aad4e 100644 --- a/resources/lang/de/texts.php +++ b/resources/lang/de/texts.php @@ -264,12 +264,12 @@ return array( 'email_from' => 'Das InvoiceNinja Team', 'user_email_footer' => 'Um deine E-Mail-Benachrichtigungen anzupassen besuche bitte '.SITE_URL.'/company/notifications', 'invoice_link_message' => 'Um deine Kundenrechnung anzuschauen, klicke auf den folgenden Link:', - 'notification_invoice_paid_subject' => 'Die Rechnung :invoice wurde von :client bezahlt', - 'notification_invoice_sent_subject' => 'Die Rechnung :invoice wurde an :client versendet', - 'notification_invoice_viewed_subject' => 'Die Rechnung :invoice wurde von :client angeschaut', + 'notification_invoice_paid_subject' => 'Die Rechnung :invoice wurde von :client bezahlt.', + 'notification_invoice_sent_subject' => 'Die Rechnung :invoice wurde an :client versandt.', + 'notification_invoice_viewed_subject' => 'Die Rechnung :invoice wurde von :client angeschaut.', 'notification_invoice_paid' => 'Eine Zahlung von :amount wurde von :client bezüglich Rechnung :invoice getätigt.', - 'notification_invoice_sent' => 'Dem folgenden Kunden :client wurde die Rechnung :invoice über :amount zugesendet.', - 'notification_invoice_viewed' => 'Der folgende Kunde :client hat sich Rechnung :invoice über :amount angesehen.', + 'notification_invoice_sent' => 'Dem Kunden :client wurde die Rechnung :invoice über :amount versandt.', + 'notification_invoice_viewed' => 'Der Kunde :client hat sich die Rechnung :invoice über :amount angesehen.', 'reset_password' => 'Du kannst dein Passwort zurücksetzen, indem du auf den folgenden Link klickst:', 'reset_password_footer' => 'Wenn du das Zurücksetzen des Passworts nicht beantragt hast, benachrichtige bitte unseren Support: ' . CONTACT_EMAIL, From af837cba22f19277c873968d31aa6bc654553856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Gonz=C3=A1lez?= Date: Thu, 3 Sep 2015 01:45:05 +0200 Subject: [PATCH 2/5] better term for "set now" "set now" means "I want to set it now". "set to now" means "I want to set it (the time) to *now*" --- resources/lang/en/texts.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 5fe8eaddabe3..9f2776e881b2 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -715,7 +715,7 @@ return array( 'update_address' => 'Update Address', 'update_address_help' => 'Update client\'s address with provided details', 'times' => 'Times', - 'set_now' => 'Set now', + 'set_now' => 'Set to now', 'dark_mode' => 'Dark Mode', 'dark_mode_help' => 'Show white text on black background', 'add_to_invoice' => 'Add to invoice :invoice', From 54e6d9c61735f99c1b932cbcd62152052d21911d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Gonz=C3=A1lez?= Date: Thu, 3 Sep 2015 01:46:27 +0200 Subject: [PATCH 3/5] emphasize "now" in "set to now" --- resources/lang/en/texts.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 9f2776e881b2..0e56c326d755 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -715,7 +715,7 @@ return array( 'update_address' => 'Update Address', 'update_address_help' => 'Update client\'s address with provided details', 'times' => 'Times', - 'set_now' => 'Set to now', + 'set_now' => 'Set to now', 'dark_mode' => 'Dark Mode', 'dark_mode_help' => 'Show white text on black background', 'add_to_invoice' => 'Add to invoice :invoice', From 3fcf1ad833654c156ce3e38eba4cefed3052fc33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Gonz=C3=A1lez?= Date: Thu, 3 Sep 2015 02:08:37 +0200 Subject: [PATCH 4/5] German translation updates --- resources/lang/de/texts.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/lang/de/texts.php b/resources/lang/de/texts.php index 76457d1a8901..6fa07777b537 100644 --- a/resources/lang/de/texts.php +++ b/resources/lang/de/texts.php @@ -628,7 +628,7 @@ return array( 'processed_updates' => 'Update erfolgreich abgeschlossen', 'tasks' => 'Zeiterfassung', 'new_task' => 'Neue Aufgabe', - 'start_time' => 'Start Time', + 'start_time' => 'Startzeit', 'created_task' => 'Aufgabe erfolgreich erstellt', 'updated_task' => 'Aufgabe erfolgreich aktualisiert', 'edit_task' => 'Aufgabe bearbeiten', @@ -715,7 +715,7 @@ return array( 'update_address' => 'Adresse Aktualisieren', 'update_address_help' => 'Kundenadresse mit den gemachten Angaben aktualisieren', 'times' => 'Zeiten', - 'set_now' => 'Jetzt setzen', + 'set_now' => 'Auf Jetzt setzen', 'dark_mode' => 'Dunkler Modus', 'dark_mode_help' => 'Weißer Text auf schwarzem Hintergrund anzeigen', 'add_to_invoice' => 'Zur Rechnung :invoice hinzufügen', From d30f14d5d3c3506201a5315f65c3581b9197d102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Gonz=C3=A1lez?= Date: Thu, 3 Sep 2015 02:50:32 +0200 Subject: [PATCH 5/5] don't escape confirmation mail templates. This patch would fix at least a part of issue #381 and #420, if it would be applied to all necessary blade files. This could be a security problem as user now maybe can enter malicious code? I am not smart enough to know these php internals. --- resources/views/emails/confirm_text.blade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/emails/confirm_text.blade.php b/resources/views/emails/confirm_text.blade.php index 652815a1f94f..7809cbfce1f7 100644 --- a/resources/views/emails/confirm_text.blade.php +++ b/resources/views/emails/confirm_text.blade.php @@ -1,7 +1,7 @@ -{{ trans('texts.confirmation_header') }} +{!! trans('texts.confirmation_header') !!} -{{ $invitationMessage . trans('texts.confirmation_message') }} +{!! $invitationMessage . trans('texts.confirmation_message') !!} {!! URL::to("user/confirm/{$user->confirmation_code}") !!} -{{ trans('texts.email_signature') }} -{{ trans('texts.email_from') }} \ No newline at end of file +{!! trans('texts.email_signature') !!} +{!! trans('texts.email_from') !!}