jenkins-bot has submitted this change and it was merged.
Change subject: Remove remnants of . replaced with _ in "lang"
......................................................................
Remove remnants of . replaced with _ in "lang"
Change-Id: I4df7d12e5ddb881b84e0988ac357fb1233cfee77
---
M multiversion/MWMultiVersion.php
M tests/multiversion/MWMultiVersionTest.php
2 files changed, 8 insertions(+), 12 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/multiversion/MWMultiVersion.php b/multiversion/MWMultiVersion.php
index 526b397..73f6883 100644
--- a/multiversion/MWMultiVersion.php
+++ b/multiversion/MWMultiVersion.php
@@ -159,18 +159,14 @@
$lang = $matches[1];
if ( $matches[2] !== 'wikimedia'
|| ( $matches[2] === 'wikimedia' && in_array(
- str_replace( '.', '_', $lang ),
+ $lang,
array(
- 'ar', 'bd', 'be', 'br', 'co',
'dk', 'et', 'fi', 'il', 'mk', 'mx', 'nl', 'noboard_chapters',
+ 'ar', 'bd', 'be', 'br', 'co',
'dk', 'et', 'fi', 'il', 'mk', 'mx', 'nl', 'noboard-chapters',
'no', 'nyc', 'nz', 'pa-us',
'pl', 'rs', 'ru', 'se', 'tr', 'ua', 'uk', 've'
)
) ) ) {
// wikimedia (non chapters) sites stay as wiki
$site = $matches[2];
-
- // Hack for some multi subdomain wikis waiting
to be renamed
- // arbcom_dewiki, arbcom_enwiki, arbcom_fiwiki,
arbcom_nlwiki, noboard_chapterswikimedia, wg_enwiki
- $lang = str_replace( '.', '-', $lang );
}
} else {
self::error( "Invalid host name ($serverName).\n" );
diff --git a/tests/multiversion/MWMultiVersionTest.php
b/tests/multiversion/MWMultiVersionTest.php
index f6cca2e..61841d2 100644
--- a/tests/multiversion/MWMultiVersionTest.php
+++ b/tests/multiversion/MWMultiVersionTest.php
@@ -33,10 +33,10 @@
array( 'enwikivoyage', 'en.wikivoyage.org' ),
array( 'advisorywiki', 'advisory.wikimedia.org' ),
- array( 'arbcom_dewiki', 'arbcom.de.wikipedia.org' ),
- array( 'arbcom_enwiki', 'arbcom.en.wikipedia.org' ),
- array( 'arbcom_fiwiki', 'arbcom.fi.wikipedia.org' ),
- array( 'arbcom_nlwiki', 'arbcom.nl.wikipedia.org' ),
+ array( 'arbcom_dewiki', 'arbcom-de.wikipedia.org' ),
+ array( 'arbcom_enwiki', 'arbcom-en.wikipedia.org' ),
+ array( 'arbcom_fiwiki', 'arbcom-fi.wikipedia.org' ),
+ array( 'arbcom_nlwiki', 'arbcom-nl.wikipedia.org' ),
array( 'arwikimedia', 'ar.wikimedia.org' ),
array( 'auditcomwiki', 'auditcom.wikimedia.org' ),
array( 'boardgovcomwiki', 'boardgovcom.wikimedia.org' ),
@@ -61,7 +61,7 @@
array( 'metawiki', 'meta.wikimedia.org' ),
array( 'movementroleswiki',
'movementroles.wikimedia.org' ),
array( 'mxwikimedia', 'mx.wikimedia.org' ),
- array( 'noboard_chapterswikimedia',
'noboard.chapters.wikimedia.org' ),
+ array( 'noboard_chapterswikimedia',
'noboard-chapters.wikimedia.org' ),
array( 'nycwikimedia', 'nyc.wikimedia.org' ),
array( 'officewiki', 'office.wikimedia.org' ),
array( 'ombudsmenwiki', 'ombudsmen.wikimedia.org' ),
@@ -81,7 +81,7 @@
array( 'transitionteamwiki',
'transitionteam.wikimedia.org' ),
array( 'usabilitywiki', 'usability.wikimedia.org' ),
array( 'votewiki', 'vote.wikimedia.org' ),
- array( 'wg_enwiki', 'wg.en.wikipedia.org' ),
+ array( 'wg_enwiki', 'wg-en.wikipedia.org' ),
array( 'wikidatawiki', 'www.wikidata.org' ),
array( 'wikimania2005wiki',
'wikimania2005.wikimedia.org' ),
array( 'wikimania2006wiki',
'wikimania2006.wikimedia.org' ),
--
To view, visit https://gerrit.wikimedia.org/r/134948
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4df7d12e5ddb881b84e0988ac357fb1233cfee77
Gerrit-PatchSet: 7
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
