external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use "%s" instead of "%h" in format strings

Browse source 
Use the standard string type specifier instead of "%h" in format
strings. Both specifiers are treated equally in __() so we shouldn't
break anything here. This also allows us to replace the hacky
substitution algorithm in __() by vsprintf().

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2011-08-15 10:12:17 +02:00
parent 72b657eb17
commit ee4b398033
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
web/html/index.php
View file

@ -25,7 +25,7 @@ $dbh = db_connect();
<?php <?php
echo __( echo __(
'Welcome to the AUR! Please read the %hAUR User Guidelines%h and %hAUR TU Guidelines%h for more information.', 'Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU Guidelines%s for more information.',
'<a href="http://wiki.archlinux.org/index.php/AUR_User_Guidelines">', '<a href="http://wiki.archlinux.org/index.php/AUR_User_Guidelines">',
'</a>', '</a>',
'<a href="http://wiki.archlinux.org/index.php/AUR_Trusted_User_Guidelines">', '<a href="http://wiki.archlinux.org/index.php/AUR_Trusted_User_Guidelines">',
@ -37,7 +37,7 @@ echo __(
<?php <?php
echo __( echo __(
'Contributed PKGBUILDs %hmust%h conform to the %hArch Packaging Standards%h otherwise they will be deleted!', 'Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s otherwise they will be deleted!',
'<b>', '</b>', '<b>', '</b>',
'<a href="http://wiki.archlinux.org/index.php/Arch_Packaging_Standards">', '<a href="http://wiki.archlinux.org/index.php/Arch_Packaging_Standards">',
'</a>' '</a>'

2
web/html/passreset.php
View file

@ -122,7 +122,7 @@ html_header(__("Password Reset"));
<?php <?php
} else { } else {
?> ?>
<p><?php echo __('If you have forgotten the e-mail address you used to register, please send a message to the %haur-general%h mailing list.', <p><?php echo __('If you have forgotten the e-mail address you used to register, please send a message to the %saur-general%s mailing list.',
'<a href="http://mailman.archlinux.org/mailman/listinfo/aur-general">', '<a href="http://mailman.archlinux.org/mailman/listinfo/aur-general">',
'</a>'); ?></p> '</a>'); ?></p>
<form action="" method="post"> <form action="" method="post">

2
web/html/pkgsubmit.php
View file

@ -273,7 +273,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 %h%s%h package.", "<b>", $pkg_name, "</b>"); $error = __( "You are not allowed to overwrite the %s%s%s package.", "<b>", $pkg_name, "</b>");
} }
if (!$error) { if (!$error) {

12
web/lib/acctfuncs.inc.php
View file

@ -233,7 +233,7 @@ function process_account_form($UTYPE,$TYPE,$A,$U="",$T="",$S="",$E="",
if ($result) { if ($result) {
$row = mysql_fetch_array($result); $row = mysql_fetch_array($result);
if ($row[0]) { if ($row[0]) {
$error = __("The username, %h%s%h, is already in use.", $error = __("The username, %s%s%s, is already in use.",
"<b>", htmlspecialchars($U,ENT_QUOTES), "</b>"); "<b>", htmlspecialchars($U,ENT_QUOTES), "</b>");
} }
} }
@ -251,7 +251,7 @@ function process_account_form($UTYPE,$TYPE,$A,$U="",$T="",$S="",$E="",
if ($result) { if ($result) {
$row = mysql_fetch_array($result); $row = mysql_fetch_array($result);
if ($row[0]) { if ($row[0]) {
$error = __("The address, %h%s%h, is already in use.", $error = __("The address, %s%s%s, is already in use.",
"<b>", htmlspecialchars($E,ENT_QUOTES), "</b>"); "<b>", htmlspecialchars($E,ENT_QUOTES), "</b>");
} }
} }
@ -273,12 +273,12 @@ function process_account_form($UTYPE,$TYPE,$A,$U="",$T="",$S="",$E="",
"VALUES (1, 0, '" . implode("', '", $escaped) . "')"; "VALUES (1, 0, '" . implode("', '", $escaped) . "')";
$result = db_query($q, $dbh); $result = db_query($q, $dbh);
if (!$result) { if (!$result) {
print __("Error trying to create account, %h%s%h: %s.", print __("Error trying to create account, %s%s%s: %s.",
"<b>", htmlspecialchars($U,ENT_QUOTES), "</b>", mysql_error($dbh)); "<b>", htmlspecialchars($U,ENT_QUOTES), "</b>", mysql_error($dbh));
} else { } else {
# account created/modified, tell them so. # account created/modified, tell them so.
# #
print __("The account, %h%s%h, has been successfully created.", print __("The account, %s%s%s, has been successfully created.",
"<b>", htmlspecialchars($U,ENT_QUOTES), "</b>"); "<b>", htmlspecialchars($U,ENT_QUOTES), "</b>");
print "<p>\n"; print "<p>\n";
print __("Click on the Home link above to login."); print __("Click on the Home link above to login.");
@ -310,10 +310,10 @@ function process_account_form($UTYPE,$TYPE,$A,$U="",$T="",$S="",$E="",
$q.= " WHERE ID = ".intval($UID); $q.= " WHERE ID = ".intval($UID);
$result = db_query($q, $dbh); $result = db_query($q, $dbh);
if (!$result) { if (!$result) {
print __("Error trying to modify account, %h%s%h: %s.", print __("Error trying to modify account, %s%s%s: %s.",
"<b>", htmlspecialchars($U,ENT_QUOTES), "</b>", mysql_error($dbh)); "<b>", htmlspecialchars($U,ENT_QUOTES), "</b>", mysql_error($dbh));
} else { } else {
print __("The account, %h%s%h, has been successfully modified.", print __("The account, %s%s%s, has been successfully modified.",
"<b>", htmlspecialchars($U,ENT_QUOTES), "</b>"); "<b>", htmlspecialchars($U,ENT_QUOTES), "</b>");
} }
} }