From c392cda2e7aec757decca80deecfb09fde611f05 Mon Sep 17 00:00:00 2001 From: "root (Deneir)" Date: Tue, 12 Nov 2024 20:39:14 +0100 Subject: [PATCH 1/3] internationalization of site/contact --- resources/lang/de/site.php | 12 ++++++++++++ resources/lang/en/site.php | 11 +++++++++++ resources/views/site/contact.blade.php | 20 ++++++++++---------- 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/resources/lang/de/site.php b/resources/lang/de/site.php index 92f81e03b..d820b0cc6 100644 --- a/resources/lang/de/site.php +++ b/resources/lang/de/site.php @@ -16,4 +16,16 @@ return [ 'contact-us' => 'Kontaktiere uns', 'places' => 'Orte', 'profiles' => 'Profile', + + // site/contact + 'you_can_contact_the_admins' => 'Du kannst die Administration kontaktieren, indem du', + 'by_using_the_form_below' => 'das folgende Formular verwendest', + 'or' => 'oder', + 'by_sending_an_email_to' => 'eine E-Mail sendest an', + 'the_admins_have_not_set_a_contact_email_address' => 'Die Administration hat keine Kontakt-Adresse angegeben', + 'Message' => 'Nachricht', + 'request_response_from_admins' => 'Um Antwort der Administration bitten', + 'Submit' => 'Absenden', + 'log_in_to_send_a_message' => 'melde dich an, um eine Nachricht zu senden', + 'Please' => 'Bitte', ]; diff --git a/resources/lang/en/site.php b/resources/lang/en/site.php index bb8a408ba..b06c5dcdd 100644 --- a/resources/lang/en/site.php +++ b/resources/lang/en/site.php @@ -17,4 +17,15 @@ return [ 'places' => 'Places', 'profiles' => 'Profiles', + // site/contact + 'you_can_contact_the_admins' => 'You can contact the admins', + 'by_using_the_form_below' => 'by using the form below', + 'or' => 'or', + 'by_sending_an_email_to' => 'by sending an email to', + 'the_admins_have_not_set_a_contact_email_address' => 'The admins have not set a contact email address', + 'Message' => 'Message', + 'request_response_from_admins' => 'Request response from admins', + 'Submit' => 'Submit', + 'log_in_to_send_a_message' => 'log in to send a message', + 'Please' => 'Please', ]; diff --git a/resources/views/site/contact.blade.php b/resources/views/site/contact.blade.php index 984752f30..2ea96554e 100644 --- a/resources/views/site/contact.blade.php +++ b/resources/views/site/contact.blade.php @@ -10,38 +10,38 @@ @auth

@if(config('instance.email') && config('instance.contact.enabled')) - You can contact the admins by sending an email to {{config('instance.email')}} or by using the form below. + {{__('site.you_can_contact_the_admins')}} {{__('site.by_sending_an_email_to')}} {{config('instance.email')}} {{__('site.or')}} {{__('site.by_using_the_form_below')}}. @elseif(config('instance.email') && !config('instance.contact.enabled')) - You can contact the admins by sending an email to {{config('instance.email')}}. + {{__('site.you_can_contact_the_admins')}} {{__('site.by_sending_an_email_to')}} {{config('instance.email')}}. @elseif(!config('instance.email') && config('instance.contact.enabled')) - You can contact the admins by using the form below. + {{__('site.you_can_contact_the_admins')}} {{__('site.by_using_the_form_below')}}. @else - The admins have not set a contact email address. + {{__('the_admins_have_not_set_a_contact_email_address')}} @endif

@if(config('instance.contact.enabled'))
@csrf
- + 0/500
- +
- +
@endif @else

@if(config('instance.email') && config('instance.contact.enabled')) - You can contact the admins by sending an email to {{config('instance.email')}} or log in to send a message. + {{__('site.you_can_contact_the_admins')}} {{__('site.by_sending_an_email_to')}} {{config('instance.email')}} {{__('site.or')}} {{__('site.log_in_to_send_a_message')}}. @elseif (!config('instance.email') && config('instance.contact.enabled')) - The admins have not set a contact email address. Please log in to send a message. + {{__('the_admins_have_not_set_a_contact_email_address')}}. {{__('site.Please')}} {{__('site.log_in_to_send_a_message')}}. @elseif (config('instance.email') && !config('instance.contact.enabled')) - You can contact the admins by sending an email to {{config('instance.email')}}. + {{__('site.you_can_contact_the_admins')}} {{__('site.by_sending_an_email_to')}} {{config('instance.email')}}. @endif

@endauth From 45986707149ea2abdaaee0381731f3158dc758bc Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 5 Dec 2024 23:59:10 -0700 Subject: [PATCH 2/3] Update confirm email template, add plaintext link. Fixes #5375 --- resources/views/emails/confirm_email.blade.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/resources/views/emails/confirm_email.blade.php b/resources/views/emails/confirm_email.blade.php index ee8dcd2db..17b5e8318 100644 --- a/resources/views/emails/confirm_email.blade.php +++ b/resources/views/emails/confirm_email.blade.php @@ -11,6 +11,12 @@ Confirm Email

This link expires after 24 hours.


+ + If the link above is not working, please copy the following address into your web browser: +

+ {{ $verify->url() }} + +

Thanks,
{{ config('pixelfed.domain.app') }} From 222d577c91430d81554c7f9ccf841b9da1e6346a Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 5 Dec 2024 23:59:37 -0700 Subject: [PATCH 3/3] Update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 510e7e813..8c23f2966 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ - Update AutolinkService, optimize lookups ([eac2c196](https://github.com/pixelfed/pixelfed/commit/eac2c196)) - Update DirectMessageController, remove 72h limit for admins ([639df410](https://github.com/pixelfed/pixelfed/commit/639df410)) - Update StatusService, fix newlines ([56c07b7a](https://github.com/pixelfed/pixelfed/commit/56c07b7a)) -- ([](https://github.com/pixelfed/pixelfed/commit/)) +- Update confirm email template, add plaintext link. Fixes #5375 ([45986707](https://github.com/pixelfed/pixelfed/commit/45986707)) - ([](https://github.com/pixelfed/pixelfed/commit/)) ## [v0.12.4 (2024-11-08)](https://github.com/pixelfed/pixelfed/compare/v0.12.4...dev)