Merge "Revert "textSelection: Use execcommand to replace text""

[lhc/web/wiklou.git] / includes / preferences / DefaultPreferencesFactory.php

diff --git a/includes/preferences/DefaultPreferencesFactory.php b/includes/preferences/DefaultPreferencesFactory.php
index 3ec6876..512a6b3 100644 (file)
--- a/includes/preferences/DefaultPreferencesFactory.php
+++ b/includes/preferences/DefaultPreferencesFactory.php
@@ -796,6 +796,7 @@ class DefaultPreferencesFactory implements PreferencesFactory {
                        'section' => 'rendering/timeoffset',
                        'id' => 'wpTimeCorrection',
                        'filter' => TimezoneFilter::class,
+                       'placeholder-message' => 'timezone-useoffset-placeholder',
                ];
        }
 
@@ -961,7 +962,7 @@ class DefaultPreferencesFactory implements PreferencesFactory {
                $defaultPreferences['hideminor'] = [
                        'type' => 'toggle',
                        'label-message' => 'tog-hideminor',
-                       'section' => 'rc/advancedrc',
+                       'section' => 'rc/changesrc',
                ];
                $defaultPreferences['rcfilters-rc-collapsed'] = [
                        'type' => 'api',
@@ -990,14 +991,14 @@ class DefaultPreferencesFactory implements PreferencesFactory {
                        $defaultPreferences['hidecategorization'] = [
                                'type' => 'toggle',
                                'label-message' => 'tog-hidecategorization',
-                               'section' => 'rc/advancedrc',
+                               'section' => 'rc/changesrc',
                        ];
                }
 
                if ( $user->useRCPatrol() ) {
                        $defaultPreferences['hidepatrolled'] = [
                                'type' => 'toggle',
-                               'section' => 'rc/advancedrc',
+                               'section' => 'rc/changesrc',
                                'label-message' => 'tog-hidepatrolled',
                        ];
                }
@@ -1005,7 +1006,7 @@ class DefaultPreferencesFactory implements PreferencesFactory {
                if ( $user->useNPPatrol() ) {
                        $defaultPreferences['newpageshidepatrolled'] = [
                                'type' => 'toggle',
-                               'section' => 'rc/advancedrc',
+                               'section' => 'rc/changesrc',
                                'label-message' => 'tog-newpageshidepatrolled',
                        ];
                }
@@ -1020,7 +1021,7 @@ class DefaultPreferencesFactory implements PreferencesFactory {
 
                $defaultPreferences['rcenhancedfilters-disable'] = [
                        'type' => 'toggle',
-                       'section' => 'rc/optoutrc',
+                       'section' => 'rc/advancedrc',
                        'label-message' => 'rcfilters-preference-label',
                        'help-message' => 'rcfilters-preference-help',
                ];
@@ -1091,27 +1092,27 @@ class DefaultPreferencesFactory implements PreferencesFactory {
                ];
                $defaultPreferences['watchlisthideminor'] = [
                        'type' => 'toggle',
-                       'section' => 'watchlist/advancedwatchlist',
+                       'section' => 'watchlist/changeswatchlist',
                        'label-message' => 'tog-watchlisthideminor',
                ];
                $defaultPreferences['watchlisthidebots'] = [
                        'type' => 'toggle',
-                       'section' => 'watchlist/advancedwatchlist',
+                       'section' => 'watchlist/changeswatchlist',
                        'label-message' => 'tog-watchlisthidebots',
                ];
                $defaultPreferences['watchlisthideown'] = [
                        'type' => 'toggle',
-                       'section' => 'watchlist/advancedwatchlist',
+                       'section' => 'watchlist/changeswatchlist',
                        'label-message' => 'tog-watchlisthideown',
                ];
                $defaultPreferences['watchlisthideanons'] = [
                        'type' => 'toggle',
-                       'section' => 'watchlist/advancedwatchlist',
+                       'section' => 'watchlist/changeswatchlist',
                        'label-message' => 'tog-watchlisthideanons',
                ];
                $defaultPreferences['watchlisthideliu'] = [
                        'type' => 'toggle',
-                       'section' => 'watchlist/advancedwatchlist',
+                       'section' => 'watchlist/changeswatchlist',
                        'label-message' => 'tog-watchlisthideliu',
                ];
 
@@ -1135,7 +1136,7 @@ class DefaultPreferencesFactory implements PreferencesFactory {
                if ( $this->config->get( 'RCWatchCategoryMembership' ) ) {
                        $defaultPreferences['watchlisthidecategorization'] = [
                                'type' => 'toggle',
-                               'section' => 'watchlist/advancedwatchlist',
+                               'section' => 'watchlist/changeswatchlist',
                                'label-message' => 'tog-watchlisthidecategorization',
                        ];
                }
@@ -1143,7 +1144,7 @@ class DefaultPreferencesFactory implements PreferencesFactory {
                if ( $user->useRCPatrol() ) {
                        $defaultPreferences['watchlisthidepatrolled'] = [
                                'type' => 'toggle',
-                               'section' => 'watchlist/advancedwatchlist',
+                               'section' => 'watchlist/changeswatchlist',
                                'label-message' => 'tog-watchlisthidepatrolled',
                        ];
                }
@@ -1174,7 +1175,7 @@ class DefaultPreferencesFactory implements PreferencesFactory {
                                // tog-watchrollback
                                $defaultPreferences[$pref] = [
                                        'type' => 'toggle',
-                                       'section' => 'watchlist/advancedwatchlist',
+                                       'section' => 'watchlist/pageswatchlist',
                                        'label-message' => "tog-$pref",
                                ];
                        }
@@ -1201,7 +1202,7 @@ class DefaultPreferencesFactory implements PreferencesFactory {
 
                $defaultPreferences['wlenhancedfilters-disable'] = [
                        'type' => 'toggle',
-                       'section' => 'watchlist/optoutwatchlist',
+                       'section' => 'watchlist/advancedwatchlist',
                        'label-message' => 'rcfilters-watchlist-preference-label',
                        'help-message' => 'rcfilters-watchlist-preference-help',
                ];