[aur-dev] [PATCH] Change "File Request" to be more explicit.

[Johannes Löthberg]

On 23/11, Eli Schwartz wrote:
>Apparently it confuses some people, and there appears to be enough space
>in the Package Actions section anyway.
>
>Fixes: https://lists.archlinux.org/pipermail/aur-general/2015-November/031776.html
>
>Because a 37-post flame war is fun. :rolleyes:
>
>Signed-off-by: Eli Schwartz <eschwartz93 at gmail.com>
>---
> web/html/pkgreq.php              | 2 +-
> web/template/pkgbase_actions.php | 2 +-
> web/template/pkgreq_form.php     | 4 ++--
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/web/html/pkgreq.php b/web/html/pkgreq.php
>index 1e671d0..5f5aca4 100644
>--- a/web/html/pkgreq.php
>+++ b/web/html/pkgreq.php
>@@ -13,7 +13,7 @@ if (isset($base_id)) {
> 		header('Location: /');
> 		exit();
> 	}
>-	html_header(__("File Request"));
>+	html_header(__("Delete/Orphan/Merge Request"));

That sounds even more confusing to me... Either way, the translation 
catalogues have to be rebuilt again as well.

> 	include('pkgreq_form.php');
> } elseif (isset($pkgreq_id)) {
> 	if (!has_credential(CRED_PKGREQ_CLOSE)) {
>diff --git a/web/template/pkgbase_actions.php b/web/template/pkgbase_actions.php
>index 198f7ab..f70ddf9 100644
>--- a/web/template/pkgbase_actions.php
>+++ b/web/template/pkgbase_actions.php
>@@ -32,7 +32,7 @@
> 			<?php endif; ?>
>
> 			<li><span class="flagged"><?php if ($row["RequestCount"] > 0) { echo _n('%d pending request', '%d pending requests', $row["RequestCount"]); } ?></span></li>
>-			<li><?= html_action_link($base_uri . 'request/', __('File Request')) ?></li>
>+			<li><?= html_action_link($base_uri . 'request/', __('Delete/Orphan/Merge Request')) ?></li>
>
> 			<?php if (has_credential(CRED_PKGBASE_DELETE)): ?>
> 			<li><?= html_action_link($base_uri . 'delete/', __('Delete Package')) ?></li>
>diff --git a/web/template/pkgreq_form.php b/web/template/pkgreq_form.php
>index 623c247..9fd3cd5 100644
>--- a/web/template/pkgreq_form.php
>+++ b/web/template/pkgreq_form.php
>@@ -1,5 +1,5 @@
> <div class="box">
>-	<h2><?= __('File Request: %s', htmlspecialchars($pkgbase_name)) ?></h2>
>+	<h2><?= __('Delete/Orphan/Merge Request: %s', htmlspecialchars($pkgbase_name)) ?></h2>
> 	<p>
> 		<?= __('Use this form to file a request against package base %s%s%s which includes the following packages:',
> 			'<strong>', htmlspecialchars($pkgbase_name), '</strong>'); ?>
>@@ -58,7 +58,7 @@
> 				<textarea name="comments" id="id_comments" rows="5" cols="50"></textarea>
> 			</p>
> 			<p>
>-				<input type="submit" class="button" name="do_FileRequest" value="<?= __("File Request") ?>" />
>+				<input type="submit" class="button" name="do_FileRequest" value="<?= __("Delete/Orphan/Merge Request") ?>" />
> 			</p>
> 		</fieldset>
> 	</form>
>-- 
>2.6.2

-- 
Sincerely,
  Johannes Löthberg
  PGP Key ID: 0x50FB9B273A9D0BB5
  https://theos.kyriasis.com/~kyrias/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 1565 bytes
Desc: not available
URL: <https://lists.archlinux.org/pipermail/aur-dev/attachments/20151123/85b54b89/attachment.asc>