From 32e96a7d17962091ff0336a819ed0594a4ebbe10 Mon Sep 17 00:00:00 2001 From: Andrew Garrett Date: Mon, 25 Feb 2008 13:01:38 +0000 Subject: [PATCH] Bring the filepageexists message in-line with the actual behaviour of the software (see bug 4636) --- RELEASE-NOTES | 1 + languages/messages/MessagesEn.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 95efe80d60..dc764fc6dd 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -40,6 +40,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * (bug 13132) Unable to unprotect pages protected with earlier versions of MediaWiki * (bug 13140) Show parent categories in category namespace * (bug 13149) Correctly format 'fileexists' message on Upload page. +* Make filepageexists accurate. === API changes in 1.13 === diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 2825d70d05..5249ef74c6 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1421,7 +1421,7 @@ To include a file in a page, use a link in the form 'largefileserver' => 'This file is bigger than the server is configured to allow.', 'emptyfile' => 'The file you uploaded seems to be empty. This might be due to a typo in the file name. Please check whether you really want to upload this file.', 'fileexists' => 'A file with this name exists already, please check $1 if you are not sure if you want to change it.', -'filepageexists' => 'A page (not a file) with this name exists already, please check $1 if you are not sure if you want to change it.', +'filepageexists' => "The description page for this file has already been created at $1, but no file with this name currently exists. The summary you enter will not appear on the description page. To make your summary appear there, you will need to manually edit it", 'fileexists-extension' => 'A file with a similar name exists:
Name of the uploading file: $1
Name of the existing file: $2
-- 2.20.1