diff options
| author | Chad Kieffer <ckieffer@gmail.com> | 2010-02-18 23:01:15 -0700 |
|---|---|---|
| committer | Chad Kieffer <ckieffer@gmail.com> | 2010-02-18 23:01:15 -0700 |
| commit | 3f021d3610a08e420402c1f05011dbecd17e835e (patch) | |
| tree | de4357fabaa48caad6c96c13e10b50e66b05a977 /modules/gallery | |
| parent | 2846d81171c7101e5015995f848d4cc3a9ddebf6 (diff) | |
| parent | 794660d73ee7749541057f8ffa67c3d211f0ceb3 (diff) | |
Merge branch 'master' of github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery')
| -rw-r--r-- | modules/gallery/helpers/gallery_event.php | 3 | ||||
| -rw-r--r-- | modules/gallery/libraries/Gallery_I18n.php | 3 | ||||
| -rw-r--r-- | modules/gallery/views/permissions_form.html.php | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php index 3f77bc42..faf1c0c6 100644 --- a/modules/gallery/helpers/gallery_event.php +++ b/modules/gallery/helpers/gallery_event.php @@ -423,9 +423,6 @@ class gallery_event_Core { if ($field == "locale") { $value = locales::display_name($value); } - if ($field == "full_name") { - $value = t($value); - } $v->user_profile_data[(string) $label] = $value; } } diff --git a/modules/gallery/libraries/Gallery_I18n.php b/modules/gallery/libraries/Gallery_I18n.php index 26d1de2c..ac0588e3 100644 --- a/modules/gallery/libraries/Gallery_I18n.php +++ b/modules/gallery/libraries/Gallery_I18n.php @@ -131,9 +131,6 @@ class Gallery_I18n_Core { $count = isset($options['count']) ? $options['count'] : null; $values = $options; unset($values['locale']); - if ($message instanceof SafeString) { - $message = (string) $message; - } $this->log($message, $options); $entry = $this->lookup($locale, $message); diff --git a/modules/gallery/views/permissions_form.html.php b/modules/gallery/views/permissions_form.html.php index b486acb7..f1714119 100644 --- a/modules/gallery/views/permissions_form.html.php +++ b/modules/gallery/views/permissions_form.html.php @@ -5,7 +5,7 @@ <tr> <th> </th> <? foreach ($groups as $group): ?> - <th> <?= html::clean(t($group->name)) ?> </th> + <th> <?= html::clean($group->name) ?> </th> <? endforeach ?> </tr> |