summaryrefslogtreecommitdiff
path: root/modules/user/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'modules/user/controllers')
-rw-r--r--modules/user/controllers/admin_groups.php15
-rw-r--r--modules/user/controllers/admin_users.php15
-rw-r--r--modules/user/controllers/login.php14
-rw-r--r--modules/user/controllers/logout.php2
4 files changed, 24 insertions, 22 deletions
diff --git a/modules/user/controllers/admin_groups.php b/modules/user/controllers/admin_groups.php
index 01500f96..d05558a9 100644
--- a/modules/user/controllers/admin_groups.php
+++ b/modules/user/controllers/admin_groups.php
@@ -40,10 +40,10 @@ class Admin_Groups_Controller extends Controller {
if ($valid) {
$group = group::create($new_name);
$group->save();
- message::success(sprintf(_("Created group %s"), $group->name));
+ message::success(t("Created group {{group_name}}", array("group_name" => $group->name)));
print json_encode(array("result" => "success"));
} else {
- message::error(_("Failed to create group"));
+ message::error(t("Failed to create group"));
print json_encode(array("result" => "error",
"form" => $form->__toString()));
}
@@ -64,13 +64,14 @@ class Admin_Groups_Controller extends Controller {
$name = $group->name;
$group->delete();
} else {
- message::error(_("Failed to delete group"));
+ message::error(t("Failed to delete group"));
print json_encode(array("result" => "error",
"form" => $form->__toString()));
}
- log::success("group", sprintf(_("Deleted group %s"), $name));
- message::success(sprintf(_("Deleted group %s"), $name));
+ $message = t("Deleted group {{group_name}}", array("group_name" => $name));
+ log::success("group", $message);
+ message::success($message);
print json_encode(array("result" => "success"));
}
@@ -103,10 +104,10 @@ class Admin_Groups_Controller extends Controller {
if ($valid) {
$group->name = $form->edit_group->inputs["name"]->value;
$group->save();
- message::success(sprintf(_("Changed group %s"), $group->name));
+ message::success(t("Changed group {{group_name}}", array("group_name" => $group->name)));
print json_encode(array("result" => "success"));
} else {
- message::error(sprintf(_("Failed to change group %s"), $group->name));
+ message::error(t("Failed to change group {{group_name}}", array("group_name" => $group->name)));
print json_encode(array("result" => "error",
"form" => $form->__toString()));
}
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 13115178..e936cb8a 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -41,10 +41,10 @@ class Admin_Users_Controller extends Controller {
$name, $form->add_user->full_name->value, $form->add_user->password->value);
$user->email = $form->add_user->email->value;
$user->save();
- message::success(sprintf(_("Created user %s"), $user->name));
+ message::success(t("Created user {{user_name}}", array("user_name" => $user->name)));
print json_encode(array("result" => "success"));
} else {
- message::error(_("Failed to create user"));
+ message::error(t("Failed to create user"));
print json_encode(array("result" => "error",
"form" => $form->__toString()));
}
@@ -65,13 +65,14 @@ class Admin_Users_Controller extends Controller {
$name = $user->name;
$user->delete();
} else {
- message::error(_("Failed to delete user"));
+ message::error(t("Failed to delete user"));
print json_encode(array("result" => "error",
"form" => $form->__toString()));
}
- log::success("user", sprintf(_("Deleted user %s"), $name));
- message::success(sprintf(_("Deleted user %s"), $name));
+ $message = t("Deleted user {{user_name}}", array("user_name" => $name));
+ log::success("user", $message);
+ message::success($message);
print json_encode(array("result" => "success"));
}
@@ -107,10 +108,10 @@ class Admin_Users_Controller extends Controller {
$user->password = $form->edit_user->password->value;
$user->email = $form->edit_user->email->value;
$user->save();
- message::success(sprintf(_("Changed user %s"), $user->name));
+ message::success(t("Changed user {{user_name}}", array("user_name" => $user->name)));
print json_encode(array("result" => "success"));
} else {
- message::error(sprintf(_("Failed to change user %s"), $user->name));
+ message::error(t("Failed to change user {{user_name}}", array("user_name" => $user->name)));
print json_encode(array("result" => "error",
"form" => $form->__toString()));
}
diff --git a/modules/user/controllers/login.php b/modules/user/controllers/login.php
index d5791eab..b3ab5b10 100644
--- a/modules/user/controllers/login.php
+++ b/modules/user/controllers/login.php
@@ -34,7 +34,7 @@ class Login_Controller extends Controller {
$user = ORM::factory("user")->where("name", $form->login->inputs["name"]->value)->find();
if (!$user->loaded || !user::is_correct_password($user, $form->login->password->value)) {
log::warning(
- "user", sprintf(_("Failed login for %s"), $form->login->inputs["name"]->value));
+ "user", t("Failed login for {{name}}", array("username" => $form->login->inputs["name"]->value)));
$form->login->inputs["name"]->add_error("invalid_login", 1);
$valid = false;
}
@@ -42,7 +42,7 @@ class Login_Controller extends Controller {
if ($valid) {
user::login($user);
- log::info("user", sprintf(_("User %s logged in"), $user->name));
+ log::info("user", t("User {{name}} logged in", array("name" => $user->name)));
print json_encode(
array("result" => "success"));
} else {
@@ -54,11 +54,11 @@ class Login_Controller extends Controller {
private function _login_form() {
$form = new Forge(url::current(true), "", "post", array("id" => "gLoginForm"));
- $group = $form->group("login")->label(_("Login"));
- $group->input("name")->label(_("Name"))->id("gName")->class(null);
- $group->password("password")->label(_("Password"))->id("gPassword")->class(null);
- $group->inputs["name"]->error_messages("invalid_login", _("Invalid name or password"));
- $group->submit(_("Login"));
+ $group = $form->group("login")->label(t("Login"));
+ $group->input("name")->label(t("Name"))->id("gName")->class(null);
+ $group->password("password")->label(t("Password"))->id("gPassword")->class(null);
+ $group->inputs["name"]->error_messages("invalid_login", t("Invalid name or password"));
+ $group->submit(t("Login"));
return $form;
}
} \ No newline at end of file
diff --git a/modules/user/controllers/logout.php b/modules/user/controllers/logout.php
index e0da9a9f..06b869be 100644
--- a/modules/user/controllers/logout.php
+++ b/modules/user/controllers/logout.php
@@ -21,7 +21,7 @@ class Logout_Controller extends Controller {
public function index() {
$user = user::active();
user::logout();
- log::info("user", sprintf(_("User %s logged out"), $user->name),
+ log::info("user", t("User {{name}} logged out", array("name" => $user->name)),
html::anchor("user/$user->id", $user->name));
if ($this->input->get("continue")) {
url::redirect($this->input->get("continue"));
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 20:03:14 +0000