From a656f8949fe7916a9a296d51776d4feefaa66dfa Mon Sep 17 00:00:00 2001
From: Remember the dot <rememberthedot@users.mediawiki.org>
Date: Thu, 9 Apr 2009 05:27:25 +0000
Subject: [PATCH] (bug 1553) Lowercase navigation headings in German

---
 RELEASE-NOTES                     |  1 +
 includes/Skin.php                 |  5 ++--
 languages/messages/MessagesDe.php |  9 +------
 skins/MonoBook.php                | 24 ++++++++++++------
 skins/monobook/main.css           | 41 +++++++++++++++++++++++++++++++
 5 files changed, 62 insertions(+), 18 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e2cd34fc87..c1f3cabc08 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -333,6 +333,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 17948) Maintenance scripts now exit(0) or exit(1) as appropriate
 * (bug 18377) Time in Enhanced ChangesList lacking localisation
 * (bug 12998) Allow <sup>, <sub>, etc. in DISPLAYTITLE
+* (bug 1553) Lowercase navigation headings in German
 
 == API changes in 1.15 ==
 * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions
diff --git a/includes/Skin.php b/includes/Skin.php
index fcba435b3b..f2305a5e28 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1870,8 +1870,7 @@ END;
 			if( strpos( $line, '*' ) !== 0 )
 				continue;
 			if( strpos( $line, '**') !== 0 ) {
-				$line = trim( $line, '* ' );
-				$heading = $line;
+				$heading = trim( $line, '* ' );
 				if( !array_key_exists( $heading, $bar ) ) $bar[$heading] = array();
 			} else {
 				if( strpos( $line, '|' ) !== false ) { // sanity check
@@ -1912,4 +1911,4 @@ END;
 		wfProfileOut( __METHOD__ );
 		return $bar;
 	}
-}
\ No newline at end of file
+}
diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index 44f1b1abfe..1376ce0cd7 100644
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -2591,14 +2591,7 @@ Alle Transwiki-Import-Aktionen werden im [[Special:Log/import|Import-Logbuch]] p
 'standard.css'    => '/* CSS an dieser Stelle wirkt sich auf den Klassik-Skin aus. Für allgemeingültige Skin-Anpassungen bitte [[MediaWiki:Common.css]] bearbeiten. */',
 'nostalgia.css'   => '/* CSS an dieser Stelle wirkt sich auf den Nostalgie-Skin aus. Für allgemeingültige Skin-Anpassungen bitte [[MediaWiki:Common.css]] bearbeiten. */',
 'cologneblue.css' => '/* CSS an dieser Stelle wirkt sich auf den Kölnisch-Blau-Skin aus. Für allgemeingültige Skin-Anpassungen bitte [[MediaWiki:Common.css]] bearbeiten. */',
-'monobook.css'    => '/* CSS an dieser Stelle wirkt sich auf den Monobook-Skin aus. Für allgemeingültige Skin-Anpassungen bitte [[MediaWiki:Common.css]] bearbeiten. */
-/* Kleinschreibung nicht erzwingen */
-.portlet h5,
-.portlet h6,
-#p-personal ul,
-#p-cactions li a {
-	text-transform: none;
-}',
+'monobook.css'    => '/* CSS an dieser Stelle wirkt sich auf den Monobook-Skin aus. Für allgemeingültige Skin-Anpassungen bitte [[MediaWiki:Common.css]] bearbeiten. */',
 'myskin.css'      => '/* CSS an dieser Stelle wirkt sich auf den MySkin-Skin aus. Für allgemeingültige Skin-Anpassungen bitte [[MediaWiki:Common.css]] bearbeiten. */',
 'chick.css'       => '/* CSS an dieser Stelle wirkt sich auf den Küken-Skin aus. Für allgemeingültige Skin-Anpassungen bitte [[MediaWiki:Common.css]] bearbeiten. */',
 'simple.css'      => '/* CSS an dieser Stelle wirkt sich auf den Einfach-Skin aus. Für allgemeingültige Skin-Anpassungen bitte [[MediaWiki:Common.css]] bearbeiten. */',
diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index 16803541f3..9d885f87c0 100644
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -64,7 +64,9 @@ class MonoBookTemplate extends QuickTemplate {
 	 * @access private
 	 */
 	function execute() {
+		global $wgLang;
 		global $wgRequest;
+		$wgLangCode = $wgLang->getCode();
 		$this->skin = $skin = $this->data['skin'];
 		$action = $wgRequest->getText( 'action' );
 
@@ -135,14 +137,14 @@ class MonoBookTemplate extends QuickTemplate {
 	<div id="p-cactions" class="portlet">
 		<h5><?php $this->msg('views') ?></h5>
 		<div class="pBody">
-			<ul>
+			<ul lang="<?php echo $wgLangCode; ?>" xml:lang="<?php echo $wgLangCode; ?>">
 	<?php		foreach($this->data['content_actions'] as $key => $tab) {
 					echo '
 				 <li id="' . Sanitizer::escapeId( "ca-$key" ) . '"';
 					if( $tab['class'] ) {
 						echo ' class="'.htmlspecialchars($tab['class']).'"';
 					}
-					echo'><a href="'.htmlspecialchars($tab['href']).'"';
+					echo '><a href="'.htmlspecialchars($tab['href']).'"';
 					# We don't want to give the watch tab an accesskey if the
 					# page is being edited, because that conflicts with the
 					# accesskey on the watch checkbox.  We also don't want to
@@ -163,7 +165,7 @@ class MonoBookTemplate extends QuickTemplate {
 	<div class="portlet" id="p-personal">
 		<h5><?php $this->msg('personaltools') ?></h5>
 		<div class="pBody">
-			<ul>
+			<ul lang="<?php echo $wgLangCode; ?>" xml:lang="<?php echo $wgLangCode; ?>">
 <?php 			foreach($this->data['personal_urls'] as $key => $item) { ?>
 				<li id="<?php echo Sanitizer::escapeId( "pt-$key" ) ?>"<?php
 					if ($item['active']) { ?> class="active"<?php } ?>><a href="<?php
@@ -249,10 +251,12 @@ class MonoBookTemplate extends QuickTemplate {
 
 	/*************************************************************************************************/
 	function searchBox() {
+		global $wgLang;
 		global $wgUseTwoButtonsSearchForm;
+		$wgLangCode = $wgLang->getCode();
 ?>
 	<div id="p-search" class="portlet">
-		<h5><label for="searchInput"><?php $this->msg('search') ?></label></h5>
+		<h5 lang="<?php echo $wgLangCode; ?>" xml:lang="<?php echo $wgLangCode; ?>"><label for="searchInput"><?php $this->msg('search') ?></label></h5>
 		<div id="searchBody" class="pBody">
 			<form action="<?php $this->text('wgScript') ?>" id="searchform"><div>
 				<input type='hidden' name="title" value="<?php $this->text('searchtitle') ?>"/>
@@ -272,9 +276,11 @@ class MonoBookTemplate extends QuickTemplate {
 
 	/*************************************************************************************************/
 	function toolbox() {
+		global $wgLang;
+		$wgLangCode = $wgLang->getCode();
 ?>
 	<div class="portlet" id="p-tb">
-		<h5><?php $this->msg('toolbox') ?></h5>
+		<h5 lang="<?php echo $wgLangCode; ?>" xml:lang="<?php echo $wgLangCode; ?>"><?php $this->msg('toolbox') ?></h5>
 		<div class="pBody">
 			<ul>
 <?php
@@ -332,10 +338,12 @@ class MonoBookTemplate extends QuickTemplate {
 
 	/*************************************************************************************************/
 	function languageBox() {
+		global $wgLang;
+		$wgLangCode = $wgLangCode;
 		if( $this->data['language_urls'] ) {
 ?>
 	<div id="p-lang" class="portlet">
-		<h5><?php $this->msg('otherlanguages') ?></h5>
+		<h5 lang="<?php echo $wgLangCode; ?>" xml:lang="<?php echo $wgLangCode; ?>"><?php $this->msg('otherlanguages') ?></h5>
 		<div class="pBody">
 			<ul>
 <?php		foreach($this->data['language_urls'] as $langlink) { ?>
@@ -351,9 +359,11 @@ class MonoBookTemplate extends QuickTemplate {
 
 	/*************************************************************************************************/
 	function customBox( $bar, $cont ) {
+		global $wgLang;
+		$wgLangCode = $wgLang->getCode();
 ?>
 	<div class='generated-sidebar portlet' id='<?php echo Sanitizer::escapeId( "p-$bar" ) ?>'<?php echo $this->skin->tooltip('p-'.$bar) ?>>
-		<h5><?php $out = wfMsg( $bar ); if (wfEmptyMsg($bar, $out)) echo $bar; else echo $out; ?></h5>
+		<h5 lang="<?php echo $wgLangCode; ?>" xml:lang="<?php echo $wgLangCode; ?>"><?php $out = wfMsg( $bar ); if (wfEmptyMsg($bar, $out)) echo htmlspecialchars($bar); else echo htmlspecialchars($out); ?></h5>
 		<div class='pBody'>
 <?php   if ( is_array( $cont ) ) { ?>
 			<ul>
diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index ed1fee94eb..b5f527629b 100644
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -889,6 +889,47 @@ li#ca-watch, li#ca-unwatch, li#ca-varlang-0, li#ca-print {
 	z-index: 3;
 }
 
+/* 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 {
+	text-transform: none;
+}
+
+
 /* 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
  */
-- 
2.20.1