Remove invalid language code "bh" (alias of "bho")

Depends on c19cf0e2d53aa4ad6e401202960501a0df876d8e

Bug: T91240
Change-Id: Ic43aa17d180213df2115f771e433fb9e0eb1e8ca

diff --git a/RELEASE-NOTES-1.26 b/RELEASE-NOTES-1.26
index 0b3f29c..8a08f02 100644 (file)
--- a/RELEASE-NOTES-1.26
+++ b/RELEASE-NOTES-1.26
@@ -35,6 +35,9 @@ MediaWiki supports over 350 languages. Many localisations are updated
 regularly. Below only new and removed languages are listed, as well as
 changes to languages because of Bugzilla reports.
 
 regularly. Below only new and removed languages are listed, as well as
 changes to languages because of Bugzilla reports.
 

+* BREAKING CHANGE (T91240): Language code "bh" is not valid in ISO 639 and
+  was removed, so it will no longer alias to "bho". If you used "bh" as your
+  wiki's $wgLanguageCode, you must update your configuration.

 
 === Other changes in 1.26 ===
 * ChangeTags::tagDescription() will return false if the interface message
 
 === Other changes in 1.26 ===
 * ChangeTags::tagDescription() will return false if the interface message

diff --git a/languages/Names.php b/languages/Names.php
index 12059ae..1563e05 100644 (file)
--- a/languages/Names.php
+++ b/languages/Names.php
@@ -77,7 +77,6 @@
        'be-x-old' => "беларуская (тарашкевіца)\xE2\x80\x8E",      # (be-tarask compat)
        'bg' => 'български',   # Bulgarian
        'bgn' => 'بلوچی رخشانی', # Western Balochi
        'be-x-old' => "беларуская (тарашкевіца)\xE2\x80\x8E",      # (be-tarask compat)
        'bg' => 'български',   # Bulgarian
        'bgn' => 'بلوچی رخشانی', # Western Balochi

-       'bh' => 'भोजपुरी',        # Bihari macro language. Falls back to Bhojpuri (bho)

        'bho' => 'भोजपुरी',       # Bhojpuri
        'bi' => 'Bislama',              # Bislama
        'bjn' => 'Bahasa Banjar',       # Banjarese
        'bho' => 'भोजपुरी',       # Bhojpuri
        'bi' => 'Bislama',              # Bislama
        'bjn' => 'Bahasa Banjar',       # Banjarese

diff --git a/languages/messages/MessagesBh.php b/languages/messages/MessagesBh.php
deleted file mode 100644 (file)
index 4453bd1..0000000
--- a/languages/messages/MessagesBh.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/** Bihari (भोजपुरी)
- *
- * To improve a translation please visit https://translatewiki.net
- *
- * @ingroup Language
- * @file
- *
- */
-
-$fallback = 'bho';
-