Merge "Add new static function LanguageCode::replaceDeprecatedCodes"

diff --git a/includes/specials/SpecialPreferences.php b/includes/specials/SpecialPreferences.php
index 40b50ea..ba5a57e 100644 (file)
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -81,7 +81,7 @@ class SpecialPreferences extends SpecialPage {
                        $user = $this->getUser();
                }
 
-               $htmlForm = Preferences::getFormObject( $user, $this->getContext() );
+               $htmlForm = $this->getFormObject( $user, $this->getContext() );
                $htmlForm->setSubmitCallback( [ 'Preferences', 'tryUISubmit' ] );
                $sectionTitles = $htmlForm->getPreferenceSections();
 
@@ -117,6 +117,16 @@ class SpecialPreferences extends SpecialPage {
                $htmlForm->show();
        }
 
+       /**
+        * Get the preferences form to use.
+        * @param User $user The user.
+        * @param IContextSource $context The context.
+        * @return PreferencesForm|HtmlForm
+        */
+       protected function getFormObject( $user, IContextSource $context ) {
+               return Preferences::getFormObject( $user, $context );
+       }
+
        private function showResetForm() {
                if ( !$this->getUser()->isAllowed( 'editmyoptions' ) ) {
                        throw new PermissionsError( 'editmyoptions' );

diff --git a/languages/data/Names.php b/languages/data/Names.php
index 19ff2a4..8970b40 100644 (file)
--- a/languages/data/Names.php
+++ b/languages/data/Names.php
@@ -314,7 +314,7 @@ class Names {
                'nl' => 'Nederlands', # Dutch
                'nl-informal' => "Nederlands (informeel)\xE2\x80\x8E", # Dutch (informal address ("je"))
                'nn' => 'norsk nynorsk', # Norwegian (Nynorsk)
-               'no' => 'norsk bokmål', # Norwegian (falls back to nb).
+               'no' => 'norsk', # Norwegian macro language (falls back to nb).
                'nov' => 'Novial', # Novial
                'nrm' => 'Nouormand', # Norman
                'nso' => 'Sesotho sa Leboa', # Northern Sotho