Merge pull request #5378 from pixelfed/staging

Staging

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)

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',
 ];

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',
 ];

resources/views/emails/confirm_email.blade.php

@@ -11,6 +11,12 @@ Confirm Email
 
 <p>This link expires after 24 hours.</p>
 <br>
+<small>
+  If the link above is not working, please copy the following address into your web browser:
+  <br><br>
+  {{ $verify->url() }}
+</small>
+<br><br>
 
 Thanks,<br>
 <a href="{{ config('app.url') }}">{{ config('pixelfed.domain.app') }}</a>

resources/views/site/contact.blade.php

@@ -10,38 +10,38 @@
     @auth
     <p class="lead">
       @if(config('instance.email') && config('instance.contact.enabled'))
-        You can contact the admins by sending an email to <span class="font-weight-bold">{{config('instance.email')}}</span> or by using the form below.
+        {{__('site.you_can_contact_the_admins')}} {{__('site.by_sending_an_email_to')}} <span class="font-weight-bold">{{config('instance.email')}}</span> {{__('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 <span class="font-weight-bold">{{config('instance.email')}}</span>.
+        {{__('site.you_can_contact_the_admins')}} {{__('site.by_sending_an_email_to')}} <span class="font-weight-bold">{{config('instance.email')}}</span>.
       @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
     </p>
     @if(config('instance.contact.enabled'))
   	<form method="POST">
       @csrf
   		<div class="form-group">
-  			<label for="input1" class="font-weight-bold">Message</label>
+  			<label for="input1" class="font-weight-bold">{{__('site.Message')}}</label>
   			<textarea class="form-control" id="input1" name="message" rows="6" placeholder="" maxlength="500" required>{{old('message')}}</textarea>
   			<span class="form-text text-muted text-right msg-counter">0/500</span>
   		</div>
 		<div class="form-group form-check">
 			<input type="checkbox" class="form-check-input" id="input2" name="request_response">
-			<label class="form-check-label" for="input2">Request response from admins</label>
+			<label class="form-check-label" for="input2">{{__('site.request_response_from_admins')}}</label>
 		</div>
-  		<button type="submit" class="btn btn-primary font-weight-bold py-0">Submit</button>
+  		<button type="submit" class="btn btn-primary font-weight-bold py-0">{{__('site.Submit')}}</button>
   	</form>
     @endif
     @else
     <p class="lead">
       @if(config('instance.email') && config('instance.contact.enabled'))
-        You can contact the admins by sending an email to <span class="font-weight-bold">{{config('instance.email')}}</span> or log in to send a message.
+        {{__('site.you_can_contact_the_admins')}} {{__('site.by_sending_an_email_to')}} <span class="font-weight-bold">{{config('instance.email')}}</span> {{__('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 <span class="font-weight-bold">{{config('instance.email')}}</span>.
+        {{__('site.you_can_contact_the_admins')}} {{__('site.by_sending_an_email_to')}} <span class="font-weight-bold">{{config('instance.email')}}</span>.
       @endif
     </p>
     @endauth