diff options
author | Lukas Fleischer <archlinux@cryptocrack.de> | 2011-08-15 10:12:17 +0200 |
---|---|---|
committer | Lukas Fleischer <archlinux@cryptocrack.de> | 2011-08-20 20:28:47 +0200 |
commit | ee4b398033da18a0cc2c57b0b2994ca16290a99e (patch) | |
tree | 5244905927b8d4d27961a947a2f5ef5ea770f21e /web/html | |
parent | 72b657eb17f51522fecb4c0ba7f47475c88e77df (diff) | |
download | aurweb-ee4b398033da18a0cc2c57b0b2994ca16290a99e.tar.xz |
Use "%s" instead of "%h" in format strings
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>
Diffstat (limited to 'web/html')
-rw-r--r-- | web/html/index.php | 4 | ||||
-rw-r--r-- | web/html/passreset.php | 2 | ||||
-rw-r--r-- | web/html/pkgsubmit.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/web/html/index.php b/web/html/index.php index ffc5f00..138541f 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -25,7 +25,7 @@ $dbh = db_connect(); <?php 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>', '<a href="http://wiki.archlinux.org/index.php/AUR_Trusted_User_Guidelines">', @@ -37,7 +37,7 @@ echo __( <?php 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>', '<a href="http://wiki.archlinux.org/index.php/Arch_Packaging_Standards">', '</a>' diff --git a/web/html/passreset.php b/web/html/passreset.php index ed5d4d3..01f3204 100644 --- a/web/html/passreset.php +++ b/web/html/passreset.php @@ -122,7 +122,7 @@ html_header(__("Password Reset")); <?php } 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>'); ?></p> <form action="" method="post"> diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 64281c7..a5cc0c0 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -273,7 +273,7 @@ if ($uid): $error = __( "Could not create directory %s.", $incoming_pkgdir); } } 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) { |