[aur-dev] [PATCH] Make some translatable strings friendlier to common usage.
Removing trailing colons and whitespace makes them more usable. Signed-off-by: Loui Chang <louipc.ist@gmail.com> --- web/html/addvote.php | 6 +++--- web/template/tu_details.php | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/html/addvote.php b/web/html/addvote.php index a31a1ff..5c1ff33 100644 --- a/web/html/addvote.php +++ b/web/html/addvote.php @@ -68,15 +68,15 @@ if ($atype == "Trusted User" OR $atype == "Developer") { <p><?php print __("Submit a proposal to vote on.") ?></p> <?php if (!empty($error)) { print $error . "<br />"; } ?> <form action='addvote.php' method='post'> -<b><?php print __("Applicant/TU:") ?></b> +<b><?php print __('Applicant/TU') ?></b> <input type='text' name='user' value='<?php if (!empty($_POST['user'])) { print htmlentities($_POST['user'], ENT_QUOTES); } ?>'> <?php print __("(empty if not applicable)") ?> <br /> -<b><?php print __("Length in days:") ?></b> +<b><?php print __('Length in days') ?></b> <input type='text' name='length' value='<?php if (!empty($_POST['length'])) { print htmlentities($_POST['length'], ENT_QUOTES); } ?>'> <?php print __("(defaults to 7 if empty)") ?> <br /> -<b><?php print __("Proposal:") ?></b><br /> +<b><?php print __('Proposal') ?></b><br /> <textarea name='agenda' rows='10' cols='50'><?php if (!empty($_POST['agenda'])) { print htmlentities($_POST['agenda']); } ?></textarea><br /> <input type='hidden' name='addVote' value='1'> <input type='submit' class='button' value='Submit'> diff --git a/web/template/tu_details.php b/web/template/tu_details.php index b1d69f6..7fc9f09 100644 --- a/web/template/tu_details.php +++ b/web/template/tu_details.php @@ -4,8 +4,8 @@ <?php if ($isrunning == 1) { ?> <div style='text-align: center; font-weight: bold; color: red'><?php print __("This vote is still running.") ?></div> <br /> -<?php } ?> -User: <b> +<?php } +echo __('User') ?>: <b> <?php if (!empty($row['User'])) { ?> <a href='packages.php?K=<?php print $row['User'] ?>&SeB=m'><?php print $row['User'] ?></a> <?php } else { ?> @@ -13,7 +13,7 @@ N/A <?php } ?> </b><br /> <?php print __("Submitted: %s by %s", "<b>" . gmdate("r", $row['Submitted']) . "</b>", "<b>" . username_from_id($row['SubmitterID']) . "</b>") ?><br /> -<?php print __("End: ") ?><b><?php print gmdate("r", $row['End']) ?></b><br /><br /> +<?php print __('End') ?>: <b><?php print gmdate("r", $row['End']) ?></b><br /><br /> <?php print str_replace("\n", "<br />\n", htmlentities($row['Agenda'])) ?><br /><br /> <center> <table cellspacing='3' class='boxSoft' style='width: 50%'> @@ -26,7 +26,7 @@ N/A <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("No") ?></span></th> <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Abstain") ?></span></th> <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Total") ?></span></th> -<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Voted?") ?></span></th> +<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __('Voted') ?></span></th> </tr> <tr> <td class='data1'><span class='f5'><span class='blue'><?php print $row['Yes'] ?></span></span></td> -- 1.6.0.5
Looking at the file, I'm not sure this is an issue here. But, please be careful when removing punctuation from translation, the punctuation shall be translated as much as text. As an example, in french the characters ':;?!' shall have a (non breakable) space before them. Not having it is a miskate. Whereas having it is a mistake in english. "Question?" shall be translated in french by "Question ?" or even better "Question ?" 2008/12/21 Loui Chang <louipc.ist@gmail.com>:
Removing trailing colons and whitespace makes them more usable.
Signed-off-by: Loui Chang <louipc.ist@gmail.com> --- web/html/addvote.php | 6 +++--- web/template/tu_details.php | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/web/html/addvote.php b/web/html/addvote.php index a31a1ff..5c1ff33 100644 --- a/web/html/addvote.php +++ b/web/html/addvote.php @@ -68,15 +68,15 @@ if ($atype == "Trusted User" OR $atype == "Developer") { <p><?php print __("Submit a proposal to vote on.") ?></p> <?php if (!empty($error)) { print $error . "<br />"; } ?> <form action='addvote.php' method='post'> -<b><?php print __("Applicant/TU:") ?></b> +<b><?php print __('Applicant/TU') ?></b> <input type='text' name='user' value='<?php if (!empty($_POST['user'])) { print htmlentities($_POST['user'], ENT_QUOTES); } ?>'> <?php print __("(empty if not applicable)") ?> <br /> -<b><?php print __("Length in days:") ?></b> +<b><?php print __('Length in days') ?></b> <input type='text' name='length' value='<?php if (!empty($_POST['length'])) { print htmlentities($_POST['length'], ENT_QUOTES); } ?>'> <?php print __("(defaults to 7 if empty)") ?> <br /> -<b><?php print __("Proposal:") ?></b><br /> +<b><?php print __('Proposal') ?></b><br /> <textarea name='agenda' rows='10' cols='50'><?php if (!empty($_POST['agenda'])) { print htmlentities($_POST['agenda']); } ?></textarea><br /> <input type='hidden' name='addVote' value='1'> <input type='submit' class='button' value='Submit'> diff --git a/web/template/tu_details.php b/web/template/tu_details.php index b1d69f6..7fc9f09 100644 --- a/web/template/tu_details.php +++ b/web/template/tu_details.php @@ -4,8 +4,8 @@ <?php if ($isrunning == 1) { ?> <div style='text-align: center; font-weight: bold; color: red'><?php print __("This vote is still running.") ?></div> <br /> -<?php } ?> -User: <b> +<?php } +echo __('User') ?>: <b> <?php if (!empty($row['User'])) { ?> <a href='packages.php?K=<?php print $row['User'] ?>&SeB=m'><?php print $row['User'] ?></a> <?php } else { ?> @@ -13,7 +13,7 @@ N/A <?php } ?> </b><br /> <?php print __("Submitted: %s by %s", "<b>" . gmdate("r", $row['Submitted']) . "</b>", "<b>" . username_from_id($row['SubmitterID']) . "</b>") ?><br /> -<?php print __("End: ") ?><b><?php print gmdate("r", $row['End']) ?></b><br /><br /> +<?php print __('End') ?>: <b><?php print gmdate("r", $row['End']) ?></b><br /><br /> <?php print str_replace("\n", "<br />\n", htmlentities($row['Agenda'])) ?><br /><br /> <center> <table cellspacing='3' class='boxSoft' style='width: 50%'> @@ -26,7 +26,7 @@ N/A <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("No") ?></span></th> <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Abstain") ?></span></th> <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Total") ?></span></th> -<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Voted?") ?></span></th> +<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __('Voted') ?></span></th> </tr> <tr> <td class='data1'><span class='f5'><span class='blue'><?php print $row['Yes'] ?></span></span></td> -- 1.6.0.5
On Sun, Dec 21, 2008 at 10:15:28PM +0100, Cilyan Olowen wrote:
Looking at the file, I'm not sure this is an issue here.
But, please be careful when removing punctuation from translation, the punctuation shall be translated as much as text. As an example, in french the characters ':;?!' shall have a (non breakable) space before them. Not having it is a miskate. Whereas having it is a mistake in english.
"Question?" shall be translated in french by "Question ?" or even better "Question ?"
Ah that makes things a bit tricky. This patch is so the strings can be used in other places easily, mainly for labels and such. When it comes to full sentences, all punctuation should be included.
Pushed, assuming there are no objections. -- Callan Barrett
participants (3)
-
Callan Barrett
-
Cilyan Olowen
-
Loui Chang