June 2015 - Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Do not use symrefs for manually created Git refs
by Lukas Fleischer 11 Jun '15

11 Jun '15

When creating the refs for the package base branch and the HEAD ref workaround, directly use commit IDs instead of symrefs. It looks like Git cannot pack symrefs, so this is expected to improve space efficiency. Also, since the refs are now only created (or updated) when new objects are actually received, this fixes a problem with dangling refs that were created when a user initialized a repository but did not push anything. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- git-interface/git-serve.py | 17 ----------------- git-interface/git-update.py | 10 ++++++++++ 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/git-interface/git-serve.py b/git-interface/git-serve.py index cfd3e34..9812acb 100755 --- a/git-interface/git-serve.py +++ b/git-interface/git-serve.py @@ -3,7 +3,6 @@ import configparser import mysql.connector import os -import pygit2 import re import shlex import sys @@ -78,21 +77,6 @@ def create_pkgbase(pkgbase, user): db.commit() db.close() -def setup_repo(pkgbase): - if not re.match(repo_regex, pkgbase): - die('%s: invalid repository name: %s' % (action, pkgbase)) - - repo = pygit2.Repository(repo_path) - refs = repo.listall_references() - - if not 'refs/heads/' + pkgbase in refs: - repo.create_reference('refs/heads/' + pkgbase, 'refs/namespaces/' + - pkgbase + '/refs/heads/master') - if not 'refs/namespaces/' + pkgbase + '/HEAD' in refs: - repo.create_reference('refs/namespaces/' + pkgbase + '/HEAD', - 'refs/namespaces/' + pkgbase + - '/refs/heads/master') - def check_permissions(pkgbase, user): db = mysql.connector.connect(host=aur_db_host, user=aur_db_user, passwd=aur_db_pass, db=aur_db_name, @@ -139,7 +123,6 @@ if action == 'git-upload-pack' or action == 'git-receive-pack': if not pkgbase_exists(pkgbase): create_pkgbase(pkgbase, user) - setup_repo(pkgbase); if action == 'git-receive-pack': if not check_permissions(pkgbase, user): diff --git a/git-interface/git-update.py b/git-interface/git-update.py index 958fa7a..7898f39 100755 --- a/git-interface/git-update.py +++ b/git-interface/git-update.py @@ -285,3 +285,13 @@ for pkgname in srcinfo.GetPackageNames(): save_srcinfo(srcinfo, db, cur, user) db.close() + +# Create (or update) a branch with the name of the package base for better +# accessibility. +repo.create_reference('refs/heads/' + pkgbase, sha1_new, True) + +# Work around a Git bug: The HEAD ref is not updated when using gitnamespaces. +# This can be removed once the bug fix is included in Git mainline. See +# http://git.661346.n2.nabble.com/PATCH-receive-pack-Create-a-HEAD-ref-for-re… +# for details. +repo.create_reference('refs/namespaces/' + pkgbase + '/HEAD', sha1_new, True) -- 2.4.2

1 0

[aur-dev] What should AURv4 helpers do to get packages?
by Chris Warrick 11 Jun '15

11 Jun '15

Hello, In AURv4, URLPath was removed due to the introduction of Git integration, which raises the question: what is the recommended way for AUR helpers to get packages? Should they: (a) manually generate a clone URL (/PKGBASE.git/) and clone it? (b) manually generate a tarball URL (/cgit/aur.git/snapshot/PKGBASE.tar.gz) and download it? (c) do something else entirely? In other words: could you please add a RPC field with a “recommended” URL to work with? -- Chris Warrick <https://chriswarrick.com/> PGP: 5EAAEA16

3 6

[aur-dev] [PATCH] Reintroduce the URLPath field
by Lukas Fleischer 11 Jun '15

11 Jun '15

In commit 74edb6f (Use Git repositories to store packages, 2014-06-06), the URLPath field was dropped from RPC package results. Reintroduce the field for backwards compatibility, even though it is no longer recommended to use the snapshot tarballs. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/aurjson.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index 5fb89a9..f25954c 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -228,7 +228,7 @@ class AurJSON { $search_data = array(); while ($row = $result->fetch(PDO::FETCH_ASSOC)) { $resultcount++; - $pkgbase_name = $row['PackageBase']; + $row['URLPath'] = sprintf(config_get('options', 'snapshot_uri'), urlencode($row['PackageBase'])); /* * Unfortunately, mysql_fetch_assoc() returns -- 2.4.2

1 0

[aur-dev] [PATCH] Make URIs to the individual cgit pages configurable
by Lukas Fleischer 11 Jun '15

11 Jun '15

Make the locations of the PKGBUILD preview, the log and the snapshot tarball configurable. This increases flexibility and simplifies the code a bit. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- conf/config.proto | 4 +++- web/template/pkg_details.php | 10 ++++++---- web/template/pkgbase_details.php | 10 ++++++---- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/conf/config.proto b/conf/config.proto index 94ef8e6..1d3e329 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -18,7 +18,6 @@ persistent_cookie_timeout = 2592000 max_filesize_uncompressed = 8388608 disable_http_login = 1 aur_location = https://aur.archlinux.org -cgit_uri = https://aur.archlinux.org/cgit/aur.git git_clone_uri_anon = https://aur.archlinux.org/%s.git/ git_clone_uri_priv = ssh+git://aur@aur.archlinux.org/%s.git/ max_rpc_results = 5000 @@ -26,6 +25,9 @@ aur_request_ml = aur-requests(a)archlinux.org request_idle_time = 1209600 auto_orphan_age = 15552000 auto_delete_age = 86400 +pkgbuild_uri = https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=%s +log_uri = https://aur.archlinux.org/cgit/aur.git/log/?h=%s +snapshot_uri = https://aur.archlinux.org/cgit/aur.git/snapshot/%s.tar.gz [auth] valid-keytypes = ssh-rsa ssh-dss ecdsa-sha2-nistp256 ecdsa-sha2-nistp384 ecdsa-sha2-nistp521 ssh-ed25519 diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 7c68c30..e50f029 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -1,6 +1,8 @@ <?php -$cgit_uri = config_get('options', 'cgit_uri'); +$pkgbuild_uri = sprintf(config_get('options', 'pkgbuild_uri'), urlencode($row['BaseName'])); +$log_uri = sprintf(config_get('options', 'log_uri'), urlencode($row['BaseName'])); +$snapshot_uri = sprintf(config_get('options', 'snapshot_uri'), urlencode($row['BaseName'])); $git_clone_uri_anon = sprintf(config_get('options', 'git_clone_uri_anon'), htmlspecialchars($row['BaseName'])); $git_clone_uri_priv = sprintf(config_get('options', 'git_clone_uri_priv'), htmlspecialchars($row['BaseName'])); @@ -82,10 +84,10 @@ $sources = pkg_sources($row["ID"]); <h4><?= __('Package Actions') ?></h4> <ul class="small"> <li> - <a href="<?= $cgit_uri . '/tree/PKGBUILD?h=' . urlencode($row['BaseName']) ?>"><?= __('View PKGBUILD') ?></a> / - <a href="<?= $cgit_uri . '/log/?h=' . urlencode($row['BaseName']) ?>"><?= __('View Changes') ?></a> + <a href="<?= $pkgbuild_uri ?>"><?= __('View PKGBUILD') ?></a> / + <a href="<?= $log_uri ?>"><?= __('View Changes') ?></a> </li> - <li><a href="<?= $cgit_uri . '/snapshot/' . urlencode($row['BaseName']) . '.tar.gz' ?>"><?= __('Download snapshot') ?></a> + <li><a href="<?= $snapshot_uri ?>"><?= __('Download snapshot') ?></a> <li><a href="https://wiki.archlinux.org/index.php/Special:Search?search=<?= urlencode($row['Name']) ?>"><?= __('Search wiki') ?></a></li> <li><span class="flagged"><?php if ($row["OutOfDateTS"] !== NULL) { echo __('Flagged out-of-date')." (${out_of_date_time})"; } ?></span></li> <?php if ($uid): ?> diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php index a425c4c..2ef8788 100644 --- a/web/template/pkgbase_details.php +++ b/web/template/pkgbase_details.php @@ -1,6 +1,8 @@ <?php -$cgit_uri = config_get('options', 'cgit_uri'); +$pkgbuild_uri = sprintf(config_get('options', 'pkgbuild_uri'), urlencode($row['Name'])); +$log_uri = sprintf(config_get('options', 'log_uri'), urlencode($row['Name'])); +$snapshot_uri = sprintf(config_get('options', 'snapshot_uri'), urlencode($row['Name'])); $git_clone_uri_anon = sprintf(config_get('options', 'git_clone_uri_anon'), htmlspecialchars($row['Name'])); $git_clone_uri_priv = sprintf(config_get('options', 'git_clone_uri_priv'), htmlspecialchars($row['Name'])); @@ -33,10 +35,10 @@ $pkgs = pkgbase_get_pkgnames($base_id); <h4><?= __('Package Actions') ?></h4> <ul class="small"> <li> - <a href="<?= $cgit_uri . '/tree/PKGBUILD?h=' . urlencode($row['Name']) ?>"><?= __('View PKGBUILD') ?></a> / - <a href="<?= $cgit_uri . '/log/?h=' . urlencode($row['Name']) ?>"><?= __('View Changes') ?></a> + <a href="<?= $pkgbuild_uri ?>"><?= __('View PKGBUILD') ?></a> / + <a href="<?= $log_uri ?>"><?= __('View Changes') ?></a> </li> - <li><a href="<?= $cgit_uri . '/snapshot/' . urlencode($row['Name']) . '.tar.gz' ?>"><?= __('Download snapshot') ?></a> + <li><a href="<?= $snapshot_uri ?>"><?= __('Download snapshot') ?></a> <li><a href="https://wiki.archlinux.org/index.php/Special:Search?search=<?= urlencode($row['Name']) ?>"><?= __('Search wiki') ?></a></li> <li><span class="flagged"><?php if ($row["OutOfDateTS"] !== NULL) { echo __('Flagged out-of-date')." (${out_of_date_time})"; } ?></span></li> <?php if ($uid): ?> -- 2.4.2

1 0

[aur-dev] [PATCH] pkgbase.php: Escape error messages
by Lukas Fleischer 10 Jun '15

10 Jun '15

Fixes FS#45284. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/pkgbase.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php index 2f8f932..c834f8b 100644 --- a/web/html/pkgbase.php +++ b/web/html/pkgbase.php @@ -146,9 +146,9 @@ html_header($title, $details); <?php if ($output): ?> <?php if ($ret): ?> -<p class="pkgoutput"><?= $output ?></p> +<p class="pkgoutput"><?= htmlspecialchars($output) ?></p> <?php else: ?> -<ul class="errorlist"><li><?= $output ?></li></ul> +<ul class="errorlist"><li><?= htmlspecialchars($output) ?></li></ul> <?php endif; ?> <?php endif; ?> -- 2.4.2

1 0

[aur-dev] [PATCH] Encode cgit URIs properly
by Lukas Fleischer 09 Jun '15

09 Jun '15

Fixes FS#45276 and FS#45277. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/template/pkg_details.php | 6 +++--- web/template/pkgbase_details.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 14f8847..7c68c30 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -82,10 +82,10 @@ $sources = pkg_sources($row["ID"]); <h4><?= __('Package Actions') ?></h4> <ul class="small"> <li> - <a href="<?= $cgit_uri . '/tree/PKGBUILD?h=' . $row['BaseName'] ?>"><?= __('View PKGBUILD') ?></a> / - <a href="<?= $cgit_uri . '/log/?h=' . $row['BaseName'] ?>"><?= __('View Changes') ?></a> + <a href="<?= $cgit_uri . '/tree/PKGBUILD?h=' . urlencode($row['BaseName']) ?>"><?= __('View PKGBUILD') ?></a> / + <a href="<?= $cgit_uri . '/log/?h=' . urlencode($row['BaseName']) ?>"><?= __('View Changes') ?></a> </li> - <li><a href="<?= $cgit_uri . '/snapshot/' . $row['BaseName'] . '.tar.gz' ?>"><?= __('Download snapshot') ?></a> + <li><a href="<?= $cgit_uri . '/snapshot/' . urlencode($row['BaseName']) . '.tar.gz' ?>"><?= __('Download snapshot') ?></a> <li><a href="https://wiki.archlinux.org/index.php/Special:Search?search=<?= urlencode($row['Name']) ?>"><?= __('Search wiki') ?></a></li> <li><span class="flagged"><?php if ($row["OutOfDateTS"] !== NULL) { echo __('Flagged out-of-date')." (${out_of_date_time})"; } ?></span></li> <?php if ($uid): ?> diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php index 401ebb3..a425c4c 100644 --- a/web/template/pkgbase_details.php +++ b/web/template/pkgbase_details.php @@ -33,10 +33,10 @@ $pkgs = pkgbase_get_pkgnames($base_id); <h4><?= __('Package Actions') ?></h4> <ul class="small"> <li> - <a href="<?= $cgit_uri . '/tree/PKGBUILD?h=' . $row['Name'] ?>"><?= __('View PKGBUILD') ?></a> / - <a href="<?= $cgit_uri . '/log/?h=' . $row['Name'] ?>"><?= __('View Changes') ?></a> + <a href="<?= $cgit_uri . '/tree/PKGBUILD?h=' . urlencode($row['Name']) ?>"><?= __('View PKGBUILD') ?></a> / + <a href="<?= $cgit_uri . '/log/?h=' . urlencode($row['Name']) ?>"><?= __('View Changes') ?></a> </li> - <li><a href="<?= $cgit_uri . '/snapshot/' . $row['Name'] . '.tar.gz' ?>"><?= __('Download snapshot') ?></a> + <li><a href="<?= $cgit_uri . '/snapshot/' . urlencode($row['Name']) . '.tar.gz' ?>"><?= __('Download snapshot') ?></a> <li><a href="https://wiki.archlinux.org/index.php/Special:Search?search=<?= urlencode($row['Name']) ?>"><?= __('Search wiki') ?></a></li> <li><span class="flagged"><?php if ($row["OutOfDateTS"] !== NULL) { echo __('Flagged out-of-date')." (${out_of_date_time})"; } ?></span></li> <?php if ($uid): ?> -- 2.4.2

1 0

[aur-dev] [PATCH] pkgbase_details.php: Fix cgit links
by Lukas Fleischer 09 Jun '15

09 Jun '15

We forgot to amend those when switching to gitnamespaces-based storage in b44411f (Use gitnamespaces for efficient storage, 2015-06-01). Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/template/pkgbase_details.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php index 98a7219..401ebb3 100644 --- a/web/template/pkgbase_details.php +++ b/web/template/pkgbase_details.php @@ -33,10 +33,10 @@ $pkgs = pkgbase_get_pkgnames($base_id); <h4><?= __('Package Actions') ?></h4> <ul class="small"> <li> - <a href="<?= $cgit_uri . $row['Name'] . '.git' ?>/tree/PKGBUILD"><?= __('View PKGBUILD') ?></a> / - <a href="<?= $cgit_uri . $row['Name'] . '.git' ?>/log/"><?= __('View Changes') ?></a> + <a href="<?= $cgit_uri . '/tree/PKGBUILD?h=' . $row['Name'] ?>"><?= __('View PKGBUILD') ?></a> / + <a href="<?= $cgit_uri . '/log/?h=' . $row['Name'] ?>"><?= __('View Changes') ?></a> </li> - <li><a href="<?= $cgit_uri . $row['Name'] . '.git' ?>/snapshot/master.tar.gz"><?= __('Download snapshot') ?></a></li> + <li><a href="<?= $cgit_uri . '/snapshot/' . $row['Name'] . '.tar.gz' ?>"><?= __('Download snapshot') ?></a> <li><a href="https://wiki.archlinux.org/index.php/Special:Search?search=<?= urlencode($row['Name']) ?>"><?= __('Search wiki') ?></a></li> <li><span class="flagged"><?php if ($row["OutOfDateTS"] !== NULL) { echo __('Flagged out-of-date')." (${out_of_date_time})"; } ?></span></li> <?php if ($uid): ?> -- 2.4.2

1 0

[aur-dev] [PATCH] Invert order when sorting packages by age
by Lukas Fleischer 09 Jun '15

09 Jun '15

Fixes FS#44195. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/pkgfuncs.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index b467a3d..a5f24ba 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -677,7 +677,7 @@ function pkg_search_page($SID="") { $q_sort .= "Maintainer " . $order . ", "; break; case 'a': - $q_sort .= "ModifiedTS " . $order . ", "; + $q_sort .= "-ModifiedTS " . $order . ", "; break; default: break; -- 2.4.2

1 0

[aur-dev] [PATCH 1/2] Drop suffixes from confirm parameters
by Lukas Fleischer 09 Jun '15

09 Jun '15

Remove the _delete and _disown suffixes from HTTP POST confirmation parameters. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/account.php | 2 +- web/html/pkgbase.php | 4 ++-- web/html/pkgdel.php | 2 +- web/html/pkgdisown.php | 2 +- web/html/pkgmerge.php | 2 +- web/lib/pkgfuncs.inc.php | 2 +- web/template/account_delete.php | 2 +- web/template/pkg_search_results.php | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/web/html/account.php b/web/html/account.php index cb33c4e..6ecd56e 100644 --- a/web/html/account.php +++ b/web/html/account.php @@ -70,7 +70,7 @@ if (isset($_COOKIE["AURSID"])) { /* Details for account being deleted. */ if (can_edit_account($row)) { $UID = $row['ID']; - if (in_request('confirm_Delete') && check_token()) { + if (in_request('confirm') && check_token()) { user_delete($UID); header('Location: /'); } else { diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php index 7c24b79..2f8f932 100644 --- a/web/html/pkgbase.php +++ b/web/html/pkgbase.php @@ -54,7 +54,7 @@ if (check_token()) { } elseif (current_action("do_Adopt")) { list($ret, $output) = pkgbase_adopt($ids, true, NULL); } elseif (current_action("do_Disown")) { - if (isset($_POST['confirm_Disown'])) { + if (isset($_POST['confirm'])) { $via = isset($_POST['via']) ? $_POST['via'] : NULL; list($ret, $output) = pkgbase_adopt($ids, false, $via); } else { @@ -66,7 +66,7 @@ if (check_token()) { } elseif (current_action("do_UnVote")) { list($ret, $output) = pkgbase_vote($ids, false); } elseif (current_action("do_Delete")) { - if (isset($_POST['confirm_Delete'])) { + if (isset($_POST['confirm'])) { $via = isset($_POST['via']) ? $_POST['via'] : NULL; if (!isset($_POST['merge_Into']) || empty($_POST['merge_Into'])) { list($ret, $output) = pkgbase_delete($ids, NULL, $via); diff --git a/web/html/pkgdel.php b/web/html/pkgdel.php index 45a3ad4..bad1cd3 100644 --- a/web/html/pkgdel.php +++ b/web/html/pkgdel.php @@ -34,7 +34,7 @@ if (has_credential(CRED_PKGBASE_DELETE)): ?> <?php if (isset($_GET['via'])): ?> <input type="hidden" name="via" value="<?= intval($_GET['via']) ?>" /> <?php endif; ?> - <p><input type="checkbox" name="confirm_Delete" value="1" /> + <p><input type="checkbox" name="confirm" value="1" /> <?= __("Confirm package deletion") ?></p> <p><input type="submit" class="button" name="do_Delete" value="<?= __("Delete") ?>" /></p> </fieldset> diff --git a/web/html/pkgdisown.php b/web/html/pkgdisown.php index d4a3714..50f5c79 100644 --- a/web/html/pkgdisown.php +++ b/web/html/pkgdisown.php @@ -41,7 +41,7 @@ if (has_credential(CRED_PKGBASE_DISOWN, $maintainer_uids)): ?> <?php if (isset($_GET['via'])): ?> <input type="hidden" name="via" value="<?= intval($_GET['via']) ?>" /> <?php endif; ?> - <p><input type="checkbox" name="confirm_Disown" value="1" /> + <p><input type="checkbox" name="confirm" value="1" /> <?= __("Confirm to disown the package") ?></p> <p><input type="submit" class="button" name="do_Disown" value="<?= __("Disown") ?>" /></p> </fieldset> diff --git a/web/html/pkgmerge.php b/web/html/pkgmerge.php index 5fbdbd8..a9c8894 100644 --- a/web/html/pkgmerge.php +++ b/web/html/pkgmerge.php @@ -55,7 +55,7 @@ if (has_credential(CRED_PKGBASE_DELETE)): ?> </script> <p><label for="merge_Into" ><?= __("Merge into:") ?></label> <input type="text" id="merge_Into" name="merge_Into" value="<?= isset($_GET['into']) ? $_GET['into'] : '' ?>" /></p> - <p><input type="checkbox" name="confirm_Delete" value="1" /> + <p><input type="checkbox" name="confirm" value="1" /> <?= __("Confirm package merge") ?></p> <p><input type="submit" class="button" name="do_Delete" value="<?= __("Merge") ?>" /></p> </fieldset> diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 1178550..b467a3d 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -503,7 +503,7 @@ function pkg_display_details($id=0, $row, $SID="") { * do_UnFlag - Remove out-of-date flag * do_Adopt - Adopt * do_Disown - Disown - * do_Delete - Delete (requires confirm_Delete to be set) + * do_Delete - Delete * do_Notify - Enable notification * do_UnNotify - Disable notification */ diff --git a/web/template/account_delete.php b/web/template/account_delete.php index 0d40e5a..03951fe 100644 --- a/web/template/account_delete.php +++ b/web/template/account_delete.php @@ -12,7 +12,7 @@ <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> </fieldset> <fieldset> - <p><input type="checkbox" name="confirm_Delete" value="1" /> + <p><input type="checkbox" name="confirm" value="1" /> <?= __("Confirm deletion") ?></p> <p> diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index e901408..86b4c74 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -122,7 +122,7 @@ if (!$result): ?> <?php if (has_credential(CRED_PKGBASE_DELETE)): ?> <label for="merge_Into"><?= __("Merge into") ?></label> <input type="text" id="merge_Into" name="merge_Into" /> - <input type="checkbox" name="confirm_Delete" value="1" /> <?= __("Confirm") ?> + <input type="checkbox" name="confirm" value="1" /> <?= __("Confirm") ?> <?php endif; ?> <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> <input type="submit" class="button" style="width: 80px" value="<?= __("Go") ?>" /> -- 2.4.2

1 1

[aur-dev] [PATCH] Fix official language name of Czech
by Lukas Fleischer 09 Jun '15

09 Jun '15

Reported-by: Pablo Lezaeta Reyes <prflr88(a)gmail.com> Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/translator.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/translator.inc.php b/web/lib/translator.inc.php index 29bd1b3..416ce66 100644 --- a/web/lib/translator.inc.php +++ b/web/lib/translator.inc.php @@ -21,7 +21,7 @@ global $streamer, $l10n; # Languages we have translations for $SUPPORTED_LANGS = array( "ca" => "Català", - "cs" => "česky", + "cs" => "Český", "da" => "Dansk", "de" => "Deutsch", "en" => "English", -- 2.4.2

1 0