summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoui Chang <louipc.ist@gmail.com>2009-01-24 06:40:30 +0100
committerLoui Chang <louipc.ist@gmail.com>2009-01-24 06:40:30 +0100
commit6bac561bf8cdbdb979417326173ace7a05ea391b (patch)
treeeeb4929f7c508b8c01666f1a0c547800797c8b63
parentff3a29ea075b661b5110572325bcd9db78518051 (diff)
downloadaur-6bac561bf8cdbdb979417326173ace7a05ea391b.tar.gz
aur-6bac561bf8cdbdb979417326173ace7a05ea391b.tar.xz
Rework login form.
Correct some xhtml validation errors. Correct translation usage. Signed-off-by: Loui Chang <louipc.ist@gmail.com>
-rw-r--r--web/lang/ca.po2
-rw-r--r--web/lang/de.po6
-rw-r--r--web/lang/es.po2
-rw-r--r--web/lang/fr.po2
-rw-r--r--web/lang/it.po2
-rw-r--r--web/lang/pl.po2
-rw-r--r--web/lang/pt.po4
-rw-r--r--web/lang/ru.po2
-rw-r--r--web/lang/tr.po4
-rw-r--r--web/template/header.php2
-rw-r--r--web/template/login_form.php50
11 files changed, 35 insertions, 43 deletions
diff --git a/web/lang/ca.po b/web/lang/ca.po
index 45e363dc..efc99f6c 100644
--- a/web/lang/ca.po
+++ b/web/lang/ca.po
@@ -187,7 +187,7 @@ $_t["Password:"] = "Contrasenya:";
$_t["Registered Users"] = "Usuaris registrats";
-$_t["Logged-in as: %h%s%h"] = "Identificat com: %h%s%h";
+$_t["Logged-in as: %s"] = "Identificat com: %s";
$_t["Incorrect password for username, %s."] = "Contrasenya incorrecta per a l'usuari, %s.";
diff --git a/web/lang/de.po b/web/lang/de.po
index f949493c..b23b43e7 100644
--- a/web/lang/de.po
+++ b/web/lang/de.po
@@ -190,7 +190,7 @@ $_t["Password:"] = "Passwort";
$_t["Registered Users"] = "Registrierte Benutzer";
-$_t["Logged-in as: %h%s%h"] = "Angemeldet als: %h%s%h";
+$_t["Logged-in as: %s"] = "Angemeldet als: %s";
$_t["Incorrect password for username, %s."] = "Falsches Passwort für Benutzername %s.";
@@ -350,8 +350,6 @@ $_t["Search Criteria"] = "Suchkriterien";
$_t["Notify"] = "Benachrichtigen";
-$_t["O%hut-of-Date"] = "V%heraltet";
-
$_t["Vote"] = "Abstimmen";
$_t["Adopt Packages"] = "Pakete übernehmen";
@@ -402,8 +400,6 @@ $_t["Required by"] = "Benötigt von";
$_t["Accounts"] = "Konten";
-
-
$_t["None of the selected packages could be deleted."] = "Keines der markierten Pakete konnte gelöscht werden.";
$_t["Your votes have been removed from the selected packages."] = "Deine Stimmen wurden von den markierten Paketen entfernt.";
diff --git a/web/lang/es.po b/web/lang/es.po
index e5e49ae7..f623c272 100644
--- a/web/lang/es.po
+++ b/web/lang/es.po
@@ -189,7 +189,7 @@ $_t["Password:"] = "Contraseña:";
$_t["Registered Users"] = "Usuarios Registrados";
-$_t["Logged-in as: %h%s%h"] = "Identificado como: %h%s%h";
+$_t["Logged-in as: %s"] = "Identificado como: %s";
$_t["Incorrect password for username, %s."] = "Contraseña incorrecta para el usuario, %s.";
diff --git a/web/lang/fr.po b/web/lang/fr.po
index 6305c1f6..d390984a 100644
--- a/web/lang/fr.po
+++ b/web/lang/fr.po
@@ -199,7 +199,7 @@ $_t["Password:"] = "Mot de passe:";
$_t["Registered Users"] = "Utilisateurs enregistrés";
-$_t["Logged-in as: %h%s%h"] = " Connecté en tant que: %h%s%h";
+$_t["Logged-in as: %s"] = " Connecté en tant que: %s";
$_t["Incorrect password for username, %s."] = "Mot de passe incorrect pour l'utilisateur, %s.";
diff --git a/web/lang/it.po b/web/lang/it.po
index c13dd6ec..dd037595 100644
--- a/web/lang/it.po
+++ b/web/lang/it.po
@@ -161,7 +161,7 @@ $_t["You must supply a username."] = "È necessario inserire il nome utente.";
$_t["After that, this can be filled in with more meaningful text."] = "Dopotutto, questo potrebbe essere riempito con un messaggio più significativo.";
-$_t["Logged-in as: %h%s%h"] = "Connesso con il nome utente: %h%s%h";
+$_t["Logged-in as: %s"] = "Connesso con il nome utente: %s";
$_t["Your account has been suspended."] = "L'account è stato sospeso.";
diff --git a/web/lang/pl.po b/web/lang/pl.po
index cee21ac0..9457184a 100644
--- a/web/lang/pl.po
+++ b/web/lang/pl.po
@@ -181,7 +181,7 @@ $_t["Email Address:"] = "Adres e-mail:";
$_t["You must supply an email address."] = "Musisz podać adres e-mail.";
$_t["Incorrect password for email address, %s."] = "Nieprawidłowe hasło dla adresu %s.";
$_t["Incorrect password for username, %s."] = "Nieprawidłowe hasło dla użytkownika %s.";
-$_t["Logged in as: %h%s%h"] = "Zalogowany jako: %h%s%h";
+$_t["Logged in as: %s"] = "Zalogowany jako: %s";
$_t["Error looking up username, %s."] = "Błąd podczas wyszukiwania użytkownika %s.";
$_t["Welcome to the AUR! If you're a newcomer, you may want to read the %hGuidelines%h."] = "Witamy w AUR! Jeżeli jesteś tu po raz pierwszy, być może zechcesz przeczytać %hInstrukcję%h.";
diff --git a/web/lang/pt.po b/web/lang/pt.po
index 053a5e2f..9133a792 100644
--- a/web/lang/pt.po
+++ b/web/lang/pt.po
@@ -147,15 +147,13 @@ $_t["Create"] = "Criar";
$_t["More"] = "Mais";
-
-
$_t["You must supply a password."] = "Você deve informar uma senha.";
$_t["You must supply a username."] = "Você deve informar um usuário.";
$_t["After that, this can be filled in with more meaningful text."] = "Depois, isso pode ter um texto mais significativo.";
-$_t["Logged-in as: %h%s%h"] = "Logado como: %h%s%h";
+$_t["Logged-in as: %s"] = "Logado como: %s";
$_t["Your account has been suspended."] = "Sua conta foi suspensa.";
diff --git a/web/lang/ru.po b/web/lang/ru.po
index 6ab2bf8c..ca5a101a 100644
--- a/web/lang/ru.po
+++ b/web/lang/ru.po
@@ -199,7 +199,7 @@ $_t["Password:"] = "Пароль:";
$_t["Registered Users"] = "Зарегистрированных пользователей";
-$_t["Logged-in as: %h%s%h"] = "Вошли как: %h%s%h";
+$_t["Logged-in as: %s"] = "Вошли как: %s";
$_t["Incorrect password for username, %s."] = "Неверный пароль для пользователя %s.";
diff --git a/web/lang/tr.po b/web/lang/tr.po
index 781305e2..e08524fe 100644
--- a/web/lang/tr.po
+++ b/web/lang/tr.po
@@ -149,15 +149,13 @@ $_t["Create"] = "Oluştur";
$_t["More"] = "Sonraki";
-
-
$_t["You must supply a password."] = "Bir parola belirlemelisiniz.";
$_t["You must supply a username."] = "Bir kullanıcı adı belirlemelisiniz.";
$_t["After that, this can be filled in with more meaningful text."] = "Eksiklikleri tamamladıktan sonra, bu kısma anlamlı bir açıklama yazabilirsiniz.";
-$_t["Logged-in as: %h%s%h"] = "%h%s%h olarak giriş yapıldı";
+$_t["Logged-in as: %s"] = "%s olarak giriş yapıldı";
$_t["Your account has been suspended."] = "Hesabınız donduruldu.";
diff --git a/web/template/header.php b/web/template/header.php
index 94e7109b..610338d0 100644
--- a/web/template/header.php
+++ b/web/template/header.php
@@ -68,7 +68,6 @@ if (isset($_COOKIE["AURSID"])) {
</div>
</div>
<div id="lang_login_sub">
- <span id="lang_bar">
<ul>
<li>Lang: </li>
<?php
@@ -81,7 +80,6 @@ foreach ($SUPPORTED_LANGS as $lang => $lang_name) {
}
?>
</ul>
- </span>
<?php include("login_form.php"); ?>
</div>
<div id="maincontent">
diff --git a/web/template/login_form.php b/web/template/login_form.php
index 1eba5cf6..6ada88bf 100644
--- a/web/template/login_form.php
+++ b/web/template/login_form.php
@@ -1,27 +1,29 @@
-<span id="login_bar">
- <?php
- if (isset($_COOKIE["AURSID"])) {
- print __("Logged-in as: %h%s%h", array("<b>", username_from_sid($_COOKIE["AURSID"]), "</b>"));
+<div id="login_bar">
+<?php
+if (isset($_COOKIE["AURSID"])) {
+ print __("Logged-in as: %s", '<b>' . username_from_sid($_COOKIE["AURSID"]) . '</b>');
?>
-<br /><a href="logout.php"><?php print __("Logout"); ?></a>
+ <a href="logout.php">[<?php print __("Logout"); ?>]</a>
<?php
- }
- else {
- if ($login_error) {
- print "<span class='error'>" . $login_error . "</span><br />\n";
- }
- ?>
- <form method="post">
- <label><?php print __('Username') . ':'; ?></label>
- <input type="text" name="user" size="30" maxlength="<?php print USERNAME_MAX_LEN; ?>" value="<?php
- if (isset($_POST['user'])) {
- print htmlspecialchars($_POST['user'], ENT_QUOTES);
- } ?>" />
- <label><?php print __('Password') . ':'; ?></label>
- <input type="password" name="passwd" size="30" maxlength="<?php print PASSWD_MAX_LEN; ?>" />
- <input type="checkbox" name="remember_me" /><?php print __("Remember me"); ?>
- <input type="submit" class="button" value="<?php print __("Login"); ?>" />
- </form>
- <?php } ?>
-</span>
+}
+else {
+ if ($login_error) {
+ print "<span class='error'>" . $login_error . "</span><br />\n";
+ }
+?>
+<form method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
+ <div>
+ <?php print __('Username') . ':'; ?>
+ <input type="text" name="user" size="30" maxlength="<?php print USERNAME_MAX_LEN; ?>" value="<?php
+ if (isset($_POST['user'])) {
+ print htmlspecialchars($_POST['user'], ENT_QUOTES);
+ } ?>" />
+ <?php print __('Password') . ':'; ?>
+ <input type="password" name="passwd" size="30" maxlength="<?php print PASSWD_MAX_LEN; ?>" />
+ <input type="checkbox" name="remember_me" /><?php print __("Remember me"); ?>
+ <input type="submit" class="button" value="<?php print __("Login"); ?>" />
+ </div>
+</form>
+<?php } ?>
+</div>