changeset 3332:38e3fa4726f6

theme: change "Preferences" link to "Settings", remove mentions of "UserPreferences"
author Johannes Berg <johannes AT sipsolutions DOT net>
date Wed, 19 Mar 2008 12:41:35 +0100
parents 104663b555ce
children 928a45b60bb3
files MoinMoin/theme/__init__.py
diffstat 1 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/theme/__init__.py	Wed Mar 19 12:39:45 2008 +0100
+++ b/MoinMoin/theme/__init__.py	Wed Mar 19 12:41:35 2008 +0100
@@ -277,7 +277,7 @@
                         request.formatter.interwikilink(0, title=title, id="userhome", *interwiki))
             userlinks.append(homelink)
             # link to userprefs action
-            userlinks.append(d['page'].link_to(request, text=_('Preferences'),
+            userlinks.append(d['page'].link_to(request, text=_('Settings'),
                                                querystr={'action': 'userprefs'}, id='userprefs', rel='nofollow'))
 
         if request.user.valid:
@@ -1503,7 +1503,6 @@
         page_title_index = wikiutil.getLocalizedPage(request, 'TitleIndex').page_name
         page_site_navigation = wikiutil.getLocalizedPage(request, 'SiteNavigation').page_name
         page_word_index = wikiutil.getLocalizedPage(request, 'WordIndex').page_name
-        page_user_prefs = wikiutil.getLocalizedPage(request, 'UserPreferences').page_name
         page_help_formatting = wikiutil.getLocalizedPage(request, 'HelpOnFormatting').page_name
         page_find_page = wikiutil.getLocalizedPage(request, 'FindPage').page_name
         home_page = wikiutil.getInterwikiHomePage(request) # sorry theme API change!!! Either None or tuple (wikiname,pagename) now.
@@ -1680,10 +1679,8 @@
                 'page_parent_page': page_parent_page,
                 'page_title_index': page_title_index,
                 'page_word_index': page_word_index,
-                'page_user_prefs': page_user_prefs,
                 'user_name': request.user.name,
                 'user_valid': request.user.valid,
-                'user_prefs': (page_user_prefs, request.user.name)[request.user.valid],
                 'msg': self._status,
                 'trail': keywords.get('trail', None),
                 # Discontinued keys, keep for a while for 3rd party theme developers