diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-15 06:27:17 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-15 06:27:17 -0800 |
| commit | eb1cdd037646b3697b64753652669fa9e25a5c8e (patch) | |
| tree | 2f9dd9bd70329d5997993eced0a9f94a80895b8a /modules/user/views | |
| parent | e41a2d4e5226c45a5201df91ca6633a40b357630 (diff) | |
| parent | 409121942590e12692eaf4e6e9e8b71bfe5ed60c (diff) | |
Merge branch 'master' into talmdal_dev
Diffstat (limited to 'modules/user/views')
| -rw-r--r-- | modules/user/views/admin_users.html.php | 2 | ||||
| -rw-r--r-- | modules/user/views/admin_users_group.html.php | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php index 270a7207..69d97547 100644 --- a/modules/user/views/admin_users.html.php +++ b/modules/user/views/admin_users.html.php @@ -78,7 +78,7 @@ <?= html::clean($user->name) ?> </td> <td> - <?= html::clean($user->full_name) ?> + <?= t(html::clean($user->full_name)) ?> </td> <td> <?= html::clean($user->email) ?> diff --git a/modules/user/views/admin_users_group.html.php b/modules/user/views/admin_users_group.html.php index 6c6c341e..8317d393 100644 --- a/modules/user/views/admin_users_group.html.php +++ b/modules/user/views/admin_users_group.html.php @@ -1,9 +1,9 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> <h4> - <?= html::clean($group->name) ?> + <?= t(html::clean($group->name)) ?> <? if (!$group->special): ?> <a href="<?= url::site("admin/users/delete_group_form/$group->id") ?>" - title="<?= t("Delete the %name group", array("name" => $group->name))->for_html_attr() ?>" + title="<?= t("Delete the %name group", array("name" => t(html::clean($group->name))))->for_html_attr() ?>" class="g-dialog-link g-button g-right"> <span class="ui-icon ui-icon-trash"><?= t("Delete") ?></span></a> <? else: ?> @@ -22,7 +22,7 @@ <a href="javascript:remove_user(<?= $user->id ?>, <?= $group->id ?>)" class="g-button g-right ui-state-default ui-corner-all ui-icon-left" title="<?= t("Remove %user from %group group", - array("user" => $user->name, "group" => $group->name))->for_html_attr() ?>"> + array("user" => $user->name, "group" => t(html::clean($group->name))))->for_html_attr() ?>"> <span class="ui-icon ui-icon-closethick"><?= t("Remove") ?></span> </a> <? endif ?> |