From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Tue, 28 Jul 2009 15:37:59 +0000 (+0000)
Subject: I'm being bold here, proposed solution to:
X-Git-Tag: 1.31.0-rc.0~40671
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/ajouter.php?a=commitdiff_plain;h=4c2d645ef3966dc75fa4c4aa6cbe2b5d87c60c69;p=lhc%2Fweb%2Fwiklou.git

I'm being bold here, proposed solution to:
* (bug 16697) Unicode combining characters are difficult to edit in some browsers
Adds font style option to preferences and adds default override for Lingala (ln)
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index efd67533b0..c730500a40 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -165,6 +165,7 @@ this. Was used when mwEmbed was going to be an extension.
   message 'interwiki-desc-PREFIX', not really used anywhere yet though
 * (bug 9691) Add type (signup or login) parameter to AuthPlugin::ModifyUITemplate()
 * (bug 14454) "Member of group(s)" in Special:Preferences causes language difficulties
+* (bug 16697) Unicode combining characters are difficult to edit in some browsers
 
 === Bug fixes in 1.16 ===
 
diff --git a/includes/Preferences.php b/includes/Preferences.php
index f5c2d02af8..fcb68415d7 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -616,6 +616,19 @@ class Preferences {
 					'min' => 4,
 					'max' => 1000,
 				);
+
+		$defaultPreferences['editfont'] =
+				array(
+					'type' => 'select',
+					'section' => 'editing/advancedediting',
+					'label-message' => 'editfont-style',
+					'options' => array(
+						wfMsg( 'editfont-default' ) => 'default',
+						wfMsg( 'editfont-monospace' ) => 'monospace',
+						wfMsg( 'editfont-sansserif' ) => 'sans-serif',
+						wfMsg( 'editfont-serif' ) => 'serif',
+					)
+				);
 		$defaultPreferences['previewontop'] =
 				array(
 					'type' => 'toggle',
diff --git a/includes/Skin.php b/includes/Skin.php
index d04779e936..8f7a950077 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -604,6 +604,10 @@ END;
 		if( !$wgUser->getOption( 'editsection' ) ) {
 			$s .= ".editsection { display: none; }\n";
 		}
+		$fontstyle = $wgUser->getOption( 'editfont' );
+		if ( $fontstyle !== 'default' ) {
+			$s .= "textarea { font-family: $fontstyle; }\n";
+		}
 		return $s;
 	}
 
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index a51ab67d51..4ec7fdd1df 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -658,6 +658,12 @@ XHTML id names.
 'underline-never'   => 'Never',
 'underline-default' => 'Browser default',
 
+'editfont-style'     => 'Edit area font style',
+'editfont-default'   => 'Browser default',
+'editfont-monospace' => 'Monospaced font',
+'editfont-sansserif' => 'Sans-serif font',
+'editfont-serif'     => 'Serif font',
+
 # Dates
 'sunday'        => 'Sunday',
 'monday'        => 'Monday',
diff --git a/languages/messages/MessagesLn.php b/languages/messages/MessagesLn.php
index 0473a11072..4f77c0cbbd 100644
--- a/languages/messages/MessagesLn.php
+++ b/languages/messages/MessagesLn.php
@@ -13,6 +13,10 @@
 
 $fallback = 'fr';
 
+$defaultUserOptionOverrides = array(
+	'editfont' => 'sans-serif', # poor font support
+);
+
 $linkPrefixExtension = true;
 
 # Same as the French (bug 8485)
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 99c85411e7..9c14fa77d7 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -65,6 +65,13 @@ $wgMessageStructure = array(
 		'underline-never',
 		'underline-default',
 	),
+	'editfont' => array(
+		'editfont-style',
+		'editfont-default',
+		'editfont-monospace',
+		'editfont-sansserif',
+		'editfont-serif',
+	),
 	'dates' => array(
 		'sunday',
 		'monday',