From: Remember the dot Date: Wed, 17 Jun 2009 04:26:06 +0000 (+0000) Subject: Follow-up to r49331: Moved decapitalization code to "a Messages*.php property, a... X-Git-Tag: 1.31.0-rc.0~41338 X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=034114ee696247bc17d2ef06332e3d342d6d5c45;p=lhc%2Fweb%2Fwiklou.git Follow-up to r49331: Moved decapitalization code to "a Messages*.php property, a class and a descendant selector, like we do for RTL", as requested by Tim Starling in r51924 --- diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php index 0604c87d7f..43c00449e0 100644 --- a/includes/SkinTemplate.php +++ b/includes/SkinTemplate.php @@ -270,6 +270,7 @@ class SkinTemplate extends Skin { $tpl->setRef( 'lang', $wgContLanguageCode ); $tpl->set( 'dir', $wgContLang->isRTL() ? 'rtl' : 'ltr' ); $tpl->set( 'rtl', $wgContLang->isRTL() ); + $tpl->set( 'capitalizeallnouns', $wgLang->capitalizeAllNouns() ? ' capitalize_all_nouns' : '' ); $tpl->set( 'langname', $wgContLang->getLanguageName( $wgContLanguageCode ) ); $tpl->set( 'showjumplinks', $wgUser->getOption( 'showjumplinks' ) ); $tpl->set( 'username', $wgUser->isAnon() ? NULL : $this->username ); diff --git a/languages/Language.php b/languages/Language.php index 917898fbb9..e0fb273827 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -59,7 +59,7 @@ class Language { static public $mLocalisationKeys = array( 'fallback', 'namespaceNames', 'mathNames', 'bookstoreList', - 'magicWords', 'messages', 'rtl', 'digitTransformTable', + 'magicWords', 'messages', 'rtl', 'capitalizeAllNouns', 'digitTransformTable', 'separatorTransformTable', 'fallback8bitEncoding', 'linkPrefixExtension', 'defaultUserOptionOverrides', 'linkTrail', 'namespaceAliases', 'dateFormats', 'datePreferences', 'datePreferenceMigrationMap', @@ -1792,6 +1792,11 @@ class Language { return $this->isRTL() ? "\xE2\x80\x8F" : "\xE2\x80\x8E"; } + function capitalizeAllNouns() { + $this->load(); + return $this->capitalizeAllNouns; + } + /** * An arrow, depending on the language direction * @@ -2482,7 +2487,7 @@ class Language { $cache = compact( self::$mLocalisationKeys ); wfDebug( "Language::loadLocalisation(): got localisation for $code from source\n" ); } - + # Load magic word source file global $IP; $filename = "$IP/includes/MagicWord.php"; diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php index e34c21ddc1..7fb2f8151c 100644 --- a/languages/messages/MessagesDe.php +++ b/languages/messages/MessagesDe.php @@ -34,6 +34,8 @@ * @author ××¢×¨× ×¨××× ×××¨× */ +$capitalizeAllNouns = true; + $namespaceNames = array( NS_MEDIA => 'Media', NS_SPECIAL => 'Spezial', diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index a4f535c195..0a88660e16 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -28,6 +28,12 @@ $fallback = false; */ $rtl = false; +/** + * Should all nouns (not just proper ones) be capitalized? + * Enabling this property will add the capitalizeAllNouns class to the tag + */ +$capitalizeAllNouns = false; + /** * Optional array mapping ASCII digits 0-9 to local digits. */ diff --git a/languages/messages/MessagesPdt.php b/languages/messages/MessagesPdt.php index 9c2333a7fe..1831b776d6 100644 --- a/languages/messages/MessagesPdt.php +++ b/languages/messages/MessagesPdt.php @@ -11,6 +11,8 @@ * @author Wikipeeta */ +$fallback = 'de'; + $messages = array( # User preference toggles 'tog-underline' => 'Links unjastritje:', diff --git a/languages/messages/MessagesPfl.php b/languages/messages/MessagesPfl.php index 2d1112c3c1..e0fbf39e07 100644 --- a/languages/messages/MessagesPfl.php +++ b/languages/messages/MessagesPfl.php @@ -11,6 +11,8 @@ * @author SPS */ +$fallback = 'de'; + $messages = array( 'underline-always' => 'Immer', 'underline-never' => 'Garnet', diff --git a/skins/MonoBook.php b/skins/MonoBook.php index 8d82f73af1..ee4eaeba0d 100644 --- a/skins/MonoBook.php +++ b/skins/MonoBook.php @@ -109,7 +109,7 @@ class MonoBookTemplate extends QuickTemplate { data['body_ondblclick']) { ?> ondblclick="text('body_ondblclick') ?>" data['body_onload']) { ?> onload="text('body_onload') ?>" - class="mediawiki text('dir') ?> text('pageclass') ?> text('skinnameclass') ?>"> + class="mediawiki text('dir'); $this->text('capitalizeallnouns') ?> text('pageclass') ?> text('skinnameclass') ?>">

diff --git a/skins/monobook/main.css b/skins/monobook/main.css index ae1c7fd09b..cb6989624a 100644 --- a/skins/monobook/main.css +++ b/skins/monobook/main.css @@ -884,53 +884,13 @@ li#ca-watch, li#ca-unwatch, li#ca-varlang-0, li#ca-print { } /* Override text-transform on languages where capitalization is significant */ -.portlet h5[lang|=bar], -.portlet h6[lang|=bar], -#p-personal ul[lang|=bar], -#p-cactions ul[lang|=bar] li a, -.portlet h5[lang|=de], -.portlet h6[lang|=de], -#p-personal ul[lang|=de], -#p-cactions ul[lang|=de] li a, -.portlet h5[lang|=gsw], -.portlet h6[lang|=gsw], -#p-personal ul[lang|=gsw], -#p-cactions ul[lang|=gsw] li a, -.portlet h5[lang|=ksh], -.portlet h6[lang|=ksh], -#p-personal ul[lang|=ksh], -#p-cactions ul[lang|=ksh] li a, -.portlet h5[lang|=lb], -.portlet h6[lang|=lb], -#p-personal ul[lang|=lb], -#p-cactions ul[lang|=lb] li a, -.portlet h5[lang|=nds], -.portlet h6[lang|=nds], -#p-personal ul[lang|=nds], -#p-cactions ul[lang|=nds] li a, -.portlet h5[lang|=pdc], -.portlet h6[lang|=pdc], -#p-personal ul[lang|=pdc], -#p-cactions ul[lang|=pdc] li a, -.portlet h5[lang|=pdt], -.portlet h6[lang|=pdt], -#p-personal ul[lang|=pdt], -#p-cactions ul[lang|=pdt] li a -.portlet h5[lang|=pfl], -.portlet h6[lang|=pfl], -#p-personal ul[lang|=pfl], -#p-cactions ul[lang|=pfl] li a { +.capitalize_all_nouns .portlet h5, +.capitalize_all_nouns .portlet h6, +.capitalize_all_nouns #p-personal ul, +.capitalize_all_nouns #p-cactions ul li a { text-transform: none; } -/* What matches for nds must not match for nds-nl - bug 19209 */ -.portlet h5[lang|=nds-nl], -.portlet h6[lang|=nds-nl], -#p-personal ul[lang|=nds-nl], -#p-cactions ul[lang|=nds-nl] li a { - text-transform: lowercase; -} - /* TODO: #t-iscite is only used by the Cite extension, come up with some * system which allows extensions to add to this file on the fly */