(bug 19423) The initial file description page uses caption in the user's language...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 145cb10..95770e5 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -255,6 +255,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 19323) action=parse doesn't return section tree on pages with Cite
   warnings
 * (bug 18720) Add anchor field to action=parse&prop=sections output
+* (bug 19423) The initial file description page used caption in user lang
+  rather than UI lang
 
 === Languages updated in 1.16 ===
 

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index bb4bae1..240d34a 100644 (file)
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -1831,13 +1831,13 @@ wgUploadAutoFill = {$autofill};
                        if ( $license != '' ) {
                                $licensetxt = '== ' . wfMsgForContent( 'license' ) . " ==\n" . '{{' . $license . '}}' . "\n";
                        }
-                       $pageText = '== ' . wfMsg ( 'filedesc' ) . " ==\n" . $comment . "\n" .
+                       $pageText = '== ' . wfMsgForContent ( 'filedesc' ) . " ==\n" . $comment . "\n" .
                          '== ' . wfMsgForContent ( 'filestatus' ) . " ==\n" . $copyStatus . "\n" .
                          "$licensetxt" .
                          '== ' . wfMsgForContent ( 'filesource' ) . " ==\n" . $source ;
                } else {
                        if ( $license != '' ) {
-                               $filedesc = $comment == '' ? '' : '== ' . wfMsg ( 'filedesc' ) . " ==\n" . $comment . "\n";
+                               $filedesc = $comment == '' ? '' : '== ' . wfMsgForContent ( 'filedesc' ) . " ==\n" . $comment . "\n";
                                 $pageText = $filedesc .
                                         '== ' . wfMsgForContent ( 'license' ) . " ==\n" . '{{' . $license . '}}' . "\n";
                        } else {