kotovalexarian-likes-gitlab
/
hagrid-keyserver--hagrid
mirror of https://gitlab.com/hagrid-keyserver/hagrid.git
1
0
Fork 0
Code Releases Activity

i18n: don't translate welcome message, we don't get a locale anyways

This commit is contained in:
Vincent Breitmoser 2019-11-02 18:51:07 +01:00
parent 58aae5f8f8
commit 9e62a001ab
No known key found for this signature in database
GPG Key ID: 7BD18320DEADFA11
5 changed files with 18 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dist/email-templates/welcome.htm.hbs vendored
View File

@ -2,25 +2,25 @@
<html lang="{{lang}}"> <html lang="{{lang}}">
<head> <head>
<meta charset=utf-8> <meta charset=utf-8>
<title>{{ text "Your key upload on {{domain}}" rerender }}</title> <title>Your key upload on {{domain}}</title>
</head> </head>
<body> <body>
<p> <p>
{{ text "Hi," }} Hi,
<p> <p>
{{ text "this is an automated message from <a href=\"{{base_uri}}\" style=\"text-decoration:none; color: #333\">{{domain}}</a>." rerender }} this is an automated message from <a href="{{base_uri}}" style="text-decoration:none; color: #333">{{domain}}</a>.
{{ text "If you didn't upload your key there, please ignore this message." }} If you didn't upload your key there, please ignore this message.
<p> <p>
{{ text "OpenPGP key: <tt>{{primary_fp}}</tt>" rerender }} OpenPGP key: <tt>{{primary_fp}}</tt>
<p> <p>
{{ 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:
<p> <p>
<a rel="nofollow" href="{{uri}}">{{uri}}</a> <a rel="nofollow" href="{{uri}}">{{uri}}</a>
<p> <p>
{{ text "You can find more info at <a href=\"{{base_uri}}/about\">{{domain}}/about</a>." rerender }} You can find more info at <a href="{{base_uri}}/about">{{domain}}/about</a>.
<p> <p>
<a href="{{base_uri}}">{{base_uri}}</a><br /> <a href="{{base_uri}}">{{base_uri}}</a><br />
{{ text "distributing OpenPGP keys since 2019" }} distributing OpenPGP keys since 2019
</body> </body>
</html> </html>

16
dist/email-templates/welcome.txt.hbs vendored
View File

@ -1,17 +1,19 @@
{{ text "Hi," }} Hi,
{{ text "this is an automated message from {{domain}}." rerender }} this is an automated message from {{domain}}.
{{ text "If you didn't upload your key, please ignore this message." }} 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}} {{uri}}
{{ text "You can find more info at {{base_uri}}/about" rerender }} You can find more info at {{base_uri}}/about
-- --
{{ base_uri }} {{ base_uri }}
{{ text "distributing OpenPGP keys since 2019" }} distributing OpenPGP keys since 2019

21
po/hagrid/hagrid.pot
View File

@ -22,11 +22,6 @@ msgctxt "Subject for manage email"
msgid "Manage your key on {domain}" msgid "Manage your key on {domain}"
msgstr "" msgstr ""
#: src/mail.rs:172
msgctxt "Subject for welcome email"
msgid "Your key upload on {domain}"
msgstr ""
#: src/gettext_strings.rs:4 #: src/gettext_strings.rs:4
msgid "Error" msgid "Error"
msgstr "" msgstr ""
@ -287,22 +282,6 @@ msgstr ""
msgid "To let others find this key from your email address \"{{userid}}\",\nplease follow the link below:" msgid "To let others find this key from your email address \"{{userid}}\",\nplease follow the link below:"
msgstr "" 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 #: src/web/manage.rs:103
msgid "This link is invalid or expired" msgid "This link is invalid or expired"
msgstr "" msgstr ""

18
src/gettext_strings.rs
View File

@ -88,22 +88,4 @@ fn _dummy() {
t!("To let others find this key from your email address \"{{userid}}\",\nplease follow the link below:"); 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!("You can find more info at {{base_uri}}/about");
t!("distributing OpenPGP keys since 2019"); t!("distributing OpenPGP keys since 2019");
t!("Your key upload on {{domain}}");
t!("Hi,");
t!("this is an automated message from <a href=\"{{base_uri}}\" style=\"text-decoration:none; color: #333\">{{domain}}</a>.");
t!("If you didn't upload your key there, please ignore this message.");
t!("OpenPGP key: <tt>{{primary_fp}}</tt>");
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 <a href=\"{{base_uri}}/about\">{{domain}}/about</a>.");
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");
} }

7
src/mail.rs
View File

@ -168,12 +168,7 @@ impl Service {
self.send( self.send(
&vec![userid], &vec![userid],
&i18n!( &format!("Your key upload on {domain}", domain = self.domain),
i18n.catalog,
context = "Subject for welcome email",
"Your key upload on {domain}";
domain = self.domain
),
"welcome", "welcome",
i18n.lang, i18n.lang,
ctx, ctx,