1 files changed, 15 insertions, 24 deletions

diff --git a/www/wiki/extensions/Translate/utils/UserToggles.php b/www/wiki/extensions/Translate/utils/UserToggles.php
index 97551934..b3205598 100644
--- a/www/wiki/extensions/Translate/utils/UserToggles.php
+++ b/www/wiki/extensions/Translate/utils/UserToggles.php
@@ -6,7 +6,7 @@
  * @author Siebrand Mazeland
  * @author Niklas Laxström
  * @copyright Copyright © 2008-2010 Siebrand Mazeland, Niklas Laxström
- * @license GPL-2.0+
+ * @license GPL-2.0-or-later
  */
 
 /**
@@ -17,38 +17,30 @@ class TranslatePreferences {
 	 * Add 'translate-pref-nonewsletter' preference.
 	 * This is most probably specific to translatewiki.net. Can be enabled
 	 * with $wgTranslateNewsletterPreference.
-	 *
-	 * @param $user User
-	 * @param $preferences array
-	 * @return bool true
+	 * @param User $user
+	 * @param array &$preferences
+	 * @return bool
 	 */
-	public static function onGetPreferences( $user, &$preferences ) {
+	public static function onGetPreferences( User $user, array &$preferences ) {
 		global $wgTranslateNewsletterPreference;
 
 		if ( !$wgTranslateNewsletterPreference ) {
 			return true;
 		}
 
-		global $wgEnableEmail, $wgEnotifRevealEditorAddress;
+		global $wgEnableEmail;
 
 		// Only show if email is enabled and user has a confirmed email address.
 		if ( $wgEnableEmail && $user->isEmailConfirmed() ) {
 			// 'translate-pref-nonewsletter' is used as opt-out for
 			// users with a confirmed email address
-			$prefs = array(
-				'translate-nonewsletter' => array(
-					'type' => 'toggle',
-					'section' => 'personal/email',
-					'label-message' => 'translate-pref-nonewsletter'
-				)
-			);
+			$preferences['translate-nonewsletter'] = [
+				'type' => 'toggle',
+				'section' => 'personal/email',
+				'label-message' => 'translate-pref-nonewsletter'
+			];
 
-			// Add setting after 'enotifrevealaddr'.
-			$preferences = wfArrayInsertAfter( $preferences, $prefs,
-				$wgEnotifRevealEditorAddress ? 'enotifrevealaddr' : 'enotifminoredits' );
 		}
-
-		return true;
 	}
 
 	/**
@@ -56,7 +48,7 @@ class TranslatePreferences {
 	 * These are the languages also shown when translating.
 	 *
 	 * @param User $user
-	 * @param array $preferences
+	 * @param array &$preferences
 	 * @return bool true
 	 */
 	public static function translationAssistLanguages( User $user, &$preferences ) {
@@ -67,7 +59,7 @@ class TranslatePreferences {
 		// Get available languages.
 		$languages = Language::fetchLanguageNames();
 
-		$preferences['translate-editlangs'] = array(
+		$preferences['translate-editlangs'] = [
 			'class' => 'HTMLJsSelectToInputField',
 			// prefs-translate
 			'section' => 'editing/translate',
@@ -76,7 +68,7 @@ class TranslatePreferences {
 			'select' => $select,
 			'valid-values' => array_keys( $languages ),
 			'name' => 'translate-editlangs',
-		);
+		];
 
 		return true;
 	}
@@ -86,7 +78,7 @@ class TranslatePreferences {
 	 * @return JsSelectToInput
 	 */
 	protected static function languageSelector() {
-		if ( is_callable( array( 'LanguageNames', 'getNames' ) ) ) {
+		if ( is_callable( [ 'LanguageNames', 'getNames' ] ) ) {
 			$lang = RequestContext::getMain()->getLanguage();
 			$languages = LanguageNames::getNames( $lang->getCode(),
 				LanguageNames::FALLBACK_NORMAL
@@ -103,7 +95,6 @@ class TranslatePreferences {
 		}
 
 		$jsSelect = new JsSelectToInput( $selector );
-		$jsSelect->setSourceId( 'mw-language-selector' );
 
 		return $jsSelect;
 	}