From 22b50800e8fbda48830a3f2dfcc6a8ca5efb3a1c Mon Sep 17 00:00:00 2001
From: Loui Chang <louipc.ist@gmail.com>
Date: Sun, 21 Dec 2008 15:10:25 -0500
Subject: 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>
Signed-off-by: Callan Barrett <wizzomafizzo@gmail.com>
---
 web/html/addvote.php        | 6 +++---
 web/template/tu_details.php | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'web')

diff --git a/web/html/addvote.php b/web/html/addvote.php
index a31a1ff5..5c1ff334 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 b1d69f6e..7fc9f09f 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'] ?>&amp;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>
-- 
cgit v1.2.3-24-g4f1b