From 81e62b6fd516cf002fcafd29bbae617cd869909b Mon Sep 17 00:00:00 2001
From: David Mudrak <david.mudrak@gmail.com>
Date: Fri, 24 Sep 2010 11:19:57 +0000
Subject: [PATCH] MDL-12192 temporarily disabled support for colonized labels

The code must be fixed so that the colon is not displayed when the label
is hidden by accessibility CSS.
---
 lang/en/langconfig.php   | 2 +-
 lib/outputcomponents.php | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lang/en/langconfig.php b/lang/en/langconfig.php
index c23bd5cbbad..7905f6696dc 100644
--- a/lang/en/langconfig.php
+++ b/lang/en/langconfig.php
@@ -29,7 +29,7 @@ $string['decsep'] = '.';
 $string['firstdayofweek'] = '0';
 $string['iso6391'] = 'en';
 $string['iso6392'] = 'eng';
-$string['labelsep'] = '&nbsp;';
+$string['labelsep'] = ': ';
 $string['listsep'] = ',';
 $string['locale'] = 'en_AU.UTF-8';
 $string['localewin'] = 'English_Australia.1252';
diff --git a/lib/outputcomponents.php b/lib/outputcomponents.php
index 0557eb65f94..cd039f789eb 100644
--- a/lib/outputcomponents.php
+++ b/lib/outputcomponents.php
@@ -1373,6 +1373,8 @@ class html_writer {
         $text = trim($text);
         $label = self::tag('label', $text, $attributes);
 
+        /*
+        // TODO $colonize disabled for now yet - see MDL-12192 for details
         if (!empty($text) and $colonize) {
             // the $text may end with the colon already, though it is bad string definition style
             $colon = get_string('labelsep', 'langconfig');
@@ -1386,6 +1388,7 @@ class html_writer {
                 }
             }
         }
+        */
 
         return $label;
     }