Tweak up last commit about opensearch desc to be nicer. Cleaner message name, use...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 68a550b..8d621cd 100644 (file)
--- 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 b71d38b..8547d44 100644 (file)
--- 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 187a74b..a94e3e9 100644 (file)
--- 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 );