From 612c64c107394ec5f41f110ac65ba128d8c547ff Mon Sep 17 00:00:00 2001 From: Aryeh Gregor Date: Thu, 11 Jan 2007 20:49:16 +0000 Subject: [PATCH] * Update for new messages * Use addcslashes() for more reliable escaping (previously would hiccup on the possibly erroneous string "\'" in MessagesBr.php) --- maintenance/language/messageTypes.inc | 45 +++++ maintenance/language/messages.inc | 200 +++++++++----------- maintenance/language/writeMessagesArray.inc | 2 +- 3 files changed, 136 insertions(+), 111 deletions(-) diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc index 2d7e3f7faa..ab669ebb8d 100644 --- a/maintenance/language/messageTypes.inc +++ b/maintenance/language/messageTypes.inc @@ -154,6 +154,51 @@ $wgOptionalMessages = array( 'variantname-kk-kz', 'variantname-kk-cn', 'variantname-kk', + 'accesskey-ca-addsection', + 'accesskey-ca-delete', + 'accesskey-ca-edit', + 'accesskey-ca-history', + 'accesskey-ca-move', + 'accesskey-ca-nstab-category', + 'accesskey-ca-nstab-help', + 'accesskey-ca-nstab-image', + 'accesskey-ca-nstab-main', + 'accesskey-ca-nstab-media', + 'accesskey-ca-nstab-mediawiki', + 'accesskey-ca-nstab-project', + 'accesskey-ca-nstab-special', + 'accesskey-ca-nstab-template', + 'accesskey-ca-nstab-user', + 'accesskey-ca-protect', + 'accesskey-ca-talk', + 'accesskey-ca-undelete', + 'accesskey-ca-unwatch', + 'accesskey-ca-viewsource', + 'accesskey-ca-watch', + 'accesskey-n-currentevents', + 'accesskey-n-help', + 'accesskey-n-mainpage', + 'accesskey-n-portal', + 'accesskey-n-randompage', + 'accesskey-n-recentchanges', + 'accesskey-n-sitesupport', + 'accesskey-p-logo', + 'accesskey-pt-anonlogin', + 'accesskey-pt-anontalk', + 'accesskey-pt-anonuserpage', + 'accesskey-pt-login', + 'accesskey-pt-logout', + 'accesskey-pt-mycontris', + 'accesskey-pt-mytalk', + 'accesskey-pt-preferences', + 'accesskey-pt-userpage', + 'accesskey-pt-watchlist', + 'accesskey-t-contributions', + 'accesskey-t-emailuser', + 'accesskey-t-recentchangeslinked', + 'accesskey-t-specialpages', + 'accesskey-t-upload', + 'accesskey-t-whatlinkshere', ); /** EXIF messages, which may be set as optional in several checks, but are generally mandatory */ diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index a9182aaeb5..2ce61615bd 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -1332,118 +1332,98 @@ $wgMessageStrucutre = array( 'import-logentry-interwiki-detail', ), 'accesskeys' => array( - 'accesskey-userpage', - 'accesskey-anonuserpage', - 'accesskey-mytalk', - 'accesskey-anontalk', - 'accesskey-preferences', - 'accesskey-watchlist', - 'accesskey-mycontris', - 'accesskey-login', - 'accesskey-anonlogin', - 'accesskey-logout', - 'accesskey-talk', - 'accesskey-edit', - 'accesskey-addsection', - 'accesskey-viewsource', - 'accesskey-history', - 'accesskey-protect', - 'accesskey-delete', - 'accesskey-undelete', - 'accesskey-move', - 'accesskey-watch', - 'accesskey-unwatch', - 'accesskey-search', - 'accesskey-logo', - 'accesskey-mainpage', - 'accesskey-portal', - 'accesskey-currentevents', - 'accesskey-recentchanges', - 'accesskey-randompage', - 'accesskey-help', - 'accesskey-sitesupport', - 'accesskey-whatlinkshere', - 'accesskey-recentchangeslinked', - 'accesskey-feed-rss', - 'accesskey-feed-atom', - 'accesskey-contributions', - 'accesskey-emailuser', - 'accesskey-upload', - 'accesskey-specialpages', - 'accesskey-main', - 'accesskey-user', - 'accesskey-media', - 'accesskey-special', - 'accesskey-project', - 'accesskey-image', - 'accesskey-mediawiki', - 'accesskey-template', - 'accesskey-help', - 'accesskey-category', - 'accesskey-search', - 'accesskey-minoredit', - 'accesskey-save', - 'accesskey-preview', - 'accesskey-diff', - 'accesskey-compareselectedversions', - 'accesskey-watch', + 'accesskey-ca-addsection', + 'accesskey-ca-delete', + 'accesskey-ca-edit', + 'accesskey-ca-history', + 'accesskey-ca-move', + 'accesskey-ca-nstab-category', + 'accesskey-ca-nstab-help', + 'accesskey-ca-nstab-image', + 'accesskey-ca-nstab-main', + 'accesskey-ca-nstab-media', + 'accesskey-ca-nstab-mediawiki', + 'accesskey-ca-nstab-project', + 'accesskey-ca-nstab-special', + 'accesskey-ca-nstab-template', + 'accesskey-ca-nstab-user', + 'accesskey-ca-protect', + 'accesskey-ca-talk', + 'accesskey-ca-undelete', + 'accesskey-ca-unwatch', + 'accesskey-ca-viewsource', + 'accesskey-ca-watch', + 'accesskey-n-currentevents', + 'accesskey-n-help', + 'accesskey-n-mainpage', + 'accesskey-n-portal', + 'accesskey-n-randompage', + 'accesskey-n-recentchanges', + 'accesskey-n-sitesupport', + 'accesskey-p-logo', + 'accesskey-pt-anonlogin', + 'accesskey-pt-anontalk', + 'accesskey-pt-anonuserpage', + 'accesskey-pt-login', + 'accesskey-pt-logout', + 'accesskey-pt-mycontris', + 'accesskey-pt-mytalk', + 'accesskey-pt-preferences', + 'accesskey-pt-userpage', + 'accesskey-pt-watchlist', + 'accesskey-t-contributions', + 'accesskey-t-emailuser', + 'accesskey-t-recentchangeslinked', + 'accesskey-t-specialpages', + 'accesskey-t-upload', + 'accesskey-t-whatlinkshere', ), 'tooltips' => array( - 'tooltip-userpage', - 'tooltip-anonuserpage', - 'tooltip-mytalk', - 'tooltip-anontalk', - 'tooltip-preferences', - 'tooltip-watchlist', - 'tooltip-mycontris', - 'tooltip-login', - 'tooltip-anonlogin', - 'tooltip-logout', - 'tooltip-talk', - 'tooltip-edit', - 'tooltip-addsection', - 'tooltip-viewsource', - 'tooltip-history', - 'tooltip-protect', - 'tooltip-delete', - 'tooltip-undelete', - 'tooltip-move', - 'tooltip-watch', - 'tooltip-unwatch', - 'tooltip-search', - 'tooltip-logo', - 'tooltip-mainpage', - 'tooltip-portal', - 'tooltip-currentevents', - 'tooltip-recentchanges', - 'tooltip-randompage', - 'tooltip-help', - 'tooltip-sitesupport', - 'tooltip-whatlinkshere', - 'tooltip-recentchangeslinked', - 'tooltip-feed-rss', - 'tooltip-feed-atom', - 'tooltip-contributions', - 'tooltip-emailuser', - 'tooltip-upload', - 'tooltip-specialpages', - 'tooltip-main', - 'tooltip-user', - 'tooltip-media', - 'tooltip-special', - 'tooltip-project', - 'tooltip-image', - 'tooltip-mediawiki', - 'tooltip-template', - 'tooltip-help', - 'tooltip-category', - 'tooltip-search', - 'tooltip-minoredit', - 'tooltip-save', - 'tooltip-preview', - 'tooltip-diff', - 'tooltip-compareselectedversions', - 'tooltip-watch', + 'tooltip-ca-addsection', + 'tooltip-ca-delete', + 'tooltip-ca-edit', + 'tooltip-ca-history', + 'tooltip-ca-move', + 'tooltip-ca-nstab-category', + 'tooltip-ca-nstab-help', + 'tooltip-ca-nstab-image', + 'tooltip-ca-nstab-main', + 'tooltip-ca-nstab-media', + 'tooltip-ca-nstab-mediawiki', + 'tooltip-ca-nstab-project', + 'tooltip-ca-nstab-special', + 'tooltip-ca-nstab-template', + 'tooltip-ca-nstab-user', + 'tooltip-ca-protect', + 'tooltip-ca-talk', + 'tooltip-ca-undelete', + 'tooltip-ca-unwatch', + 'tooltip-ca-viewsource', + 'tooltip-ca-watch', + 'tooltip-n-currentevents', + 'tooltip-n-help', + 'tooltip-n-mainpage', + 'tooltip-n-portal', + 'tooltip-n-randompage', + 'tooltip-n-recentchanges', + 'tooltip-n-sitesupport', + 'tooltip-p-logo', + 'tooltip-pt-anonlogin', + 'tooltip-pt-anontalk', + 'tooltip-pt-anonuserpage', + 'tooltip-pt-login', + 'tooltip-pt-logout', + 'tooltip-pt-mycontris', + 'tooltip-pt-mytalk', + 'tooltip-pt-preferences', + 'tooltip-pt-userpage', + 'tooltip-pt-watchlist', + 'tooltip-t-contributions', + 'tooltip-t-emailuser', + 'tooltip-t-recentchangeslinked', + 'tooltip-t-specialpages', + 'tooltip-t-upload', + 'tooltip-t-whatlinkshere', ), 'stylesheets' => array( 'common.css', diff --git a/maintenance/language/writeMessagesArray.inc b/maintenance/language/writeMessagesArray.inc index cb0cb89c8f..1084b8f8a9 100644 --- a/maintenance/language/writeMessagesArray.inc +++ b/maintenance/language/writeMessagesArray.inc @@ -100,7 +100,7 @@ function writeMessagesBlock( $name, $comment, $messages, $ignoredComments ) { } else { # Pick the less numerous one to escape $quote = substr_count( $value, '"' ) >= substr_count( $value, "'" ) ? "'" : '"'; - $blockText .= $quote . str_replace( $quote, '\\'.$quote, $value ) . $quote; + $blockText .= $quote . addcslashes( $value, $quote.'\\' ) . $quote; } # Comma -- 2.20.1