From 6bac561bf8cdbdb979417326173ace7a05ea391b Mon Sep 17 00:00:00 2001 From: Loui Chang Date: Sat, 24 Jan 2009 00:40:30 -0500 Subject: Rework login form. Correct some xhtml validation errors. Correct translation usage. Signed-off-by: Loui Chang --- web/lang/ca.po | 2 +- web/lang/de.po | 6 +----- web/lang/es.po | 2 +- web/lang/fr.po | 2 +- web/lang/it.po | 2 +- web/lang/pl.po | 2 +- web/lang/pt.po | 4 +--- web/lang/ru.po | 2 +- web/lang/tr.po | 4 +--- web/template/header.php | 2 -- web/template/login_form.php | 50 +++++++++++++++++++++++---------------------- 11 files changed, 35 insertions(+), 43 deletions(-) (limited to 'web') diff --git a/web/lang/ca.po b/web/lang/ca.po index 45e363d..efc99f6 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 f949493..b23b43e 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 e5e49ae..f623c27 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 6305c1f..d390984 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 c13dd6e..dd03759 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 cee21ac..9457184 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 053a5e2..9133a79 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 6ab2bf8..ca5a101 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 781305e..e08524f 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 94e7109..610338d 100644 --- a/web/template/header.php +++ b/web/template/header.php @@ -68,7 +68,6 @@ if (isset($_COOKIE["AURSID"])) {
-
  • Lang:
    • $lang_name) { } ?>
-
diff --git a/web/template/login_form.php b/web/template/login_form.php index 1eba5cf..6ada88b 100644 --- a/web/template/login_form.php +++ b/web/template/login_form.php @@ -1,27 +1,29 @@ - - ", username_from_sid($_COOKIE["AURSID"]), "")); +
+' . username_from_sid($_COOKIE["AURSID"]) . ''); ?> -
+ [] " . $login_error . "
\n"; - } - ?> -
- - - - - - " /> -
- - +} +else { + if ($login_error) { + print "" . $login_error . "
\n"; + } +?> +
+
+ + + + + + " /> +
+
+ +
-- cgit v1.2.3-54-g00ecf