From a0ffe2f945c6c7fd4c0a9a0f49cdf18c91f018ce Mon Sep 17 00:00:00 2001
From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Tue, 3 Jan 2006 20:59:19 +0000
Subject: [PATCH] * (bug 3194) default implementation of translateBlockExpiry
 which uses ipboptions

---
 RELEASE-NOTES          |  4 +++-
 languages/Language.php | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e0311cd61b..cb6b1c1572 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -398,7 +398,9 @@ fully support the editing toolbar, but was found to be too confusing.
 * Removed broken wgAllowAnonymousMinor and added new group right minoredit
 * (bug 4457) Update for Portuguese language (pt)
 * convertPlural breakage fixed a little
-* Bug 4456: Add hook for marking article patrolled
+* (bug 4456) Add hook for marking article patrolled
+* (bug 3194) default implementation of translateBlockExpiry
+  which uses ipboptions
 
 
 === Caveats ===
diff --git a/languages/Language.php b/languages/Language.php
index 3df742df4a..154eded065 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -2896,6 +2896,22 @@ class Language {
 	 * @see LanguageFi.php for example implementation
 	 */
 	function translateBlockExpiry( $str ) {
+
+		$scBlockExpiryOptions = wfMsg( 'ipboptions' );
+
+		if ( $scBlockExpiryOptions == '-') {
+			return $str;
+		}
+
+		foreach (explode(',', $scBlockExpiryOptions) as $option) {
+			if ( strpos($option, ":") === false )
+				continue;
+			list($show, $value) = explode(":", $option);
+			if ( strcmp ( $str, $value) == 0 )
+				return '<span title="' . htmlspecialchars($str). '">' .
+					htmlspecialchars( trim( $show ) ) . '</span>';
+		}
+
 		return $str;
 	}
 
-- 
2.20.1