changeset 4509:ac61d43c1c5a

merged moin/1.7
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sat, 24 Jan 2009 05:44:35 +0100
parents 5a70e87ab9f3 (current diff) 83bdb8f78bce (diff)
children 6180f7b85a45
files MoinMoin/config/multiconfig.py MoinMoin/wikiutil.py docs/CHANGES wiki/config/more_samples/user_wikiconfig_snippet wiki/config/wikiconfig.py
diffstat 5 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/config/multiconfig.py	Sat Jan 24 04:40:25 2009 +0100
+++ b/MoinMoin/config/multiconfig.py	Sat Jan 24 05:44:35 2009 +0100
@@ -501,7 +501,7 @@
 """
 
         decode_names = (
-            'sitename', 'interwikiname', 'logo_string', 'navi_bar',
+            'sitename', 'interwikiname', 'user_homewiki', 'logo_string', 'navi_bar',
             'page_front_page', 'page_category_regex', 'page_dict_regex',
             'page_group_regex', 'page_template_regex', 'page_license_page',
             'page_local_spelling_words', 'acl_rights_default',
@@ -1094,8 +1094,8 @@
       ('jid_unique', True,
        "if True, check Jabber IDs for uniqueness and don't accept duplicates."),
 
-      ('homewiki', 'Self',
-       "interwiki name of the wiki where the user home pages are located (useful if you have ''many'' users). You could even link to nonwiki \"user pages\" if the wiki username is in the target URL."),
+      ('homewiki', u'Self',
+       "interwiki name of the wiki where the user home pages are located [Unicode] - useful if you have ''many'' users. You could even link to nonwiki \"user pages\" if the wiki username is in the target URL."),
 
       ('checkbox_fields',
        [
--- a/MoinMoin/wikiutil.py	Sat Jan 24 04:40:25 2009 +0100
+++ b/MoinMoin/wikiutil.py	Sat Jan 24 05:44:35 2009 +0100
@@ -837,7 +837,7 @@
 
     homewiki = request.cfg.user_homewiki
     if homewiki == request.cfg.interwikiname:
-        homewiki = 'Self'
+        homewiki = u'Self'
 
     return homewiki, username
 
--- a/wiki/config/more_samples/user_wikiconfig_snippet	Sat Jan 24 04:40:25 2009 +0100
+++ b/wiki/config/more_samples/user_wikiconfig_snippet	Sat Jan 24 05:44:35 2009 +0100
@@ -3,7 +3,7 @@
 
     #userprefs_disabled = [] # allow disabling certain userpreferences plugins
 
-    #user_homewiki = 'Self' # interwiki name for where user homepages are located
+    #user_homewiki = u'Self' # interwiki name for where user homepages are located
 
     #password_checker = None
     #user_email_unique = True # do we check whether a user's email is unique?
--- a/wiki/config/wikiconfig.py	Sat Jan 24 04:40:25 2009 +0100
+++ b/wiki/config/wikiconfig.py	Sat Jan 24 05:44:35 2009 +0100
@@ -49,7 +49,7 @@
     #page_front_page = u"FrontPage"
 
     # The interwiki name used in interwiki links
-    #interwikiname = 'UntitledWiki'
+    #interwikiname = u'UntitledWiki'
     # Show the interwiki name (and link it to page_front_page) in the Theme,
     # nice for farm setups or when your logo does not show the wiki's name.
     #show_interwiki = 1
--- a/wiki/config/wikifarm/mywiki.py	Sat Jan 24 04:40:25 2009 +0100
+++ b/wiki/config/wikifarm/mywiki.py	Sat Jan 24 05:44:35 2009 +0100
@@ -20,7 +20,7 @@
 
     # basic options (you normally need to change these)
     sitename = u'MyWiki' # [Unicode]
-    interwikiname = 'MyWiki'
+    interwikiname = u'MyWiki' # [Unicode]
 
     # name of entry page / front page [Unicode], choose one of those: