http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88404

Revision: 88404
Author:   jeroendedauw
Date:     2011-05-19 13:08:37 +0000 (Thu, 19 May 2011)
Log Message:
-----------
follow up to r88394

Modified Paths:
--------------
    trunk/extensions/SemanticWatchlist/SemanticWatchlist.hooks.php
    trunk/extensions/SemanticWatchlist/SemanticWatchlist.i18n.php

Modified: trunk/extensions/SemanticWatchlist/SemanticWatchlist.hooks.php
===================================================================
--- trunk/extensions/SemanticWatchlist/SemanticWatchlist.hooks.php      
2011-05-19 06:58:57 UTC (rev 88403)
+++ trunk/extensions/SemanticWatchlist/SemanticWatchlist.hooks.php      
2011-05-19 13:08:37 UTC (rev 88404)
@@ -102,24 +102,22 @@
                        
                        switch ( true ) {
                                case count( $group->getCategories() ) > 0 :
-                                       $type = 'swl-prefs-category';
+                                       $type = 'category';
                                        $name = $group->getCategories();
                                        $name = $name[0];
                                        break;
                                case count( $group->getNamespaces() ) > 0 :
-                                       $type = 'swl-prefs-namespace';
+                                       $type = 'namespace';
                                        $name = $group->getNamespaces();
                                        $name = $name[0] == 0 ? wfMsg( 'main' ) 
: MWNamespace::getCanonicalName( $name[0] );
                                        break;
                                case count( $group->getConcepts() ) > 0 :
-                                       $type = 'swl-prefs-concept';
+                                       $type = 'concept';
                                        $name = $group->getConcepts();
                                        $name = $item[0];
                                        break;
                        }
                        
-                       $type = wfMsg( $type );
-                       
                        $properties = $group->getProperties();
                        
                        foreach ( $properties as &$property ) {
@@ -129,12 +127,11 @@
                        $preferences['swlwatchgroup-' . $group->getId()] = 
array(
                                'type' => 'toggle',
                                'label' => wfMsgExt(
-                                       'swl-prefs-label',
+                                       "swl-prefs-$type-label",
                                        'parseinline',
                                        $group->getName(),
                                        count( $group->getProperties() ),
                                        $GLOBALS['wgLang']->listToText( 
$properties ),
-                                       $type,
                                        $name
                                ),
                                'section' => 'swl/swlgroup',

Modified: trunk/extensions/SemanticWatchlist/SemanticWatchlist.i18n.php
===================================================================
--- trunk/extensions/SemanticWatchlist/SemanticWatchlist.i18n.php       
2011-05-19 06:58:57 UTC (rev 88403)
+++ trunk/extensions/SemanticWatchlist/SemanticWatchlist.i18n.php       
2011-05-19 13:08:37 UTC (rev 88404)
@@ -49,10 +49,9 @@
        'prefs-swl' => 'Semantic watchlist',
        'prefs-swlgroup' => 'Groups to watch',
        'prefs-swlnotification' => 'Notification options',
-       'swl-prefs-label' => "'''$1''': {{PLURAL:$2|property|properties}} $3 
from $4 ''$5''.",
-       'swl-prefs-category' => 'category',
-       'swl-prefs-namespace' => 'namespace',
-       'swl-prefs-concept' => 'concept',
+       'swl-prefs-category-label' => "'''$1''': 
{{PLURAL:$2|property|properties}} $3 from category ''$4''.",
+       'swl-prefs-namespace-label' => "'''$1''': 
{{PLURAL:$2|property|properties}} $3 from namespace ''$4''.",
+       'swl-prefs-concept-label' => "'''$1''': 
{{PLURAL:$2|property|properties}} $3 from concept ''$4''.",
        'swl-prefs-emailnofity' => 'E-mail me on changes to properties I am 
watching'
 );
 


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to