- Aur-dev - lists.archlinux.org

[PATCH v3 1/2] Support smtplib for sending emails
by Lukas Fleischer 10 Feb '20

10 Feb '20

Support mail delivery without a local MTA. Instead, an SMTP server can now be configured using the smtp-server option in the [notifications] section. In order to use this option, the value of the sendmail option must be empty. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- Reintroduce the option to use a local sendmail binary (needed for the test suite) and only use smtplib if no such binary is configured. aurweb/scripts/notify.py | 22 ++++++++++++++++++---- conf/config.defaults | 3 ++- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/aurweb/scripts/notify.py b/aurweb/scripts/notify.py index b0f218b..941187e 100755 --- a/aurweb/scripts/notify.py +++ b/aurweb/scripts/notify.py @@ -1,6 +1,8 @@ #!/usr/bin/env python3 import email.mime.text +import email.utils +import smtplib import subprocess import sys import textwrap @@ -63,7 +65,6 @@ class Notification: return body.rstrip() def send(self): - sendmail = aurweb.config.get('notifications', 'sendmail') sender = aurweb.config.get('notifications', 'sender') reply_to = aurweb.config.get('notifications', 'reply-to') reason = self.__class__.__name__ @@ -79,13 +80,26 @@ class Notification: msg['Reply-to'] = reply_to msg['To'] = to msg['X-AUR-Reason'] = reason + msg['Date'] = email.utils.formatdate(localtime=True) for key, value in self.get_headers().items(): msg[key] = value - p = subprocess.Popen([sendmail, '-t', '-oi'], - stdin=subprocess.PIPE) - p.communicate(msg.as_bytes()) + sendmail = aurweb.config.get('notifications', 'sendmail') + if sendmail: + # send email using the sendmail binary specified in the + # configuration file + p = subprocess.Popen([sendmail, '-t', '-oi'], + stdin=subprocess.PIPE) + p.communicate(msg.as_bytes()) + else: + # send email using smtplib; no local MTA required + server_addr = aurweb.config.get('notifications', 'smtp-server') + + server = smtplib.SMTP(server_addr) + server.set_debuglevel(1) + server.sendmail(sender, recipient, msg.as_bytes()) + server.quit() class ResetKeyNotification(Notification): diff --git a/conf/config.defaults b/conf/config.defaults index c519eae..23d46b0 100644 --- a/conf/config.defaults +++ b/conf/config.defaults @@ -47,7 +47,8 @@ window_length = 86400 [notifications] notify-cmd = /usr/local/bin/aurweb-notify -sendmail = /usr/bin/sendmail +sendmail = +smtp-server = localhost sender = notify(a)aur.archlinux.org reply-to = noreply(a)aur.archlinux.org -- 2.25.0

1 1

[PATCH v2 1/2] Use smtplib for sending emails
by Lukas Fleischer 07 Feb '20

07 Feb '20

Support mail delivery without a local MTA. Instead, an SMTP server can now be configured using the smtp-server option in the [notifications] section. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- Change the default configuration to use localhost. aurweb/scripts/notify.py | 13 ++++++++----- conf/config.defaults | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/aurweb/scripts/notify.py b/aurweb/scripts/notify.py index b0f218b..35d2701 100755 --- a/aurweb/scripts/notify.py +++ b/aurweb/scripts/notify.py @@ -1,7 +1,8 @@ #!/usr/bin/env python3 import email.mime.text -import subprocess +import email.utils +import smtplib import sys import textwrap @@ -63,7 +64,7 @@ class Notification: return body.rstrip() def send(self): - sendmail = aurweb.config.get('notifications', 'sendmail') + server_addr = aurweb.config.get('notifications', 'smtp-server') sender = aurweb.config.get('notifications', 'sender') reply_to = aurweb.config.get('notifications', 'reply-to') reason = self.__class__.__name__ @@ -79,13 +80,15 @@ class Notification: msg['Reply-to'] = reply_to msg['To'] = to msg['X-AUR-Reason'] = reason + msg['Date'] = email.utils.formatdate(localtime=True) for key, value in self.get_headers().items(): msg[key] = value - p = subprocess.Popen([sendmail, '-t', '-oi'], - stdin=subprocess.PIPE) - p.communicate(msg.as_bytes()) + server = smtplib.SMTP(server_addr) + server.set_debuglevel(1) + server.sendmail(sender, recipient, msg.as_bytes()) + server.quit() class ResetKeyNotification(Notification): diff --git a/conf/config.defaults b/conf/config.defaults index c519eae..e77ccf4 100644 --- a/conf/config.defaults +++ b/conf/config.defaults @@ -47,7 +47,7 @@ window_length = 86400 [notifications] notify-cmd = /usr/local/bin/aurweb-notify -sendmail = /usr/bin/sendmail +smtp-server = localhost sender = notify(a)aur.archlinux.org reply-to = noreply(a)aur.archlinux.org -- 2.25.0

1 1

[PATCH] Make SMTP port and authentication configurable
by Lukas Fleischer 07 Feb '20

07 Feb '20

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- aurweb/scripts/notify.py | 19 ++++++++++++++++++- conf/config.defaults | 5 +++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/aurweb/scripts/notify.py b/aurweb/scripts/notify.py index 35d2701..ddf4736 100755 --- a/aurweb/scripts/notify.py +++ b/aurweb/scripts/notify.py @@ -65,6 +65,11 @@ class Notification: def send(self): server_addr = aurweb.config.get('notifications', 'smtp-server') + server_port = aurweb.config.getint('notifications', 'smtp-port') + use_ssl = aurweb.config.getboolean('notifications', 'smtp-use-ssl') + use_starttls = aurweb.config.getboolean('notifications', 'smtp-use-starttls') + smtp_user = aurweb.config.get('notifications', 'smtp-user') + smtp_passwd = aurweb.config.get('notifications', 'smtp-password') sender = aurweb.config.get('notifications', 'sender') reply_to = aurweb.config.get('notifications', 'reply-to') reason = self.__class__.__name__ @@ -85,7 +90,19 @@ class Notification: for key, value in self.get_headers().items(): msg[key] = value - server = smtplib.SMTP(server_addr) + if use_ssl: + server = smtplib.SMTP_SSL(server_addr, server_port) + else: + server = smtplib.SMTP(server_addr, server_port) + + if use_starttls: + server.ehlo() + server.starttls() + server.ehlo() + + if user and password: + server.login(user, passwd) + server.set_debuglevel(1) server.sendmail(sender, recipient, msg.as_bytes()) server.quit() diff --git a/conf/config.defaults b/conf/config.defaults index af85ce8..83820c0 100644 --- a/conf/config.defaults +++ b/conf/config.defaults @@ -48,6 +48,11 @@ window_length = 86400 [notifications] notify-cmd = /usr/local/bin/aurweb-notify smtp-server = orion.archlinux.org +smtp-port = 587 +smtp-use-ssl = 0 +smtp-use-starttls = 1 +smtp-user = aur +smtp-password = aur sender = notify(a)aur.archlinux.org reply-to = noreply(a)aur.archlinux.org -- 2.25.0

1 0

[PATCH] Use smtplib for sending emails
by Lukas Fleischer 07 Feb '20

07 Feb '20

Support mail delivery without a local MTA. Instead, an SMTP server can now be configured using the smtp-server option in the [notifications] section. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- aurweb/scripts/notify.py | 13 ++++++++----- conf/config.defaults | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/aurweb/scripts/notify.py b/aurweb/scripts/notify.py index b0f218b..35d2701 100755 --- a/aurweb/scripts/notify.py +++ b/aurweb/scripts/notify.py @@ -1,7 +1,8 @@ #!/usr/bin/env python3 import email.mime.text -import subprocess +import email.utils +import smtplib import sys import textwrap @@ -63,7 +64,7 @@ class Notification: return body.rstrip() def send(self): - sendmail = aurweb.config.get('notifications', 'sendmail') + server_addr = aurweb.config.get('notifications', 'smtp-server') sender = aurweb.config.get('notifications', 'sender') reply_to = aurweb.config.get('notifications', 'reply-to') reason = self.__class__.__name__ @@ -79,13 +80,15 @@ class Notification: msg['Reply-to'] = reply_to msg['To'] = to msg['X-AUR-Reason'] = reason + msg['Date'] = email.utils.formatdate(localtime=True) for key, value in self.get_headers().items(): msg[key] = value - p = subprocess.Popen([sendmail, '-t', '-oi'], - stdin=subprocess.PIPE) - p.communicate(msg.as_bytes()) + server = smtplib.SMTP(server_addr) + server.set_debuglevel(1) + server.sendmail(sender, recipient, msg.as_bytes()) + server.quit() class ResetKeyNotification(Notification): diff --git a/conf/config.defaults b/conf/config.defaults index c519eae..af85ce8 100644 --- a/conf/config.defaults +++ b/conf/config.defaults @@ -47,7 +47,7 @@ window_length = 86400 [notifications] notify-cmd = /usr/local/bin/aurweb-notify -sendmail = /usr/bin/sendmail +smtp-server = orion.archlinux.org sender = notify(a)aur.archlinux.org reply-to = noreply(a)aur.archlinux.org -- 2.25.0

1 0

[PATCH 1/3] rendercomment: safer Flyspray task linkification
by Frédéric Mangano-Tarumi 02 Feb '20

02 Feb '20

When an FS#123 is part of a code block, it must not be converted into a link. FS#123 may also appear inside an URL, in which case regular linkifaction of URLs must take precedence. --- aurweb/scripts/rendercomment.py | 21 ++++++++++++++------- test/t2600-rendercomment.sh | 26 ++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/aurweb/scripts/rendercomment.py b/aurweb/scripts/rendercomment.py index ba28486..7cba6ef 100755 --- a/aurweb/scripts/rendercomment.py +++ b/aurweb/scripts/rendercomment.py @@ -29,18 +29,25 @@ class LinkifyExtension(markdown.extensions.Extension): md.inlinePatterns.add('linkify', processor, '_end') -class FlysprayLinksPreprocessor(markdown.preprocessors.Preprocessor): - _fsre = re.compile(r'\b(FS#(\d+))\b') - _sub = r'[\1](https://bugs.archlinux.org/task/\2)' +class FlysprayLinksInlineProcessor(markdown.inlinepatterns.InlineProcessor): + """ + Turn Flyspray task references like FS#1234 into links to bugs.archlinux.org. + + The pattern's capture group 0 is the text of the link and group 1 is the + Flyspray task ID. + """ - def run(self, lines): - return [self._fsre.sub(self._sub, line) for line in lines] + def handleMatch(self, m, data): + el = markdown.util.etree.Element('a') + el.set('href', f'https://bugs.archlinux.org/task/{m.group(1)}') + el.text = markdown.util.AtomicString(m.group(0)) + return el, m.start(0), m.end(0) class FlysprayLinksExtension(markdown.extensions.Extension): def extendMarkdown(self, md, md_globals): - preprocessor = FlysprayLinksPreprocessor(md) - md.preprocessors.add('flyspray-links', preprocessor, '_end') + processor = FlysprayLinksInlineProcessor(r'\bFS#(\d+)\b',md) + md.inlinePatterns.add('flyspray-links', processor, '_end') class GitCommitsInlineProcessor(markdown.inlinepatterns.InlineProcessor): diff --git a/test/t2600-rendercomment.sh b/test/t2600-rendercomment.sh index b0209eb..1da422d 100755 --- a/test/t2600-rendercomment.sh +++ b/test/t2600-rendercomment.sh @@ -103,4 +103,30 @@ test_expect_success 'Test Git commit linkification.' ' test_cmp actual expected ' +test_expect_success 'Test Flyspray issue linkification.' ' + sqlite3 aur.db <<-EOD && + INSERT INTO PackageComments (ID, PackageBaseID, Comments, RenderedComment) VALUES (6, 1, " + FS#1234567. + *FS#1234* + FS# + XFS#1 + \`FS#1234\` + https://archlinux.org/?test=FS#1234 + ", ""); + EOD + "$RENDERCOMMENT" 6 && + cat <<-EOD >expected && + <p><a href="https://bugs.archlinux.org/task/1234567">FS#1234567</a>. + <em><a href="https://bugs.archlinux.org/task/1234">FS#1234</a></em> + FS# + XFS#1 + <code>FS#1234</code> + <a href="https://archlinux.org/?test=FS#1234">https://archlinux.org/?test=FS#1234</a></p> + EOD + sqlite3 aur.db <<-EOD >actual && + SELECT RenderedComment FROM PackageComments WHERE ID = 6; + EOD + test_cmp actual expected +' + test_done -- 2.25.0

2 1

[PATCH 3/3] rendercomment: use python-markdown's new registration API
by Frédéric Mangano-Tarumi 02 Feb '20

02 Feb '20

First, this gets rid of the deprecation warnings Python displayed. Second, this fixes the case where a link contained a pair of underscores, which used to be interpreted as an emphasis because the linkify processor ran after the emphasis processor. --- aurweb/scripts/rendercomment.py | 10 ++++++---- test/t2600-rendercomment.sh | 6 ++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/aurweb/scripts/rendercomment.py b/aurweb/scripts/rendercomment.py index 7cba6ef..ed66756 100755 --- a/aurweb/scripts/rendercomment.py +++ b/aurweb/scripts/rendercomment.py @@ -26,7 +26,8 @@ class LinkifyExtension(markdown.extensions.Extension): def extendMarkdown(self, md, md_globals): processor = markdown.inlinepatterns.AutolinkInlineProcessor(self._urlre, md) - md.inlinePatterns.add('linkify', processor, '_end') + # Register it right after the default <>-link processor (priority 120). + md.inlinePatterns.register(processor, 'linkify', 119) class FlysprayLinksInlineProcessor(markdown.inlinepatterns.InlineProcessor): @@ -47,7 +48,7 @@ class FlysprayLinksInlineProcessor(markdown.inlinepatterns.InlineProcessor): class FlysprayLinksExtension(markdown.extensions.Extension): def extendMarkdown(self, md, md_globals): processor = FlysprayLinksInlineProcessor(r'\bFS#(\d+)\b',md) - md.inlinePatterns.add('flyspray-links', processor, '_end') + md.inlinePatterns.register(processor, 'flyspray-links', 118) class GitCommitsInlineProcessor(markdown.inlinepatterns.InlineProcessor): @@ -92,7 +93,7 @@ class GitCommitsExtension(markdown.extensions.Extension): def extendMarkdown(self, md, md_globals): processor = GitCommitsInlineProcessor(md, self._head) - md.inlinePatterns.add('git-commits', processor, '_end') + md.inlinePatterns.register(processor, 'git-commits', 117) class HeadingTreeprocessor(markdown.treeprocessors.Treeprocessor): @@ -106,7 +107,8 @@ class HeadingTreeprocessor(markdown.treeprocessors.Treeprocessor): class HeadingExtension(markdown.extensions.Extension): def extendMarkdown(self, md, md_globals): - md.treeprocessors.add('heading', HeadingTreeprocessor(md), '_end') + # Priority doesn't matter since we don't conflict with other processors. + md.treeprocessors.register(HeadingTreeprocessor(md), 'heading', 30) def get_comment(conn, commentid): diff --git a/test/t2600-rendercomment.sh b/test/t2600-rendercomment.sh index 1ba560a..be408b8 100755 --- a/test/t2600-rendercomment.sh +++ b/test/t2600-rendercomment.sh @@ -52,7 +52,8 @@ test_expect_success 'Test HTML sanitizing.' ' test_expect_success 'Test link conversion.' ' cat <<-EOD | sqlite3 aur.db && INSERT INTO PackageComments (ID, PackageBaseID, Comments, RenderedComment) VALUES (4, 1, " - Visit https://www.archlinux.org/. + Visit https://www.archlinux.org/#_test_. + Visit *https://www.archlinux.org/*. Visit <https://www.archlinux.org/>. Visit \`https://www.archlinux.org/\`. Visit [Arch Linux](https://www.archlinux.org/). @@ -62,7 +63,8 @@ test_expect_success 'Test link conversion.' ' EOD "$RENDERCOMMENT" 4 && cat <<-EOD >expected && - <p>Visit <a href="https://www.archlinux.org/">https://www.archlinux.org/</a>. + <p>Visit <a href="https://www.archlinux.org/#_test_">https://www.archlinux.org/#_test_</a>. + Visit <em><a href="https://www.archlinux.org/">https://www.archlinux.org/</a></em>. Visit <a href="https://www.archlinux.org/">https://www.archlinux.org/</a>. Visit <code>https://www.archlinux.org/</code>. Visit <a href="https://www.archlinux.org/">Arch Linux</a>. -- 2.25.0

1 0

[PATCH 2/3] rendercomment: test headings lowering
by Frédéric Mangano-Tarumi 02 Feb '20

02 Feb '20

--- test/t2600-rendercomment.sh | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/test/t2600-rendercomment.sh b/test/t2600-rendercomment.sh index 1da422d..1ba560a 100755 --- a/test/t2600-rendercomment.sh +++ b/test/t2600-rendercomment.sh @@ -129,4 +129,30 @@ test_expect_success 'Test Flyspray issue linkification.' ' test_cmp actual expected ' +test_expect_success 'Test headings lowering.' ' + sqlite3 aur.db <<-EOD && + INSERT INTO PackageComments (ID, PackageBaseID, Comments, RenderedComment) VALUES (7, 1, " + # One + ## Two + ### Three + #### Four + ##### Five + ###### Six + ", ""); + EOD + "$RENDERCOMMENT" 7 && + cat <<-EOD >expected && + <h5>One</h5> + <h6>Two</h6> + <h6>Three</h6> + <h6>Four</h6> + <h6>Five</h6> + <h6>Six</h6> + EOD + sqlite3 aur.db <<-EOD >actual && + SELECT RenderedComment FROM PackageComments WHERE ID = 7; + EOD + test_cmp actual expected +' + test_done -- 2.25.0

1 0

[PATCH] rendercomment: safer auto-linkification of URLs
by Frédéric Mangano-Tarumi 02 Feb '20

02 Feb '20

Fixes a few edge cases: - URLs within code blocks used to get redundant <> added, breaking bash code snippets like `curl https://...` into `curl <https://...>`. - Links written with markdown’s <https://...> syntax also used to get an extra pair of brackets. --- aurweb/scripts/rendercomment.py | 19 +++++++++++-------- test/t2600-rendercomment.sh | 15 +++++++++++++-- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/aurweb/scripts/rendercomment.py b/aurweb/scripts/rendercomment.py index ad39ceb..ba28486 100755 --- a/aurweb/scripts/rendercomment.py +++ b/aurweb/scripts/rendercomment.py @@ -13,17 +13,20 @@ repo_path = aurweb.config.get('serve', 'repo-path') commit_uri = aurweb.config.get('options', 'commit_uri') -class LinkifyPreprocessor(markdown.preprocessors.Preprocessor): - _urlre = re.compile(r'(\b(?:https?|ftp):\/\/[\w\/\#~:.?+=&%@!\-;,]+?' - r'(?=[.:?\-;,]*(?:[^\w\/\#~:.?+=&%@!\-;,]|$)))') - - def run(self, lines): - return [self._urlre.sub(r'<\1>', line) for line in lines] +class LinkifyExtension(markdown.extensions.Extension): + """ + Turn URLs into links, even without explicit markdown. + Do not linkify URLs in code blocks. + """ + # Captures http(s) and ftp URLs until the first non URL-ish character. + # Excludes trailing punctuation. + _urlre = (r'(\b(?:https?|ftp):\/\/[\w\/\#~:.?+=&%@!\-;,]+?' + r'(?=[.:?\-;,]*(?:[^\w\/\#~:.?+=&%@!\-;,]|$)))') -class LinkifyExtension(markdown.extensions.Extension): def extendMarkdown(self, md, md_globals): - md.preprocessors.add('linkify', LinkifyPreprocessor(md), '_end') + processor = markdown.inlinepatterns.AutolinkInlineProcessor(self._urlre, md) + md.inlinePatterns.add('linkify', processor, '_end') class FlysprayLinksPreprocessor(markdown.preprocessors.Preprocessor): diff --git a/test/t2600-rendercomment.sh b/test/t2600-rendercomment.sh index 7b3a4a8..b0209eb 100755 --- a/test/t2600-rendercomment.sh +++ b/test/t2600-rendercomment.sh @@ -51,11 +51,22 @@ test_expect_success 'Test HTML sanitizing.' ' test_expect_success 'Test link conversion.' ' cat <<-EOD | sqlite3 aur.db && - INSERT INTO PackageComments (ID, PackageBaseID, Comments, RenderedComment) VALUES (4, 1, "Visit https://www.archlinux.org/.", ""); + INSERT INTO PackageComments (ID, PackageBaseID, Comments, RenderedComment) VALUES (4, 1, " + Visit https://www.archlinux.org/. + Visit <https://www.archlinux.org/>. + Visit \`https://www.archlinux.org/\`. + Visit [Arch Linux](https://www.archlinux.org/). + Visit [Arch Linux][arch]. + [arch]: https://www.archlinux.org/ + ", ""); EOD "$RENDERCOMMENT" 4 && cat <<-EOD >expected && - <p>Visit <a href="https://www.archlinux.org/">https://www.archlinux.org/</a>.</p> + <p>Visit <a href="https://www.archlinux.org/">https://www.archlinux.org/</a>. + Visit <a href="https://www.archlinux.org/">https://www.archlinux.org/</a>. + Visit <code>https://www.archlinux.org/</code>. + Visit <a href="https://www.archlinux.org/">Arch Linux</a>. + Visit <a href="https://www.archlinux.org/">Arch Linux</a>.</p> EOD cat <<-EOD | sqlite3 aur.db >actual && SELECT RenderedComment FROM PackageComments WHERE ID = 4; -- 2.25.0

2 1

[PATCH] Update message catalog
by Lukas Fleischer 31 Jan '20

31 Jan '20

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- po/aurweb.pot | 125 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 102 insertions(+), 23 deletions(-) diff --git a/po/aurweb.pot b/po/aurweb.pot index e49dc13..9240d2d 100644 --- a/po/aurweb.pot +++ b/po/aurweb.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the AUR package. +# This file is distributed under the same license as the AURWEB package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: AUR v4.6.0\n" +"Project-Id-Version: AURWEB v4.8.0\n" "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" -"POT-Creation-Date: 2018-05-17 22:58+0200\n" +"POT-Creation-Date: 2020-01-31 08:43+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -73,6 +73,10 @@ msgstr "" msgid "You do not have permission to edit this account." msgstr "" +#: html/account.php lib/acctfuncs.inc.php +msgid "Invalid password." +msgstr "" + #: html/account.php msgid "Use this form to search existing accounts." msgstr "" @@ -367,10 +371,10 @@ msgid "Enter login credentials" msgstr "" #: html/login.php -msgid "User name or email address" +msgid "User name or primary email address" msgstr "" -#: html/login.php template/account_edit_form.php +#: html/login.php template/account_delete.php template/account_edit_form.php msgid "Password" msgstr "" @@ -431,7 +435,7 @@ msgid "Your password has been reset successfully." msgstr "" #: html/passreset.php -msgid "Confirm your e-mail address:" +msgid "Confirm your user name or primary e-mail address:" msgstr "" #: html/passreset.php @@ -449,12 +453,12 @@ msgstr "" #: html/passreset.php #, php-format msgid "" -"If you have forgotten the e-mail address you used to register, please send a " -"message to the %saur-general%s mailing list." +"If you have forgotten the user name and the primary e-mail address you used " +"to register, please send a message to the %saur-general%s mailing list." msgstr "" #: html/passreset.php -msgid "Enter your e-mail address:" +msgid "Enter your user name or your primary e-mail address:" msgstr "" #: html/pkgbase.php @@ -646,19 +650,19 @@ msgstr "" msgid "Close Request" msgstr "" -#: html/pkgreq.php lib/pkgfuncs.inc.php +#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php msgid "First" msgstr "" -#: html/pkgreq.php lib/pkgfuncs.inc.php +#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php msgid "Previous" msgstr "" -#: html/pkgreq.php lib/pkgfuncs.inc.php template/tu_list.php +#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php template/tu_list.php msgid "Next" msgstr "" -#: html/pkgreq.php lib/pkgfuncs.inc.php +#: html/pkgreq.php lib/aur.inc.php lib/pkgfuncs.inc.php msgid "Last" msgstr "" @@ -759,10 +763,18 @@ msgstr "" msgid "Can contain only one period, underscore or hyphen." msgstr "" +#: lib/acctfuncs.inc.php +msgid "Please confirm your new password." +msgstr "" + #: lib/acctfuncs.inc.php msgid "The email address is invalid." msgstr "" +#: lib/acctfuncs.inc.php +msgid "The backup email address is invalid." +msgstr "" + #: lib/acctfuncs.inc.php msgid "The home page is invalid, please specify the full HTTP(s) URL." msgstr "" @@ -802,6 +814,18 @@ msgstr "" msgid "The SSH public key, %s%s%s, is already in use." msgstr "" +#: lib/acctfuncs.inc.php +msgid "The CAPTCHA is missing." +msgstr "" + +#: lib/acctfuncs.inc.php +msgid "This CAPTCHA has expired. Please try again." +msgstr "" + +#: lib/acctfuncs.inc.php +msgid "The entered CAPTCHA answer is invalid." +msgstr "" + #: lib/acctfuncs.inc.php #, php-format msgid "Error trying to create account, %s%s%s." @@ -1210,6 +1234,10 @@ msgstr "" msgid "Edit this user's account" msgstr "" +#: template/account_details.php +msgid "List this user's comments" +msgstr "" + #: template/account_edit_form.php #, php-format msgid "Click %shere%s if you want to permanently delete this account." @@ -1220,6 +1248,11 @@ msgstr "" msgid "Click %shere%s for user details." msgstr "" +#: template/account_edit_form.php +#, php-format +msgid "Click %shere%s to list the comments made by this account." +msgstr "" + #: template/account_edit_form.php msgid "required" msgstr "" @@ -1253,11 +1286,23 @@ msgid "" msgstr "" #: template/account_edit_form.php -msgid "Hide Email Address" +msgid "Backup Email Address" msgstr "" #: template/account_edit_form.php -msgid "Re-type password" +msgid "" +"Optionally provide a secondary email address that can be used to restore " +"your account in case you lose access to your primary email address." +msgstr "" + +#: template/account_edit_form.php +msgid "" +"Password reset links are always sent to both your primary and your backup " +"email address." +msgstr "" + +#: template/account_edit_form.php +msgid "Hide Email Address" msgstr "" #: template/account_edit_form.php @@ -1268,6 +1313,16 @@ msgstr "" msgid "Timezone" msgstr "" +#: template/account_edit_form.php +msgid "" +"If you want to change the password, enter a new password and confirm the new " +"password by entering it again." +msgstr "" + +#: template/account_edit_form.php +msgid "Re-type password" +msgstr "" + #: template/account_edit_form.php msgid "" "The following information is only required if you want to submit packages to " @@ -1294,6 +1349,24 @@ msgstr "" msgid "Notify of ownership changes" msgstr "" +#: template/account_edit_form.php +msgid "To confirm the profile changes, please enter your current password:" +msgstr "" + +#: template/account_edit_form.php +msgid "Your current password" +msgstr "" + +#: template/account_edit_form.php +msgid "" +"To protect the AUR against automated account creation, we kindly ask you to " +"provide the output of the following command:" +msgstr "" + +#: template/account_edit_form.php +msgid "Answer" +msgstr "" + #: template/account_edit_form.php template/pkgbase_details.php #: template/pkg_details.php msgid "Update" @@ -1422,7 +1495,7 @@ msgstr "" msgid "Disable notifications" msgstr "" -#: template/pkgbase_actions.php +#: template/pkgbase_actions.php template/pkg_comment_form.php msgid "Enable notifications" msgstr "" @@ -1453,6 +1526,10 @@ msgstr "" msgid "read-only" msgstr "" +#: template/pkgbase_details.php template/pkg_details.php +msgid "click to copy" +msgstr "" + #: template/pkgbase_details.php template/pkg_details.php #: template/pkg_search_form.php msgid "Keywords" @@ -1500,15 +1577,15 @@ msgid "Add Comment" msgstr "" #: template/pkg_comments.php -msgid "View all comments" +msgid "Pinned Comments" msgstr "" #: template/pkg_comments.php -msgid "Pinned Comments" +msgid "Latest Comments" msgstr "" #: template/pkg_comments.php -msgid "Latest Comments" +msgid "Comments for" msgstr "" #: template/pkg_comments.php @@ -1521,6 +1598,11 @@ msgstr "" msgid "Anonymous comment on %s" msgstr "" +#: template/pkg_comments.php +#, php-format +msgid "Commented on package %s on %s" +msgstr "" + #: template/pkg_comments.php #, php-format msgid "deleted on %s by %s" @@ -1557,10 +1639,6 @@ msgstr "" msgid "Unpin comment" msgstr "" -#: template/pkg_comments.php -msgid "All comments" -msgstr "" - #: template/pkg_details.php msgid "Package Details" msgstr "" @@ -2106,6 +2184,7 @@ msgstr "" msgid "" "{user} [1] merged {old} [2] into {new} [3].\n" "\n" +"-- \n" "If you no longer wish receive notifications about the new package, please go " "to [3] and click \"{label}\"." msgstr "" -- 2.25.0

1 1

[PATCH] Explain syntax/features in the comments section
by Lukas Fleischer 31 Jan '20

31 Jan '20

Addresses FS#64983. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/template/pkg_comment_form.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/template/pkg_comment_form.php b/web/template/pkg_comment_form.php index 3feee8f..e8a516e 100644 --- a/web/template/pkg_comment_form.php +++ b/web/template/pkg_comment_form.php @@ -8,6 +8,10 @@ <?php endif; ?> <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> </div> + <p> + <?= __("Git commit identifiers referencing commits in the AUR package repository and URLs are converted to links automatically.") ?> + <?= __("%sMarkdown syntax%s is partially supported.", '<a href="https://daringfireball.net/projects/markdown/syntax">', "</a>") ?> + </p> <p> <textarea id="id_comment" name="comment" cols="80" rows="10"><?= (isset($comment_id)) ? htmlspecialchars($comment) : "" ?></textarea> </p> -- 2.25.0

1 0