Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Consistent spelling of "subpage"

Browse source 
Also:
1. Other minor fixes in comments touched by this patch.
2. Add a separate test for subpage with spaces.

Change-Id: I267f19027098e5778b1cd491826e1741fc7ee794
This commit is contained in:
Amir E. Aharoni 2024-08-06 04:01:02 -04:00
parent 88770fc9c8
commit c14bbf4e2f
11 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/Permissions/PermissionManager.php
View file

@ -1389,7 +1389,7 @@ class PermissionManager {
}
/**
* Check CSS/JSON/JS sub-page permissions
* Check CSS/JSON/JS subpage permissions
*
* @param string $action The action to check
* @param UserIdentity $user User to check

2
includes/page/WikiPage.php
View file

@ -2865,7 +2865,7 @@ class WikiPage implements Stringable, Page, PageRecord {
// queue a high-priority LinksUpdate job, to ensure that we really protect all
// content that is currently transcluded onto the page. This is important, because
// wikitext supports conditional statements based on the current time, which enables
// transcluding of a different sub page based on which day it is, and then show that
// transcluding of a different subpage based on which day it is, and then show that
// information on the Main Page, without the Main Page itself being edited.
MediaWikiServices::getInstance()->getJobQueueGroup()->lazyPush(
RefreshLinksJob::newPrioritized( $this->mTitle, $params )

4
includes/skins/SkinTemplate.php
View file

@ -449,7 +449,7 @@ class SkinTemplate extends Skin {
# We need to do an explicit check for Special:Contributions, as we
# have to match both the title, and the target, which could come
# from request values (Special:Contributions?target=Jimbo_Wales)
# or be specified in "sub page" form
# or be specified in "subpage" form
# (Special:Contributions/Jimbo_Wales). The plot
# thickens, because the Title object is altered for special pages,
# so it doesn't contain the original alias-with-subpage.
@ -1425,7 +1425,7 @@ class SkinTemplate extends Skin {
}
$special->setContext( $this );
$associatedNavigationLinks = $special->getAssociatedNavigationLinks();
// If no sub pages we should not render.
// If there are no subpages, we should not render
if ( count( $associatedNavigationLinks ) === 0 ) {
return [];
}

2
includes/specialpage/FormSpecialPage.php
View file

@ -40,7 +40,7 @@ use UserBlockedError;
*/
abstract class FormSpecialPage extends SpecialPage {
/**
* The sub-page of the special page.
* The subpage of the special page.
* @var string|null
*/
protected $par = null;

2
includes/specialpage/SpecialPage.php
View file

@ -808,7 +808,7 @@ class SpecialPage implements MessageLocalizer {
}
/**
* Similar to getDescription but takes into account sub pages and designed for display
* Similar to getDescription, but takes into account subpages and designed for display
* in tabs.
*
* @since 1.39

2
includes/specials/SpecialVersion.php
View file

@ -125,7 +125,7 @@ class SpecialVersion extends SpecialPage {
$out = $this->getOutput();
$out->setPreventClickjacking( false );
// Explode the sub page information into useful bits
// Explode the subpage information into useful bits
$parts = explode( '/', (string)$par );
$extNode = null;
if ( isset( $parts[1] ) ) {

8
includes/title/Title.php
View file

@ -1450,7 +1450,7 @@ class Title implements Stringable, LinkTarget, PageIdentity {
}
/**
* Is this a "config" (.css, .json, or .js) sub-page of a user page?
* Is this a "config" (.css, .json, or .js) subpage of a user page?
*
* @return bool
* @since 1.31
@ -1485,7 +1485,7 @@ class Title implements Stringable, LinkTarget, PageIdentity {
}
/**
* Is this a CSS "config" sub-page of a user page?
* Is this a CSS "config" subpage of a user page?
*
* @return bool
* @since 1.31
@ -1499,7 +1499,7 @@ class Title implements Stringable, LinkTarget, PageIdentity {
}
/**
* Is this a JSON "config" sub-page of a user page?
* Is this a JSON "config" subpage of a user page?
*
* @return bool
* @since 1.31
@ -1513,7 +1513,7 @@ class Title implements Stringable, LinkTarget, PageIdentity {
}
/**
* Is this a JS "config" sub-page of a user page?
* Is this a JS "config" subpage of a user page?
*
* @return bool
* @since 1.31

2
languages/i18n/qqq.json
View file

@ -3918,7 +3918,7 @@
"version-poweredby-others": "Used at the end of {{msg-mw|version-poweredby-credits}} on [[Special:Version]]. First, there's a long list of selected MediaWiki authors, then a comma and then this translation, which is supposed to credit the many other people than developer helping with MediaWiki.\n{{Identical|Other}}",
"version-poweredby-translators": "Used as label for a link to [[Translating:MediaWiki/Credits]].\n\nPreceded by {{msg-mw|version-poweredby-others}} and {{msg-mw|and}}.\n\nUsed at the end of {{msg-mw|version-poweredby-credits}} on [[Special:Version]].",
"version-poweredby-various": "Shown on [[Special:Version]] as an author name if the extension or skin (etc.) credits contain only <code>...</code> which is used to indicate various (unknown or unspecified) authors. See also {{msg-mw|version-poweredby-others}}, which is used when an extension or a skin contains code by various named and unnamed contributors.",
"version-credits-summary": "Summary of the [[Special:Version/Credits]] sub page, which lists all developers etc. who contributed to MediaWiki. Shown at the top.",
"version-credits-summary": "Summary of the [[Special:Version/Credits]] subpage, which lists all developers etc. who contributed to MediaWiki. Shown at the top.",
"version-license-info": "[[wikipedia:GNU GPL|GNU GPL]] notice shown at [[Special:Version]]. See //www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html for available translations.",
"version-software": "Message shown on [[Special:Version]].\nThis message is followed by the list of installed software (MediaWiki, PHP and MySQL).",
"version-software-product": "Shown in [[Special:Version]].\n{{Identical|Product}}",

2
maintenance/deleteEqualMessages.php
View file

@ -74,7 +74,7 @@ class DeleteEqualMessages extends Maintenance {
$nonContentLanguage,
$this->getReplicaDB()
);
// getCustomisedStatuses is stripping the sub page from the page titles, add it back
// getCustomisedStatuses is stripping the subpage from the page titles, add it back
$titleSuffix = $nonContentLanguage ? "/$langCode" : '';
foreach ( $messageNames as $key ) {

2
resources/src/mediawiki.rcfilters/ui/ChangesListWrapperWidget.js
View file

@ -259,7 +259,7 @@ ChangesListWrapperWidget.prototype.updateEnhancedParentHighlight = function () {
activeHighlightClasses = this.filtersViewModel.getCurrentlyUsedHighlightColors().map( ( color ) => 'mw-rcfilters-highlight-color-' + color );
// Go over top pages and their children, and figure out if all sub-pages have the
// Go over top pages and their children, and figure out if all subpages have the
// same highlights between themselves. If they do, the parent should be highlighted
// with all colors. If classes are different, the parent should receive a grey
// background

3
tests/phpunit/includes/site/MediaWikiSiteTest.php
View file

@ -92,7 +92,8 @@ class MediaWikiSiteTest extends SiteTest {
[ 'http://acme.test/wiki/', 'Berlin', '/wiki/' ],
[ 'http://acme.test/w/index.php?title=$1', 'Berlin', '/w/index.php?title=Berlin' ],
[ 'http://acme.test/wiki/$1', '', '/wiki/' ],
[ 'http://acme.test/wiki/$1', 'Berlin/sub page', '/wiki/Berlin/sub_page' ],
[ 'http://acme.test/wiki/$1', 'Berlin/subpage', '/wiki/Berlin/subpage' ],
[ 'http://acme.test/wiki/$1', 'Berlin/subpage with spaces', '/wiki/Berlin/subpage_with_spaces' ],
[ 'http://acme.test/wiki/$1', 'Cork (city) ', '/Cork_(city)' ],
[ 'http://acme.test/wiki/$1', 'M&M', '/wiki/M%26M' ],
];