summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/user/controllers/login.php8
-rw-r--r--modules/user/views/login.html.php6
2 files changed, 7 insertions, 7 deletions
diff --git a/modules/user/controllers/login.php b/modules/user/controllers/login.php
index e0defa59..7c70bb0f 100644
--- a/modules/user/controllers/login.php
+++ b/modules/user/controllers/login.php
@@ -37,17 +37,17 @@ class Login_Controller extends Controller {
// Load the user
$user = ORM::factory("user")->where("name", $form->username->value)->find();
if (!$user->loaded) {
- $response["error_message"] = "Invalid username or password";
+ $response["error_message"] = _("Invalid username or password");
} else {
- if (user::is_correct_password($user,$form->password->value)) {
+ if (user::is_correct_password($user, $form->password->value)) {
user::login($user);
$response["error_message"] = "";
} else {
- $response["error_message"] = "Invalid username or password";
+ $response["error_message"] = _("Invalid username or password");
}
}
} else {
- $response["error_message"] = "Invalid username or password";
+ $response["error_message"] = _("Invalid username or password");
}
print json_encode($response);
diff --git a/modules/user/views/login.html.php b/modules/user/views/login.html.php
index fa7dbc9b..a6abf4ab 100644
--- a/modules/user/views/login.html.php
+++ b/modules/user/views/login.html.php
@@ -1,14 +1,14 @@
<? defined("SYSPATH") or die("No direct script access."); ?>
<form id="gLogin" action="<?= url::site("login/process") ?>">
<fieldset>
- <legend>Login</legend>
+ <legend><?= _("Login") ?></legend>
<ul class="gInline">
<li>
- <label for="gUsername">Username</label>
+ <label for="gUsername"><?= _("Username") ?></label>
<input type="text" id="gUsername" />
</li>
<li>
- <label for="gPassword">Password</label>
+ <label for="gPassword"><?= _("Password") ?></label>
<input type="password" id="gPassword" />
</li>
<li>