Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/227738
Change subject: Revert "Revert "Move sourceswiki special.dblist->wikisource.dblist"" ...................................................................... Revert "Revert "Move sourceswiki special.dblist->wikisource.dblist"" This reverts commit c4260a5ecd64fe873c58f65f4201a60bfc429b58. Change-Id: I3a5c0b175466f0e1eda52141ae9286174a7356d7 --- M special.dblist M tests/dblistTest.php D w/static/images/project-logos/sourceswiki.png M wikisource.dblist M wmf-config/InitialiseSettings.php 5 files changed, 10 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/38/227738/1 diff --git a/special.dblist b/special.dblist index 4cfc8a9..b365248 100644 --- a/special.dblist +++ b/special.dblist @@ -32,7 +32,6 @@ outreachwiki qualitywiki searchcomwiki -sourceswiki spcomwiki specieswiki stewardwiki diff --git a/tests/dblistTest.php b/tests/dblistTest.php index 155a5d8..8b8791e 100644 --- a/tests/dblistTest.php +++ b/tests/dblistTest.php @@ -31,6 +31,13 @@ : $projectname ; + # Sadly, we end up with an exception because hysterical raisins + # sourceswiki is the original Wikisource and is still active + if ( $database === 'sourceswiki' ) { + $this->assertEquals( $projectname, 'wikisource' ); + return; + } + # Verifiy the databasename suffix $this->assertStringEndsWith( $dbsuffix, $database, "Database name $database lacks db suffix $dbsuffix of $projectname" diff --git a/w/static/images/project-logos/sourceswiki.png b/w/static/images/project-logos/sourceswiki.png deleted file mode 100644 index 290f254..0000000 --- a/w/static/images/project-logos/sourceswiki.png +++ /dev/null Binary files differ diff --git a/wikisource.dblist b/wikisource.dblist index 2505b13..9204b16 100644 --- a/wikisource.dblist +++ b/wikisource.dblist @@ -51,6 +51,7 @@ sawikisource skwikisource slwikisource +sourceswiki srwikisource svwikisource tawikisource diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 1feab08..5ee8410 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -144,6 +144,7 @@ 'otrs_wikiwiki' => 'en', 'qualitywiki' => 'en', 'searchcomwiki' => 'en', + 'sourceswiki' => 'en', 'stewardwiki' => 'en', 'strategywiki' => 'en', 'tenwiki' => 'en', @@ -934,7 +935,6 @@ 'thwikinews' => '/static/images/project-logos/thwikinews.png', // Wikisource - 'sourceswiki' => '/static/images/project-logos/sourceswiki.png', 'arwikisource' => '/static/images/project-logos/arwikisource.png', 'aswikisource' => '/static/images/project-logos/aswikisource.png', // T45129 'azwikisource' => '/static/images/project-logos/azwikisource.png', // T54019 @@ -1833,7 +1833,6 @@ 'slwikisource' => 'Wikivir', 'slwiktionary' => 'Wikislovar', 'slwikiversity' => 'Wikiverza', - 'sourceswiki' => 'Wikisource', 'spcomwiki' => 'Spcom', 'specieswiki' => 'Wikispecies', 'sqwikinews' => 'Wikilajme', @@ -2311,7 +2310,6 @@ 'slwikisource' => 'Wikivir', 'slwiktionary' => 'Wikislovar', 'slwikiversity' => 'Wikiverza', - 'sourceswiki' => 'Wikisource', 'spcomwiki' => 'Spcom', 'specieswiki' => 'Wikispecies', 'sqwikinews' => 'Wikilajme', @@ -4238,7 +4236,7 @@ 'outreachwiki' => 'wikimedia', 'usabilitywiki' => 'wikimedia', 'strategywiki' => 'wikimedia', - 'sourceswiki' => 'wikisource', + 'sourceswiki' => 'wikisource', // $site is wikipedia for this 'specieswiki' => 'wikispecies', 'testwiki' => 'test', 'wikimania' => 'wikimedia', @@ -10422,7 +10420,6 @@ 'wmgUseProofreadPage' => array( 'default' => false, 'wikisource' => true, - 'sourceswiki' => true, // FIXME: Why isn't this part of wikisource? 'test2wiki' => true, 'frrwiki' => true, // T40023 ), @@ -10718,7 +10715,6 @@ 'otrs_wikiwiki' => '/static/favicon/wmf.ico', 'outreachwiki' => '/static/favicon/community.ico', 'searchcomwiki' => '/static/favicon/wmf.ico', - 'sourceswiki' => '/static/favicon/wikisource.ico', 'spcomwiki' => '/static/favicon/spcom.ico', 'specieswiki' => '/static/favicon/wikispecies.ico', 'stewardwiki' => '/static/favicon/community.ico', @@ -10879,7 +10875,6 @@ 'wikinews' => '/srv/mediawiki/w/static/images/sul/wikinews.png', 'wikiquote' => '/srv/mediawiki/w/static/images/sul/wikiquote.png', 'wikisource' => '/srv/mediawiki/w/static/images/sul/wikisource.png', - 'sourceswiki' => '/srv/mediawiki/w/static/images/sul/wikisource.png', 'wikiversity' => '/srv/mediawiki/w/static/images/sul/wikiversity.png', 'wiktionary' => '/srv/mediawiki/w/static/images/sul/wiktionary.png', 'metawiki' => '/srv/mediawiki/w/static/images/sul/meta.png', @@ -12737,7 +12732,6 @@ 'wmgUseDoubleWiki' => array( 'default' => false, 'wikisource' => true, - 'sourceswiki' => true, 'frwiktionary' => true, 'frwikiversity' => true, 'fawiki' => true, -- To view, visit https://gerrit.wikimedia.org/r/227738 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3a5c0b175466f0e1eda52141ae9286174a7356d7 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Alex Monk <kren...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits