Merge e8d629f into 259079d

marc1706 · Apr 8, 2020 · 4f73e21 · 4f73e21
2 parents 259079d + e8d629f
commit 4f73e21
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 22 deletions.
diff --git a/config/services.yml b/config/services.yml
@@ -2,17 +2,17 @@ services:
     marc.quickedit.listener:
         class: marc\quickedit\event\listener
         arguments:
-            - @config
-            - @marc.quickedit.listener_helper
-            - @request
-            - @template
-            - @user
+            - '@config'
+            - '@marc.quickedit.listener_helper'
+            - '@request'
+            - '@template'
+            - '@user'
+            - '@language'
         tags:
-            - { name: event.listener }
-
+            - {name: event.listener}
     marc.quickedit.listener_helper:
         class: marc\quickedit\event\listener_helper
         arguments:
-            - @auth
-            - @config
-            - @request
+            - '@auth'
+            - '@config'
+            - '@request'
diff --git a/event/listener.php b/event/listener.php
@@ -28,23 +28,28 @@ class listener implements EventSubscriberInterface
 	/** @var \phpbb\user */
 	protected $user;
 
+	/* @var \phpbb\language\language */
+	protected $language;
+
 	/**
 	* Constructor for listener
 	*
-	* @param \phpbb\config\config $config phpBB config
-	* @param \marc\quickedit\event\listener_helper $helper Listener helper
-	* @param \phpbb\request\request $request phpBB request
-	* @param \phpbb\template\template $template phpBB template
-	* @param \phpbb\user $user phpBB user
+	* @param \phpbb\config\config 						$config phpBB config
+	* @param \marc\quickedit\event\listener_helper 		$helper Listener helper
+	* @param \phpbb\request\request 					$request phpBB request
+	* @param \phpbb\template\template 					$template phpBB template
+	* @param \phpbb\user 								$user phpBB user
+	* @param \phpbb\language\language					$language
 	* @access public
 	*/
-	public function __construct(\phpbb\config\config $config, \marc\quickedit\event\listener_helper $helper, \phpbb\request\request_interface $request, \phpbb\template\template $template, \phpbb\user $user)
+	public function __construct(\phpbb\config\config $config, \marc\quickedit\event\listener_helper $helper, \phpbb\request\request_interface $request, \phpbb\template\template $template, \phpbb\user $user, \phpbb\language\language $language)
 	{
 		$this->config = $config;
 		$this->helper = $helper;
 		$this->request = $request;
 		$this->template = $template;
 		$this->user = $user;
+		$this->language = $language;
 	}
 
 	/**
@@ -109,7 +114,7 @@ public function acp_board_settings($event)
 		{
 			$this->helper->modify_acp_display_vars($event);
 
-			$this->user->add_lang_ext('marc/quickedit', 'quickedit_acp');
+			$this->language->add_lang('quickedit_acp', 'marc/quickedit');
 
 			if ($this->request->is_set_post('allow_quick_edit_enable'))
 			{
@@ -128,15 +133,15 @@ public function acp_board_settings($event)
 	*/
 	static public function quickedit_settings($value, $key)
 	{
-		// Called statically so can't use $this->user
-		global $user;
+		// Called statically so can't use $this->language
+		global $language;
 
-		$user->add_lang_ext('marc/quickedit', 'quickedit_acp');
+		$language->add_lang('quickedit_acp', 'marc/quickedit');
 
 		$radio_ary = array(1 => 'YES', 0 => 'NO');
 
 		return h_radio('config[allow_quick_edit]', $radio_ary, $value) .
-			'<br /><br /><input class="button2" type="submit" id="' . $key . '_enable" name="' . $key . '_enable" value="' . $user->lang('ALLOW_QUICK_EDIT_BUTTON') . '" />';
+			'<br /><br /><input class="button2" type="submit" id="' . $key . '_enable" name="' . $key . '_enable" value="' . $language->lang('ALLOW_QUICK_EDIT_BUTTON') . '" />';
 	}
 
 	/**
@@ -176,7 +181,7 @@ public function initialise_forums_flag_data($event)
 	*/
 	public function acp_forums_settings($event)
 	{
-		$this->user->add_lang_ext('marc/quickedit', 'quickedit_acp');
+		$this->language->add_lang('quickedit_acp', 'marc/quickedit');
 
 		$template_data = $event['template_data'];
 		$template_data['S_ENABLE_QUICK_EDIT'] = ($event['forum_data']['forum_flags'] & listener_helper::QUICKEDIT_FLAG) ? true : false;