diff options
| author | Lukas Fleischer <archlinux@cryptocrack.de> | 2014-06-30 08:18:05 +0200 |
|---|---|---|
| committer | Lukas Fleischer <archlinux@cryptocrack.de> | 2014-06-30 08:18:05 +0200 |
| commit | 181c07edc61d9f70e57ed6d809dab88ffc0bbdf2 (patch) | |
| tree | 14af5f138b3afa4b93d7fd451c81d0e7cc2268a6 | |
| parent | 1fe14899aa808f50144162d6b14fc583873d08fc (diff) | |
| parent | e82a2b80e5e93e29c5d6cac4096f8aa664c800d1 (diff) | |
Merge branch 'maint'
| -rw-r--r-- | po/aur.pot | 25 | ||||
| -rw-r--r-- | web/lib/pkgfuncs.inc.php | 3 |
2 files changed, 16 insertions, 12 deletions
@@ -6,9 +6,9 @@ #, fuzzy msgid "" 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" -"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" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -523,6 +523,9 @@ msgstr "" msgid "The account, %s%s%s, has been successfully created." msgstr "" +msgid "Click on the Login link above to use your account." +msgstr "" + #, php-format msgid "" "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." msgstr "" -msgid "Click on the Login link above to use your account." -msgstr "" - #, php-format msgid "No changes were made to the account, %s%s%s." msgstr "" @@ -552,9 +552,6 @@ msgstr "" msgid "Account suspended" msgstr "" -msgid "An error occurred trying to generate a user session." -msgstr "" - #, php-format msgid "" "Your password has been reset. If you just created a new account, please use " @@ -565,9 +562,15 @@ msgstr "" msgid "Bad username or password." msgstr "" +msgid "An error occurred trying to generate a user session." +msgstr "" + msgid "Invalid e-mail and reset key combination." msgstr "" +msgid "None" +msgstr "" + msgid "Error retrieving package details." msgstr "" @@ -829,6 +832,9 @@ msgstr "" msgid "Download tarball" msgstr "" +msgid "Search wiki" +msgstr "" + msgid "Flagged out-of-date" msgstr "" @@ -878,9 +884,6 @@ msgstr "" msgid "View account information for %s" msgstr "" -msgid "None" -msgstr "" - msgid "Maintainer" msgstr "" diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index c736051..f515864 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -954,7 +954,8 @@ function pkg_add_lic($pkgid, $licid) { function latest_pkgs($numpkgs) { $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.= "ORDER BY SubmittedTS DESC "; $q.= "LIMIT " . intval($numpkgs); |