From e78e254434ce1a83fa8d17f60c1a2a3cf4b96e1b Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Wed, 1 Jul 2009 00:52:22 +0000 Subject: [PATCH] (bug 19423) The initial file description page uses caption in the user's language instead of content language --- RELEASE-NOTES | 2 ++ includes/specials/SpecialUpload.php | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 145cb10ca9..95770e570d 100644 --- 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 bb4bae10ff..240d34ad31 100644 --- 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 { -- 2.20.1