Follow-up to r55800

* update messages.inc to correctly create subgroup img_auth
* rebuild messages files

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index e489ae7..4c9758d 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2144,18 +2144,24 @@ If the problem persists, contact an [[Special:ListUsers/sysop|administrator]].',
 'upload-unknown-size'       => 'Unknown size',
 'upload-http-error'         => 'An HTTP error occured: $1',
 
-#img_auth script messages
-'img-auth-accessdenied'   => "Access Denied",
-'img-auth-desc'                  => 'Image authorisation script',
-'img-auth-nopathinfo'     => "Missing PATH_INFO.  Your server is not set up to pass this information - may be CGI-based and can't support img_auth. See http://www.mediawiki.org/wiki/Manual:Image_Authorization.",
-'img-auth-notindir'      => "Requested path is not in the configured upload directory.",
-'img-auth-badtitle'      => "Unable to construct a valid title from `$1`.",
-'img-auth-nologinnWL'     => "You are not logged in and `$1` not in whitelist.",
-'img-auth-nofile'            => "File `$1` does not exist.",
-'img-auth-isdir'                 => "you are trying to access a directory`$1`.  Only file access is allowed.",
-'img-auth-streaming'     => "Streaming `$1`.",
-'img-auth-public'                => "The function of img_auth.php is to output files from a private wiki. This wiki is configured as a public wiki. For optimal security, img_auth.php is disabled for this case.",
-'img-auth-noread'                => "User does not have access to read `$1`.",
+# img_auth script messages
+'img-auth-accessdenied' => 'Access Denied',
+'img-auth-desc'         => 'Image authorisation script',
+'img-auth-nopathinfo'   => 'Missing PATH_INFO.
+Your server is not set up to pass this information.
+It may be CGI-based and cannot support img_auth.
+See http://www.mediawiki.org/wiki/Manual:Image_Authorization.',
+'img-auth-notindir'     => 'Requested path is not in the configured upload directory.',
+'img-auth-badtitle'     => 'Unable to construct a valid title from `$1`.',
+'img-auth-nologinnWL'   => 'You are not logged in and `$1` not in whitelist.',
+'img-auth-nofile'       => 'File `$1` does not exist.',
+'img-auth-isdir'        => 'You are trying to access a directory "$1".
+Only file access is allowed.',
+'img-auth-streaming'    => 'Streaming "$1".',
+'img-auth-public'       => 'The function of img_auth.php is to output files from a private wiki.
+This wiki is configured as a public wiki.
+For optimal security, img_auth.php is disabled.',
+'img-auth-noread'       => 'User does not have access to read "$1".',
 
 # Some likely curl errors. More could be added from <http://curl.haxx.se/libcurl/c/libcurl-errors.html>
 'upload-curl-error6'       => 'Could not reach URL',

diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index 52b86f0..83c9663 100644 (file)
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -1519,6 +1519,19 @@ Parameter $1 is a link to the deletion log, with the text in {{msg|deletionlog}}
 
 'upload-file-error' => '{{Identical|Internal error}}',
 
+# img_auth script messages
+'img-auth-accessdenied' => '[[Manual:Image Authorization]] Access Denied',
+'img-auth-desc'         => '[[Manual:Image Authorization]] script, see http://www.mediawiki.org/wiki/Manual:Image_Authorization',
+'img-auth-nopathinfo'   => '[[Manual:Image Authorization]] Missing PATH_INFO - see english description',
+'img-auth-notindir'     => '[[Manual:Image Authorization]] when the specified path is not in upload directory.',
+'img-auth-badtitle'     => '[[Manual:Image Authorization]] bad title, $1 is the invalid title',
+'img-auth-nologinnWL'   => '[[Manual:Image Authorization]] logged in and file not whitelisted. $1 is the file not in whitelist.',
+'img-auth-nofile'       => '[[Manual:Image Authorization]] non existent file, $1 is the file that does not exist.',
+'img-auth-isdir'        => '[[Manual:Image Authorization]] trying to access a directory instead of a file, $1 is the directory.',
+'img-auth-streaming'    => '[[Manual:Image Authorization]] is now streaming file specified by $1.',
+'img-auth-public'       => '[[Manual:Image Authorization]] an error message when the admin has configured the wiki to be a public wiki, but is using img_auth script - normally this is a configuration error, except when special restriction extensions are used',
+'img-auth-noread'       => '[[Manual:Image Authorization]] User does not have access to read file, $1 is the file',
+
 'license'           => 'This appears in the upload form for the license drop-down. The header in the file description page is now at {{msg-mw|License-header}}.',
 'nolicense'         => '{{Identical|None selected}}',
 'license-nopreview' => 'Error message when a certain license does not exist',
@@ -2641,19 +2654,6 @@ The message appears after the name of the patroller.',
 * $1 is a date (example: ''19 March 2008'')
 * $2 is a time (example: ''12:15'')",
 
-#img_auth script messages
-'img-auth-desc'                  => '[[Manual:Image Authorization]] script, see http://www.mediawiki.org/wiki/Manual:Image_Authorization',
-'img-auth-accessdenied'   => "[[Manual:Image Authorization]] Access Denied",
-'img-auth-nopathinfo'     => "[[Manual:Image Authorization]] Missing PATH_INFO - see english description",
-'img-auth-notindir'      => "[[Manual:Image Authorization]] when the specified path is not in upload directory.",
-'img-auth-badtitle'      => "[[Manual:Image Authorization]] bad title, $1 is the invalid title",
-'img-auth-nologinnWL'     => "[[Manual:Image Authorization]] logged in and file not whitelisted. $1 is the file not in whitelist.",
-'img-auth-nofile'            => "[[Manual:Image Authorization]] non existent file, $1 is the file that does not exist.",
-'img-auth-isdir'                 => "[[Manual:Image Authorization]] trying to access a directory instead of a file, $1 is the directory.",
-'img-auth-streaming'     => "[[Manual:Image Authorization]] is now streaming file specified by $1.",
-'img-auth-public'                => "[[Manual:Image Authorization]] an error message when the admin has configured the wiki to be a public wiki, but is using img_auth script - normally this is a configuration error, except when special restriction extensions are used",
-'img-auth-noread'                => "[[Manual:Image Authorization]] User does not have access to read file, $1 is the file",
-
 # Video information, used by Language::formatTimePeriod() to format lengths in the above messages
 'seconds-abbrev' => '{{optional}}',
 'minutes-abbrev' => '{{optional}}',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 756eec4..e3e3a33 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -327,17 +327,6 @@ $wgMessageStructure = array(
                'anonnotice',
                'newsectionheaderdefaultlevel',
                'red-link-title',
-               'img-auth-accessdenied',
-               'img-auth-desc',
-               'img-auth-nopathinfo',
-               'img-auth-notindir',
-               'img-auth-badtitle',
-               'img-auth-nologinnWL',
-               'img-auth-nofile',
-               'img-auth-isdir',
-               'img-auth-streaming',
-               'img-auth-public',
-               'img-auth-noread',
        ),
        'nstab' => array(
                'nstab-main',
@@ -1292,6 +1281,19 @@ $wgMessageStructure = array(
                'upload-unknown-size',
                'upload-http-error',
        ),
+       'img-auth' => array(
+               'img-auth-accessdenied',
+               'img-auth-desc',
+               'img-auth-nopathinfo',
+               'img-auth-notindir',
+               'img-auth-badtitle',
+               'img-auth-nologinnWL',
+               'img-auth-nofile',
+               'img-auth-isdir',
+               'img-auth-streaming',
+               'img-auth-public',
+               'img-auth-noread',
+       ),
        'upload-curl-errors' => array(
                'upload-curl-error6',
                'upload-curl-error6-text',
@@ -3180,6 +3182,7 @@ XHTML id names.",
        'recentchangeslinked' => 'Recent changes linked',
        'upload'              => 'Upload',
        'upload-errors'       => '',
+       'img-auth'            => 'img_auth script messages',
        'upload-curl-errors'  => 'Some likely curl errors. More could be added from <http://curl.haxx.se/libcurl/c/libcurl-errors.html>',
        'licenses'            => '',
        'filelist'            => 'Special:ListFiles',