external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'maint'

Browse source
This commit is contained in:
Lukas Fleischer 2014-06-30 08:18:05 +02:00
commit 181c07edc6
2 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
po/aur.pot
View file

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: AUR v3.0.0-rc1\n" "Project-Id-Version: AUR v3.1.0\n"
"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
"POT-Creation-Date: 2014-05-07 11:11+0200\n" "POT-Creation-Date: 2014-06-22 12:13+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -523,6 +523,9 @@ msgstr ""
msgid "The account, %s%s%s, has been successfully created." msgid "The account, %s%s%s, has been successfully created."
msgstr "" msgstr ""
msgid "Click on the Login link above to use your account."
msgstr ""
#, php-format #, php-format
msgid "" msgid ""
"Welcome to %s! In order to set an initial password for your new account, " "Welcome to %s! In order to set an initial password for your new account, "
@ -533,9 +536,6 @@ msgstr ""
msgid "A password reset key has been sent to your e-mail address." msgid "A password reset key has been sent to your e-mail address."
msgstr "" msgstr ""
msgid "Click on the Login link above to use your account."
msgstr ""
#, php-format #, php-format
msgid "No changes were made to the account, %s%s%s." msgid "No changes were made to the account, %s%s%s."
msgstr "" msgstr ""
@ -552,9 +552,6 @@ msgstr ""
msgid "Account suspended" msgid "Account suspended"
msgstr "" msgstr ""
msgid "An error occurred trying to generate a user session."
msgstr ""
#, php-format #, php-format
msgid "" msgid ""
"Your password has been reset. If you just created a new account, please use " "Your password has been reset. If you just created a new account, please use "
@ -565,9 +562,15 @@ msgstr ""
msgid "Bad username or password." msgid "Bad username or password."
msgstr "" msgstr ""
msgid "An error occurred trying to generate a user session."
msgstr ""
msgid "Invalid e-mail and reset key combination." msgid "Invalid e-mail and reset key combination."
msgstr "" msgstr ""
msgid "None"
msgstr ""
msgid "Error retrieving package details." msgid "Error retrieving package details."
msgstr "" msgstr ""
@ -829,6 +832,9 @@ msgstr ""
msgid "Download tarball" msgid "Download tarball"
msgstr "" msgstr ""
msgid "Search wiki"
msgstr ""
msgid "Flagged out-of-date" msgid "Flagged out-of-date"
msgstr "" msgstr ""
@ -878,9 +884,6 @@ msgstr ""
msgid "View account information for %s" msgid "View account information for %s"
msgstr "" msgstr ""
msgid "None"
msgstr ""
msgid "Maintainer" msgid "Maintainer"
msgstr "" msgstr ""

3
web/lib/pkgfuncs.inc.php
View file

@ -954,7 +954,8 @@ function pkg_add_lic($pkgid, $licid) {
function latest_pkgs($numpkgs) { function latest_pkgs($numpkgs) {
$dbh = DB::connect(); $dbh = DB::connect();
$q = "SELECT * FROM Packages LEFT JOIN PackageBases ON "; $q = "SELECT Packages.*, MaintainerUID, SubmittedTS ";
$q.= "FROM Packages LEFT JOIN PackageBases ON ";
$q.= "PackageBases.ID = Packages.PackageBaseID "; $q.= "PackageBases.ID = Packages.PackageBaseID ";
$q.= "ORDER BY SubmittedTS DESC "; $q.= "ORDER BY SubmittedTS DESC ";
$q.= "LIMIT " . intval($numpkgs); $q.= "LIMIT " . intval($numpkgs);