some rewording and fixing typos

attachment_tmpl.html

@@ -25,17 +25,16 @@
             <span>Password: </span><span style="color: rgb(89, 89, 89);">%PASSWORD%</span><br />
         </span>
         %ENDPASSWORD%
-        %BEGINVALIDUNTIL%
         <span style="grid-column: 2 / span 3; font-size: small;">
             <span>Available until: </span><span style="color: rgb(89, 89, 89);">%VALIDUNTIL%, after which the download link will expire</span><br />
         </span>
-        %ENDVALIDUNTIL%
         <br />
     </div>
     <div style="margin-top: 15px; color: rgb(100,100,100); font-size: 11pt; margin-left: 15px">
         <p>
             Attachments hosted on %SERVERURL% and subject to the server provider's terms of service and privacy policy.
-            <b>The sender may delete the Attachment at any point; download and save the file to retain a local copy.</b>
+            <b>Beyond the attachment becoming unavailable after the expiration date, the sender may delete the attachment
+                at any point; download and save the file to retain a local copy.</b>
             Be careful who's attachments you trust, especially with executables and office documents.
         </p>
     </div>

hooks.php

@@ -582,7 +582,7 @@ public function upload(array $data): array
         $tmpl = str_replace("%ICONBLOB%", base64_encode($mime_icon), $tmpl);
         $tmpl = str_replace("%CHECKSUM%", strtoupper($checksum) . " " . hash_file($checksum, $data["path"]), $tmpl);
 
-        $icon_rows = 4;
+        $icon_rows = 5;
         if (isset($form_params["password"])){
             $tmpl = str_replace("%PASSWORD%", $form_params["password"], $tmpl);
             $tmpl = str_replace("%BEGINPASSWORD%", "", $tmpl);
@@ -594,11 +594,8 @@ public function upload(array $data): array
 
         if (isset($form_params["expireDate"]) && isset($expire_date)){
             $tmpl = str_replace("%VALIDUNTIL%", $expire_date->format("Y-m-d"), $tmpl);
-            $tmpl = str_replace("%BEGINVALIDUNTIL%", "", $tmpl);
-            $tmpl = str_replace("%ENDVALIDUNTIL%", "", $tmpl);
-            $icon_rows++;
         } else {
-            $tmpl = preg_replace("/%BEGINVALIDUNTIL%.*?%ENDVALIDUNTIL%/", "", $tmpl);
+            $tmpl = str_replace("%VALIDUNTIL%", "deletion", $tmpl);
         }
 
         $tmpl = str_replace("%ICONSPAN%", $icon_rows, $tmpl);

l10n/en_US.inc

@@ -9,9 +9,9 @@ $labels['login_and_link_file'] = "Login and share Link";
 
 $labels['file_too_big'] = "File Too Big";
 
-$labels['file_too_big_not_logged_in_explain'] = "The file is larger then %limit% and can't be attached. After connecting the your Nextcloud account below, you may send it anyway, by sharing it as file-link instead.";
+$labels['file_too_big_not_logged_in_explain'] = "The file is larger than %limit% and can't be attached. After connecting to your Nextcloud account below, you may send it anyway, by sharing it as file-link instead.";
 
-$labels['file_too_big_explain'] = "The file is larger then %limit% and can't be attached. You can share it as Nextcloud file-link instead.";
+$labels['file_too_big_explain'] = "The file is larger than %limit% and can't be attached. You can share it as Nextcloud file-link instead.";
 
 $labels['file_big'] = "How do You Want to Share the File?";
 $labels['file_big_explain'] = "The file is quite large: %size%. You can keep your emails small by sharing it as a file-link instead.";
@@ -20,17 +20,17 @@ $labels['file_big_not_logged_in_explain'] = "The file is quite large: %size%. Yo
 $labels['link_file'] = "Upload and share link";
 $labels['attach'] = "Attach copy";
 
-$labels['upload_success_link_inserted'] = "successfully uploaded to Nextcloud and link inserted";
+$labels['upload_success_link_inserted'] = "Successfully uploaded to Nextcloud and link inserted";
 
 $labels['upload_failed_title'] = "Nextcloud Upload Failed";
 $labels['upload_warning_title'] = "Nextcloud Warning";
 $labels['upload_failed'] = "Nextcloud Upload Failed:";
 
 $labels['delete_ok'] = "File deleted from Nextcloud successfully";
-$labels['delete_error_explain'] = "File deletion failed with the following reason code: <b>%reason%</b>. If you want to ignore the error you can delete the file from the attachment list anyway.";
+$labels['delete_error_explain'] = "File deletion failed with the following reason code: <b>%reason%</b>. If you want to ignore the error, you can delete the file from the attachment list anyway.";
 $labels['remove_attachment'] = "Remove Nextcloud Attachment";
 $labels['remove_from_list'] = "Ignore and remove from list";
-$labels['remove_from_nextcloud_question'] = "This is a Nextcloud attachment. Do want to delete it from Nextcloud as well? However you will still need to remove the attachment from the message text yourself.";
+$labels['remove_from_nextcloud_question'] = "This is a Nextcloud attachment. Do want to delete it from Nextcloud as well? However, you will still need to remove the attachment from the message text yourself.";
 $labels['remove_from_nextcloud'] = "Remove from Nextcloud";
 $labels['keep_in_nextcloud'] = "Keep in Nextcloud, but remove from list";