Commit d56a8889 authored by Lukas Fleischer's avatar Lukas Fleischer
Browse files

Avoid use of "<b>"/"</b>"



* Use "<label>"/"</label>" for form labels.
* Use "<strong>"/"</strong>" for important text.
* Use "<h4>"/"</h4>" for headings.
* Drop "<b>"/"</b>" everywhere else.

Signed-off-by: default avatarLukas Fleischer <archlinux@cryptocrack.de>
parent 6102759b
...@@ -70,18 +70,18 @@ if ($atype == "Trusted User" || $atype == "Developer") { ...@@ -70,18 +70,18 @@ if ($atype == "Trusted User" || $atype == "Developer") {
<form action="<?= get_uri('/addvote/'); ?>" method="post"> <form action="<?= get_uri('/addvote/'); ?>" method="post">
<p> <p>
<b><?= __("Applicant/TU") ?></b> <label for="id_user"><?= __("Applicant/TU") ?></label>
<input type="text" name="user" value="<?php if (!empty($_POST['user'])) { print htmlentities($_POST['user'], ENT_QUOTES); } ?>" /> <input type="text" name="user" id="id_user" value="<?php if (!empty($_POST['user'])) { print htmlentities($_POST['user'], ENT_QUOTES); } ?>" />
<?= __("(empty if not applicable)") ?> <?= __("(empty if not applicable)") ?>
</p> </p>
<p> <p>
<b><?= __("Length in days") ?></b> <label for="id_length"><?= __("Length in days") ?></label>
<input type="text" name="length" value="<?php if (!empty($_POST['length'])) { print htmlentities($_POST['length'], ENT_QUOTES); } ?>" /> <input type="text" name="length" id="id_length" value="<?php if (!empty($_POST['length'])) { print htmlentities($_POST['length'], ENT_QUOTES); } ?>" />
<?= __("(defaults to 7 if empty)") ?> <?= __("(defaults to 7 if empty)") ?>
</p> </p>
<p> <p>
<b><?= __("Proposal") ?></b><br /> <label for="id_agenda"><?= __("Proposal") ?></label><br />
<textarea name="agenda" rows="15" cols="80"><?php if (!empty($_POST['agenda'])) { print htmlentities($_POST['agenda']); } ?></textarea><br /> <textarea name="agenda" id="id_agenda" rows="15" cols="80"><?php if (!empty($_POST['agenda'])) { print htmlentities($_POST['agenda']); } ?></textarea><br />
<input type="hidden" name="addVote" value="1" /> <input type="hidden" name="addVote" value="1" />
<input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" />
<input type="submit" class="button" value="<?= __("Submit"); ?>" /> <input type="submit" class="button" value="<?= __("Submit"); ?>" />
......
...@@ -33,7 +33,7 @@ $dbh = db_connect(); ...@@ -33,7 +33,7 @@ $dbh = db_connect();
<?php <?php
echo __( echo __(
'Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s otherwise they will be deleted!', 'Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s otherwise they will be deleted!',
'<b>', '</b>', '<strong>', '</strong>',
'<a href="http://wiki.archlinux.org/index.php/Arch_Packaging_Standards">', '<a href="http://wiki.archlinux.org/index.php/Arch_Packaging_Standards">',
'</a>' '</a>'
); );
...@@ -67,9 +67,8 @@ $dbh = db_connect(); ...@@ -67,9 +67,8 @@ $dbh = db_connect();
?> ?>
</p> </p>
<h4><?= __('DISCLAIMER') ?></h4>
<div class="important"> <div class="important">
<b><?= __('DISCLAIMER') ?> :</b>
<br />
<?= __('Unsupported packages are user produced content. Any use of the provided files is at your own risk.'); ?> <?= __('Unsupported packages are user produced content. Any use of the provided files is at your own risk.'); ?>
</div> </div>
</div> </div>
......
...@@ -324,7 +324,7 @@ if ($uid): ...@@ -324,7 +324,7 @@ if ($uid):
$error = __( "Could not create directory %s.", $incoming_pkgdir); $error = __( "Could not create directory %s.", $incoming_pkgdir);
} }
} else { } else {
$error = __( "You are not allowed to overwrite the %s%s%s package.", "<b>", $pkg_name, "</b>"); $error = __( "You are not allowed to overwrite the %s%s%s package.", "<strong>", $pkg_name, "</strong>");
} }
if (!$error) { if (!$error) {
......
...@@ -165,7 +165,7 @@ function process_account_form($UTYPE,$TYPE,$A,$U="",$T="",$S="",$E="", ...@@ -165,7 +165,7 @@ function process_account_form($UTYPE,$TYPE,$A,$U="",$T="",$S="",$E="",
if ($row[0]) { if ($row[0]) {
$error = __("The username, %s%s%s, is already in use.", $error = __("The username, %s%s%s, is already in use.",
"<b>", htmlspecialchars($U,ENT_QUOTES), "</b>"); "<strong>", htmlspecialchars($U,ENT_QUOTES), "</strong>");
} }
} }
if (!$error) { if (!$error) {
...@@ -182,7 +182,7 @@ function process_account_form($UTYPE,$TYPE,$A,$U="",$T="",$S="",$E="", ...@@ -182,7 +182,7 @@ function process_account_form($UTYPE,$TYPE,$A,$U="",$T="",$S="",$E="",
if ($row[0]) { if ($row[0]) {
$error = __("The address, %s%s%s, is already in use.", $error = __("The address, %s%s%s, is already in use.",
"<b>", htmlspecialchars($E,ENT_QUOTES), "</b>"); "<strong>", htmlspecialchars($E,ENT_QUOTES), "</strong>");
} }
} }
if ($error) { if ($error) {
...@@ -209,12 +209,12 @@ function process_account_form($UTYPE,$TYPE,$A,$U="",$T="",$S="",$E="", ...@@ -209,12 +209,12 @@ function process_account_form($UTYPE,$TYPE,$A,$U="",$T="",$S="",$E="",
$result = $dbh->exec($q); $result = $dbh->exec($q);
if (!$result) { if (!$result) {
print __("Error trying to create account, %s%s%s.", print __("Error trying to create account, %s%s%s.",
"<b>", htmlspecialchars($U,ENT_QUOTES), "</b>"); "<strong>", htmlspecialchars($U,ENT_QUOTES), "</strong>");
} else { } else {
# account created/modified, tell them so. # account created/modified, tell them so.
# #
print __("The account, %s%s%s, has been successfully created.", print __("The account, %s%s%s, has been successfully created.",
"<b>", htmlspecialchars($U,ENT_QUOTES), "</b>"); "<strong>", htmlspecialchars($U,ENT_QUOTES), "</strong>");
print "<p>\n"; print "<p>\n";
print __("Click on the Login link above to use your account."); print __("Click on the Login link above to use your account.");
print "</p>\n"; print "</p>\n";
...@@ -247,10 +247,10 @@ function process_account_form($UTYPE,$TYPE,$A,$U="",$T="",$S="",$E="", ...@@ -247,10 +247,10 @@ function process_account_form($UTYPE,$TYPE,$A,$U="",$T="",$S="",$E="",
$result = $dbh->exec($q); $result = $dbh->exec($q);
if (!$result) { if (!$result) {
print __("Error trying to modify account, %s%s%s.", print __("Error trying to modify account, %s%s%s.",
"<b>", htmlspecialchars($U,ENT_QUOTES), "</b>"); "<strong>", htmlspecialchars($U,ENT_QUOTES), "</strong>");
} else { } else {
print __("The account, %s%s%s, has been successfully modified.", print __("The account, %s%s%s, has been successfully modified.",
"<b>", htmlspecialchars($U,ENT_QUOTES), "</b>"); "<strong>", htmlspecialchars($U,ENT_QUOTES), "</strong>");
} }
} }
} }
......
...@@ -689,7 +689,7 @@ class FeedCreator extends HtmlDescribable { ...@@ -689,7 +689,7 @@ class FeedCreator extends HtmlDescribable {
$this->_redirect($filename); $this->_redirect($filename);
} }
} else { } else {
echo "<br /><b>Error creating feed file, please check write permissions.</b><br />"; echo "<br /><strong>Error creating feed file, please check write permissions.</strong><br />";
} }
} }
......
...@@ -9,7 +9,7 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR ...@@ -9,7 +9,7 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR
# #
# examples: # examples:
# print __("%s has %s apples.", "Bill", "5"); # print __("%s has %s apples.", "Bill", "5");
# print __("This is a %smajor%s problem!", "<b>", "</b>"); # print __("This is a %smajor%s problem!", "<strong>", "</strong>");
include_once('config.inc.php'); include_once('config.inc.php');
include_once('gettext.php'); include_once('gettext.php');
......
...@@ -9,18 +9,18 @@ ...@@ -9,18 +9,18 @@
<p> <p>
<?= __("User") ?>: <?= __("User") ?>:
<b> <strong>
<?php if (!empty($row['User'])): ?> <?php if (!empty($row['User'])): ?>
<a href="<?= get_uri('/packages/'); ?>?K=<?= $row['User'] ?>&amp;SeB=m"><?= $row['User'] ?></a> <a href="<?= get_uri('/packages/'); ?>?K=<?= $row['User'] ?>&amp;SeB=m"><?= $row['User'] ?></a>
<?php else: ?> <?php else: ?>
N/A N/A
<?php endif; ?> <?php endif; ?>
</b> </strong>
<br /> <br />
<?= __("Submitted: %s by %s", "<b>" . gmdate("Y-m-d H:i", $row['Submitted']) . "</b>", "<b>" . username_from_id($row['SubmitterID']) . "</b>") ?> <?= __("Submitted: %s by %s", gmdate("Y-m-d H:i", $row['Submitted']), username_from_id($row['SubmitterID'])) ?>
<br /> <br />
<?= __("End") ?>: <?= __("End") ?>:
<b><?= gmdate("Y-m-d H:i", $row['End']) ?></b> <strong><?= gmdate("Y-m-d H:i", $row['End']) ?></strong>
</p> </p>
<p> <p>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment