Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/99604
Change subject: Fix pa_uswikimedia
......................................................................
Fix pa_uswikimedia
Bug: 58024
Change-Id: I0db35457bd6e6d553290226bb2c53d85c7c9aede
---
M multiversion/MWMultiVersion.php
M tests/multiversion/MWMultiVersionTest.php
2 files changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/04/99604/1
diff --git a/multiversion/MWMultiVersion.php b/multiversion/MWMultiVersion.php
index 19e0383..83bcba9 100644
--- a/multiversion/MWMultiVersion.php
+++ b/multiversion/MWMultiVersion.php
@@ -152,13 +152,14 @@
// http://wikidata.beta.wmflabs.org/
$lang = $matches[1];
}
- } elseif ( preg_match( '/^(.*)\.([a-z]+)\.org$/', $serverName,
$matches) ) {
+ } elseif ( preg_match( '/^(.*)\.([a-z]+)\.org$/', $serverName,
$matches ) ) {
$lang = $matches[1];
if ( $matches[2] !== 'wikimedia'
|| ( $matches[2] === 'wikimedia' && in_array(
str_replace( '.', '_', $lang ),
- array( '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'
+ array(
+ '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
diff --git a/tests/multiversion/MWMultiVersionTest.php
b/tests/multiversion/MWMultiVersionTest.php
index 0ba4025..8eea685 100644
--- a/tests/multiversion/MWMultiVersionTest.php
+++ b/tests/multiversion/MWMultiVersionTest.php
@@ -66,7 +66,7 @@
array( 'ombudsmenwiki', 'ombudsmen.wikimedia.org' ),
array( 'otrs_wikiwiki', 'otrs-wiki.wikimedia.org' ),
array( 'outreachwiki', 'outreach.wikimedia.org' ),
- array( 'pa_uswikimedia', 'pa.us.wikimedia.org' ),
+ array( 'pa_uswikimedia', 'pa-us.wikimedia.org' ),
array( 'qualitywiki', 'quality.wikimedia.org' ),
array( 'searchcomwiki', 'searchcom.wikimedia.org' ),
array( 'sourceswiki', 'wikisource.org' ),
--
To view, visit https://gerrit.wikimedia.org/r/99604
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0db35457bd6e6d553290226bb2c53d85c7c9aede
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
