From 44390ff7e85c3eced6c71fa2932ecdf2390a91b8 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 27 Feb 2008 04:56:29 +0000 Subject: [PATCH] Tweak up last commit about opensearch desc to be nicer. Cleaner message name, use wfMsgForContent, remove an obsolete line. --- RELEASE-NOTES | 2 +- languages/messages/MessagesEn.php | 2 +- opensearch_desc.php | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 68a550b267..8d621cdb68 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -50,7 +50,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * (bug 13132) Unable to unprotect pages protected with earlier versions of MediaWiki * (bug 12723) OpenSearch description name now uses more compact language code to avoid passing the length limit as often, is customizable per site via - 'opensearch-shortname' message. + 'opensearch-desc' message. === API changes in 1.13 === diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index b71d38b588..8547d44eb4 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1240,7 +1240,7 @@ Make sure that this change will maintain historical page continuity. ', # don't translate or duplicate this message to other languages # OpenSearch description -'opensearch-shortname' => '{{SITENAME}} ({{CONTENTLANGUAGE}})', +'opensearch-desc' => '{{SITENAME}} ({{CONTENTLANGUAGE}})', # Preferences page 'preferences' => 'Preferences', diff --git a/opensearch_desc.php b/opensearch_desc.php index 187a74b8af..a94e3e950d 100644 --- a/opensearch_desc.php +++ b/opensearch_desc.php @@ -6,8 +6,7 @@ require_once( dirname(__FILE__) . '/includes/WebStart.php' ); require_once( dirname(__FILE__) . '/languages/Names.php' ); -$fullName = "$wgSitename ($wgLanguageCode)"; -$fullName = wfMsg( 'opensearch-shortname' ); +$fullName = wfMsgForContent( 'opensearch-desc' ); $shortName = htmlspecialchars( mb_substr( $fullName, 0, 24 ) ); $siteName = htmlspecialchars( $fullName ); -- 2.20.1