diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2015-10-29 14:46:02 +0100 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2015-10-29 14:46:02 +0100 |
| commit | 257f5f8b24b34f6e37144a59d4a2cabf665f5fc8 (patch) | |
| tree | 1a1c8bfa2b254be0281a941208d02409f8672626 /phpBB/phpbb/notification/type/post.php | |
| parent | 5f85f19a5ea9f89a869c9fcb6391e48faa5cbd0c (diff) | |
| parent | 28cc98a7ac69f5670ccb2746f8e4158681aa7926 (diff) | |
| download | forums-257f5f8b24b34f6e37144a59d4a2cabf665f5fc8.tar forums-257f5f8b24b34f6e37144a59d4a2cabf665f5fc8.tar.gz forums-257f5f8b24b34f6e37144a59d4a2cabf665f5fc8.tar.bz2 forums-257f5f8b24b34f6e37144a59d4a2cabf665f5fc8.tar.xz forums-257f5f8b24b34f6e37144a59d4a2cabf665f5fc8.zip | |
Merge pull request #3971 from VSEphpbb/ticket/14237
[ticket/14237] Use $language class for notifications
Diffstat (limited to 'phpBB/phpbb/notification/type/post.php')
| -rw-r--r-- | phpBB/phpbb/notification/type/post.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/phpBB/phpbb/notification/type/post.php b/phpBB/phpbb/notification/type/post.php index b16014ff74..b9afc6d70a 100644 --- a/phpBB/phpbb/notification/type/post.php +++ b/phpBB/phpbb/notification/type/post.php @@ -83,6 +83,7 @@ class post extends \phpbb\notification\type\base * Get the id of the item * * @param array $post The data from the post + * @return int The post id */ static public function get_item_id($post) { @@ -93,6 +94,7 @@ class post extends \phpbb\notification\type\base * Get the id of the parent * * @param array $post The data from the post + * @return int The topic id */ static public function get_item_parent_id($post) { @@ -218,14 +220,14 @@ class post extends \phpbb\notification\type\base if ($trimmed_responders_cnt > 20) { - $usernames[] = $this->user->lang('NOTIFICATION_MANY_OTHERS'); + $usernames[] = $this->language->lang('NOTIFICATION_MANY_OTHERS'); } else if ($trimmed_responders_cnt) { - $usernames[] = $this->user->lang('NOTIFICATION_X_OTHERS', $trimmed_responders_cnt); + $usernames[] = $this->language->lang('NOTIFICATION_X_OTHERS', $trimmed_responders_cnt); } - return $this->user->lang( + return $this->language->lang( $this->language_key, phpbb_generate_string_list($usernames, $this->user), $responders_cnt @@ -239,7 +241,7 @@ class post extends \phpbb\notification\type\base */ public function get_reference() { - return $this->user->lang( + return $this->language->lang( 'NOTIFICATION_REFERENCE', censor_text($this->get_data('topic_title')) ); @@ -407,6 +409,7 @@ class post extends \phpbb\notification\type\base * Add responders to the notification * * @param mixed $post + * @return array Array of responder data */ public function add_responders($post) { |