From b2f4e4559f0064544dbc708785967b61a03b6486 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 21 Mar 2016 09:41:13 +0100 Subject: [PATCH] Add comment icons and "You commented" translations --- apps/comments/activity/extension.php | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/apps/comments/activity/extension.php b/apps/comments/activity/extension.php index b65f1911d1..6bf7cae588 100644 --- a/apps/comments/activity/extension.php +++ b/apps/comments/activity/extension.php @@ -105,7 +105,7 @@ class Extension implements IExtension { public function getTypeIcon($type) { switch ($type) { case self::APP_NAME: - return false; + return 'icon-comment'; } return false; @@ -150,6 +150,9 @@ class Extension implements IExtension { switch ($text) { case self::ADD_COMMENT_SUBJECT: + if ($this->authorIsCurrentUser($params[0])) { + return (string) $l->t('You commented'); + } return (string) $l->t('%1$s commented', $params); case self::ADD_COMMENT_MESSAGE: return $this->convertParameterToComment($params[0], 120); @@ -168,6 +171,9 @@ class Extension implements IExtension { switch ($text) { case self::ADD_COMMENT_SUBJECT: + if ($this->authorIsCurrentUser($params[0])) { + return (string) $l->t('You commented on %2$s', $params); + } return (string) $l->t('%1$s commented on %2$s', $params); case self::ADD_COMMENT_MESSAGE: return $this->convertParameterToComment($params[0]); @@ -176,6 +182,21 @@ class Extension implements IExtension { return false; } + /** + * Check if the author is the current user + * + * @param string $user Parameter e.g. `admin` + * @return bool + */ + protected function authorIsCurrentUser($user) { + try { + return strip_tags($user) === $this->activityManager->getCurrentUserId(); + } catch (\UnexpectedValueException $e) { + // FIXME this is awkward, but we have no access to the current user in emails + return false; + } + } + /** * The extension can define the type of parameters for translation *