Index: extensions/Cite/citeParserTests.txt
===================================================================
--- extensions/Cite/citeParserTests.txt (revision 43635)
+++ extensions/Cite/citeParserTests.txt (working copy)
@@ -112,7 +112,7 @@
|
Index: phase3/includes/Namespace.php
===================================================================
--- phase3/includes/Namespace.php (revision 43635)
+++ phase3/includes/Namespace.php (working copy)
@@ -16,8 +16,8 @@
NS_USER_TALK => 'User_talk',
NS_PROJECT => 'Project',
NS_PROJECT_TALK => 'Project_talk',
- NS_IMAGE => 'Image',
- NS_IMAGE_TALK => 'Image_talk',
+ NS_IMAGE => 'File',
+ NS_IMAGE_TALK => 'File_talk',
NS_MEDIAWIKI => 'MediaWiki',
NS_MEDIAWIKI_TALK => 'MediaWiki_talk',
NS_TEMPLATE => 'Template',
Index: phase3/languages/messages/MessagesEn.php
===================================================================
--- phase3/languages/messages/MessagesEn.php (revision 43635)
+++ phase3/languages/messages/MessagesEn.php (working copy)
@@ -86,8 +86,8 @@
NS_USER_TALK => 'User_talk',
# NS_PROJECT set by $wgMetaNamespace
NS_PROJECT_TALK => '$1_talk',
- NS_IMAGE => 'Image',
- NS_IMAGE_TALK => 'Image_talk',
+ NS_IMAGE => 'File',
+ NS_IMAGE_TALK => 'File_talk',
NS_MEDIAWIKI => 'MediaWiki',
NS_MEDIAWIKI_TALK => 'MediaWiki_talk',
NS_TEMPLATE => 'Template',
@@ -101,7 +101,10 @@
/**
* Array of namespace aliases, mapping from name to NS_xxx index
*/
-$namespaceAliases = array();
+$namespaceAliases = array(
+ 'Image' => NS_IMAGE,
+ 'Image_talk' => NS_IMAGE_TALK,
+);
/**
* Skin names. If any key is not specified, the English one will be used.
Index: phase3/maintenance/parserTests.txt
===================================================================
--- phase3/maintenance/parserTests.txt (revision 43635)
+++ phase3/maintenance/parserTests.txt (working copy)
@@ -2335,7 +2335,7 @@
{{paramtest|
param =[[Image:noimage.png|thumb|[[no link|link]] [[no link|caption]]]]}}
!! result
-This is a test template with parameter
+This is a test template with parameter
!! end
@@ -3072,7 +3072,7 @@
!! input
[[Image:foobar.jpg]]
!! result
-
+
!! end
@@ -3081,16 +3081,25 @@
!! input
[[Image:foobar.jpg|right]]
!! result
-
+
!! end
!! test
+Simple image (using File: namespace, now canonical)
+!! input
+[[File:foobar.jpg]]
+!! result
+
+
+!! end
+
+!! test
Image with caption
!! input
[[Image:foobar.jpg|right|Caption text]]
!! result
-
+
!! end
@@ -3128,7 +3137,7 @@
!! input
[[Image:Foobar.jpg|frame|left|This is a test image [[Main Page]]]]
!! result
-
+
!! end
@@ -3137,7 +3146,7 @@
!! input
[[Image:Foobar.jpg|frame|left|This is a test image [[Main Page]]|alt=Altitude]]
!! result
-
+
!! end
@@ -3146,7 +3155,7 @@
!! input
[[Image:Foobar.jpg|testing '''bold''' in alt]]
!! result
-
+
!! end
@@ -3155,18 +3164,18 @@
!! input
[[Image:Foobar.jpg|alt=testing '''bold''' in alt]]
!! result
-
+
!! end
!! test
Link to image page- image page normally doesn't exists, hence edit link
Add test with existing image page
-#Image:test
+#
Image:test
!! input
[[:Image:test]]
!! result
-
Image:test
+
Image:test
!! end
@@ -3175,7 +3184,7 @@
!! input
[[Image:foobar.jpg|http://example.com]]
!! result
-
+
!! end
@@ -3184,7 +3193,7 @@
!! input
[[Image:foobar.jpg|thumb|http://example.com]]
!! result
-
+
!! end
@@ -3193,7 +3202,7 @@
!! input
[[Image:foobar.jpg|thumb|http://example.com|alt=Alteration]]
!! result
-
+
!! end
@@ -3202,7 +3211,7 @@
!! input
[[Image:foobar.jpg|thumb|ISBN 1235467890]]
!! result
-
+
!! end
@@ -3211,7 +3220,7 @@
!! input
[[Image:foobar.jpg|thumb|This is RFC 12354]]
!! result
-
+
!! end
@@ -3220,7 +3229,7 @@
!! input
[[Image:foobar.jpg|thumb|Please mailto:nobody@example.com]]
!! result
-
+
!! end
@@ -3230,7 +3239,7 @@
!! input
[[Image:foobar.jpg|thumb|]]
!! result
-
+
!! end
@@ -3241,7 +3250,7 @@
!! input
[[Image:foobar.jpg|thumb|]]
!! result
-
+
!! end
@@ -3251,7 +3260,7 @@
!! input
[[Image:foobar.jpg|text with a [[link]] in it]]
!! result
-
+
!! end
@@ -3260,7 +3269,7 @@
!! input
[[Image:foobar.jpg|text with a [[link]]foo in it]]
!! result
-
+
!! end
@@ -3269,7 +3278,7 @@
!! input
[[Image:foobar.jpg|text with a [[MeatBall:Link]] in it]]
!! result
-
+
!! end
@@ -3278,7 +3287,7 @@
!! input
[[Image:foobar.jpg|text with a [[MeatBall:Link|link]] in it]]
!! result
-
+
!! end
@@ -3287,7 +3296,7 @@
!! input
[[Image:foobar.jpg|& < > "]]
!! result
-
+
!! end
@@ -3296,7 +3305,7 @@
!! input
[[Image:foobar.jpg|♀]]
!! result
-
+
!! end
@@ -3314,7 +3323,7 @@
!! input
[[Image:Foobar.jpg|thumb|This is a caption with another [[Image:icon.png|image]] inside it!]]
!! result
-
+
!! end
@@ -3324,7 +3333,7 @@
[[Image:Foobar.jpg|This
*is some text]]
!! result
-
+
!!end
@@ -3334,7 +3343,7 @@
!! input
[[Image:Foobar.jpg|thumb|200px|This caption has [irc://example.net irc] and [https://example.com Secure] ext links in it.]]
!! result
- This caption has
irc and
Secure ext links in it.
+ This caption has
irc and
Secure ext links in it.
!! end
@@ -3737,7 +3746,7 @@
!! input
http://example.com [[Image:foobar.jpg]]
!! result
-http://example.com
+
http://example.com
!!end
@@ -3746,7 +3755,7 @@
!! input
http://example.com[[Image:foobar.jpg]]
!! result
-http://example.com
+
http://example.com
!!end
@@ -3932,7 +3941,7 @@
!! input
[[Image:No such.jpg]]
!! result
-Image:No such.jpg
+
File:No such.jpg
!! end
@@ -3941,7 +3950,7 @@
!! input
[[:Image:No such.jpg]]
!! result
-Image:No such.jpg
+
Image:No such.jpg
!! end
@@ -6254,7 +6263,7 @@
!! input
[[Image:foobar.jpg|centre]]
!! result
-
+
!!end
@@ -6263,7 +6272,7 @@
!! input
[[Image:foobar.jpg|none]]
!! result
-
+
!!end
@@ -6272,7 +6281,7 @@
!! input
[[Image:foobar.jpg|640x480px]]
!! result
-
+
!!end
@@ -6281,7 +6290,7 @@
!! input
[[Image:foobar.jpg|640px]]
!! result
-
+
!!end
@@ -6290,7 +6299,7 @@
!! input
[[Image:foobar.jpg|640px ]]
!! result
-
+
!!end
@@ -6299,7 +6308,7 @@
!! input
[[Image:foobar.jpg| 640px]]
!! result
-
+
!!end
@@ -6337,7 +6346,7 @@
!! input
[[image:Foobar.jpg|thumb|An [http://test/?param1=|left|¶m2=|x external] URL]]
!! result
-
+
!!end
@@ -7151,7 +7160,7 @@
!! input
[[Image:Foobar.jpg|thumb|http://x|hello]]
!! result
-
+
!! end