diff -ruN ./ZWiki-0.11.0/CHANGES.txt ./ZWiki/CHANGES.txt
--- ./ZWiki-0.11.0/CHANGES.txt Sun Oct 20 02:57:40 2002
+++ ./ZWiki/CHANGES.txt Sat Oct 19 15:11:10 2002
@@ -1,4 +1,11 @@
Zwiki 0.11.0 2002-10-01
+
+ 概要
+
+ バグとり、国際化ページ名、ログノート記載、WikiForNowsとの完全同化
+ CMFWikiとの統合(alpha)。
+
+Zwiki 0.11.0 2002-10-01
Summary
diff -ruN ./ZWiki-0.11.0/Diff.py ./ZWiki/Diff.py
--- ./ZWiki-0.11.0/Diff.py Sun Oct 20 02:57:40 2002
+++ ./ZWiki/Diff.py Thu Oct 3 06:43:28 2002
@@ -94,16 +94,16 @@
r = []
for tag, alo, ahi, blo, bhi in cruncher.get_opcodes():
if tag == 'replace':
- if verbose: r.append('??changed:')
+ if verbose: r.append('??変更:')
r = r + self._abbreviateDiffLines(a[alo:ahi],'-',10)
r = r + self._abbreviateDiffLines(b[blo:bhi],'',50)
r.append('')
elif tag == 'delete':
- if verbose: r.append('--removed:')
+ if verbose: r.append('--削除:')
r = r + self._abbreviateDiffLines(a[alo:ahi],'-',10)
r.append('')
elif tag == 'insert':
- if verbose: r.append('++added:')
+ if verbose: r.append('++追加:')
r = r + self._abbreviateDiffLines(b[blo:bhi],'',50)
r.append('')
elif tag == 'equal':
@@ -160,8 +160,11 @@
return """\
+
+
+
@@ -171,10 +174,10 @@
@@ -189,11 +192,11 @@
self.page_url(),
(revA>=19 and '') # we only see 20 revs right now
or '''
-
+
''',
(revA==1 and '')
or '''
-
+
''',
revA,
t)
@@ -313,7 +316,7 @@
"""Create a new object copy with the contents of an historic copy."""
request=getattr(self, 'REQUEST', None)
if not self.isAllowed('edit', request):
- raise 'Unauthorized', "You're not allowed to edit this page"
+ raise 'Unauthorized', "あなたにはこのページの編集許可がありません。 (You're not allowed to edit this page)"
self.manage_historyCopy(keys=keys)
if REQUEST is not None:
REQUEST.RESPONSE.redirect(self.wiki_page_url())
diff -ruN ./ZWiki-0.11.0/Mail.py ./ZWiki/Mail.py
--- ./ZWiki-0.11.0/Mail.py Sun Oct 20 02:57:40 2002
+++ ./ZWiki/Mail.py Sun Oct 20 01:24:35 2002
@@ -493,7 +493,7 @@
pageurl,
self.wiki_url(),
mailouttext,
- getattr(self.folder(),'mail_signature','forwarded from %s') %pageurl
+ getattr(self.folder(),'mail_signature','配信元サイト: %s %s \nforwarded from %s') %(self.folder().title,pageurl,pageurl)
) # mail_signature is very temporary.. I think
mhost.send(msg)
diff -ruN ./ZWiki-0.11.0/Parents.py ./ZWiki/Parents.py
--- ./ZWiki-0.11.0/Parents.py Sun Oct 20 02:57:40 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
@@ -50,7 +50,7 @@
#if not (self._checkPermission(Permissions.Reparent, self) and
# self.requestHasSomeId(REQUEST)):
# raise 'Unauthorized', (
- # _('You are not authorized to reparent this ZWiki Page.'))
+ # _('あなたには、このページの親ページ変更の権限がありません。 (You are not authorized to reparent this ZWiki Page.)'))
if pagename:
parents = pagename
@@ -154,8 +154,8 @@
suppress_hyperlink=suppress_hyperlink,
realid=self.pageWithName(myid).id())
- return '
""" % (
titlestr,
_("Someone else has saved this page while you were editing"),
@@ -3039,13 +3056,28 @@
# please clean me up
def linkTitleFrom(self,last_edit_time=None,last_editor=None,prettyprint=0):
"""
+ 最終更新時と更新者のリンクタイトル文字列の生成
make a link title string from these last_edit_time and editor strings
with prettyprint=1, format it for use in the standard header.
"""
interval = self.asAgeString(last_edit_time)
+ interval = replace(interval,'seconds','秒')
+ interval = replace(interval,'second','秒')
+ interval = replace(interval,'minutes','分')
+ interval = replace(interval,'minute','分')
+ interval = replace(interval,'hours','時間')
+ interval = replace(interval,'hour','時間')
+ interval = replace(interval,'days','日')
+ interval = replace(interval,'day','日')
+ interval = replace(interval,'weeks','週間')
+ interval = replace(interval,'week','週間')
+ interval = replace(interval,'months','月')
+ interval = replace(interval,'month','月')
+ interval = replace(interval,'years','年')
+ interval = replace(interval,'year','年')
if not prettyprint:
- s = "last edited %s ago" % (interval)
+ s = " %s 前更新" % (interval)
else:
try:
assert self.REQUEST.AUTHENTICATED_USER.has_permission(
@@ -3053,10 +3085,11 @@
#XXX do timezone conversion ?
lastlog = self.lastlog()
if lastlog: lastlog = ' ('+lastlog+')'
- s = 'last edited %s ago' % \
+# s = 'last edited %s ago' % \
+ s = '%s前更新' % \
(self.page_url(), lastlog, interval)
except:
- s = 'last edited %s ago' % (interval)
+ s = ' %s 前更新 ' % (interval)
if (last_editor and
not re.match(r'^[0-9\.\s]*$',last_editor)):
# escape some things that might cause trouble in an attribute
@@ -3414,3 +3447,30 @@
#large programs, it is wise to use some kind of convention that
#...
#verbs for methods and nouns for data attributes."
+
+
+def unquote_i(s,u=0):
+ """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
+ del list[0]
+ for item in list:
+ if item[1:2]:
+ try:
+ myappend(mychr(myatoi(item[:2], 16))
+ + item[2:])
+ except:
+ myappend('%' + item)
+ else:
+ myappend('%' + item)
+ return "".join(res)
diff -ruN ./ZWiki-0.11.0/dtml/zwikiPageAdd.dtml ./ZWiki/dtml/zwikiPageAdd.dtml
--- ./ZWiki-0.11.0/dtml/zwikiPageAdd.dtml Sun Oct 20 02:57:40 2002
+++ ./ZWiki/dtml/zwikiPageAdd.dtml Thu Oct 3 07:17:20 2002
@@ -1,14 +1,20 @@
-Add ZWiki Page
+
+
+ZWikiページ の 追加(Add ZWiki Page)
+
-
Add ZWiki Page
+
ZWikiページ の 追加(Add ZWiki Page)
+ 下のフォームを使って新しいZWikiページオブジェクトを作ります。
+ 同様に、「開く(Browse)」ボタンをクリックすることでお手元のコンピュータ
+ より既存のHTMLファイルを選択し、掲載しても結構です。
You may create a new ZWiki Page object using the form below.
You may also choose to upload an existing html file from your
local computer by clicking the Browse button.
diff -ruN ./ZWiki-0.11.0/dtml/zwikiWebAdd.dtml ./ZWiki/dtml/zwikiWebAdd.dtml
--- ./ZWiki-0.11.0/dtml/zwikiWebAdd.dtml Sun Oct 20 02:57:40 2002
+++ ./ZWiki/dtml/zwikiWebAdd.dtml Thu Oct 3 07:08:10 2002
@@ -1,9 +1,12 @@
-Add a ZWiki web
+
+
+ZWiki Web の 追加(Add a ZWiki web)
+
-