From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 27 Feb 2008 04:56:29 +0000 (+0000)
Subject: Tweak up last commit about opensearch desc to be nicer. Cleaner message name, use... 
X-Git-Tag: 1.31.0-rc.0~49324
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22sites_tous%22%29%20.%20%22?a=commitdiff_plain;h=44390ff7e85c3eced6c71fa2932ecdf2390a91b8;p=lhc%2Fweb%2Fwiklou.git

Tweak up last commit about opensearch desc to be nicer. Cleaner message name, use wfMsgForContent, remove an obsolete line.
---

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.
 </form>', # 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 );