From 77f9c1a1fc5af5e3423b4cb36a0dae52d2090791 Mon Sep 17 00:00:00 2001 From: Keegan Rankin Date: Mon, 20 May 2024 12:59:56 -0700 Subject: [PATCH] Apply automatic formatting updates to automated email content --- config/system.site.yml | 1 + config/user.mail.yml | 104 +++------------------------------- config/views.view.article.yml | 2 +- 3 files changed, 11 insertions(+), 96 deletions(-) diff --git a/config/system.site.yml b/config/system.site.yml index 1d3d44a..7cd3352 100644 --- a/config/system.site.yml +++ b/config/system.site.yml @@ -12,3 +12,4 @@ page: admin_compact_mode: false weight_select_max: 100 default_langcode: en +mail_notification: '' diff --git a/config/user.mail.yml b/config/user.mail.yml index bf425c0..6bf98bf 100644 --- a/config/user.mail.yml +++ b/config/user.mail.yml @@ -3,114 +3,28 @@ _core: langcode: en cancel_confirm: subject: 'Account cancellation request for [user:display-name] at [site:name]' - body: |- - [user:display-name] - - A request to cancel your account has been made at [site:name]. - - You may now cancel your account on [site:url-brief] by clicking this link or copying and pasting it into your browser: - - [user:cancel-url] - - NOTE: The cancellation of your account is not reversible. - - This link expires in one day and nothing will happen if it is not used. - - -- [site:name] team + body: "[user:display-name]\r\n\r\nA request to cancel your account has been made at [site:name].\r\n\r\nYou may now cancel your account on [site:url-brief] by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:cancel-url]\r\n\r\nNOTE: The cancellation of your account is not reversible.\r\n\r\nThis link expires in one day and nothing will happen if it is not used.\r\n\r\n-- [site:name] team" password_reset: subject: 'Replacement login information for [user:display-name] at [site:name]' - body: |- - [user:display-name], - - A request to reset the password for your account has been made at [site:name]. - - You may now log in by clicking this link or copying and pasting it into your browser: - - [user:one-time-login-url] - - This link can only be used once to log in and will lead you to a page where you can set your password. It expires after one day and nothing will happen if it's not used. - - -- [site:name] team + body: "[user:display-name],\r\n\r\nA request to reset the password for your account has been made at [site:name].\r\n\r\nYou may now log in by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis link can only be used once to log in and will lead you to a page where you can set your password. It expires after one day and nothing will happen if it's not used.\r\n\r\n-- [site:name] team" register_admin_created: subject: 'An administrator created an account for you at [site:name]' - body: |- - [user:display-name], - - A site administrator at [site:name] has created an account for you. You may now log in by clicking this link or copying and pasting it into your browser: - - [user:one-time-login-url] - - This link can only be used once to log in and will lead you to a page where you can set your password. - - After setting your password, you will be able to log in at [site:login-url] in the future using: - - username: [user:name] - password: Your password - - -- [site:name] team + body: "[user:display-name],\r\n\r\nA site administrator at [site:name] has created an account for you. You may now log in by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis link can only be used once to log in and will lead you to a page where you can set your password.\r\n\r\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\r\n\r\nusername: [user:name]\r\npassword: Your password\r\n\r\n-- [site:name] team" register_no_approval_required: subject: 'Account details for [user:display-name] at [site:name]' - body: |- - [user:display-name], - - Thank you for registering at [site:name]. You may now log in by clicking this link or copying and pasting it into your browser: - - [user:one-time-login-url] - - This link can only be used once to log in and will lead you to a page where you can set your password. - - After setting your password, you will be able to log in at [site:login-url] in the future using: - - username: [user:name] - password: Your password - - -- [site:name] team + body: "[user:display-name],\r\n\r\nThank you for registering at [site:name]. You may now log in by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis link can only be used once to log in and will lead you to a page where you can set your password.\r\n\r\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\r\n\r\nusername: [user:name]\r\npassword: Your password\r\n\r\n-- [site:name] team" register_pending_approval: subject: 'Account details for [user:display-name] at [site:name] (pending admin approval)' - body: |- - [user:display-name], - - Thank you for registering at [site:name]. Your application for an account is currently pending approval. Once it has been approved, you will receive another email containing information about how to log in, set your password, and other details. - - -- [site:name] team + body: "[user:display-name],\r\n\r\nThank you for registering at [site:name]. Your application for an account is currently pending approval. Once it has been approved, you will receive another email containing information about how to log in, set your password, and other details.\r\n\r\n-- [site:name] team" register_pending_approval_admin: subject: 'Account details for [user:display-name] at [site:name] (pending admin approval)' - body: |- - [user:display-name] has applied for an account. - - [user:edit-url] + body: "[user:display-name] has applied for an account.\r\n\r\n[user:edit-url]" status_activated: subject: 'Account details for [user:display-name] at [site:name] (approved)' - body: |- - [user:display-name], - - Your account at [site:name] has been activated. - - You may now log in by clicking this link or copying and pasting it into your browser: - - [user:one-time-login-url] - - This link can only be used once to log in and will lead you to a page where you can set your password. - - After setting your password, you will be able to log in at [site:login-url] in the future using: - - username: [user:account-name] - password: Your password - - -- [site:name] team + body: "[user:display-name],\r\n\r\nYour account at [site:name] has been activated.\r\n\r\nYou may now log in by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis link can only be used once to log in and will lead you to a page where you can set your password.\r\n\r\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\r\n\r\nusername: [user:account-name]\r\npassword: Your password\r\n\r\n-- [site:name] team" status_blocked: subject: 'Account details for [user:display-name] at [site:name] (blocked)' - body: |- - [user:display-name], - - Your account on [site:name] has been blocked. - - -- [site:name] team + body: "[user:display-name],\r\n\r\nYour account on [site:name] has been blocked.\r\n\r\n-- [site:name] team" status_canceled: subject: 'Account details for [user:display-name] at [site:name] (canceled)' - body: |- - [user:display-name], - - Your account on [site:name] has been canceled. - - -- [site:name] team \ No newline at end of file + body: "[user:display-name],\r\n\r\nYour account on [site:name] has been canceled.\r\n\r\n-- [site:name] team" diff --git a/config/views.view.article.yml b/config/views.view.article.yml index 2ca6666..f6e1879 100644 --- a/config/views.view.article.yml +++ b/config/views.view.article.yml @@ -234,7 +234,7 @@ display: type: normal title: Blog description: '' - weight: -47 + weight: -45 enabled: true expanded: false menu_name: main