https://bugzilla.wikimedia.org/show_bug.cgi?id=12261

--- Comment #3 from Thana <m8r-cyc...@mailinator.com> 2010-03-18 03:56:18 UTC 
---
(From update of attachment 7215)
Index: maintenance/language/messages.inc
===================================================================
--- maintenance/language/messages.inc    (revision 63894)
+++ maintenance/language/messages.inc    (working copy)
@@ -2891,7 +2891,6 @@
         'confirm-purge-bottom',
     ),
     'separators' => array(
-        'catseparator',
         'semicolon-separator',
         'comma-separator',
         'colon-separator',
Index: maintenance/language/messageTypes.inc
===================================================================
--- maintenance/language/messageTypes.inc    (revision 63894)
+++ maintenance/language/messageTypes.inc    (working copy)
@@ -330,7 +330,6 @@
     'hebrew-calendar-m11-gen',
     'hebrew-calendar-m12-gen',
     'version-svn-revision',
-    'catseparator',
     'semicolon-separator',
     'comma-separator',
     'colon-separator',
Index: skins/common/shared.css
===================================================================
--- skins/common/shared.css    (revision 63894)
+++ skins/common/shared.css    (working copy)
@@ -829,3 +829,21 @@
 a.sortheader {
     margin: 0 0.3em;
 }
+
+#catlinks ul, li {
+    display:inline;
+    margin:0px;
+    padding:0px;
+    list-style:none;
+    list-style-type:none;
+    list-style-image:none;
+    }
+
+#catlinks li:after {
+    content: " | ";
+    }
+        
+#catlinks li:last-child:after {
+    content: "";
+    }
+
Index: includes/Skin.php
===================================================================
--- includes/Skin.php    (revision 63894)
+++ includes/Skin.php    (working copy)
@@ -779,25 +779,21 @@
             return '';
         }

-        # Separator
-        $sep = wfMsgExt( 'catseparator', array( 'parsemag', 'escapenoentities'
) );
-
         // Use Unicode bidi embedding override characters,
         // to make sure links don't smash each other up in ugly ways.
         $dir = $wgContLang->getDir();
-        $embed = "<span dir='$dir'>";
-        $pop = '</span>';
+        $embed = "<li dir='$dir'>";
+        $pop = '</li>';

         $allCats = $wgOut->getCategoryLinks();
         $s = '';
         $colon = wfMsgExt( 'colon-separator', 'escapenoentities' );
         if ( !empty( $allCats['normal'] ) ) {
-            $t = $embed . implode( "{$pop} {$sep} {$embed}" ,
$allCats['normal'] ) . $pop;
-
             $msg = wfMsgExt( 'pagecategories', array( 'parsemag',
'escapenoentities' ), count( $allCats['normal'] ) );
-            $s .= '<div id="mw-normal-catlinks">' .
-                $this->link( Title::newFromText( wfMsgForContent(
'pagecategorieslink' ) ), $msg )
-                . $colon . $t . '</div>';
+            $s .= '<div id="mw-normal-catlinks">'
+                . $this->link( Title::newFromText( wfMsgForContent(
'pagecategorieslink' ) ), $msg ). $colon 
+                . '<ul>' . $embed . implode( "{$pop} {$embed}" ,
$allCats['normal'] ) . $pop . '</ul>'
+                . '</div>';
         }

         # Hidden categories
@@ -809,10 +805,10 @@
             } else {
                 $class = 'mw-hidden-cats-hidden';
             }
-            $s .= "<div id=\"mw-hidden-catlinks\" class=\"$class\">" .
-                wfMsgExt( 'hidden-categories', array( 'parsemag',
'escapenoentities' ), count( $allCats['hidden'] ) ) .
-                $colon . $embed . implode( "$pop $sep $embed",
$allCats['hidden'] ) . $pop .
-                '</div>';
+            $s .= "<div id=\"mw-hidden-catlinks\" class=\"$class\">"
+                . wfMsgExt( 'hidden-categories', array( 'parsemag',
'escapenoentities' ), count( $allCats['hidden'] ) ) . $colon
+                . '<ul>' . $embed . implode( "{$pop} {$embed}" ,
$allCats['hidden'] ) . $pop . '</ul>'
+                . '</div>';
         }

         # optional 'dmoz-like' category browser. Will be shown under the list
Index: languages/messages/MessagesEn.php
===================================================================
--- languages/messages/MessagesEn.php    (revision 63894)
+++ languages/messages/MessagesEn.php    (working copy)
@@ -506,7 +506,6 @@
     'accesskey-t-specialpages',
     'accesskey-t-whatlinkshere',
     'anonnotice',
-    'catseparator',
     'colon-separator',
     'currentevents',
     'currentevents-url',
@@ -3952,7 +3951,6 @@
 'confirm-purge-bottom' => 'Purging a page clears the cache and forces the most
current revision to appear.',

 # Separators for various lists, etc.
-'catseparator'        => '|', # only translate this message to other languages
if you have to change it
 'semicolon-separator' => ';&#32;', # only translate this message to other
languages if you have to change it
 'comma-separator'     => ',&#32;', # only translate this message to other
languages if you have to change it
 'colon-separator'     => ':&#32;', # only translate this message to other
languages if you have to change it
Index: languages/messages/MessagesKrc.php
===================================================================
--- languages/messages/MessagesKrc.php    (revision 63894)
+++ languages/messages/MessagesKrc.php    (working copy)
@@ -2997,7 +2997,6 @@
 'confirm-purge-bottom' => 'Бетни кеши кетерилгенден сора, андан сора келген
версиясы кёргюзюллюкдю.',

 # Separators for various lists, etc.
-'catseparator'        => '|',
 'semicolon-separator' => ';&#32;',
 'percent'             => '$1%',
 'parentheses'         => '($1)',

-- 
Configure bugmail: https://bugzilla.wikimedia.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.
You are on the CC list for the bug.
_______________________________________________
Wikibugs-l mailing list
Wikibugs-l@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/wikibugs-l

Reply via email to