From: Ævar Arnfjörð Bjarmason <avar@users.mediawiki.org>
Date: Mon, 23 May 2005 23:25:43 +0000 (+0000)
Subject: * Restored the {{msg:}} magic word, except now it's the wikisyntax
X-Git-Tag: 1.5.0alpha2~103
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/?a=commitdiff_plain;h=d2142c6e606f6b51b41b52408bfe03af04425deb;p=lhc%2Fweb%2Fwiklou.git

* Restored the {{msg:}} magic word, except now it's the wikisyntax
  representation of wfMsgForContent() rather than a shorthand for {{Template:}}
* Using {{msg:}} in the navbar so as to not break links if the user selects a
  different language than the default language for the wiki in hir preferences.
---

diff --git a/languages/Language.php b/languages/Language.php
index 39a96296ea..d59cbbfe76 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -215,6 +215,7 @@ $wgLanguageNamesEn =& $wgLanguageNames;
 	MAG_PAGENAME             => array( 1,    'PAGENAME'               ),
 	MAG_PAGENAMEE            => array( 1,    'PAGENAMEE'              ),
 	MAG_NAMESPACE            => array( 1,    'NAMESPACE'              ),
+	MAG_MSG                  => array( 0,    'MSG:'                   ),
 	MAG_SUBST                => array( 0,    'SUBST:'                 ),
 	MAG_MSGNW                => array( 0,    'MSGNW:'                 ),
 	MAG_END                  => array( 0,    '__END__'                ),
@@ -253,14 +254,14 @@ global $wgRightsText;
 
 # The navigation toolbar, int: is used here to make sure that the appropriate
 # messages are automatically pulled from the user-selected language file.
-'navbar' =>
-'* [[{{int:mainpage}}]]
-* [[{{int:portal-url}}|{{int:portal}}]]
-* [[{{int:currentevents-url}}|{{int:currentevents}}]]
-* [[{{int:recentchanges-url}}|{{int:recentchanges}}]]
-* [[{{int:randompage-url}}|{{int:randompage}}]]
-* [[{{int:helppage}}|{{int:help}}]]
-* [[{{int:sitesupport-url}}|{{int:sitesupport}}]]',
+'navbar' =>'
+* [[{{int:mainpage}}]]
+* [[{{msg:portal-url}}|{{int:portal}}]]
+* [[{{msg:currentevents-url}}|{{int:currentevents}}]]
+* [[{{msg:recentchanges-url}}|{{int:recentchanges}}]]
+* [[{{msg:randompage-url}}|{{int:randompage}}]]
+* [[{{msg:helppage}}|{{int:help}}]]
+* [[{{msg:sitesupport-url}}|{{int:sitesupport}}]]',
 
 # User preference toggles
 'tog-underline' => 'Underline links',
@@ -338,9 +339,6 @@ global $wgRightsText;
 "mainpagedocfooter" => "Please see [http://meta.wikipedia.org/wiki/MediaWiki_i18n documentation on customizing the interface]
 and the [http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide User's Guide] for usage and configuration help.",
 
-# NOTE: To turn off "Community portal" in the title links,
-# set "portal" => "-"
-
 'portal'		=> 'Community portal',
 'portal-url'		=> 'Project:Community Portal',
 'about'			=> 'About',