From 46287536cfa228ec6b1d301d3e46e864a9683d4a Mon Sep 17 00:00:00 2001 From: "This, that and the other" Date: Sun, 17 Jan 2016 12:54:56 +1100 Subject: [PATCH] Improve wording and tense in some "page language" strings The titles of "action" special pages are normally expressed as actions ("Move page", "Reset password", "Upload file"), and the names of log types are normally nouns ("Deletion log", "Content model change log"). In any case, "Change language log" and "$1 changed page language for $3" are not good English. Log entries also do not end in full stops. Change-Id: I1d2fed64549ce584418bb3b72d33bf5657c2681f --- languages/i18n/en.json | 6 +++--- tests/phpunit/includes/logging/PageLangLogFormatterTest.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/languages/i18n/en.json b/languages/i18n/en.json index b436f90977..7742352f34 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -3850,7 +3850,7 @@ "expand_templates_preview_fail_html": "Because {{SITENAME}} has raw HTML enabled and there was a loss of session data, the preview is hidden as a precaution against JavaScript attacks.\n\nIf this is a legitimate preview attempt, please try again.\nIf it still does not work, try [[Special:UserLogout|logging out]] and logging back in.", "expand_templates_preview_fail_html_anon": "Because {{SITENAME}} has raw HTML enabled and you are not logged in, the preview is hidden as a precaution against JavaScript attacks.\n\nIf this is a legitimate preview attempt, please [[Special:UserLogin|log in]] and try again.", "expand_templates_input_missing": "You need to provide at least some input text.", - "pagelanguage": "Page language selector", + "pagelanguage": "Change page language", "pagelang-name": "Page", "pagelang-language": "Language", "pagelang-use-default": "Use default language", @@ -3858,9 +3858,9 @@ "pagelang-submit": "Submit", "right-pagelang": "Change page language", "action-pagelang": "change the page language", - "log-name-pagelang": "Change language log", + "log-name-pagelang": "Language change log", "log-description-pagelang": "This is a log of changes in page languages.", - "logentry-pagelang-pagelang": "$1 {{GENDER:$2|changed}} page language for $3 from $4 to $5.", + "logentry-pagelang-pagelang": "$1 {{GENDER:$2|changed}} the language of $3 from $4 to $5", "default-skin-not-found": "Whoops! The default skin for your wiki, defined in $wgDefaultSkin as $1, is not available.\n\nYour installation seems to include the following {{PLURAL:$4|skin|skins}}. See [https://www.mediawiki.org/wiki/Manual:Skin_configuration Manual: Skin configuration] for information how to enable {{PLURAL:$4|it|them and choose the default}}.\n\n$2\n\n; If you have just installed MediaWiki:\n: You probably installed from git, or directly from the source code using some other method. This is expected. Try installing some skins from [https://www.mediawiki.org/wiki/Category:All_skins mediawiki.org's skin directory], by:\n:* Downloading the [https://www.mediawiki.org/wiki/Download tarball installer], which comes with several skins and extensions. You can copy and paste the skins/ directory from it.\n:* Downloading individual skin tarballs from [https://www.mediawiki.org/wiki/Special:SkinDistributor mediawiki.org].\n:* [https://www.mediawiki.org/wiki/Download_from_Git#Using_Git_to_download_MediaWiki_skins Using Git to download skins].\n: Doing this should not interfere with your git repository if you're a MediaWiki developer.\n\n; If you have just upgraded MediaWiki:\n: MediaWiki 1.24 and newer no longer automatically enables installed skins (see [https://www.mediawiki.org/wiki/Manual:Skin_autodiscovery Manual: Skin autodiscovery]). You can paste the following {{PLURAL:$5|line|lines}} into LocalSettings.php to enable {{PLURAL:$5|the|all}} installed {{PLURAL:$5|skin|skins}}:\n\n
$3
\n\n; If you have just modified LocalSettings.php:\n: Double-check the skin names for typos.", "default-skin-not-found-no-skins": "Whoops! The default skin for your wiki, defined in $wgDefaultSkin as $1, is not available.\n\nYou have no installed skins.\n\n; If you have just installed or upgraded MediaWiki:\n: You probably installed from git, or directly from the source code using some other method. This is expected. MediaWiki 1.24 and newer doesn't include any skins in the main repository. Try installing some skins from [https://www.mediawiki.org/wiki/Category:All_skins mediawiki.org's skin directory], by:\n:* Downloading the [https://www.mediawiki.org/wiki/Download tarball installer], which comes with several skins and extensions. You can copy and paste the skins/ directory from it.\n:* Downloading individual skin tarballs from [https://www.mediawiki.org/wiki/Special:SkinDistributor mediawiki.org].\n:* [https://www.mediawiki.org/wiki/Download_from_Git#Using_Git_to_download_MediaWiki_skins Using Git to download skins].\n: Doing this should not interfere with your git repository if you're a MediaWiki developer. See [https://www.mediawiki.org/wiki/Manual:Skin_configuration Manual: Skin configuration] for information how to enable skins and choose the default.\n", "default-skin-not-found-row-enabled": "* $1 / $2 (enabled)", diff --git a/tests/phpunit/includes/logging/PageLangLogFormatterTest.php b/tests/phpunit/includes/logging/PageLangLogFormatterTest.php index 226e492b22..4224443786 100644 --- a/tests/phpunit/includes/logging/PageLangLogFormatterTest.php +++ b/tests/phpunit/includes/logging/PageLangLogFormatterTest.php @@ -34,7 +34,7 @@ class PageLangLogFormatterTest extends LogFormatterTestCase { ), ), array( - 'text' => 'User changed page language for Page from English (en) to Deutsch (de) [default].', + 'text' => 'User changed the language of Page from English (en) to Deutsch (de) [default]', 'api' => array( 'oldlanguage' => 'en', 'newlanguage' => 'de[def]' -- 2.20.1