summaryrefslogtreecommitdiff
path: root/modules/user
diff options
context:
space:
mode:
Diffstat (limited to 'modules/user')
-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
-rw-r--r--modules/user/helpers/group.php20
-rw-r--r--modules/user/helpers/user.php44
-rw-r--r--modules/user/helpers/user_menu.php6
-rw-r--r--modules/user/views/admin_groups.html.php12
-rw-r--r--modules/user/views/admin_users.html.php12
-rw-r--r--modules/user/views/login.html.php10
10 files changed, 76 insertions, 74 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"));
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index bd00d91e..41f19a7d 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -63,22 +63,22 @@ class group_Core {
public static function get_edit_form_admin($group) {
$form = new Forge("admin/groups/edit/$group->id");
- $form_group = $form->group("edit_group")->label(_("Edit Group"));
- $form_group->input("name")->label(_("Name"))->id("gName")->value($group->name);
+ $form_group = $form->group("edit_group")->label(t("Edit Group"));
+ $form_group->input("name")->label(t("Name"))->id("gName")->value($group->name);
$form_group->inputs["name"]->error_messages(
- "in_use", _("There is already a group with that name"));
- $form_group->submit(_("Save"));
+ "in_use", t("There is already a group with that name"));
+ $form_group->submit(t("Save"));
$form->add_rules_from($group);
return $form;
}
public static function get_add_form_admin() {
$form = new Forge("admin/groups/add");
- $form_group = $form->group("add_group")->label(_("Add Group"));
- $form_group->input("name")->label(_("Name"))->id("gName");
+ $form_group = $form->group("add_group")->label(t("Add Group"));
+ $form_group->input("name")->label(t("Name"))->id("gName");
$form_group->inputs["name"]->error_messages(
- "in_use", _("There is already a group with that name"));
- $form_group->submit(_("Add Group"));
+ "in_use", t("There is already a group with that name"));
+ $form_group->submit(t("Add Group"));
$group = ORM::factory("group");
$form->add_rules_from($group);
return $form;
@@ -87,8 +87,8 @@ class group_Core {
public static function get_delete_form_admin($group) {
$form = new Forge("admin/groups/delete/$group->id", "", "post");
$form_group = $form->group("delete_group")->label(
- sprintf(_("Are you sure you want to delete group %s?"), $group->name));
- $form_group->submit(_("Delete"));
+ t("Are you sure you want to delete group {{group_name}}?", array("group_name" => $group->name)));
+ $form_group->submit(t("Delete"));
return $form;
}
}
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 3d8816e7..cc70d874 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -26,40 +26,40 @@
class user_Core {
public static function get_edit_form($user, $action = NULL) {
$form = new Forge("users/$user->id?_method=put", "", "post", array("id" => "gUserForm"));
- $group = $form->group("edit_user")->label(_("Edit User"));
- $group->input("name")->label(_("Name"))->id("gName")->value($user->name);
- $group->input("full_name")->label(_("Full Name"))->id("gFullName")->value($user->full_name);
- $group->password("password")->label(_("Password"))->id("gPassword");
- $group->input("email")->label(_("Email"))->id("gEmail")->value($user->email);
- $group->submit(_("Save"));
+ $group = $form->group("edit_user")->label(t("Edit User"));
+ $group->input("name")->label(t("Name"))->id("gName")->value($user->name);
+ $group->input("full_name")->label(t("Full Name"))->id("gFullName")->value($user->full_name);
+ $group->password("password")->label(t("Password"))->id("gPassword");
+ $group->input("email")->label(t("Email"))->id("gEmail")->value($user->email);
+ $group->submit(t("Save"));
$form->add_rules_from($user);
return $form;
}
public static function get_edit_form_admin($user) {
$form = new Forge("admin/users/edit/$user->id");
- $group = $form->group("edit_user")->label(_("Edit User"));
- $group->input("name")->label(_("Name"))->id("gName")->value($user->name);
+ $group = $form->group("edit_user")->label(t("Edit User"));
+ $group->input("name")->label(t("Name"))->id("gName")->value($user->name);
$group->inputs["name"]->error_messages(
- "in_use", _("There is already a user with that name"));
- $group->input("full_name")->label(_("Full Name"))->id("gFullName")->value($user->full_name);
- $group->password("password")->label(_("Password"))->id("gPassword");
- $group->input("email")->label(_("Email"))->id("gEmail")->value($user->email);
- $group->submit(_("Modify User"));
+ "in_use", t("There is already a user with that name"));
+ $group->input("full_name")->label(t("Full Name"))->id("gFullName")->value($user->full_name);
+ $group->password("password")->label(t("Password"))->id("gPassword");
+ $group->input("email")->label(t("Email"))->id("gEmail")->value($user->email);
+ $group->submit(t("Modify User"));
$form->add_rules_from($user);
return $form;
}
public static function get_add_form_admin() {
$form = new Forge("admin/users/add");
- $group = $form->group("add_user")->label(_("Add User"));
- $group->input("name")->label(_("Name"))->id("gName");
+ $group = $form->group("add_user")->label(t("Add User"));
+ $group->input("name")->label(t("Name"))->id("gName");
$group->inputs["name"]->error_messages(
- "in_use", _("There is already a user with that name"));
- $group->input("full_name")->label(_("Full Name"))->id("gFullName");
- $group->password("password")->label(_("Password"))->id("gPassword");
- $group->input("email")->label(_("Email"))->id("gEmail");
- $group->submit(_("Add User"));
+ "in_use", t("There is already a user with that name"));
+ $group->input("full_name")->label(t("Full Name"))->id("gFullName");
+ $group->password("password")->label(t("Password"))->id("gPassword");
+ $group->input("email")->label(t("Email"))->id("gEmail");
+ $group->submit(t("Add User"));
$user = ORM::factory("user");
$form->add_rules_from($user);
return $form;
@@ -68,8 +68,8 @@ class user_Core {
public static function get_delete_form_admin($user) {
$form = new Forge("admin/users/delete/$user->id", "", "post");
$group = $form->group("delete_user")->label(
- sprintf(_("Are you sure you want to delete user %s?"), $user->name));
- $group->submit(sprintf(_("Delete user %s"), $user->name));
+ t("Are you sure you want to delete user {{name}}?", array("name" => $user->name)));
+ $group->submit(t("Delete user {{name}}", array("name" => $user->name)));
return $form;
}
diff --git a/modules/user/helpers/user_menu.php b/modules/user/helpers/user_menu.php
index 713e47bb..bdbe411b 100644
--- a/modules/user/helpers/user_menu.php
+++ b/modules/user/helpers/user_menu.php
@@ -22,15 +22,15 @@ class user_menu_Core {
$menu->get("users_groups_menu")
->append(Menu::factory("link")
->id("list_users")
- ->label(_("Users"))
+ ->label(t("Users"))
->url(url::site("admin/users")))
->append(Menu::factory("link")
->id("list_groups")
- ->label(_("Groups"))
+ ->label(t("Groups"))
->url(url::site("admin/groups")))
->append(Menu::factory("link")
->id("users_groups")
- ->label(_("Users <-> Groups"))
+ ->label(t("Users <-> Groups"))
->url("#"));
}
}
diff --git a/modules/user/views/admin_groups.html.php b/modules/user/views/admin_groups.html.php
index 5b5066dc..9547e121 100644
--- a/modules/user/views/admin_groups.html.php
+++ b/modules/user/views/admin_groups.html.php
@@ -1,24 +1,24 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<div class="gBlock">
- <h2><?= _("Group Administration") ?></h2>
+ <h2><?= t("Group Administration") ?></h2>
<div class="gBlockContent">
- <p><?= _("These are the groups in your system") ?></p>
+ <p><?= t("These are the groups in your system") ?></p>
</div>
<ul>
<? foreach ($groups as $i => $group): ?>
<li>
<?= $group->name ?>
<a href="groups/edit_form/<?= $group->id ?>" class="gDialogLink"
- title="<?= _("Edit group") ?>"><?= _("edit") ?></a>
+ title="<?= t("Edit group") ?>"><?= t("edit") ?></a>
<? if (!$group->special): ?>
<a href="groups/delete_form/<?= $group->id ?>" class="gDialogLink"
- title="<?= sprintf(_("Do you really want to delete %s"), $group->name) ?>">
- <?= _("delete") ?></a>
+ title="<?= t("Do you really want to delete {{group_name}}", array("group_name" => $group->name)) ?>">
+ <?= t("delete") ?></a>
<? endif ?>
</li>
<? endforeach ?>
<li><a href="groups/add_form" class="gDialogLink"
- title="<?= _("Add group") ?>"><?= _("Add group") ?></a></li>
+ title="<?= t("Add group") ?>"><?= t("Add group") ?></a></li>
</ul>
</div>
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index c31588d9..3d1c311f 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -1,22 +1,22 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<div class="gBlock">
- <h2><?= _("User Administration") ?></h2>
+ <h2><?= t("User Administration") ?></h2>
<div class="gBlockContent">
- <p><?= _("These are the users in your system") ?></p>
+ <p><?= t("These are the users in your system") ?></p>
<ul>
<? foreach ($users as $i => $user): ?>
<li>
<?= $user->name ?>
<?= ($user->last_login == 0) ? "" : "(" . date("M j, Y", $user->last_login) . ")" ?>
- <a href="users/edit_form/<?= $user->id ?>" class="gDialogLink"><?= _("edit") ?></a>
+ <a href="users/edit_form/<?= $user->id ?>" class="gDialogLink"><?= t("edit") ?></a>
<? if (!(user::active()->id == $user->id || user::guest()->id == $user->id)): ?>
<a href="users/delete_form/<?= $user->id ?>" class="gDialogLink">
- <?= _("delete") ?></a>
+ <?= t("delete") ?></a>
<? endif ?>
</li>
<? endforeach ?>
- <li><a href="users/add_form" class="gDialogLink" title="<?= _("Add user") ?>">
- <?= _("Add user") ?></a></li>
+ <li><a href="users/add_form" class="gDialogLink" title="<?= t("Add user") ?>">
+ <?= t("Add user") ?></a></li>
</ul>
</div>
</div>
diff --git a/modules/user/views/login.html.php b/modules/user/views/login.html.php
index b73bea07..fd9bd773 100644
--- a/modules/user/views/login.html.php
+++ b/modules/user/views/login.html.php
@@ -2,13 +2,13 @@
<ul id="gLoginMenu">
<? if ($user->guest): ?>
<li class="first"><a href="<?= url::site("login") ?>"
- title="<?= _("Login to Gallery") ?>"
- id="gLoginLink"><?= _("Login") ?></a></li>
+ title="<?= t("Login to Gallery") ?>"
+ id="gLoginLink"><?= t("Login") ?></a></li>
<? else: ?>
<li class="first"><a href="<?= url::site("form/edit/users/{$user->id}") ?>"
- title="<?= _("Edit Your Profile") ?>"
- id="gUserProfileLink" class="gDialogLink"><?= _("Modify Profile") ?></a></li>
+ title="<?= t("Edit Your Profile") ?>"
+ id="gUserProfileLink" class="gDialogLink"><?= t("Modify Profile") ?></a></li>
<li><a href="<?= url::site("logout?continue=" . url::current(true)) ?>"
- id="gLogoutLink"><?= _("Logout") ?></a></li>
+ id="gLogoutLink"><?= t("Logout") ?></a></li>
<? endif; ?>
</ul>
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 15:20:15 +0000