- {{ text "Hi," }} + Hi,
- {{ text "this is an automated message from {{domain}}." rerender }} - {{ text "If you didn't upload your key there, please ignore this message." }} + this is an automated message from {{domain}}. + If you didn't upload your key there, please ignore this message.
- {{ text "OpenPGP key: {{primary_fp}}" rerender }} + OpenPGP key: {{primary_fp}}
- {{ text "This key was just uploaded for the first time, and is now published without identity information. If you want to allow others to find this key by e-mail address, please follow this link:" }} + This key was just uploaded for the first time, and is now published without identity information. If you want to allow others to find this key by e-mail address, please follow this link:
- {{ text "You can find more info at {{domain}}/about." rerender }} + You can find more info at {{domain}}/about.
{{base_uri}}
- {{ text "distributing OpenPGP keys since 2019" }}
+ distributing OpenPGP keys since 2019
diff --git a/dist/email-templates/welcome.txt.hbs b/dist/email-templates/welcome.txt.hbs
index 9a4da14..e200391 100644
--- a/dist/email-templates/welcome.txt.hbs
+++ b/dist/email-templates/welcome.txt.hbs
@@ -1,17 +1,19 @@
-{{ text "Hi," }}
+Hi,
-{{ text "this is an automated message from {{domain}}." rerender }}
-{{ text "If you didn't upload your key, please ignore this message." }}
+this is an automated message from {{domain}}.
+If you didn't upload your key, please ignore this message.
-{{ text "OpenPGP key: {{primary_fp}}" rerender }}
+OpenPGP key: {{primary_fp}}
-{{ text "This key was just uploaded for the first time, and is now published without\nidentity information. If you want to allow others to find this key by e-mail\naddress, please follow this link:" }}
+This key was just uploaded for the first time, and is now published without
+identity information. If you want to allow others to find this key by e-mail
+address, please follow this link:
{{uri}}
-{{ text "You can find more info at {{base_uri}}/about" rerender }}
+You can find more info at {{base_uri}}/about
--
{{ base_uri }}
-{{ text "distributing OpenPGP keys since 2019" }}
+distributing OpenPGP keys since 2019
diff --git a/po/hagrid/hagrid.pot b/po/hagrid/hagrid.pot
index 988c778..a3ebc38 100644
--- a/po/hagrid/hagrid.pot
+++ b/po/hagrid/hagrid.pot
@@ -22,11 +22,6 @@ msgctxt "Subject for manage email"
msgid "Manage your key on {domain}"
msgstr ""
-#: src/mail.rs:172
-msgctxt "Subject for welcome email"
-msgid "Your key upload on {domain}"
-msgstr ""
-
#: src/gettext_strings.rs:4
msgid "Error"
msgstr ""
@@ -287,22 +282,6 @@ msgstr ""
msgid "To let others find this key from your email address \"{{userid}}\",\nplease follow the link below:"
msgstr ""
-#: src/gettext_strings.rs:92
-msgid "Your key upload on {{domain}}"
-msgstr ""
-
-#: src/gettext_strings.rs:96
-msgid "If you didn't upload your key there, please ignore this message."
-msgstr ""
-
-#: src/gettext_strings.rs:98
-msgid "This key was just uploaded for the first time, and is now published without identity information. If you want to allow others to find this key by e-mail address, please follow this link:"
-msgstr ""
-
-#: src/gettext_strings.rs:106
-msgid "This key was just uploaded for the first time, and is now published without\nidentity information. If you want to allow others to find this key by e-mail\naddress, please follow this link:"
-msgstr ""
-
#: src/web/manage.rs:103
msgid "This link is invalid or expired"
msgstr ""
diff --git a/src/gettext_strings.rs b/src/gettext_strings.rs
index 5cdb9c9..49f872c 100644
--- a/src/gettext_strings.rs
+++ b/src/gettext_strings.rs
@@ -88,22 +88,4 @@ fn _dummy() {
t!("To let others find this key from your email address \"{{userid}}\",\nplease follow the link below:");
t!("You can find more info at {{base_uri}}/about");
t!("distributing OpenPGP keys since 2019");
-
- t!("Your key upload on {{domain}}");
-
- t!("Hi,");
- t!("this is an automated message from {{domain}}.");
- t!("If you didn't upload your key there, please ignore this message.");
- t!("OpenPGP key: {{primary_fp}}");
- t!("This key was just uploaded for the first time, and is now published without identity information. If you want to allow others to find this key by e-mail address, please follow this link:");
- t!("You can find more info at {{domain}}/about.");
- t!("distributing OpenPGP keys since 2019");
-
- t!("Hi,");
- t!("this is an automated message from {{domain}}.");
- t!("If you didn't upload your key there, please ignore this message.");
- t!("OpenPGP key: {{primary_fp}}");
- t!("This key was just uploaded for the first time, and is now published without\nidentity information. If you want to allow others to find this key by e-mail\naddress, please follow this link:");
- t!("You can find more info at {{base_uri}}/about");
- t!("distributing OpenPGP keys since 2019");
}
diff --git a/src/mail.rs b/src/mail.rs
index 15e0d27..309fab6 100644
--- a/src/mail.rs
+++ b/src/mail.rs
@@ -168,12 +168,7 @@ impl Service {
self.send(
&vec![userid],
- &i18n!(
- i18n.catalog,
- context = "Subject for welcome email",
- "Your key upload on {domain}";
- domain = self.domain
- ),
+ &format!("Your key upload on {domain}", domain = self.domain),
"welcome",
i18n.lang,
ctx,