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

diff --git a/RELEASE-NOTES-1.26 b/RELEASE-NOTES-1.26
index 61e04b8..6f1120e 100644 (file)
--- a/RELEASE-NOTES-1.26
+++ b/RELEASE-NOTES-1.26
@@ -37,9 +37,6 @@ 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.
 
-* 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

diff --git a/languages/Names.php b/languages/Names.php
index 88d95f2..ddd40f1 100644 (file)
--- a/languages/Names.php
+++ b/languages/Names.php
@@ -78,6 +78,7 @@
        '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

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