diff -ruN ./ZWiki-0.11.0JP003/Parents.py ./ZWiki/Parents.py --- ./ZWiki-0.11.0JP003/Parents.py Sun Oct 27 02:02:28 2002 +++ ./ZWiki/Parents.py Sat Oct 26 18:03:14 2002 @@ -1,7 +1,7 @@ ###################################################################### # zwiki page parenting functionality -from string import join +from string import join,upper from types import * from urllib import quote import Acquisition @@ -549,12 +549,12 @@ """ ul=quote_x(u) if u==ul: - return u + return upper(ul[0])+ul[1:] else: if ul[0:1]=='_' and not u[0:1]=='_': return 'X%s' % (ul) else: - return ul + return upper(ul[0])+ul[1:] always_safe = ('ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' diff -ruN ./ZWiki-0.11.0JP003/ZWikiPage.py ./ZWiki/ZWikiPage.py --- ./ZWiki-0.11.0JP003/ZWikiPage.py Sun Oct 27 02:02:28 2002 +++ ./ZWiki/ZWikiPage.py Sat Oct 26 17:30:33 2002 @@ -913,6 +913,8 @@ # I think they all need unquoting # also allow for differing wikiname & id now page = self.pageWithName(unquote_i(pagename)) + if not page: + page = self.pageWithName(unquote_i(pagename,1)) # bah!!! if page: linktitle = page.linkTitle() @@ -1651,7 +1653,7 @@ 'APageWith_21' >>> p.canonicalIdFrom('a_page') 'A_5fpage' - >>> p.canonicalIdFrom('��age') + >>> p.canonicalIdFrom('?Page') 'X_c3Page' >>> p.canonicalIdFrom('_c3Page') 'X_5fc3Page' @@ -3447,13 +3449,17 @@ #verbs for methods and nouns for data attributes." -def unquote_i(s): +def unquote_i(s,u): """unquote('abc%20def') -> 'abc def'.""" mychr = chr myatoi = int if s[0:2]=='X_': s=s[1:] pat=re.compile(r'(X_+[0-9a-f]+[0-9a-f]+)') + pat2=re.compile(r'[A-Z]+') if re.match(pat,s[0:2]): s=s[1:] + else: + if u==1: + if re.match(pat2,s[0:1]):s=lower(s[0])+s[1:] list = s.split('_') res = [list[0]] myappend = res.append diff -ruN ./ZWiki-0.11.0JP003/templates/defaults/backlinks.dtml ./ZWiki/templates/defaults/backlinks.dtml --- ./ZWiki-0.11.0JP003/templates/defaults/backlinks.dtml Sun Oct 27 02:02:30 2002 +++ ./ZWiki/templates/defaults/backlinks.dtml Sun Oct 27 00:02:39 2002 @@ -49,7 +49,7 @@

-���Υڡ����οƤ����ꤷ������ƥ�ġ��ĥ꡼��ΰ����դ�������ޤ��� +���Υڡ����οƤ����ꤷ������ƥ�ġ��ޥå׾�ΰ����դ�������ޤ��� �ܥå����Υ���å��ޤ����̤Υڡ���̾�����ϸ塢�ֿƥڡ�������(Reparent)�ץܥ���򥯥�å����ޤ��� �̾�ϡ���ĤοƤǽ�ʬ�Ǥ��礦��
(You can also set this page's parent(s), to locate it within the @@ -103,7 +103,7 @@

-���Υڡ����οƤ����ꤷ������ƥ�ġ��ĥ꡼��ΰ����դ�������ޤ��� +���Υڡ����οƤ����ꤷ������ƥ�ġ��ޥå׾�ΰ����դ�������ޤ��� �ܥå����Υ���å��ޤ����̤Υڡ���̾�����ϸ塢�ֿƥڡ�������(Reparent)�ץܥ���򥯥�å����ޤ��� �̾�ϡ���ĤοƤǽ�ʬ�Ǥ��礦��
(You can also set this page's parent(s), to locate it within the diff -ruN ./ZWiki-0.11.0JP003/templates/defaults/subscribeform.dtml ./ZWiki/templates/defaults/subscribeform.dtml --- ./ZWiki-0.11.0JP003/templates/defaults/subscribeform.dtml Sun Oct 27 02:02:30 2002 +++ ./ZWiki/templates/defaults/subscribeform.dtml Sat Oct 26 23:41:57 2002 @@ -1,6 +1,6 @@ -<dtml-var "aq_parent.title"><dtml-var id> �� ������Ͽ(subscription) +<dtml-var "aq_parent.title">��<dtml-var title_or_id>�פؤ� �ۿ���Ͽ(subscription) @@ -15,7 +15,7 @@ home -�᡼����Ͽ(Mail subscription) +�ۿ���Ͽ(Mail subscription) @@ -30,22 +30,22 @@ -�����Υڡ����ޤ��Ϥ���Wiki��������Τ��Ф����ɤ���Ͽ������ޤ��� +�����Υڡ����ޤ��Ϥ���Wiki��������Τ��Ф��᡼���ۿ�����Ͽ������ޤ��� ��Ͽ�Ԥ��Żҥ᡼���ͳ�ǡ������ȤΥ��ԡ������뤳�Ȥˤʤ�ޤ� (���ε�ǽ�ϡ������ȴ���Ԥ������ͭ��ˤ��ʤ��¤����ޤ���)�� -��Ͽ���ʤ��ʤ�С�&dtml-id;�����ޤ��礦��
+��Ͽ���ʤ��ʤ�С���&dtml-title_or_id;�פ����ޤ��礦��
You can subscribe to this page or to the whole wiki. Subscribers receive a copy of comments via email (but not general edits, unless enabled by the site admin). -Or return to &dtml-id;. +Or return to '&dtml-title_or_id;'.

���ʤ���Email���ɥ쥹(Your email address): - +

@@ -75,9 +75,9 @@ to this page.
- + - +
@@ -135,7 +135,7 @@
-�ؤ���Ͽ��(subscribers): +���פؤ���Ͽ��(subscribers):
@@ -173,7 +173,7 @@
- + diff -ruN ./ZWiki-0.11.0JP003/templates/defaults/wikipage.zpt ./ZWiki/templates/defaults/wikipage.zpt --- ./ZWiki-0.11.0JP003/templates/defaults/wikipage.zpt Sun Oct 27 02:02:30 2002 +++ ./ZWiki/templates/defaults/wikipage.zpt Sun Oct 27 00:27:53 2002 @@ -262,8 +262,8 @@ tal:condition="python:here.isMailoutEnabled()" tal:attributes="href python:here.page_url() + '/subscribeform'" href="page_url/subscribeform" -title="���Υڡ����ޤ��ϥ�������Τؤ�Email���ɤ�����(configure email subscription to this page or site)" accesskey="u" ->������Ͽ(subscribe) +title="���Υڡ����ޤ��ϥ�������Τؤ�Email�ۿ�������(configure email subscription to this page or site)" accesskey="u" +>�ۿ���Ͽ(subscribe) diff -ruN ./ZWiki-0.11.0JP003/templates/zwikidotorgjp/FrontPage.stx ./ZWiki/templates/zwikidotorgjp/FrontPage.stx --- ./ZWiki-0.11.0JP003/templates/zwikidotorgjp/FrontPage.stx Sun Oct 27 02:02:29 2002 +++ ./ZWiki/templates/zwikidotorgjp/FrontPage.stx Sun Oct 27 02:35:29 2002 @@ -45,9 +45,9 @@ 'Zwiki: ' and appear at the end of the permissions list. --> -- **�᡼�� ��� (������Ͽ)**
+- **�᡼�� ��� (�ۿ���Ͽ)**
��Zope��HailHost���֥������Ȥ�����ȡ�mail_from�ץե�����ͭ�������ɥ쥹�� -ʸ��ץ�ѥƥ����ɲä��ޤ����ֹ�����Ͽ�פΥ�󥯤ϥڡ����եå�����ɽ������ޤ��� +ʸ��ץ�ѥƥ����ɲä��ޤ������ۿ���Ͽ�פΥ�󥯤ϥڡ����եå���ɽ������ޤ��� BCC����ˤϡ���ZWiki:MailHostFix�פ��ɲä��ޤ���