Further improve notification text layout

Signed-off-by: Matt Friedman <maf675@gmail.com>

Author: iMattPro

language/en/common.php

@@ -38,7 +38,7 @@
 	'IDEA_DELETED'			=> 'Idea successfully deleted.',
 	'IDEA_LIST'				=> 'Idea List',
 	'IDEA_NOT_FOUND'		=> 'Idea not found',
-	'IDEA_STATUS_CHANGE'	=> '<strong>Idea status changed</strong> by %1$s to <em>%2$s</em> for:',
+	'IDEA_STATUS_CHANGE'	=> '<strong>Idea status changed</strong> by %s:',
 	'IDEA_STORED_MOD'		=> 'Your idea has been submitted successfully, but it will need to be approved by a moderator before it is publicly viewable. You will be notified when your idea has been approved.<br /><br /><a href="%s">Return to Ideas</a>.',
 	'IDEAS_TITLE'			=> 'phpBB Ideas',
 	'IDEAS_NOT_AVAILABLE'	=> 'Ideas is not available at this time.',
@@ -67,6 +67,7 @@
 	'NEW'					=> 'New',
 	'NEW_IDEA'				=> 'New Idea',
 	'NO_IDEAS_DISPLAY'		=> 'There are no ideas to display.',
+	'NOTIFICATION_STATUS'	=> '<em>Status: <strong>%s</strong></em>',
 
 	'OPEN_IDEAS'			=> 'Open ideas',
 

notification/type/status.php

@@ -134,10 +134,9 @@ public function get_title()
 			$this->language->add_lang('common', 'phpbb/ideas');
 		}
 
-		$status = $this->language->lang(ext::status_name($this->get_data('status')));
 		$username = $this->user_loader->get_username($this->get_data('updater_id'), 'no_profile');
 
-		return $this->language->lang($this->language_key, $username, $status);
+		return $this->language->lang($this->language_key, $username);
 	}
 
 	/**
@@ -151,6 +150,17 @@ public function get_reference()
 		);
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	public function get_reason()
+	{
+		return $this->language->lang(
+			'NOTIFICATION_STATUS',
+			$this->language->lang(ext::status_name($this->get_data('status')))
+		);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */

tests/notification/status_test.php

@@ -169,43 +169,32 @@ public function test_users_to_query()
 	public function test_get_title()
 	{
 		$this->setNotificationData([
-			'updater_id' => 123,
-			'status' => ext::$statuses['IN_PROGRESS']
+			'updater_id' => 123
 		]);
 
 		$this->language->expects($this->once())
 			->method('is_set')
 			->with('IDEA_STATUS_CHANGE')
 			->willReturn(true);
 
-		$this->language->expects($this->exactly(2))
+		$this->language->expects($this->once())
 			->method('lang')
-			->willReturnCallback(function($key, ...$args) {
-				if ($key === 'IN_PROGRESS')
-				{
-					return 'In Progress';
-				}
-				if ($key === 'IDEA_STATUS_CHANGE' && $args[0] === 'TestUser' && $args[1] === 'In Progress')
-				{
-					return 'TestUser changed status to In Progress';
-				}
-				return '';
-			});
+			->with('IDEA_STATUS_CHANGE', 'TestUser')
+			->willReturn('Idea status changed by TestUser');
 
 		$this->user_loader->expects($this->once())
 			->method('get_username')
 			->with(123, 'no_profile')
 			->willReturn('TestUser');
 
 		$result = $this->notification_type->get_title();
-		$this->assertEquals('TestUser changed status to In Progress', $result);
+		$this->assertEquals('Idea status changed by TestUser', $result);
 	}
 
 	public function test_get_title_loads_language()
 	{
 		$this->setNotificationData([
 			'updater_id' => 456,
-			'status' => ext::$statuses['IMPLEMENTED']
 		]);
 
 		$this->language->expects($this->once())
@@ -217,27 +206,18 @@ public function test_get_title_loads_language()
 			->method('add_lang')
 			->with('common', 'phpbb/ideas');
 
-		$this->language->expects($this->exactly(2))
+		$this->language->expects($this->once())
 			->method('lang')
-			->willReturnCallback(function($key, ...$args) {
-				if ($key === 'IMPLEMENTED')
-				{
-					return 'Implemented';
-				}
-				if ($key === 'IDEA_STATUS_CHANGE' && $args[0] === 'AdminUser' && $args[1] === 'Implemented')
-				{
-					return 'AdminUser changed status to Implemented';
-				}
-				return '';
-			});
+			->with('IDEA_STATUS_CHANGE', 'AdminUser')
+			->willReturn('Idea status changed by AdminUser');
 
 		$this->user_loader->expects($this->once())
 			->method('get_username')
 			->with(456, 'no_profile')
 			->willReturn('AdminUser');
 
 		$result = $this->notification_type->get_title();
-		$this->assertEquals('AdminUser changed status to Implemented', $result);
+		$this->assertEquals('Idea status changed by AdminUser', $result);
 	}
 
 	public function test_get_reference()
@@ -252,6 +232,29 @@ public function test_get_reference()
 		$this->assertEquals('“Test Idea”', $this->notification_type->get_reference());
 	}
 
+	public function test_get_reason()
+	{
+		$this->setNotificationData([
+			'status' => ext::$statuses['IN_PROGRESS'],
+		]);
+
+		$this->language->expects($this->exactly(2))
+			->method('lang')
+			->willReturnCallback(function($key, ...$args) {
+				if ($key === 'IN_PROGRESS')
+				{
+					return 'In Progress';
+				}
+				if ($key === 'NOTIFICATION_STATUS' && $args[0] === 'In Progress')
+				{
+					return 'Status: In Progress';
+				}
+				return '';
+			});
+
+		$this->assertEquals('Status: In Progress', $this->notification_type->get_reason());
+	}
+
 	public function test_get_url()
 	{
 		$this->setNotificationData(['idea_id' => 42]);