[aur-dev] [PATCH] Change "File Request" to be more explicit.
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@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")); 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
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@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/
Thanks again for the patch, Eli. Mark Weiman recently suggested "Submit Request" as an alternative in a private email. It's no secret that Mark and I don't always see eye to eye, but we do in this case. It's also worth noting that Mark has opened a ticket on the Bugtracker about this issue: https://bugs.archlinux.org/task/47167. It might just need to be assigned to the correct person in order to be effective. "Submit" doesn't have the double meaning of "file" (WRT the AUR) and it's more widespread than "lodge". Plus, it'd be relatively easy to translate into other languages as it's very much a mainstream word. I would be happy to modify Eli's patch to "Submit Request", and then do all of the necessary translations via Google Translate. *Johannes*: Before I do so, can you please indicate whether this would be acceptable?
On 25/11, Xavion wrote:
I would be happy to modify Eli's patch to "Submit Request", and then do all of the necessary translations via Google Translate. *Johannes*: Before I do so, can you please indicate whether this would be acceptable?
Sounds pretty fine to be, possibly throwing an 'a' in the middle there. -- Sincerely, Johannes Löthberg PGP Key ID: 0x50FB9B273A9D0BB5 https://theos.kyriasis.com/~kyrias/
On 11/24/2015 06:54 PM, Johannes Löthberg wrote:
On 25/11, Xavion wrote:
I would be happy to modify Eli's patch to "Submit Request", and then do all of the necessary translations via Google Translate. *Johannes*: Before I do so, can you please indicate whether this would be acceptable?
Sounds pretty fine to be, possibly throwing an 'a' in the middle there.
Well, "Submit Request" would definitely prevent the kind of issue that prompted the other thread. But I was also thinking of the issue Jiachen Yang raised in that thread, about non-native English speakers. He did suggest the specific terminology of "Delete/Orphan/Merge Request". [1] Johannes, I'm not sure why that would be confusing, but I will admit to thinking all of the possibilities, including the original, are quite clear. If "Submit Request" satisfies everyone, then so be it -- but sticking an "a" in there would basically go against the pattern of every other piece of text on the page. [1] https://lists.archlinux.org/pipermail/aur-general/2015-November/031783.html -- Eli Schwartz
Sounds pretty fine to be, possibly throwing an 'a' in the middle there.
It looks like Mark has done just that. He's posted a complete solution (including translations) in a new thread. The same patch is now available on his Bugtracker ticket as well: https://bugs.archlinux.org/task/47167 Well, "Submit Request" would definitely prevent the kind of issue that
prompted the other thread. But I was also thinking of the issue Jiachen Yang raised in that thread, about non-native English speakers. He did suggest the specific terminology of "Delete/Orphan/Merge Request". [1]
The only thing I had against "Delete/Orphan/Merge Request" is that it's a bit chunky. I wasn't going to argue, though, as you'd gone to the trouble of submitting a patch :-). The other thing is that a string like that could balloon out significantly post-translation.
If "Submit Request" satisfies everyone, then so be it -- but sticking an "a" in there would basically go against the pattern of every other piece of text on the page.
I don't really mind anymore. The key point is that we're getting rid of "File Request", which even I (a native English speaker) found somewhat confusing.
On Wed, 25 Nov 2015 at 03:52:43, Xavion wrote:
[...] The only thing I had against "Delete/Orphan/Merge Request" is that it's a bit chunky. I wasn't going to argue, though, as you'd gone to the trouble of submitting a patch :-). The other thing is that a string like that could balloon out significantly post-translation.
"Delete/Orphan/Merge Request" is too long and it has a problem similar to "File Request" ("Delete/Orphan/Merge a Request").
If "Submit Request" satisfies everyone, then so be it -- but sticking an "a" in there would basically go against the pattern of every other piece of text on the page.
I don't really mind anymore. The key point is that we're getting rid of "File Request", which even I (a native English speaker) found somewhat confusing.
Both "Submit Request" and "Submit a Request" sound fine to me.
Apparently the reference to "files" can be confusing. Fixes FS#47167 Signed-off-by: Eli Schwartz <eschwartz93@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..8348a4f 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(__("Submit Request")); 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..f8968fb 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/', __('Submit 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..6cf8588 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><?= __('Submit 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="<?= __("Submit Request") ?>" /> </p> </fieldset> </form> -- 2.6.2
On Wed, 25 Nov 2015 at 07:51:08, Eli Schwartz wrote:
Apparently the reference to "files" can be confusing.
Fixes FS#47167
Signed-off-by: Eli Schwartz <eschwartz93@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(-) [...]
It seems like this addresses all the issues I mentioned in the other thread. Since you were the first to submit a patch anyway, I will queue this one. Thanks!
On 11/25/2015 02:06 AM, Lukas Fleischer wrote:
On Wed, 25 Nov 2015 at 07:51:08, Eli Schwartz wrote:
Apparently the reference to "files" can be confusing.
Fixes FS#47167
Signed-off-by: Eli Schwartz <eschwartz93@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(-) [...]
It seems like this addresses all the issues I mentioned in the other thread. Since you were the first to submit a patch anyway, I will queue this one.
Thanks!
Well, glad that's finally over! I was kind of sitting on v2 until I heard a definite rejection of v1 from you. And I really do think avoiding the "a" is a must, unless we stick a whole bunch more "a"s, "the"s, and "your"s in there to match it. That's just awkwardly verbose, anyway. ;) -- Eli Schwartz
Well, glad that's finally over!
I was kind of sitting on v2 until I heard a definite rejection of v1 from you.
Thanks again, Eli. Most would say it was only a little problem, but I think this fix will have a decent impact. If it was even troubling for some native English speakers, something had to be done about it.
And I really do think avoiding the "a" is a must, unless we stick a whole bunch more "a"s, "the"s, and "your"s in there to match it. That's just awkwardly verbose, anyway. ;)
I'm happy with "Submit Request" as well. Even if some bonehead interprets it as a "request for submission (of the package)", that's basically just an orphan request :-). We can't possibly lose with this rewording!
On Mon 23 Nov 2015 13:38 -0500, 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:
I -strongly- believe the colour should be chartreuse!
participants (5)
-
Eli Schwartz
-
Johannes Löthberg
-
Loui Chang
-
Lukas Fleischer
-
Xavion