From jhermann at users.sourceforge.net Mon Jun 3 14:35:04 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Mon Jun 3 14:35:04 2002 Subject: [Moin-devel] CVS: dist/wiki/data intermap.txt,1.13,1.14 Message-ID: Update of /cvsroot/moin/dist/wiki/data In directory usw-pr-cvs1:/tmp/cvs-serv23767/data Modified Files: intermap.txt Log Message: URL fix Index: intermap.txt =================================================================== RCS file: /cvsroot/moin/dist/wiki/data/intermap.txt,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** intermap.txt 10 May 2002 12:08:24 -0000 1.13 --- intermap.txt 3 Jun 2002 21:34:36 -0000 1.14 *************** *** 55,59 **** KnowHow http://www2.iro.umontreal.ca/~paquetse/cgi-bin/wiki.cgi? LegoWiki http://www.object-arts.com/wiki/html/Lego-Robotics/ ! LinuxWiki http://linuxwiki.de/ MathSongsWiki http://SeedWiki.com/page.cfm?wikiid=237&doc= MbTest http://www.usemod.com/cgi-bin/mbtest.pl? --- 55,59 ---- KnowHow http://www2.iro.umontreal.ca/~paquetse/cgi-bin/wiki.cgi? LegoWiki http://www.object-arts.com/wiki/html/Lego-Robotics/ ! LinuxWiki http://www.linuxwiki.de/ MathSongsWiki http://SeedWiki.com/page.cfm?wikiid=237&doc= MbTest http://www.usemod.com/cgi-bin/mbtest.pl? From jhermann at users.sourceforge.net Tue Jun 4 13:48:06 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Tue Jun 4 13:48:06 2002 Subject: [Moin-devel] CVS: MoinMoin request.py,1.11,1.12 wikiaction.py,1.74,1.75 Message-ID: Update of /cvsroot/moin/MoinMoin In directory usw-pr-cvs1:/tmp/cvs-serv17233 Modified Files: request.py wikiaction.py Log Message: Dumping version history using browser widget Index: request.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/request.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** request.py 23 May 2002 20:38:03 -0000 1.11 --- request.py 4 Jun 2002 20:47:51 -0000 1.12 *************** *** 8,12 **** """ ! import os, string, time ############################################################################# --- 8,12 ---- """ ! import os, string, time, sys ############################################################################# *************** *** 95,97 **** --- 95,102 ---- return self.logger + + def write(self, data): + """ Write to output stream. + """ + sys.stdout.write(data) Index: wikiaction.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/wikiaction.py,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -r1.74 -r1.75 *** wikiaction.py 16 May 2002 18:28:15 -0000 1.74 --- wikiaction.py 4 Jun 2002 20:47:51 -0000 1.75 *************** *** 318,333 **** # open log for this page from MoinMoin import editlog log = editlog.EditLog() log.filter(pagename=pagename) ! print '

' + _('Revision History') + '

\n' ! print '\n' ! print '' ! print '' ! print '' ! if config.show_hosts: ! print '' ! print '' ! print '\n' count = 1 for file in revisions: --- 318,336 ---- # open log for this page from MoinMoin import editlog + from MoinMoin.util.dataset import TupleDataset, Column + log = editlog.EditLog() log.filter(pagename=pagename) ! history = TupleDataset() ! history.columns = [ ! Column('count', label='#', align='right'), ! Column('mtime', label=_('Date'), align='right'), ! Column('size', label=_('Size'), align='right'), ! Column('editor', label=_('Editor'), hidden=not config.show_hosts), ! Column('comment', label=_('Comment')), ! Column('action', label=_('Action')), ! ] ! count = 1 for file in revisions: *************** *** 353,370 **** text=_('diff'), querystr='action=diff&date=%d' % mtime)) - print '' % ( - count, - request.user.getFormattedDateTime(st[ST_MTIME]), - st[ST_SIZE]) - - if config.show_hosts: - print '' % (log.getEditor() or _("N/A"),) ! print '' % (cgi.escape(log.comment) or ' ') ! ! print '\n' % (actions,) count = count + 1 if count > 100: break ! print '
#' + _('Date') + '' + _('Size') + '' + _('Editor') + '' + _('Comment') + '' + _('Action') + '
%d %s %d%s%s %s
\n' wikiutil.send_footer(request, pagename, showpage=1) --- 356,380 ---- text=_('diff'), querystr='action=diff&date=%d' % mtime)) ! history.addRow(( ! count, ! ' ' + request.user.getFormattedDateTime(st[ST_MTIME]), ! ' ' + str(st[ST_SIZE]), ! log.getEditor() or _("N/A"), ! cgi.escape(log.comment) or ' ', ! actions, ! )) count = count + 1 if count > 100: break ! ! # print version history ! from MoinMoin.widget.browser import DataBrowserWidget ! from MoinMoin.formatter.text_html import Formatter ! ! print '

' + _('Revision History') + '

\n' ! request.formatter = Formatter(request) ! history_table = DataBrowserWidget(request) ! history_table.setData(history) ! history_table.render() wikiutil.send_footer(request, pagename, showpage=1) From jhermann at users.sourceforge.net Tue Jun 4 13:48:06 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Tue Jun 4 13:48:06 2002 Subject: [Moin-devel] CVS: MoinMoin/util dataset.py,1.1,1.2 Message-ID: Update of /cvsroot/moin/MoinMoin/util In directory usw-pr-cvs1:/tmp/cvs-serv17233/util Modified Files: dataset.py Log Message: Dumping version history using browser widget Index: dataset.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/util/dataset.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** dataset.py 9 May 2002 18:17:48 -0000 1.1 --- dataset.py 4 Jun 2002 20:47:51 -0000 1.2 *************** *** 11,24 **** """ class Dataset: ! pass ! class TupleDataset: ! pass - class DictDataset: - pass ! class DbDataset: pass --- 11,80 ---- """ + class Column: + """ Meta-data for a column. + """ + + _SLOTS = [ + ('label', ''), + ('sortable', 0), + ('hidden', 0), + ('align', ''), + ] + + def __init__(self, name, **kw): + self.name = name + for slot, defval in self._SLOTS: + setattr(self, slot, kw.get(slot, defval)) + + class Dataset: ! """ Holds a 2-dimensional data set (m rows on n columns) ! and associated meta-data (column titles, etc.) ! """ ! ! def __init__(self): ! self.columns = [] ! self.data = [] ! self._pos = 0 ! ! def __len__(self): ! return len(self.data) ! ! def reset(self): ! """ Reset iterator to start. ! """ ! self._pos = 0 ! ! def next(self): ! """ Return next row as a tuple, ordered by columns. ! """ ! if self._pos >= len(self): ! return None ! ! row = self.data[self._pos] ! self._pos += 1 ! return row ! ! def addRow(self, row): ! """ Add a row to the dataset. ! """ ! self.data.append(row) ! ! ! class TupleDataset(Dataset): ! """ A dataset that stores tuples. ! """ ! ! ! class DictDataset(Dataset): ! """ A dataset that stores dicts as the rows. ! """ ! def next(self): ! row = Dataset.next(self) ! return tuple([row[col.name] for col in self.columns]) ! class DbDataset(Dataset): pass From jhermann at users.sourceforge.net Tue Jun 4 13:48:06 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Tue Jun 4 13:48:06 2002 Subject: [Moin-devel] CVS: MoinMoin/widget base.py,1.1,1.2 browser.py,1.1,1.2 Message-ID: Update of /cvsroot/moin/MoinMoin/widget In directory usw-pr-cvs1:/tmp/cvs-serv17233/widget Modified Files: base.py browser.py Log Message: Dumping version history using browser widget Index: base.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/widget/base.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** base.py 9 May 2002 18:17:48 -0000 1.1 --- base.py 4 Jun 2002 20:47:51 -0000 1.2 *************** *** 11,17 **** def __init__(self, request, **kw): ! pass def render(self): ! pass --- 11,17 ---- def __init__(self, request, **kw): ! self.request = request def render(self): ! raise NotImplementedError Index: browser.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/widget/browser.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** browser.py 9 May 2002 18:17:48 -0000 1.1 --- browser.py 4 Jun 2002 20:47:51 -0000 1.2 *************** *** 15,17 **** --- 15,63 ---- def __init__(self, request, **kw): base.Widget.__init__(self, request, **kw) + self.data = None + + def setData(self, dataset): + """ Sets the data for the browser (see MoinMoin.util.dataset). + """ + self.data = dataset + + def render(self): + fmt = self.request.formatter + + result = [] + result.append(fmt.table(1, { + 'border': 1, + 'cellpadding': 3, + 'cellspacing': 0, + })) + + # add header line + result.append(fmt.table_row(1)) + for col in self.data.columns: + if col.hidden: continue + result.append(fmt.table_cell(1, {'align': 'Center'})) + result.append(fmt.strong(1)) + result.append(col.label or col.name) + result.append(fmt.strong(0)) + result.append(fmt.table_cell(0)) + result.append(fmt.table_row(0)) + + # add data + self.data.reset() + row = self.data.next() + while row: + result.append(fmt.table_row(1)) + for idx in range(len(row)): + if self.data.columns[idx].hidden: continue + attrs = {} + if self.data.columns[idx].align: + attrs['align'] = self.data.columns[idx].align + result.append(fmt.table_cell(1, attrs)) + result.append(str(row[idx])) + result.append(fmt.table_cell(0)) + result.append(fmt.table_row(0)) + row = self.data.next() + + result.append(fmt.table(0)) + self.request.write(''.join(result)) From jhermann at users.sourceforge.net Tue Jun 4 13:57:06 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Tue Jun 4 13:57:06 2002 Subject: [Moin-devel] CVS: MoinMoin/widget browser.py,1.2,1.3 Message-ID: Update of /cvsroot/moin/MoinMoin/widget In directory usw-pr-cvs1:/tmp/cvs-serv20194/widget Modified Files: browser.py Log Message: Typo Index: browser.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/widget/browser.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** browser.py 4 Jun 2002 20:47:51 -0000 1.2 --- browser.py 4 Jun 2002 20:56:54 -0000 1.3 *************** *** 36,40 **** for col in self.data.columns: if col.hidden: continue ! result.append(fmt.table_cell(1, {'align': 'Center'})) result.append(fmt.strong(1)) result.append(col.label or col.name) --- 36,40 ---- for col in self.data.columns: if col.hidden: continue ! result.append(fmt.table_cell(1, {'align': 'center'})) result.append(fmt.strong(1)) result.append(col.label or col.name) From jhermann at users.sourceforge.net Wed Jun 5 11:44:04 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Wed Jun 5 11:44:04 2002 Subject: [Moin-devel] CVS: dist CHANGES,1.98,1.99 Message-ID: Update of /cvsroot/moin/dist In directory usw-pr-cvs1:/tmp/cvs-serv23788 Modified Files: CHANGES Log Message: if the page file is read-only, you get a message Index: CHANGES =================================================================== RCS file: /cvsroot/moin/dist/CHANGES,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -r1.98 -r1.99 *** CHANGES 26 May 2002 19:56:24 -0000 1.98 --- CHANGES 5 Jun 2002 18:43:22 -0000 1.99 *************** *** 19,22 **** --- 19,24 ---- * "config.page_category_regex" defines what pages are categories * changed security default: deletion only available to known users + * if the page file is read-only, you get a message (i.e. you can now + protect pages against changes if you're the wiki admin) Unfinished features: From jhermann at users.sourceforge.net Wed Jun 5 11:44:04 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Wed Jun 5 11:44:04 2002 Subject: [Moin-devel] CVS: MoinMoin Page.py,1.126,1.127 PageEditor.py,1.17,1.18 Message-ID: Update of /cvsroot/moin/MoinMoin In directory usw-pr-cvs1:/tmp/cvs-serv23788/MoinMoin Modified Files: Page.py PageEditor.py Log Message: if the page file is read-only, you get a message Index: Page.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/Page.py,v retrieving revision 1.126 retrieving revision 1.127 diff -C2 -r1.126 -r1.127 *** Page.py 28 May 2002 22:42:02 -0000 1.126 --- Page.py 5 Jun 2002 18:43:22 -0000 1.127 *************** *** 79,82 **** --- 79,87 ---- + def isWritable(self): + """True if page can be changed""" + return os.access(self._text_filename(), os.W_OK) + + def exists(self): """True if the page exists""" Index: PageEditor.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/PageEditor.py,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -r1.17 -r1.18 *** PageEditor.py 28 May 2002 19:34:05 -0000 1.17 --- PageEditor.py 5 Jun 2002 18:43:23 -0000 1.18 *************** *** 50,53 **** --- 50,58 ---- webapi.http_headers(request, webapi.nocache) + if not self.isWritable(): + self.send_page(request, + msg=_('Page is immutable!')) + return + if self.prev_date: print 'Cannot edit old revisions' *************** *** 387,391 **** if not request.user.may.edit: msg = _("""You are not allowed to edit any pages.""") ! if not newtext: msg = _("""You cannot save empty pages.""") elif datestamp == '0': --- 392,398 ---- if not request.user.may.edit: msg = _("""You are not allowed to edit any pages.""") ! elif not self.isWritable(): ! msg = _('Page is immutable!') ! elif not newtext: msg = _("""You cannot save empty pages.""") elif datestamp == '0': From jhermann at users.sourceforge.net Wed Jun 5 11:44:05 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Wed Jun 5 11:44:05 2002 Subject: [Moin-devel] CVS: MoinMoin/i18n de.py,1.83,1.84 Message-ID: Update of /cvsroot/moin/MoinMoin/i18n In directory usw-pr-cvs1:/tmp/cvs-serv23788/MoinMoin/i18n Modified Files: de.py Log Message: if the page file is read-only, you get a message Index: de.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/i18n/de.py,v retrieving revision 1.83 retrieving revision 1.84 diff -C2 -r1.83 -r1.84 *** de.py 23 May 2002 20:38:03 -0000 1.83 --- de.py 5 Jun 2002 18:43:23 -0000 1.84 *************** *** 127,130 **** --- 127,133 ---- 'Keine Rechtschreibfehler gefunden!', + 'Page is immutable!': + 'Die Seite ist gegen ?nderungen gesch?tzt!', + 'Please provide a valid email address!': 'Bitte eine g?ltige Email-Adresse angeben!', From jhermann at users.sourceforge.net Fri Jun 7 11:03:05 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Fri Jun 7 11:03:05 2002 Subject: [Moin-devel] CVS: dist/wiki/data intermap.txt,1.14,1.15 Message-ID: Update of /cvsroot/moin/dist/wiki/data In directory usw-pr-cvs1:/tmp/cvs-serv1394/wiki/data Modified Files: intermap.txt Log Message: AwarenessWiki http://taoriver.net/aware/ Index: intermap.txt =================================================================== RCS file: /cvsroot/moin/dist/wiki/data/intermap.txt,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** intermap.txt 3 Jun 2002 21:34:36 -0000 1.14 --- intermap.txt 7 Jun 2002 18:02:34 -0000 1.15 *************** *** 13,16 **** --- 13,17 ---- DseWiki http://www.wikiservice.at/dse/wiki.cgi? DocBook http://docbook.org/wiki/moin.cgi/ + AwarenessWiki http://taoriver.net/aware/ # Updated 2002-05-10 from http://www.usemod.com/cgi-bin/mb.pl?InterMapTxt From noreply at sourceforge.net Fri Jun 7 21:52:18 2002 From: noreply at sourceforge.net (noreply at sourceforge.net) Date: Fri Jun 7 21:52:18 2002 Subject: [Moin-devel] [ moin-Patches-566094 ] TitleIndex for non-latin-alphabet languages Message-ID: Patches item #566094, was opened at 2002-06-08 13:51 You can respond by visiting: http://sourceforge.net/tracker/?func=detail&atid=308482&aid=566094&group_id=8482 Category: None Group: None Status: Open Resolution: None Priority: 5 Submitted By: Hye-Shik Chang (perky) Assigned to: Nobody/Anonymous (nobody) Summary: TitleIndex for non-latin-alphabet languages Initial Comment: TitleIndex patch for non-latin alphabet languages. (this patch contains only for Hangul Syllables U+AC00) ---------------------------------------------------------------------- You can respond by visiting: http://sourceforge.net/tracker/?func=detail&atid=308482&aid=566094&group_id=8482 From noreply at sourceforge.net Sat Jun 8 14:28:34 2002 From: noreply at sourceforge.net (noreply at sourceforge.net) Date: Sat Jun 8 14:28:34 2002 Subject: [Moin-devel] [ moin-Patches-566094 ] TitleIndex for non-latin-alphabet languages Message-ID: Patches item #566094, was opened at 2002-06-08 06:51 You can respond by visiting: http://sourceforge.net/tracker/?func=detail&atid=308482&aid=566094&group_id=8482 Category: None Group: None >Status: Closed >Resolution: Accepted Priority: 5 Submitted By: Hye-Shik Chang (perky) Assigned to: Nobody/Anonymous (nobody) Summary: TitleIndex for non-latin-alphabet languages Initial Comment: TitleIndex patch for non-latin alphabet languages. (this patch contains only for Hangul Syllables U+AC00) ---------------------------------------------------------------------- You can respond by visiting: http://sourceforge.net/tracker/?func=detail&atid=308482&aid=566094&group_id=8482 From jhermann at users.sourceforge.net Sat Jun 8 14:29:21 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Sat Jun 8 14:29:21 2002 Subject: [Moin-devel] CVS: MoinMoin/macro SystemAdmin.py,1.3,1.4 Message-ID: Update of /cvsroot/moin/MoinMoin/macro In directory usw-pr-cvs1:/tmp/cvs-serv6827/macro Modified Files: SystemAdmin.py Log Message: Removed print (which was illegal anyway) Index: SystemAdmin.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/macro/SystemAdmin.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** SystemAdmin.py 1 Dec 2001 20:30:10 -0000 1.3 --- SystemAdmin.py 8 Jun 2002 09:44:46 -0000 1.4 *************** *** 13,21 **** from MoinMoin.i18n import _ - def execute(macro, args): ! print wikiutil.link_tag("?action=export", _("Download XML export of this wiki")) if util.isImportable('gzip'): ! print " [%s]" % wikiutil.link_tag("?action=export&compression=gzip", "gzip") - return "" --- 13,21 ---- from MoinMoin.i18n import _ def execute(macro, args): ! result = wikiutil.link_tag("?action=export", _("Download XML export of this wiki")) if util.isImportable('gzip'): ! result += " [%s]" % wikiutil.link_tag("?action=export&compression=gzip", "gzip") ! ! return result From jhermann at users.sourceforge.net Sat Jun 8 15:03:51 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Sat Jun 8 15:03:51 2002 Subject: [Moin-devel] CVS: MoinMoin/webapi cgiMoin.py,1.14,1.15 Message-ID: Update of /cvsroot/moin/MoinMoin/webapi In directory usw-pr-cvs1:/tmp/cvs-serv6188/webapi Modified Files: cgiMoin.py Log Message: Removed print & string from cgiMain Index: cgiMoin.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/webapi/cgiMoin.py,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** cgiMoin.py 22 May 2002 19:08:19 -0000 1.14 --- cgiMoin.py 8 Jun 2002 09:40:09 -0000 1.15 *************** *** 13,17 **** # Imports ! import os, string, sys ############################################################################# --- 13,17 ---- # Imports ! import os, sys ############################################################################# *************** *** 39,43 **** if os.name == 'nt': scriptname = getScriptname() ! if string.find(pathinfo, scriptname) == 0: pathinfo = pathinfo[len(scriptname):] --- 39,43 ---- if os.name == 'nt': scriptname = getScriptname() ! if pathinfo.startswith(scriptname): pathinfo = pathinfo[len(scriptname):] *************** *** 109,126 **** # send http headers for header in more_headers: ! if string.lower(header)[:13] == "content-type:": have_ct = 1 ! print header for header in request.user_headers: ! if string.lower(header)[:13] == "content-type:": have_ct = 1 ! print header if not have_ct: ! print "Content-type: text/html;charset=%s" % config.charset ! #print "Pragma: no-cache" ! #print "Cache-control: no-cache" ! #!!! Better set expiry to some 10 mins or so for normal pages? ! print #from pprint import pformat --- 109,123 ---- # send http headers for header in more_headers: ! if header.lower().startswith("content-type:"): have_ct = 1 ! request.write(header, '\r\n') for header in request.user_headers: ! if header.lower().startswith("content-type:"): have_ct = 1 ! request.write(header, '\r\n') if not have_ct: ! request.write("Content-type: text/html;charset=%s\r\n" % config.charset) ! request.write('\r\n') #from pprint import pformat *************** *** 131,135 **** def http_redirect(request, url): """ Redirect to a fully qualified, or server-rooted URL """ ! if string.count(url, "://") == 0: url = getQualifiedURL(url) --- 128,132 ---- def http_redirect(request, url): """ Redirect to a fully qualified, or server-rooted URL """ ! if url.find("://") == -1: url = getQualifiedURL(url) From jhermann at users.sourceforge.net Sat Jun 8 15:09:34 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Sat Jun 8 15:09:34 2002 Subject: [Moin-devel] CVS: dist CHANGES,1.99,1.100 Message-ID: Update of /cvsroot/moin/dist In directory usw-pr-cvs1:/tmp/cvs-serv24194 Modified Files: CHANGES Log Message: [ 566094 ] TitleIndex for non-latin-alphabet languages (by perky) Index: CHANGES =================================================================== RCS file: /cvsroot/moin/dist/CHANGES,v retrieving revision 1.99 retrieving revision 1.100 diff -C2 -r1.99 -r1.100 *** CHANGES 5 Jun 2002 18:43:22 -0000 1.99 --- CHANGES 8 Jun 2002 08:08:44 -0000 1.100 *************** *** 21,24 **** --- 21,25 ---- * if the page file is read-only, you get a message (i.e. you can now protect pages against changes if you're the wiki admin) + * [[free link]] in addition to ["free link"] Unfinished features: *************** *** 31,34 **** --- 32,36 ---- * Bugfix for PageList when no arguments are given * Disallow full-text searches with too short search terms + * [ 566094 ] TitleIndex now supports grouping by Hangul Syllables ----------------------------------------------------------------------------- From jhermann at users.sourceforge.net Sat Jun 8 15:18:46 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Sat Jun 8 15:18:46 2002 Subject: [Moin-devel] CVS: MoinMoin request.py,1.12,1.13 Message-ID: Update of /cvsroot/moin/MoinMoin In directory usw-pr-cvs1:/tmp/cvs-serv6188 Modified Files: request.py Log Message: Removed print & string from cgiMain Index: request.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/request.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** request.py 4 Jun 2002 20:47:51 -0000 1.12 --- request.py 8 Jun 2002 09:40:09 -0000 1.13 *************** *** 96,102 **** return self.logger ! def write(self, data): """ Write to output stream. """ ! sys.stdout.write(data) --- 96,103 ---- return self.logger ! def write(self, *data): """ Write to output stream. """ ! for piece in data: ! sys.stdout.write(piece) From jhermann at users.sourceforge.net Sat Jun 8 15:39:18 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Sat Jun 8 15:39:18 2002 Subject: [Moin-devel] CVS: MoinMoin Page.py,1.127,1.128 Message-ID: Update of /cvsroot/moin/MoinMoin In directory usw-pr-cvs1:/tmp/cvs-serv30257/MoinMoin Modified Files: Page.py Log Message: Bugfix for isWritable() Index: Page.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/Page.py,v retrieving revision 1.127 retrieving revision 1.128 diff -C2 -r1.127 -r1.128 *** Page.py 5 Jun 2002 18:43:22 -0000 1.127 --- Page.py 8 Jun 2002 21:08:41 -0000 1.128 *************** *** 81,85 **** def isWritable(self): """True if page can be changed""" ! return os.access(self._text_filename(), os.W_OK) --- 81,85 ---- def isWritable(self): """True if page can be changed""" ! return os.access(self._text_filename(), os.W_OK) or not self.exists() From jhermann at users.sourceforge.net Sat Jun 8 15:42:33 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Sat Jun 8 15:42:33 2002 Subject: [Moin-devel] CVS: MoinMoin wikimacro.py,1.43,1.44 wikiutil.py,1.102,1.103 Message-ID: Update of /cvsroot/moin/MoinMoin In directory usw-pr-cvs1:/tmp/cvs-serv24194/MoinMoin Modified Files: wikimacro.py wikiutil.py Log Message: [ 566094 ] TitleIndex for non-latin-alphabet languages (by perky) Index: wikimacro.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/wikimacro.py,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -r1.43 -r1.44 *** wikimacro.py 16 May 2002 18:28:15 -0000 1.43 --- wikimacro.py 8 Jun 2002 08:08:45 -0000 1.44 *************** *** 166,170 **** letter = name[0] if wikiutil.isUnicodeName(name): ! letter = "~" if letter not in index_letters: index_letters.append(letter) --- 166,175 ---- letter = name[0] if wikiutil.isUnicodeName(name): ! try: ! letter = wikiutil.getUnicodeIndexGroup(unicode(name, config.charset)) ! letter = letter.encode(config.charset) ! except UnicodeError: ! letter = None ! if not letter: letter = "~" if letter not in index_letters: index_letters.append(letter) Index: wikiutil.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/wikiutil.py,v retrieving revision 1.102 retrieving revision 1.103 diff -C2 -r1.102 -r1.103 *** wikiutil.py 11 May 2002 19:51:23 -0000 1.102 --- wikiutil.py 8 Jun 2002 08:08:45 -0000 1.103 *************** *** 400,403 **** --- 400,415 ---- + def getUnicodeIndexGroup(name): + """ Return a group letter for `name`, which must be a unicode string. + + Currently supported: + - Hangul Syllables (U+AC00 - U+D7AF) + """ + if u'\uAC00' <= name[0] <= u'\uD7AF': # Hangul Syllables + return unichr(0xac00 + (int(ord(name[0]) - 0xac00) / 588) * 588) + else: + return None + + def isUnicodeName(name): """Try to determine if the quoted wikiname is a special, pure unicode name""" From jhermann at users.sourceforge.net Wed Jun 12 14:10:07 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Wed Jun 12 14:10:07 2002 Subject: [Moin-devel] CVS: MoinMoin/action AttachFile.py,1.37,1.38 Message-ID: Update of /cvsroot/moin/MoinMoin/action In directory usw-pr-cvs1:/tmp/cvs-serv11027/action Modified Files: AttachFile.py Log Message: More info on Python installation in "?test" pages; pass request object to user object Index: AttachFile.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/action/AttachFile.py,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -r1.37 -r1.38 *** AttachFile.py 22 May 2002 21:37:44 -0000 1.37 --- AttachFile.py 12 Jun 2002 21:09:48 -0000 1.38 *************** *** 95,99 **** ############################################################################# ! def _addLogEntry(action, pagename, filename): """ Add an entry to the edit log on uploads and deletes. --- 95,99 ---- ############################################################################# ! def _addLogEntry(request, action, pagename, filename): """ Add an entry to the edit log on uploads and deletes. *************** *** 101,105 **** """ from MoinMoin import editlog ! log = editlog.makeLogStore() remote_name = os.environ.get('REMOTE_ADDR', '') log.addEntry(pagename, remote_name, time.time(), --- 101,105 ---- """ from MoinMoin import editlog ! log = editlog.makeLogStore(request) remote_name = os.environ.get('REMOTE_ADDR', '') log.addEntry(pagename, remote_name, time.time(), *************** *** 367,371 **** msg = _("Attachment '%(target)s' (remote name '%(filename)s')" " with %(bytes)d bytes saved.") % locals() ! _addLogEntry('ATTNEW', pagename, target) # return attachment list --- 367,371 ---- msg = _("Attachment '%(target)s' (remote name '%(filename)s')" " with %(bytes)d bytes saved.") % locals() ! _addLogEntry(request, 'ATTNEW', pagename, target) # return attachment list *************** *** 401,405 **** if ext == '.draw': ! _addLogEntry('ATTDRW', pagename, basename + ext) savepath = os.path.join(getAttachDir(pagename), basename + ext) --- 401,405 ---- if ext == '.draw': ! _addLogEntry(request, 'ATTDRW', pagename, basename + ext) savepath = os.path.join(getAttachDir(pagename), basename + ext) *************** *** 418,422 **** # delete file os.remove(fpath) ! _addLogEntry('ATTDEL', pagename, filename) upload_form(pagename, request, msg=_("Attachment '%(filename)s' deleted.") % locals()) --- 418,422 ---- # delete file os.remove(fpath) ! _addLogEntry(request, 'ATTDEL', pagename, filename) upload_form(pagename, request, msg=_("Attachment '%(filename)s' deleted.") % locals()) From jhermann at users.sourceforge.net Wed Jun 12 14:10:08 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Wed Jun 12 14:10:08 2002 Subject: [Moin-devel] CVS: MoinMoin PageEditor.py,1.18,1.19 cgimain.py,1.56,1.57 editlog.py,1.16,1.17 request.py,1.13,1.14 security.py,1.4,1.5 user.py,1.60,1.61 userform.py,1.18,1.19 wikiaction.py,1.75,1.76 wikimacro.py,1.44,1.45 wikitest.py,1.2,1.3 Message-ID: Update of /cvsroot/moin/MoinMoin In directory usw-pr-cvs1:/tmp/cvs-serv11027 Modified Files: PageEditor.py cgimain.py editlog.py request.py security.py user.py userform.py wikiaction.py wikimacro.py wikitest.py Log Message: More info on Python installation in "?test" pages; pass request object to user object Index: PageEditor.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/PageEditor.py,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** PageEditor.py 5 Jun 2002 18:43:23 -0000 1.18 --- PageEditor.py 12 Jun 2002 21:09:48 -0000 1.19 *************** *** 284,288 **** for uid in userlist: if uid == request.user.id: continue # no self notification ! subscriber = user.User(uid) if not subscriber.email: continue # skip empty email address --- 284,288 ---- for uid in userlist: if uid == request.user.id: continue # no self notification ! subscriber = user.User(request, uid) if not subscriber.email: continue # skip empty email address *************** *** 437,441 **** # write the editlog entry from MoinMoin import editlog ! log = editlog.makeLogStore() remote_name = os.environ.get('REMOTE_ADDR', '') log.addEntry(self.page_name, remote_name, mtime, kw.get('comment', '')) --- 437,441 ---- # write the editlog entry from MoinMoin import editlog ! log = editlog.makeLogStore(request) remote_name = os.environ.get('REMOTE_ADDR', '') log.addEntry(self.page_name, remote_name, mtime, kw.get('comment', '')) Index: cgimain.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/cgimain.py,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -r1.56 -r1.57 *** cgimain.py 28 May 2002 18:50:20 -0000 1.56 --- cgimain.py 12 Jun 2002 21:09:48 -0000 1.57 *************** *** 47,65 **** opened_logs = 1 request = createRequest(properties) # Imports ! request.clock.start('imports') ! from MoinMoin import version, wikiutil, user, webapi from MoinMoin.Page import Page from MoinMoin.i18n import _ - request.clock.stop('imports') # install stdout guard if available if hasattr(webapi, 'StdoutGuard'): sys.stdout = webapi.StdoutGuard(request) - - # !!! if all refs to user.current are removed, create the user together with the request instance - request.user = user.current # sys.stderr.write("----\n") --- 47,61 ---- opened_logs = 1 + # create request object, including default user request = createRequest(properties) # Imports ! from MoinMoin import version, wikiutil, webapi from MoinMoin.Page import Page from MoinMoin.i18n import _ # install stdout guard if available if hasattr(webapi, 'StdoutGuard'): sys.stdout = webapi.StdoutGuard(request) # sys.stderr.write("----\n") Index: editlog.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/editlog.py,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** editlog.py 27 Mar 2002 22:41:14 -0000 1.16 --- editlog.py 12 Jun 2002 21:09:48 -0000 1.17 *************** *** 25,29 **** """ ! def __init__(self, optstr): self.options = optstr --- 25,30 ---- """ ! def __init__(self, request, optstr): ! self.request = request self.options = optstr *************** *** 52,57 **** """ ! def __init__(self, optstr): ! LogBase.__init__(self, optstr) self.filename = os.path.join(config.data_dir, optstr) --- 53,58 ---- """ ! def __init__(self, request, optstr): ! LogBase.__init__(self, request, optstr) self.filename = os.path.join(config.data_dir, optstr) *************** *** 77,81 **** logfile = open(self.filename, 'a+') entry = string.join((wikiutil.quoteFilename(pagename), host, `mtime`, ! hostname, user.User().id, comment, action), "\t") + "\n" try: # fcntl.flock(logfile.fileno(), fcntl.LOCK_EX) --- 78,82 ---- logfile = open(self.filename, 'a+') entry = string.join((wikiutil.quoteFilename(pagename), host, `mtime`, ! hostname, self.request.user.id, comment, action), "\t") + "\n" try: # fcntl.flock(logfile.fileno(), fcntl.LOCK_EX) *************** *** 91,95 **** ############################################################################# ! def makeLogStore(option=None): """ Creates a storage object that provides an implementation of the storage type given in the `option` parameter; option consists --- 92,96 ---- ############################################################################# ! def makeLogStore(request, option=None): """ Creates a storage object that provides an implementation of the storage type given in the `option` parameter; option consists *************** *** 102,106 **** schema, optstr = string.split(option, ':', 1) if schema == "text": ! return LogText(optstr) return None --- 103,107 ---- schema, optstr = string.split(option, ':', 1) if schema == "text": ! return LogText(request, optstr) return None *************** *** 121,125 **** _NUM_FIELDS = 7 ! def __init__(self, **kw): self._index = 0 self._usercache = {} --- 122,128 ---- _NUM_FIELDS = 7 ! def __init__(self, request, **kw): ! self.request = request ! self._index = 0 self._usercache = {} *************** *** 194,198 **** if self.userid: if not self._usercache.has_key(self.userid): ! self._usercache[self.userid] = user.User(self.userid) userdata = self._usercache[self.userid] if userdata.name: --- 197,201 ---- if self.userid: if not self._usercache.has_key(self.userid): ! self._usercache[self.userid] = user.User(self.request, self.userid) userdata = self._usercache[self.userid] if userdata.name: Index: request.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/request.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** request.py 8 Jun 2002 09:40:09 -0000 1.13 --- request.py 12 Jun 2002 21:09:48 -0000 1.14 *************** *** 42,48 **** def __init__(self, properties={}): from MoinMoin import i18n - self.user = None self.form = None self.logger = None --- 42,53 ---- def __init__(self, properties={}): + # order is important here! + from MoinMoin import user + self.user = user.User(self) + # !!! if all refs to user.current are removed, kill this assign + user.current = self.user + from MoinMoin import i18n self.form = None self.logger = None Index: security.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/security.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** security.py 26 May 2002 19:56:24 -0000 1.4 --- security.py 12 Jun 2002 21:09:48 -0000 1.5 *************** *** 32,35 **** --- 32,38 ---- def __init__(self, user): + """ Calculate the permissons `user` has. + """ + # note that request object is in `self.user._request` self.user = user Index: user.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/user.py,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -r1.60 -r1.61 *** user.py 10 May 2002 23:12:08 -0000 1.60 --- user.py 12 Jun 2002 21:09:48 -0000 1.61 *************** *** 50,54 **** _MAX_TRAIL = config.trail_size ! def __init__(self, id=None): """Init user with id""" self.valid = 0 --- 50,54 ---- _MAX_TRAIL = config.trail_size ! def __init__(self, request, id=None): """Init user with id""" self.valid = 0 *************** *** 68,71 **** --- 68,72 ---- # attrs not saved to profile + self._request = request self._trail = [] *************** *** 344,350 **** self._trail = self._trail[-self._MAX_TRAIL:] return self._trail - - - # current user - current = User() --- 345,347 ---- Index: userform.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/userform.py,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** userform.py 15 May 2002 06:01:57 -0000 1.18 --- userform.py 12 Jun 2002 21:09:48 -0000 1.19 *************** *** 47,51 **** cookie['MOIN_ID'].value, webapi.getScriptname(),)) os.environ['HTTP_COOKIE'] = '' ! request.user = user.User() user.current = request.user return _("Cookie deleted!") --- 47,51 ---- cookie['MOIN_ID'].value, webapi.getScriptname(),)) os.environ['HTTP_COOKIE'] = '' ! request.user = user.User(request) user.current = request.user return _("Cookie deleted!") *************** *** 62,66 **** users = user.getUserList() for uid in users: ! theuser = user.User(uid) if theuser.email == email: text = "%s\n\nID: %s\nName: %s\nLogin URL: %s?action=userform&uid=%s" % ( --- 62,66 ---- users = user.getUserList() for uid in users: ! theuser = user.User(request, uid) if theuser.email == email: text = "%s\n\nID: %s\nName: %s\nLogin URL: %s?action=userform&uid=%s" % ( *************** *** 90,94 **** # load the user data and check for validness ! theuser = user.User(uid) if not theuser.valid: return _("Please enter a valid user id!") --- 90,94 ---- # load the user data and check for validness ! theuser = user.User(request, uid) if not theuser.valid: return _("Please enter a valid user id!") *************** *** 100,104 **** else: # save user's profile, first get user instance ! theuser = user.User() # try to get the name, if name is empty or missing, return an error msg --- 100,104 ---- else: # save user's profile, first get user instance ! theuser = user.User(request) # try to get the name, if name is empty or missing, return an error msg Index: wikiaction.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/wikiaction.py,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -r1.75 -r1.76 *** wikiaction.py 4 Jun 2002 20:47:51 -0000 1.75 --- wikiaction.py 12 Jun 2002 21:09:48 -0000 1.76 *************** *** 320,324 **** from MoinMoin.util.dataset import TupleDataset, Column ! log = editlog.EditLog() log.filter(pagename=pagename) --- 320,324 ---- from MoinMoin.util.dataset import TupleDataset, Column ! log = editlog.EditLog(request) log.filter(pagename=pagename) Index: wikimacro.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/wikimacro.py,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -r1.44 -r1.45 *** wikimacro.py 8 Jun 2002 08:08:45 -0000 1.44 --- wikimacro.py 12 Jun 2002 21:09:48 -0000 1.45 *************** *** 249,253 **** row(_('Number of pages'), len(wikiutil.getPageList(config.text_dir))) row(_('Number of backup versions'), len(wikiutil.getBackupList(config.backup_dir, None))) ! edlog = editlog.EditLog() row(_('Entries in edit log'), _("%(logcount)s (%(logsize)s bytes)") % {'logcount': len(edlog), 'logsize': edlog.size()}) --- 249,253 ---- row(_('Number of pages'), len(wikiutil.getPageList(config.text_dir))) row(_('Number of backup versions'), len(wikiutil.getBackupList(config.backup_dir, None))) ! edlog = editlog.EditLog(self.request) row(_('Entries in edit log'), _("%(logcount)s (%(logsize)s bytes)") % {'logcount': len(edlog), 'logsize': edlog.size()}) Index: wikitest.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/wikitest.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** wikitest.py 28 May 2002 19:01:21 -0000 1.2 --- wikitest.py 12 Jun 2002 21:09:48 -0000 1.3 *************** *** 18,22 **** # Note that importing here makes a difference, namely the request # object is already created ! import os, string from MoinMoin import config, util, version, editlog --- 18,22 ---- # Note that importing here makes a difference, namely the request # object is already created ! import os, sys, xml from MoinMoin import config, util, version, editlog *************** *** 24,27 **** --- 24,32 ---- print 'Revision', version.revision print + print 'Python version', sys.version + print 'Python installed to', sys.exec_prefix + print + print 'PyXML is %sinstalled' % (xml.__file__.find('_xmlplus') == -1 and 'NOT ' or '') + print # check if the request is a local one *************** *** 47,51 **** # check editlog access ! log = editlog.makeLogStore() msg = log.sanityCheck() if msg: print "***", msg --- 52,56 ---- # check editlog access ! log = editlog.makeLogStore(request) msg = log.sanityCheck() if msg: print "***", msg *************** *** 58,62 **** print "*** Could not find external diff utility '%s'!" % config.external_diff else: ! print 'Found an external diff: "%s"' % (string.strip(lines[0]),) # keep some values to ourselves --- 63,67 ---- print "*** Could not find external diff utility '%s'!" % config.external_diff else: ! print 'Found an external diff: "%s"' % (lines[0].strip(),) # keep some values to ourselves From whisper at oz.net Wed Jun 12 21:07:02 2002 From: whisper at oz.net (David LeBlanc) Date: Wed Jun 12 21:07:02 2002 Subject: [Moin-devel] How to set up Moin for stand-alone operation. Message-ID: I've tried and tried to get Moin-1.0 to run stand-alone using httpdmain, but I can't figure out how to get it configured. This installation is running already ok as a cgi script. Directions appreciated. TIA, David LeBlanc Seattle, WA USA From jhermann at users.sourceforge.net Thu Jun 13 08:34:03 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Thu Jun 13 08:34:03 2002 Subject: [Moin-devel] CVS: MoinMoin/macro RecentChanges.py,1.59,1.60 Message-ID: Update of /cvsroot/moin/MoinMoin/macro In directory usw-pr-cvs1:/tmp/cvs-serv1722/macro Modified Files: RecentChanges.py Log Message: Bugfix for __init__ call Index: RecentChanges.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/macro/RecentChanges.py,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -r1.59 -r1.60 *** RecentChanges.py 2 May 2002 19:13:07 -0000 1.59 --- RecentChanges.py 13 Jun 2002 15:33:27 -0000 1.60 *************** *** 196,200 **** def __init__(self, request, **kw): ! apply(editlog.EditLog.__init__, (self,), kw) self.request = request self.changes = {} --- 196,200 ---- def __init__(self, request, **kw): ! editlog.EditLog.__init__(self, request, **kw) self.request = request self.changes = {} From jhermann at users.sourceforge.net Sat Jun 15 03:55:03 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Sat Jun 15 03:55:03 2002 Subject: [Moin-devel] CVS: dist/wiki/data intermap.txt,1.15,1.16 Message-ID: Update of /cvsroot/moin/dist/wiki/data In directory usw-pr-cvs1:/tmp/cvs-serv15462a/wiki/data Modified Files: intermap.txt Log Message: PythonWiki Index: intermap.txt =================================================================== RCS file: /cvsroot/moin/dist/wiki/data/intermap.txt,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** intermap.txt 7 Jun 2002 18:02:34 -0000 1.15 --- intermap.txt 15 Jun 2002 10:54:47 -0000 1.16 *************** *** 14,17 **** --- 14,18 ---- DocBook http://docbook.org/wiki/moin.cgi/ AwarenessWiki http://taoriver.net/aware/ + PythonWiki http://www.pythonwiki.de/ # Updated 2002-05-10 from http://www.usemod.com/cgi-bin/mb.pl?InterMapTxt From jhermann at users.sourceforge.net Sat Jun 15 04:37:03 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Sat Jun 15 04:37:03 2002 Subject: [Moin-devel] CVS: dist CHANGES,1.100,1.101 Message-ID: Update of /cvsroot/moin/dist In directory usw-pr-cvs1:/tmp/cvs-serv22555 Modified Files: CHANGES Log Message: Flags Index: CHANGES =================================================================== RCS file: /cvsroot/moin/dist/CHANGES,v retrieving revision 1.100 retrieving revision 1.101 diff -C2 -r1.100 -r1.101 *** CHANGES 8 Jun 2002 08:08:44 -0000 1.100 --- CHANGES 15 Jun 2002 11:36:09 -0000 1.101 *************** *** 21,25 **** * if the page file is read-only, you get a message (i.e. you can now protect pages against changes if you're the wiki admin) ! * [[free link]] in addition to ["free link"] Unfinished features: --- 21,25 ---- * if the page file is read-only, you get a message (i.e. you can now protect pages against changes if you're the wiki admin) ! * Added flag icons for the languages supported in "i18n" Unfinished features: From jhermann at users.sourceforge.net Sat Jun 15 04:37:03 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Sat Jun 15 04:37:03 2002 Subject: [Moin-devel] CVS: MoinMoin wikiutil.py,1.103,1.104 Message-ID: Update of /cvsroot/moin/MoinMoin In directory usw-pr-cvs1:/tmp/cvs-serv22555/MoinMoin Modified Files: wikiutil.py Log Message: Flags Index: wikiutil.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/wikiutil.py,v retrieving revision 1.103 retrieving revision 1.104 diff -C2 -r1.103 -r1.104 *** wikiutil.py 8 Jun 2002 08:08:45 -0000 1.103 --- wikiutil.py 15 Jun 2002 11:36:10 -0000 1.104 *************** *** 38,71 **** smileys = { ! "X-(": (15, 15, "angry.gif"), ! ":D": (15, 15, "biggrin.gif"), ! "<:(": (15, 15, "frown.gif"), ! ":o": (15, 15, "redface.gif"), ! ":(": (15, 15, "sad.gif"), ! ":)": (15, 15, "smile.gif"), ! "B)": (15, 15, "smile2.gif"), ! ":))": (15, 15, "smile3.gif"), ! ";)": (15, 15, "smile4.gif"), ! "/!\\": (15, 15, "alert.gif"), ! "": (15, 15, "attention.gif"), ! "(!)": (15, 15, "idea.gif"), # copied 2001-11-16 from http://pikie.darktech.org/cgi/pikie.py?EmotIcon ! ":-?": (15, 15, "tongue.gif"), ! ":\\": (15, 15, "ohwell.gif"), ! ">:>": (15, 15, "devil.gif"), ! "%)": (15, 15, "eyes.gif"), ! "@)": (15, 15, "eek.gif"), ! "|)": (15, 15, "tired.gif"), ! ";))": (15, 15, "lol.gif"), # version 1.0 ! "(./)": (20, 15, "checkmark.gif"), ! "{OK}": (14, 12, "thumbs-up.gif"), ! "{X}": (16, 16, "icon-error.gif"), ! "{i}": (16, 16, "icon-info.gif"), ! "{1}": (15, 13, "prio1.gif"), ! "{2}": (15, 13, "prio2.gif"), ! "{3}": (15, 13, "prio3.gif"), } --- 38,86 ---- smileys = { ! "X-(": (15, 15, 0, "angry.gif"), ! ":D": (15, 15, 0, "biggrin.gif"), ! "<:(": (15, 15, 0, "frown.gif"), ! ":o": (15, 15, 0, "redface.gif"), ! ":(": (15, 15, 0, "sad.gif"), ! ":)": (15, 15, 0, "smile.gif"), ! "B)": (15, 15, 0, "smile2.gif"), ! ":))": (15, 15, 0, "smile3.gif"), ! ";)": (15, 15, 0, "smile4.gif"), ! "/!\\": (15, 15, 0, "alert.gif"), ! "": (15, 15, 0, "attention.gif"), ! "(!)": (15, 15, 0, "idea.gif"), # copied 2001-11-16 from http://pikie.darktech.org/cgi/pikie.py?EmotIcon ! ":-?": (15, 15, 0, "tongue.gif"), ! ":\\": (15, 15, 0, "ohwell.gif"), ! ">:>": (15, 15, 0, "devil.gif"), ! "%)": (15, 15, 0, "eyes.gif"), ! "@)": (15, 15, 0, "eek.gif"), ! "|)": (15, 15, 0, "tired.gif"), ! ";))": (15, 15, 0, "lol.gif"), # version 1.0 ! "(./)": (20, 15, 0, "checkmark.gif"), ! "{OK}": (14, 12, 0, "thumbs-up.gif"), ! "{X}": (16, 16, 0, "icon-error.gif"), ! "{i}": (16, 16, 0, "icon-info.gif"), ! "{1}": (15, 13, 0, "prio1.gif"), ! "{2}": (15, 13, 0, "prio2.gif"), ! "{3}": (15, 13, 0, "prio3.gif"), ! ! # version 1.1 (flags) ! # flags for the languages in MoinMoin.i18n ! "{de}": (18, 12, 0, "flag-de.gif"), ! "{en}": (24, 12, 0, "flag-en.gif"), ! "{fi}": (18, 12, 1, "flag-fi.gif"), ! "{fr}": (18, 12, 1, "flag-fr.gif"), ! "{it}": (18, 12, 1, "flag-it.gif"), ! "{ja}": (18, 12, 1, "flag-ja.gif"), ! "{ko}": (18, 12, 1, "flag-ko.gif"), ! "{nl}": (18, 12, 1, "flag-nl.gif"), ! "{pt}": (18, 12, 0, "flag-pt.gif"), ! "{sv}": (18, 12, 0, "flag-sv.gif"), ! "{us}": (20, 12, 0, "flag-us.gif"), ! "{zh}": (18, 12, 0, "flag-zh.gif"), } *************** *** 73,80 **** def getSmiley(text, formatter): if formatter.request.user.show_emoticons: ! w, h, img = smileys[string.strip(text)] return formatter.image( src="%s/img/%s" % (config.url_prefix, img), ! alt=text, hspace=6, width=w, height=h) else: return formatter.text(text) --- 88,95 ---- def getSmiley(text, formatter): if formatter.request.user.show_emoticons: ! w, h, b, img = smileys[string.strip(text)] return formatter.image( src="%s/img/%s" % (config.url_prefix, img), ! alt=text, hspace=6, width=w, height=h, border=b) else: return formatter.text(text) From jhermann at users.sourceforge.net Sat Jun 15 04:37:04 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Sat Jun 15 04:37:04 2002 Subject: [Moin-devel] CVS: dist/wiki/htdocs/img flag-de.gif,NONE,1.1 flag-en.gif,NONE,1.1 flag-fi.gif,NONE,1.1 flag-fr.gif,NONE,1.1 flag-it.gif,NONE,1.1 flag-ja.gif,NONE,1.1 flag-ko.gif,NONE,1.1 flag-nl.gif,NONE,1.1 flag-pt.gif,NONE,1.1 flag-sv.gif,NONE,1.1 flag-us.gif,NONE,1.1 flag-zh.gif,NONE,1.1 Message-ID: Update of /cvsroot/moin/dist/wiki/htdocs/img In directory usw-pr-cvs1:/tmp/cvs-serv22555/wiki/htdocs/img Added Files: flag-de.gif flag-en.gif flag-fi.gif flag-fr.gif flag-it.gif flag-ja.gif flag-ko.gif flag-nl.gif flag-pt.gif flag-sv.gif flag-us.gif flag-zh.gif Log Message: Flags --- NEW FILE: flag-de.gif --- GIF89a --- NEW FILE: flag-en.gif --- GIF89a --- NEW FILE: flag-fi.gif --- GIF89a --- NEW FILE: flag-fr.gif --- GIF89a --- NEW FILE: flag-it.gif --- GIF89a --- NEW FILE: flag-ja.gif --- GIF89a --- NEW FILE: flag-ko.gif --- GIF89a ? ? Hr?oS Js?ca`_k? ?SG??D*4?? ???>???G? --- NEW FILE: flag-nl.gif --- GIF89a --- NEW FILE: flag-pt.gif --- GIF89a --- NEW FILE: flag-sv.gif --- GIF89a --- NEW FILE: flag-us.gif --- GIF89a --- NEW FILE: flag-zh.gif --- GIF89a From jhermann at users.sourceforge.net Tue Jun 18 11:09:05 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Tue Jun 18 11:09:05 2002 Subject: [Moin-devel] CVS: dist CHANGES,1.101,1.102 Message-ID: Update of /cvsroot/moin/dist In directory usw-pr-cvs1:/tmp/cvs-serv26603 Modified Files: CHANGES Log Message: Subscriber list shown on page info Index: CHANGES =================================================================== RCS file: /cvsroot/moin/dist/CHANGES,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -r1.101 -r1.102 *** CHANGES 15 Jun 2002 11:36:09 -0000 1.101 --- CHANGES 18 Jun 2002 18:08:45 -0000 1.102 *************** *** 22,25 **** --- 22,26 ---- protect pages against changes if you're the wiki admin) * Added flag icons for the languages supported in "i18n" + * Subscriber list shown on page info Unfinished features: From jhermann at users.sourceforge.net Tue Jun 18 11:09:06 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Tue Jun 18 11:09:06 2002 Subject: [Moin-devel] CVS: MoinMoin Page.py,1.128,1.129 PageEditor.py,1.19,1.20 wikiaction.py,1.76,1.77 Message-ID: Update of /cvsroot/moin/MoinMoin In directory usw-pr-cvs1:/tmp/cvs-serv26603/MoinMoin Modified Files: Page.py PageEditor.py wikiaction.py Log Message: Subscriber list shown on page info Index: Page.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/Page.py,v retrieving revision 1.128 retrieving revision 1.129 diff -C2 -r1.128 -r1.129 *** Page.py 8 Jun 2002 21:08:41 -0000 1.128 --- Page.py 18 Jun 2002 18:08:45 -0000 1.129 *************** *** 154,157 **** --- 154,196 ---- + def getSubscribers(self, request, **kw): + """ Get all subscribers of this page. + Return dict with email lists per language. + + include_self == 1: include current user (default: 0) + return_users == 1: return user instances (default: 0) + """ + include_self = kw.get('include_self', 0) + return_users = kw.get('return_users', 0) + + # extract categories of this page + pageList = self.getPageLinks(request) + CATEGORY_RE = re.compile(config.page_category_regex) + pageList = filter(CATEGORY_RE.match, pageList) + + # add current page name for list matching + pageList.append(self.page_name) + + # get email addresses of the all wiki user which have a profile stored; + # add the address only if the user has subscribed to the page and + # the user is not the current editor + userlist = user.getUserList() + emails = {} + for uid in userlist: + if uid == request.user.id and not include_self: continue # no self notification + subscriber = user.User(request, uid) + if not subscriber.email: continue # skip empty email address + + if subscriber.isSubscribedTo(pageList): + lang = subscriber.language or 'en' + if not emails.has_key(lang): emails[lang] = [] + if return_users: + emails[lang].append(subscriber) + else: + emails[lang].append(subscriber.email) + + return emails + + def send_page(self, request, msg=None, **keywords): """ Send the formatted page to stdout. Index: PageEditor.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/PageEditor.py,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -r1.19 -r1.20 *** PageEditor.py 12 Jun 2002 21:09:48 -0000 1.19 --- PageEditor.py 18 Jun 2002 18:08:45 -0000 1.20 *************** *** 269,294 **** Return message, indicating success or errors. """ ! # extract categories of this page ! pageList = self.getPageLinks(request) ! CATEGORY_RE = re.compile(config.page_category_regex) ! pageList = filter(CATEGORY_RE.match, pageList) ! ! # add current page name for list matching ! pageList.append(self.page_name) ! ! # get email addresses of the all wiki user which have a profile stored; ! # add the address only if the user has subscribed to the page and ! # the user is not the current editor ! userlist = user.getUserList() ! emails = {} ! for uid in userlist: ! if uid == request.user.id: continue # no self notification ! subscriber = user.User(request, uid) ! if not subscriber.email: continue # skip empty email address ! ! if subscriber.isSubscribedTo(pageList): ! lang = subscriber.language or 'en' ! if not emails.has_key(lang): emails[lang] = [] ! emails[lang].append(subscriber.email) if emails: --- 269,273 ---- Return message, indicating success or errors. """ ! emails = self._getSubscribers(request) if emails: Index: wikiaction.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/wikiaction.py,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -r1.76 -r1.77 *** wikiaction.py 12 Jun 2002 21:09:48 -0000 1.76 --- wikiaction.py 18 Jun 2002 18:08:45 -0000 1.77 *************** *** 296,299 **** --- 296,309 ---- if attachment_info: attachment_info(pagename, request.form) + # show subscribers + subscribers = page.getSubscribers(request, include_self=1, return_users=1) + if subscribers: + request.write('

', _('The following users subscribed to this page:')) + for lang in subscribers.keys(): + request.write('
[%s] ' % lang) + for user in subscribers[lang]: + request.write('%s ' % (urllib.quote(user.email), cgi.escape(user.name))) + request.write('

') + # show links links = page.getPageLinks(request) From jhermann at users.sourceforge.net Tue Jun 18 11:09:06 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Tue Jun 18 11:09:06 2002 Subject: [Moin-devel] CVS: MoinMoin/i18n de.py,1.84,1.85 Message-ID: Update of /cvsroot/moin/MoinMoin/i18n In directory usw-pr-cvs1:/tmp/cvs-serv26603/MoinMoin/i18n Modified Files: de.py Log Message: Subscriber list shown on page info Index: de.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/i18n/de.py,v retrieving revision 1.84 retrieving revision 1.85 diff -C2 -r1.84 -r1.85 *** de.py 5 Jun 2002 18:43:23 -0000 1.84 --- de.py 18 Jun 2002 18:08:46 -0000 1.85 *************** *** 691,694 **** --- 691,697 ---- 'Die nachfolgenden %(badwords)d Worte konnten nicht im W?rterbuch mit %(totalwords)d Worten%(localwords)s gefunden werden und sind im Text hervorgehoben:', + 'The following users subscribed to this page:': + 'Nachfolgende Benutzer haben diese Seite abonniert:', + 'The page was saved %(count)d%(times)s, though!': 'Die Seite wurde jedoch %(count)d mal gespeichert!', From jhermann at users.sourceforge.net Tue Jun 18 11:12:04 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Tue Jun 18 11:12:04 2002 Subject: [Moin-devel] CVS: MoinMoin/i18n sv.py,1.17,1.18 Message-ID: Update of /cvsroot/moin/MoinMoin/i18n In directory usw-pr-cvs1:/tmp/cvs-serv28029 Modified Files: sv.py Log Message: Update of Swedish Index: sv.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/i18n/sv.py,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -r1.17 -r1.18 *** sv.py 8 Mar 2002 18:53:20 -0000 1.17 --- sv.py 18 Jun 2002 18:11:38 -0000 1.18 *************** *** 10,17 **** ''': ''' !

New Attachment

!

An upload will never overwrite an existing file. If there is a name ! conflict, you have to rename the file that you want to upload. ! Otherwise, if "Rename to" is left blank, the original filename will be used.

''', --- 10,17 ---- ''': [...1248 lines suppressed...] 'diff', + 'edit': + '?ndra', + + 'get': + 'h?mta', + '''green=view red=edit''': ! '''gr?n=visa ! r?d=?ndra''', 'of this page': ! 'p? den h?r sidan', 'page size upper bound [bytes]': ! '?vre sidstorleksgr?ns [byte]', 'set bookmark': From lele at seldati.it Tue Jun 18 11:41:02 2002 From: lele at seldati.it (Lele Gaifax) Date: Tue Jun 18 11:41:02 2002 Subject: [Moin-devel] Italian messages In-Reply-To: References: Message-ID: <15631.32391.431554.933002@paci.nautilus> Index: it.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/i18n/it.py,v retrieving revision 1.5 diff -u -r1.5 it.py --- it.py 15 May 2002 19:55:51 -0000 1.5 +++ it.py 18 Jun 2002 18:36:32 -0000 @@ -127,9 +127,15 @@ 'No spelling errors found!': 'Non sono stati trovati errori di ortografia!', +'Page is immutable!': +'La pagina non ? modificabile!', + 'Please provide a valid email address!': 'Per favore immetti un indirizzo email valido!', +"Please use a more selective search term instead of '%(needle)s'!": +"Per favore usa un termine di ricerca più selettivo di '%(needle)s'!", + '''Sorry, someone else saved the page while you edited it.

Please do the following: Use the back button of your browser, and cut&paste your changes from there. Then go forward to here, and click EditText again. @@ -522,6 +528,9 @@ 'No pages match "%s"!': 'Nessuna pagina corrisponde a "%s"!', +'No quotes on %(pagename)s.': +'La pagina %(pagename)s non contiene nessuna citazione.', + 'No wanted pages in this wiki.': 'Non ci sono pagine "non scritte" in questo wiki.', @@ -676,11 +685,11 @@ 'La copia di backup di questa pagina ? deprecata e pertanto non verr? inclusa nella ricerca!', '''The comment on the change is: -%s +%(comment)s ''': '''Descrizione delle modifiche: -%s +%(comment)s ''', @@ -690,8 +699,11 @@ 'The following %(badwords)d words could not be found in the dictionary of %(totalwords)d words%(localwords)s and are highlighted below:': 'Le seguenti %(badwords)d parole non sono state trovate nel dizionario di %(totalwords)d termini%(localwords)s e sono evidenziate qui sotto:', +'The following users subscribed to this page:': +'Elenco degli abbonati a questa pagina:', + 'The page was saved %(count)d%(times)s, though!': -'La pagina ? stata salvata %(count)d %(times)s, comunque!', +'La pagina ? stata comunque salvata %(count)d %(times)s!', 'There are %(count)s attachment(s) stored for this page.': 'Ci sono %(count)s allegati per questa pagina.', -- nickname: Lele Gaifax | Quando vivro' di quello che ho pensato ieri real: Emanuele Gaifas | comincero' ad aver paura di chi mi copia. email: lele at seldati.it | -- Fortunato Depero, 1929. From jhermann at users.sourceforge.net Tue Jun 18 12:43:02 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Tue Jun 18 12:43:02 2002 Subject: [Moin-devel] CVS: MoinMoin PageEditor.py,1.20,1.21 Message-ID: Update of /cvsroot/moin/MoinMoin In directory usw-pr-cvs1:/tmp/cvs-serv308 Modified Files: PageEditor.py Log Message: Bugfix (method rename) Index: PageEditor.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/PageEditor.py,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** PageEditor.py 18 Jun 2002 18:08:45 -0000 1.20 --- PageEditor.py 18 Jun 2002 19:42:17 -0000 1.21 *************** *** 269,273 **** Return message, indicating success or errors. """ ! emails = self._getSubscribers(request) if emails: --- 269,273 ---- Return message, indicating success or errors. """ ! emails = self.getSubscribers(request) if emails: From jhermann at users.sourceforge.net Wed Jun 19 11:10:09 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Wed Jun 19 11:10:09 2002 Subject: [Moin-devel] CVS: MoinMoin/i18n it.py,1.5,1.6 Message-ID: Update of /cvsroot/moin/MoinMoin/i18n In directory usw-pr-cvs1:/tmp/cvs-serv28802 Modified Files: it.py Log Message: Update of Italian Index: it.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/i18n/it.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** it.py 15 May 2002 19:55:51 -0000 1.5 --- it.py 19 Jun 2002 18:09:32 -0000 1.6 *************** *** 128,134 **** --- 128,140 ---- 'Non sono stati trovati errori di ortografia!', + 'Page is immutable!': + 'La pagina non ? modificabile!', + 'Please provide a valid email address!': 'Per favore immetti un indirizzo email valido!', + "Please use a more selective search term instead of '%(needle)s'!": + "Per favore usa un termine di ricerca più selettivo di '%(needle)s'!", + '''Sorry, someone else saved the page while you edited it.

Please do the following: Use the back button of your browser, and cut&paste *************** *** 523,526 **** --- 529,535 ---- 'Nessuna pagina corrisponde a "%s"!', + 'No quotes on %(pagename)s.': + 'La pagina %(pagename)s non contiene nessuna citazione.', + 'No wanted pages in this wiki.': 'Non ci sono pagine "non scritte" in questo wiki.', *************** *** 677,685 **** '''The comment on the change is: ! %s ''': '''Descrizione delle modifiche: ! %s ''', --- 686,694 ---- '''The comment on the change is: ! %(comment)s ''': '''Descrizione delle modifiche: ! %(comment)s ''', *************** *** 691,696 **** 'Le seguenti %(badwords)d parole non sono state trovate nel dizionario di %(totalwords)d termini%(localwords)s e sono evidenziate qui sotto:', 'The page was saved %(count)d%(times)s, though!': ! 'La pagina ? stata salvata %(count)d %(times)s, comunque!', 'There are %(count)s attachment(s) stored for this page.': --- 700,708 ---- 'Le seguenti %(badwords)d parole non sono state trovate nel dizionario di %(totalwords)d termini%(localwords)s e sono evidenziate qui sotto:', + 'The following users subscribed to this page:': + 'Elenco degli abbonati a questa pagina:', + 'The page was saved %(count)d%(times)s, though!': ! 'La pagina ? stata comunque salvata %(count)d %(times)s!', 'There are %(count)s attachment(s) stored for this page.': From jhermann at users.sourceforge.net Thu Jun 20 13:52:06 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Thu Jun 20 13:52:06 2002 Subject: [Moin-devel] CVS: MoinMoin/macro FootNote.py,1.2,1.3 Message-ID: Update of /cvsroot/moin/MoinMoin/macro In directory usw-pr-cvs1:/tmp/cvs-serv7786/MoinMoin/macro Modified Files: FootNote.py Log Message: HTML-escape footnotes Index: FootNote.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/macro/FootNote.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** FootNote.py 24 Jan 2002 23:25:22 -0000 1.2 --- FootNote.py 20 Jun 2002 20:51:41 -0000 1.3 *************** *** 48,52 **** result.append(formatter.sup(0)) result.append(formatter.code(0)) ! result.append(request.footnotes[idx]) request.footnotes = [] return string.join(result, '') --- 48,52 ---- result.append(formatter.sup(0)) result.append(formatter.code(0)) ! result.append(formatter.text(request.footnotes[idx])) request.footnotes = [] return string.join(result, '') From jhermann at users.sourceforge.net Thu Jun 20 13:52:06 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Thu Jun 20 13:52:06 2002 Subject: [Moin-devel] CVS: dist CHANGES,1.102,1.103 Message-ID: Update of /cvsroot/moin/dist In directory usw-pr-cvs1:/tmp/cvs-serv7786 Modified Files: CHANGES Log Message: HTML-escape footnotes Index: CHANGES =================================================================== RCS file: /cvsroot/moin/dist/CHANGES,v retrieving revision 1.102 retrieving revision 1.103 diff -C2 -r1.102 -r1.103 *** CHANGES 18 Jun 2002 18:08:45 -0000 1.102 --- CHANGES 20 Jun 2002 20:51:41 -0000 1.103 *************** *** 34,37 **** --- 34,38 ---- * Disallow full-text searches with too short search terms * [ 566094 ] TitleIndex now supports grouping by Hangul Syllables + * Footnotes were not HTML escaped ----------------------------------------------------------------------------- From jhermann at users.sourceforge.net Thu Jun 20 14:02:04 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Thu Jun 20 14:02:04 2002 Subject: [Moin-devel] CVS: MoinMoin/i18n de.py,1.85,1.86 Message-ID: Update of /cvsroot/moin/MoinMoin/i18n In directory usw-pr-cvs1:/tmp/cvs-serv11158/MoinMoin/i18n Modified Files: de.py Log Message: editor shows page size Index: de.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/i18n/de.py,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -r1.85 -r1.86 *** de.py 18 Jun 2002 18:08:46 -0000 1.85 --- de.py 20 Jun 2002 21:01:21 -0000 1.86 *************** *** 85,88 **** --- 85,91 ---- '%(matchcount)d %(matches)s passen zu "%(title)s"', + '   [current page size %(size)d bytes]': + '   [aktuelle Seitengr??e %(size)d Bytes]', + '("None" for disabling CSS)': '("None" um CSS auszuschalten)', From jhermann at users.sourceforge.net Thu Jun 20 14:02:05 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Thu Jun 20 14:02:05 2002 Subject: [Moin-devel] CVS: MoinMoin PageEditor.py,1.21,1.22 Message-ID: Update of /cvsroot/moin/MoinMoin In directory usw-pr-cvs1:/tmp/cvs-serv11158/MoinMoin Modified Files: PageEditor.py Log Message: editor shows page size Index: PageEditor.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/PageEditor.py,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** PageEditor.py 18 Jun 2002 19:42:17 -0000 1.21 --- PageEditor.py 20 Jun 2002 21:01:21 -0000 1.22 *************** *** 76,91 **** title % {'pagename': self.split_title(),}, pagename=self.page_name, body_class="editor") - template_param = '' - if form.has_key('template'): - template_param = '&template=' + form['template'].value - print '%s' % ( - wikiutil.quoteWikiname(self.page_name), template_param, - _('Reduce editor size')) - print "|", wikiutil.getSysPage('HelpOnFormatting').link_to() - print "|", wikiutil.getSysPage('InterWiki').link_to(target='_blank') - if preview: - print '| %s' % _('Skip to preview') ! # send form try: text_rows = int(form['rows'].value) --- 76,81 ---- title % {'pagename': self.split_title(),}, pagename=self.page_name, body_class="editor") ! # get request parameters try: text_rows = int(form['rows'].value) *************** *** 99,114 **** if request.user.valid: text_cols = int(request.user.edit_cols) - print '

' % ( - webapi.getScriptname(), - wikiutil.quoteWikiname(self.page_name), - '#preview', - ) - print '' - if os.path.isfile(self._text_filename()): - mtime = os.path.getmtime(self._text_filename()) - else: - mtime = 0 - print '' % (mtime,) - # get the text body for the editor field if form.has_key('template'): --- 89,92 ---- *************** *** 122,125 **** --- 100,129 ---- else: raw_body = self.get_raw_body() + + # send text above text area + template_param = '' + if form.has_key('template'): + template_param = '&template=' + form['template'].value + print '%s' % ( + wikiutil.quoteWikiname(self.page_name), template_param, + _('Reduce editor size')) + print "|", wikiutil.getSysPage('HelpOnFormatting').link_to() + print "|", wikiutil.getSysPage('InterWiki').link_to(target='_blank') + if preview: + print '| %s' % _('Skip to preview') + request.write(_('   [current page size %(size)d bytes]') % {'size': len(raw_body)}) + + # send form + print '' % ( + webapi.getScriptname(), + wikiutil.quoteWikiname(self.page_name), + '#preview', + ) + print '' + if os.path.isfile(self._text_filename()): + mtime = os.path.getmtime(self._text_filename()) + else: + mtime = 0 + print '' % (mtime,) # generate default content From jhermann at users.sourceforge.net Thu Jun 20 14:02:05 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Thu Jun 20 14:02:05 2002 Subject: [Moin-devel] CVS: dist CHANGES,1.103,1.104 Message-ID: Update of /cvsroot/moin/dist In directory usw-pr-cvs1:/tmp/cvs-serv11158 Modified Files: CHANGES Log Message: editor shows page size Index: CHANGES =================================================================== RCS file: /cvsroot/moin/dist/CHANGES,v retrieving revision 1.103 retrieving revision 1.104 diff -C2 -r1.103 -r1.104 *** CHANGES 20 Jun 2002 20:51:41 -0000 1.103 --- CHANGES 20 Jun 2002 21:01:21 -0000 1.104 *************** *** 23,26 **** --- 23,27 ---- * Added flag icons for the languages supported in "i18n" * Subscriber list shown on page info + * editor shows the current size of the page Unfinished features: From jhermann at users.sourceforge.net Thu Jun 20 14:17:06 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Thu Jun 20 14:17:06 2002 Subject: [Moin-devel] CVS: MoinMoin/action LikePages.py,1.14,1.15 Message-ID: Update of /cvsroot/moin/MoinMoin/action In directory usw-pr-cvs1:/tmp/cvs-serv16587/action Modified Files: LikePages.py Log Message: Refactored LikePages to functions Index: LikePages.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/action/LikePages.py,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** LikePages.py 24 Apr 2002 19:36:54 -0000 1.14 --- LikePages.py 20 Jun 2002 21:16:54 -0000 1.15 *************** *** 19,41 **** ! def execute(pagename, request, s_re=re.compile('([%s][%s]+)' % (config.upperletters, config.lowerletters)), e_re=re.compile('([%s][%s]+)$' % (config.upperletters, config.lowerletters))): - # figure the start and end words s_match = s_re.match(pagename) e_match = e_re.search(pagename) if not (s_match and e_match): ! Page(pagename).send_page(request, ! msg=_('You cannot use LikePages on an extended pagename!')) ! return # extract the words start = s_match.group(1) - s_len = len(start) end = e_match.group(1) - e_len = len(end) subpage = pagename + '/' - sp_len = len(subpage) # find any matching pages --- 19,65 ---- ! def execute(pagename, request): ! start, end, matches = findMatches(pagename, request) ! ! # error? ! if isinstance(matches, type('')): ! Page(pagename).send_page(request, msg=matches) ! return ! ! # no matches :( ! if not matches: ! Page(pagename).send_page(request, ! msg='' + _('No pages match "%s"!') % (pagename,) + '') ! return ! ! # one match - display it ! if len(matches) == 1: ! Page(matches.keys()[0]).send_page(request, ! msg='' + _('Exactly one matching page for "%s" found!') % (pagename,) + '') ! return ! ! # more than one match, list 'em ! webapi.http_headers(request) ! wikiutil.send_title(_('Multiple matches for "%s...%s"') % (start, end), ! pagename=pagename) ! ! showMatches(pagename, start, end, matches) ! ! wikiutil.send_footer(request, pagename) ! ! ! def findMatches(pagename, request, s_re=re.compile('([%s][%s]+)' % (config.upperletters, config.lowerletters)), e_re=re.compile('([%s][%s]+)$' % (config.upperletters, config.lowerletters))): # figure the start and end words s_match = s_re.match(pagename) e_match = e_re.search(pagename) if not (s_match and e_match): ! return None, None, _('You cannot use LikePages on an extended pagename!') # extract the words start = s_match.group(1) end = e_match.group(1) subpage = pagename + '/' # find any matching pages *************** *** 45,85 **** if anypage == pagename: continue ! p_len = len(anypage) ! if p_len > sp_len and anypage[:sp_len] == subpage: matches[anypage] = 4 else: ! if p_len > s_len and anypage[:s_len] == start: matches[anypage] = 1 ! if p_len > e_len and anypage[-e_len:] == end: matches[anypage] = matches.get(anypage, 0) + 2 ! # no matches :( ! if not matches: ! Page(pagename).send_page(request, ! msg='' + _('No pages match "%s"!') % (pagename,) + '') ! return ! ! # one match - display it ! if len(matches) == 1: ! Page(matches.keys()[0]).send_page(request, ! msg='' + _('Exactly one matching page for "%s" found!') % (pagename,) + '') ! return - # more than one match, list 'em - webapi.http_headers(request) - wikiutil.send_title(_('Multiple matches for "%s...%s"') % (start, end), - pagename=pagename) keys = matches.keys() keys.sort() ! showMatches(matches, keys, 4, "%s/..." % pagename) ! showMatches(matches, keys, 3, "%s...%s" % (start, end)) ! showMatches(matches, keys, 1, "%s..." % (start,)) ! showMatches(matches, keys, 2, "...%s" % (end,)) ! ! wikiutil.send_footer(request, pagename) ! def showMatches(matches, keys, match, title): matchcount = matches.values().count(match) --- 69,93 ---- if anypage == pagename: continue ! if anypage.startswith(subpage): matches[anypage] = 4 else: ! if anypage.startswith(start): matches[anypage] = 1 ! if anypage.endswith(end): matches[anypage] = matches.get(anypage, 0) + 2 ! return start, end, matches + def showMatches(pagename, start, end, matches): keys = matches.keys() keys.sort() ! _showMatchGroup(matches, keys, 4, "%s/..." % pagename) ! _showMatchGroup(matches, keys, 3, "%s...%s" % (start, end)) ! _showMatchGroup(matches, keys, 1, "%s..." % (start,)) ! _showMatchGroup(matches, keys, 2, "...%s" % (end,)) ! def _showMatchGroup(matches, keys, match, title): matchcount = matches.values().count(match) From jhermann at users.sourceforge.net Thu Jun 20 15:37:04 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Thu Jun 20 15:37:04 2002 Subject: [Moin-devel] CVS: MoinMoin Page.py,1.129,1.130 Message-ID: Update of /cvsroot/moin/MoinMoin In directory usw-pr-cvs1:/tmp/cvs-serv8499/MoinMoin Modified Files: Page.py Log Message: LikePages shows similar pages (using difflib.get_close_matches); Page creation shows LikePages that already exist Index: Page.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/Page.py,v retrieving revision 1.129 retrieving revision 1.130 diff -C2 -r1.129 -r1.130 *** Page.py 18 Jun 2002 18:08:45 -0000 1.129 --- Page.py 20 Jun 2002 22:36:55 -0000 1.130 *************** *** 386,416 **** # new page? if not self.exists() and self.default_formatter and not content_only: ! # generate the default page content for new pages ! print wikiutil.link_tag(wikiutil.quoteWikiname(self.page_name)+'?action=edit', ! _("Create this page")) ! ! # look for template pages ! templates = filter(lambda page, u = wikiutil: u.isTemplatePage(page), ! wikiutil.getPageList(config.text_dir)) ! if templates: ! print self.formatter.paragraph(1) ! print self.formatter.text(_('Alternatively, use one of these templates:')) ! print self.formatter.paragraph(0) ! ! # send list of template pages ! print self.formatter.bullet_list(1) ! for page in templates: ! print self.formatter.listitem(1) ! print wikiutil.link_tag("%s?action=edit&template=%s" % ( ! wikiutil.quoteWikiname(self.page_name), ! wikiutil.quoteWikiname(page)), ! page) ! print self.formatter.listitem(0) ! print self.formatter.bullet_list(0) ! ! print self.formatter.paragraph(1) ! print self.formatter.text(_('To create you own templates, ' + ! 'add a page with a name ending in Template.')) ! print self.formatter.paragraph(0) else: # parse the text and send the page content --- 386,390 ---- # new page? if not self.exists() and self.default_formatter and not content_only: ! self._emptyPageText(request) else: # parse the text and send the page content *************** *** 444,447 **** --- 418,460 ---- request.clock.stop('send_page') + + + def _emptyPageText(self, request): + from MoinMoin.action import LikePages + + # generate the default page content for new pages + print wikiutil.link_tag(wikiutil.quoteWikiname(self.page_name)+'?action=edit', + _("Create this page")) + + # look for template pages + templates = filter(lambda page, u = wikiutil: u.isTemplatePage(page), + wikiutil.getPageList(config.text_dir)) + if templates: + print self.formatter.paragraph(1) + print self.formatter.text(_('Alternatively, use one of these templates:')) + print self.formatter.paragraph(0) + + # send list of template pages + print self.formatter.bullet_list(1) + for page in templates: + print self.formatter.listitem(1) + print wikiutil.link_tag("%s?action=edit&template=%s" % ( + wikiutil.quoteWikiname(self.page_name), + wikiutil.quoteWikiname(page)), + page) + print self.formatter.listitem(0) + print self.formatter.bullet_list(0) + + print self.formatter.paragraph(1) + print self.formatter.text(_('To create you own templates, ' + + 'add a page with a name ending in Template.')) + print self.formatter.paragraph(0) + + # list similar pages that already exist + start, end, matches = LikePages.findMatches(self.page_name, request) + if matches and not isinstance(matches, type('')): + print self.formatter.rule() + print _('

The following pages with similar names already exist...

') + LikePages.showMatches(self.page_name, start, end, matches) From jhermann at users.sourceforge.net Thu Jun 20 15:37:04 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Thu Jun 20 15:37:04 2002 Subject: [Moin-devel] CVS: dist CHANGES,1.104,1.105 Message-ID: Update of /cvsroot/moin/dist In directory usw-pr-cvs1:/tmp/cvs-serv8499 Modified Files: CHANGES Log Message: LikePages shows similar pages (using difflib.get_close_matches); Page creation shows LikePages that already exist Index: CHANGES =================================================================== RCS file: /cvsroot/moin/dist/CHANGES,v retrieving revision 1.104 retrieving revision 1.105 diff -C2 -r1.104 -r1.105 *** CHANGES 20 Jun 2002 21:01:21 -0000 1.104 --- CHANGES 20 Jun 2002 22:36:55 -0000 1.105 *************** *** 24,27 **** --- 24,29 ---- * Subscriber list shown on page info * editor shows the current size of the page + * LikePages shows similar pages (using difflib.get_close_matches) + * Page creation shows LikePages that already exist Unfinished features: From jhermann at users.sourceforge.net Thu Jun 20 15:37:04 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Thu Jun 20 15:37:04 2002 Subject: [Moin-devel] CVS: MoinMoin/action LikePages.py,1.15,1.16 Message-ID: Update of /cvsroot/moin/MoinMoin/action In directory usw-pr-cvs1:/tmp/cvs-serv8499/MoinMoin/action Modified Files: LikePages.py Log Message: LikePages shows similar pages (using difflib.get_close_matches); Page creation shows LikePages that already exist Index: LikePages.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/action/LikePages.py,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** LikePages.py 20 Jun 2002 21:16:54 -0000 1.15 --- LikePages.py 20 Jun 2002 22:36:55 -0000 1.16 *************** *** 13,17 **** """ ! import re from MoinMoin import config, user, util, wikiutil, webapi from MoinMoin.Page import Page --- 13,17 ---- """ ! import re, cgi from MoinMoin import config, user, util, wikiutil, webapi from MoinMoin.Page import Page *************** *** 52,79 **** s_re=re.compile('([%s][%s]+)' % (config.upperletters, config.lowerletters)), e_re=re.compile('([%s][%s]+)$' % (config.upperletters, config.lowerletters))): # figure the start and end words s_match = s_re.match(pagename) e_match = e_re.search(pagename) ! if not (s_match and e_match): return None, None, _('You cannot use LikePages on an extended pagename!') ! # extract the words ! start = s_match.group(1) ! end = e_match.group(1) ! subpage = pagename + '/' ! ! # find any matching pages matches = {} ! for anypage in wikiutil.getPageList(config.text_dir): ! # skip current page ! if anypage == pagename: ! continue ! if anypage.startswith(subpage): ! matches[anypage] = 4 ! else: ! if anypage.startswith(start): ! matches[anypage] = 1 ! if anypage.endswith(end): ! matches[anypage] = matches.get(anypage, 0) + 2 return start, end, matches --- 52,99 ---- s_re=re.compile('([%s][%s]+)' % (config.upperletters, config.lowerletters)), e_re=re.compile('([%s][%s]+)$' % (config.upperletters, config.lowerletters))): + from MoinMoin.support import difflib + + # get page lists + pagelist = wikiutil.getPageList(config.text_dir) + lowerpages = [p.lower() for p in pagelist] + similar = difflib.get_close_matches(pagename.lower(), lowerpages, 10) + # figure the start and end words s_match = s_re.match(pagename) e_match = e_re.search(pagename) ! if not (s_match and e_match or similar): return None, None, _('You cannot use LikePages on an extended pagename!') ! start = None ! end = None matches = {} ! if s_match and e_match: ! # extract the words ! start = s_match.group(1) ! end = e_match.group(1) ! subpage = pagename + '/' ! ! # find any matching pages ! for anypage in pagelist: ! # skip current page ! if anypage == pagename: ! continue ! if anypage.startswith(subpage): ! matches[anypage] = 4 ! else: ! if anypage.startswith(start): ! matches[anypage] = 1 ! if anypage.endswith(end): ! matches[anypage] = matches.get(anypage, 0) + 2 ! ! if similar: ! pagemap = {} ! for anypage in pagelist: ! pagemap[anypage.lower()] = anypage ! ! for anypage in similar: ! if anypage == pagename: ! continue ! matches[pagemap[anypage]] = 8 return start, end, matches *************** *** 83,86 **** --- 103,107 ---- keys = matches.keys() keys.sort() + _showMatchGroup(matches, keys, 8, pagename) _showMatchGroup(matches, keys, 4, "%s/..." % pagename) _showMatchGroup(matches, keys, 3, "%s...%s" % (start, end)) *************** *** 96,100 **** 'matchcount': matchcount, 'matches': (_(' match'), _(' matches'))[matchcount != 1], ! 'title': title} + '
' print "
    " for key in keys: --- 117,121 ---- 'matchcount': matchcount, 'matches': (_(' match'), _(' matches'))[matchcount != 1], ! 'title': cgi.escape(title)} + '' print "
      " for key in keys: From jhermann at users.sourceforge.net Thu Jun 20 15:37:05 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Thu Jun 20 15:37:05 2002 Subject: [Moin-devel] CVS: MoinMoin/i18n de.py,1.86,1.87 Message-ID: Update of /cvsroot/moin/MoinMoin/i18n In directory usw-pr-cvs1:/tmp/cvs-serv8499/MoinMoin/i18n Modified Files: de.py Log Message: LikePages shows similar pages (using difflib.get_close_matches); Page creation shows LikePages that already exist Index: de.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/i18n/de.py,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -r1.86 -r1.87 *** de.py 20 Jun 2002 21:01:21 -0000 1.86 --- de.py 20 Jun 2002 22:36:55 -0000 1.87 *************** *** 254,257 **** --- 254,260 ---- '

      Signatur des Seiteninhalts nach dem SHA-Verfahren: %(digest)s

      ', + '

      The following pages with similar names already exist...

      ': + '

      Die nachfolgenden Seiten mit ?hnlichem Namen sind bereits angelegt worden...

      ', + '''

      To refer to attachments on a page, use attachment:filename, as shown below in the list of files. *************** *** 409,412 **** --- 412,418 ---- 'Entries in event log': 'Eintr?ge im Ereignisprotokoll', + + 'Exactly one matching page for "%s" found!': + 'Exactly one matching page for "%s" found!', 'Expected "=" to follow "%(token)s"': From jhermann at users.sourceforge.net Thu Jun 20 16:58:01 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Thu Jun 20 16:58:01 2002 Subject: [Moin-devel] CVS: MoinMoin wikimacro.py,1.45,1.46 Message-ID: Update of /cvsroot/moin/MoinMoin In directory usw-pr-cvs1:/tmp/cvs-serv27294 Modified Files: wikimacro.py Log Message: Bugfix for TitleIndex Index: wikimacro.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/wikimacro.py,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -r1.45 -r1.46 *** wikimacro.py 12 Jun 2002 21:09:48 -0000 1.45 --- wikimacro.py 20 Jun 2002 23:57:12 -0000 1.46 *************** *** 168,172 **** try: letter = wikiutil.getUnicodeIndexGroup(unicode(name, config.charset)) ! letter = letter.encode(config.charset) except UnicodeError: letter = None --- 168,172 ---- try: letter = wikiutil.getUnicodeIndexGroup(unicode(name, config.charset)) ! if letter: letter = letter.encode(config.charset) except UnicodeError: letter = None From jhermann at users.sourceforge.net Thu Jun 20 17:02:04 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Thu Jun 20 17:02:04 2002 Subject: [Moin-devel] CVS: MoinMoin/action titleindex.py,1.5,1.6 Message-ID: Update of /cvsroot/moin/MoinMoin/action In directory usw-pr-cvs1:/tmp/cvs-serv28376/action Modified Files: titleindex.py Log Message: Bugfix: no LF before xml declaration Index: titleindex.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/action/titleindex.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** titleindex.py 17 Apr 2002 21:58:17 -0000 1.5 --- titleindex.py 21 Jun 2002 00:01:52 -0000 1.6 *************** *** 26,30 **** webapi.http_headers(request, ["Content-Type: " + mimetype]) - print pages = list(wikiutil.getPageList(config.text_dir)) --- 26,29 ---- From jhermann at users.sourceforge.net Fri Jun 21 04:35:05 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Fri Jun 21 04:35:05 2002 Subject: [Moin-devel] CVS: dist/wiki/htdocs/img flag-es.gif,NONE,1.1 Message-ID: Update of /cvsroot/moin/dist/wiki/htdocs/img In directory usw-pr-cvs1:/tmp/cvs-serv4332/wiki/htdocs/img Added Files: flag-es.gif Log Message: flag-es.gif --- NEW FILE: flag-es.gif --- GIF89a From jhermann at users.sourceforge.net Fri Jun 21 04:35:05 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Fri Jun 21 04:35:05 2002 Subject: [Moin-devel] CVS: MoinMoin wikiutil.py,1.104,1.105 Message-ID: Update of /cvsroot/moin/MoinMoin In directory usw-pr-cvs1:/tmp/cvs-serv4332/MoinMoin Modified Files: wikiutil.py Log Message: flag-es.gif Index: wikiutil.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/wikiutil.py,v retrieving revision 1.104 retrieving revision 1.105 diff -C2 -r1.104 -r1.105 *** wikiutil.py 15 Jun 2002 11:36:10 -0000 1.104 --- wikiutil.py 21 Jun 2002 11:34:16 -0000 1.105 *************** *** 73,76 **** --- 73,77 ---- "{de}": (18, 12, 0, "flag-de.gif"), "{en}": (24, 12, 0, "flag-en.gif"), + "{es}": (18, 12, 0, "flag-es.gif"), "{fi}": (18, 12, 1, "flag-fi.gif"), "{fr}": (18, 12, 1, "flag-fr.gif"), From jhermann at users.sourceforge.net Fri Jun 21 15:28:04 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Fri Jun 21 15:28:04 2002 Subject: [Moin-devel] CVS: MoinMoin wikiutil.py,1.105,1.106 Message-ID: Update of /cvsroot/moin/MoinMoin In directory usw-pr-cvs1:/tmp/cvs-serv22243 Modified Files: wikiutil.py Log Message: Omit page title from "print" view Index: wikiutil.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/wikiutil.py,v retrieving revision 1.105 retrieving revision 1.106 diff -C2 -r1.105 -r1.106 *** wikiutil.py 21 Jun 2002 11:34:16 -0000 1.105 --- wikiutil.py 21 Jun 2002 22:27:49 -0000 1.106 *************** *** 568,572 **** # if in print mode, emit the title and return immediately if keywords.get('print_mode', 0): ! print '

      %s


      \n' % (cgi.escape(text),) return --- 568,572 ---- # if in print mode, emit the title and return immediately if keywords.get('print_mode', 0): ! ## print '

      %s


      \n' % (cgi.escape(text),) return From lele at seldati.it Sun Jun 23 03:13:01 2002 From: lele at seldati.it (Lele Gaifax) Date: Sun Jun 23 03:13:01 2002 Subject: [Moin-devel] Diffs for italian messages Message-ID: <15637.40715.916349.488923@paci.nautilus> Hi all, here is the update to the latest CVS for it.py. Thanx&bye, lele. -------------- next part -------------- A non-text attachment was scrubbed... Name: mm.patch Type: application/octet-stream Size: 1296 bytes Desc: not available URL: -------------- next part -------------- -- nickname: Lele Gaifax | Quando vivro' di quello che ho pensato ieri real: Emanuele Gaifas | comincero' ad aver paura di chi mi copia. email: lele at seldati.it | -- Fortunato Depero, 1929. From jhermann at users.sourceforge.net Tue Jun 25 08:19:03 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Tue Jun 25 08:19:03 2002 Subject: [Moin-devel] CVS: MoinMoin/util dataset.py,1.2,1.3 Message-ID: Update of /cvsroot/moin/MoinMoin/util In directory usw-pr-cvs1:/tmp/cvs-serv2862 Modified Files: dataset.py Log Message: Typo Index: dataset.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/util/dataset.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** dataset.py 4 Jun 2002 20:47:51 -0000 1.2 --- dataset.py 25 Jun 2002 15:18:28 -0000 1.3 *************** *** 29,33 **** class Dataset: ! """ Holds a 2-dimensional data set (m rows on n columns) and associated meta-data (column titles, etc.) """ --- 29,33 ---- class Dataset: ! """ Holds a 2-dimensional data set (m rows of n columns) and associated meta-data (column titles, etc.) """ From tyrone at mutablerealms.com Tue Jun 25 12:48:04 2002 From: tyrone at mutablerealms.com (Tyrone Buckle) Date: Tue Jun 25 12:48:04 2002 Subject: [Moin-devel] Error message Message-ID: <3D18C821.BF07298@mutablerealms.com> Sorry to spam you guys/girls like this, but I need help. When i run the setup.py script I get the errors below. Any suggestions? Thanking you in advance...Tee mydir/moin-1.0# python setup.py --quiet install --prefix=/home/SystemSpec File "/home/SystemSpec/lib/python1.5/site-packages/MoinMoin/wikirpc.py", line 109 response = globals().get('xmlrpc_' + method)(*params) ^ SyntaxError: invalid syntax File "/home/SystemSpec/lib/python1.5/site-packages/MoinMoin/action/AttachFile.py", line 385 print >>sys.stderr, "save_drawing: tainted path '%s', aborting!" % filename ^ SyntaxError: invalid syntax File "/home/SystemSpec/lib/python1.5/site-packages/MoinMoin/scripts/moin_dump.py", line 147 print >>sys.stderr, "*** Caught exception while writing page!" ^ SyntaxError: invalid syntax File "/home/SystemSpec/lib/python1.5/site-packages/MoinMoin/stats/chart.py", line 80 gdchart.option(**self.options) ^ SyntaxError: invalid syntax File "/home/SystemSpec/lib/python1.5/site-packages/MoinMoin/stats/hitcounts.py", line 68 ratchet_time += 86400 ^ SyntaxError: invalid syntax File "/home/SystemSpec/lib/python1.5/site-packages/MoinMoin/stats/pagesize.py", line 55 sizes = [(p.size(), name) for name, p in pages.items()] ^ SyntaxError: invalid syntax File "/home/SystemSpec/lib/python1.5/site-packages/MoinMoin/stats/useragents.py", line 50 colors = ([Color(c) for c in colors]) ^ SyntaxError: invalid syntax File "/home/SystemSpec/lib/python1.5/site-packages/MoinMoin/support/difflib.py", line 774 return [x for score, x in result] ^ SyntaxError: invalid syntax File "/home/SystemSpec/lib/python1.5/site-packages/MoinMoin/widget/browser.py", line 16 base.Widget.__init__(self, request, **kw) ^ SyntaxError: invalid syntax From magnus at thinkware.se Tue Jun 25 13:05:04 2002 From: magnus at thinkware.se (Magnus Lycka) Date: Tue Jun 25 13:05:04 2002 Subject: [Moin-devel] Error message In-Reply-To: <3D18C821.BF07298@mutablerealms.com> Message-ID: <5.1.0.14.0.20020625215824.02844078@www.thinkware.se> At 16:44 2002-06-25 -0300, Tyrone Buckle wrote: >Sorry to spam you guys/girls like this, but I need help. When i run the >setup.py script I get the errors below. Any suggestions? Thanking you in >advance...Tee It seems you have an ancient version of python. (Pre 1.5.2?) It's probably a good idea to upgrade to Python 2.2.1. -- Magnus Lyck?, Thinkware AB ?lvans v?g 99, SE-907 50 UME? tel: 070-582 80 65, fax: 070-612 80 65 http://www.thinkware.se/ mailto:magnus at thinkware.se From andersjm at dancontrol.dk Wed Jun 26 10:55:03 2002 From: andersjm at dancontrol.dk (Anders J. Munch) Date: Wed Jun 26 10:55:03 2002 Subject: [Moin-devel] Macros, parsers, processors and extending MoinMoin in general Message-ID: <001501c21d3a$32080410$2501a8c0@quebec> I'm looking to create a MoinMoin extension to allow the embedding of PGN (chess game) documents in Wiki pages, displaying them with a graphical chessboard. So... Are there any documents describing the big picture of MoinMoin? Like how all these concepts like macros, parsers and processors fit together. Macros and processors seems to be very similar concepts; when do you use one and when do you use the other? And how do you go about creating a {macro,parser,processor} of your own? It is striking that there are markets for these things yet no description of how to make one of these critters to bring to market. Are the entries in FooMarket just hacked at random or have all authors gone through extensive MoinMoin source code studies? my-name-is-not-Luke-and-I-don't-want-to-read-the-source-if-I-can-avoid-it-ly y'rs, Anders From tyrone at mutablerealms.com Thu Jun 27 12:38:05 2002 From: tyrone at mutablerealms.com (Tyrone Buckle) Date: Thu Jun 27 12:38:05 2002 Subject: [Moin-devel] Dueling pythons References: <5.1.0.14.0.20020625215824.02844078@www.thinkware.se> Message-ID: <3D1B6851.BBADDF49@mutablerealms.com> I have both python 1.5.2 and 2.1. When I try to run the most recent version of the wiki I get the folowing error. I have changed the path variables, etc. Nothing seems to work. Any suggestions? SystemError: Failed to load the builtin codecs: No module named _codecs Python 1.5.2 /usr/bin/python From jh at web.de Fri Jun 28 13:38:01 2002 From: jh at web.de (Juergen Hermann) Date: Fri Jun 28 13:38:01 2002 Subject: [Moin-devel] Dueling pythons In-Reply-To: <3D1B6851.BBADDF49@mutablerealms.com> Message-ID: On Thu, 27 Jun 2002 16:32:33 -0300, Tyrone Buckle wrote: >I have both python 1.5.2 and 2.1. When I try to run the most recent version >of the wiki I get the folowing error. I have changed the path variables, etc. >Nothing seems to work. Any suggestions? Define "most recent". >SystemError: Failed to load the builtin codecs: No module named _codecs >Python 1.5.2 >/usr/bin/python Seems your Python installation is broken, mainly caused by "I have both python 1.5.2 and 2.1". Ciao, J?rgen From jh at web.de Fri Jun 28 13:44:05 2002 From: jh at web.de (Juergen Hermann) Date: Fri Jun 28 13:44:05 2002 Subject: [Moin-devel] Macros, parsers, processors and extending MoinMoin in general In-Reply-To: <001501c21d3a$32080410$2501a8c0@quebec> Message-ID: On Wed, 26 Jun 2002 19:52:10 +0200, Anders J. Munch wrote: >Are there any documents describing the big picture of MoinMoin? Like how all No, I don't have the time for it, and many things will change soon anyway. But any information that IS there is on MoinMoin:MoinDev. >these concepts like macros, parsers and processors fit together. Macros and >processors seems to be very similar concepts; when do you use one and when >do you use the other? A processor takes any amount of data out of a page. A macro just has a few (small) parameters. >And how do you go about creating a {macro,parser,processor} of your own? It Look at those that are there. The chess thing is easily based on the CSV processor. Ciao, J?rgen From jhermann at users.sourceforge.net Fri Jun 28 23:37:01 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Fri Jun 28 23:37:01 2002 Subject: [Moin-devel] CVS: MoinMoin/i18n da.py,NONE,1.1 __init__.py,1.24,1.25 es.py,1.1,1.2 Message-ID: Update of /cvsroot/moin/MoinMoin/i18n In directory usw-pr-cvs1:/tmp/cvs-serv17915 Modified Files: __init__.py es.py Added Files: da.py Log Message: Updates Spanish / Danish --- NEW FILE: da.py --- # Text translations for da (Dansk) # Maintained by: Jonas Smedegaard # Encoding: iso-8859-1 text = { '''

      New Attachment

      An upload will never overwrite an existing file. If there is a name conflict, you have to rename the file that you want to upload. Otherwise, if "Rename to" is left blank, the original filename will be used.

      ''': '''

      Ny vedh?ftet fil

      En upload overskriver aldrig en eksisterende fil. Hvis der opst?r navnekonflikt, skal du omd?be den fil du vil uploade. Alternativt, hvis "Omd?b" er blank, anvendes det originale filnavn.

      ''', ' (including %(localwords)d %(pagelink)s)': ' (inklusive %(localwords)d %(pagelink)s)', ' (spanning %d versions)': ' (over %d versioner)', ' Create Profile ': ' Opret bruger ', ' Delete ': ' Slet ', ' Login ': ' Log ind', ' Logout ': ' Log ud', ' Mail me my account data ': ' Send mig mine adgangsoplysninger ', ' Save ': ' Gem ', ' Upload ': ' Upload ', ' by browsing, title search %(titlesearch)s, text search %(textsearch)s or an index
      ': ' ved titels?gning %(titlesearch)s, friteksts?gning %(textsearch)s eller en af oversigtssiderne
      ', ' for this page (cached %(date)s)': ' for denne side (husket siden %(date)s)', ' match': ' resultat', ' matches': ' resultater', ' time': ' gang', ' times': ' gange', '# of hits': 'Antal bes?g', '# of pages of this size': 'Antal sider af denne st?rrelse', '%(changecount)s changes': '%(changecount)s rettelser', '%(chart_title)s for %(filterpage)s': '%(chart_title)s for %(filterpage)s', '%(errortype)s processing error': 'Programfejl fejltype %(errortype)s', '%(hits)d hits out of %(pages)d pages searched.': '%(hits)d resultater ved en s?gning p? %(pages)d sider.', '%(logcount)s (%(logsize)s bytes)': '%(logcount)s (%(logsize)s bytes)', '%(matchcount)d %(matches)s for "%(title)s"': '%(matchcount)d %(matches)s for "%(title)s"', '   [current page size %(size)d bytes]': '   [nuv?rende sidest?rrelse %(size)d bytes]', '("None" for disabling CSS)': '("None" for at sl? CSS fra)', '(currently set to %s)': '(I ?jeblikket sat til %s)', '(last modified %s)': '(senest ?ndret %s)', '(no bookmark set)': '(intet bogm?rke sat)', '4Suite Version': '4Suite-Version', "Attachment '%(filename)s' does not exist!": "Vedh?ftede fil '%(filename)s' eksisterer ikke!", 'Cookie deleted!': 'Cookie slettet!', 'Differences between version dated %s and %s': 'Forskelle mellem versionerne dateret %s og %s', 'Filename of attachment not specified!': 'Filnavn for vedh?ftet fil mangler eller er forkert!', "Found no account matching the given email address '%(email)s'!": "Ingen konto blev fundet med email-adressen '%(email)s'!", 'NONE': 'INGEN', 'No differences found!': 'Ingen forskelle fundet!', 'No older revisions available!': 'Ingen ?ldre versioner tilg?ngelig!', 'No spelling errors found!': 'Ingen stavefejl fundet!', 'Page is immutable!': 'Siden kan ikke redigeres!', 'Please provide a valid email address!': 'Angiv venligst en korrekt email-adresse!', "Please use a more selective search term instead of '%(needle)s'!": "Brug venligst en mere selektiv s?geformulering end '%(needle)s'!", '''Sorry, someone else saved the page while you edited it.

      Please do the following: Use the back button of your browser, and cut&paste your changes from there. Then go forward to here, and click EditText again. Now re-add your changes to the current page contents.

      Do not just replace the content editbox with your version of the page, because that would delete the changes of the other person, which is excessively rude! ''': '''Desv?rre, en anden har gemt rettelser til siden mens du har redigeret den.

      G?r venligst f?lgende: Brug "tilbage"-knappen p? din browser, og kopi?r dine ?ndringer derfra. V?lg derefter Redig?rTekst igen, og tilf?j dine rettelser til den nuv?rende tekst.

      Overskriv ikke blot den nuv?rende tekst med din version. Det vil slette den anden persons rettelser, og det er meget ubeh?vlet!! ''', '''Thank you for your changes. Your attention to detail is appreciated.''': '''Tak for dine rettelser. Din opm?rksomhed for detaljer er v?rdsat.''', 'Unsupported upload action: %s': 'Ukendt upload-rutine: %s', 'User preferences saved!': 'Brugerprofil gemt!', 'You are already subscribed to this page.': 'Du abonnerer allerede p? denne side.', 'You are not allowed to delete attachments.': 'Du har ikke adgang til at slette vedh?ftede filer (har du logget p? under "UserPreferences"?).', 'You are not allowed to upload files.': 'Du har ikke adgang til at uploade filer (har du logget p? under "UserPreferences"?).', 'You cannot save empty pages.': 'Du kan ikke gemme tomme sider.', 'You cannot use LikePages on an extended pagename!': 'Du kan ikke bruge "LikePages" p? et udvidet sidenavn!', 'You have been subscribed to this page.': 'Du abonnerer nu p? denne side.', '''
      To unsubscribe, go to your profile and delete this page from the subscription list. ''': '''
      For at afmelde abonnement skal du g? til din brugerprofil og slette siden fra abonnementslisten. ''', '

      Bad chart type "%s"!
      ': '
      Forkert tabeltype"%s"!
      ', '
      Charts are not available!
      ': '
      Tabeller er ikke tilg?ngelige!
      ', '
      You need to provide a chart type!
      ': '
      Tabeltypen skal angives!
      ', '

      Attached Files

      ': '

      Vedh?ftede filer

      ', "

      Attachment '%(filename)s'

      ": "

      Vedh?ftet fil '%(filename)s'

      ", '

      Edit drawing

      ': '

      Redig?r tegning

      ', """
      Emphasis: ''italics''; '''bold'''; '''''bold italics'''''; ''mixed '''bold''' and italics''; ---- horizontal rule.
      Headings: = Title 1 =; == Title 2 ==; === Title 3 ===; ==== Title 4 ====; ===== Title 5 =====.
      Lists: space and one of * bullets; 1., a., A., i., I. numbered items; 1.#n start numbering at n; space alone indents.
      Links: JoinCapitalizedWords; [\"brackets and double quotes\"]; url; [url]; [url label].
      Tables: || cell text |||| cell text spanning two columns ||; no trailing white space allowed after tables or titles.

      """: """
      Fremh?velser: ''kursiv''; '''fed'''; '''''kursiv fed'''''; ''blandet '''fed''' og kursiv''; ---- vandret streg.
      Overskrifter: = Titel 1 =; == Titel 2 ==; === Titel 3 ===; ==== Titel 4 ====; ===== Titel 5 =====.
      Lister: mellemrum og en asterisk (*); 1., a., A., i., I. nummererede paragraffer; 1.#n begynd nummerering ved \"n\"; mellemrum alene giver indryk.
      Links: SammenSatteOrd; [\"lodrette klammer og citationstegn\"]; URL; [URL]; [URL beskrivende navn].
      Tabeller: || celletekst |||| celletekst over to kolonner ||; efterf?lgende mellemrum er ikke tiladt efter tabeller eller rubrikker.

      """, '''

      If you submit this form, the submitted values will be displayed. To use this form on other pages, insert a

          [[Form("%(pagename)s")]]

      macro call.

      ''': '''

      Hvis du indsender denne formular vil de angivne v?rdier blive vist. For at bruge denne formular p? andre sider skal f?lgende makro

          [[Form("%(pagename)s")]]

      placeres p? siderne.

      ''', "

      SHA digest of this page's content is: %(digest)s

      ": '

      Signatur for indholdet p? denne side: %(digest)s

      ', '

      The following pages with similar names already exist...

      ': '

      F?lgende sider med lignende navne eksisterer allerede...

      ', '''

      To refer to attachments on a page, use attachment:filename, as shown below in the list of files. Do NOT use the URL of the [get] link, since this is subject to change and can break easily.

      ''': '''

      Brug attachment:filename til at referere til vedh?ftede filer p? en side, som vist nedenfor i fil-oversigten. Anvend IKKE URLen under [get], da den ikke er permanent, og derfor kan ?del?gge integriteten af informationerne.

      ''', '

      Unknown file type, cannot display this attachment inline.

      ': '

      Ukendt filtype. Kan ikke vise den vedh?ftede fil direkte.

      ', '[goto %s]': '[g? til %s]', '': '', 'Action': 'Rutine', 'Add "Open in new window" icon to pretty links': 'Tilf?j "?bn i nyt vindue"-ikon til detaljeret link', 'Add checked words to dictionary': 'Tilf?j de markerede ord til ordlisten', 'Add spaces to displayed wiki names': 'Tilf?j mellemrum i viste wiki-navne', 'Additions are marked like this.': 'Tilf?jelser er markeret som denne linje.', 'Alternatively, use one of these templates:': 'Alternativt kan du anvende en af disse skabeloner:', "Attachment '%(filename)s' deleted.": "Vedh?ftet fil '%(filename)s' slettet.", "Attachment '%(target)s' (remote name '%(filename)s') with %(bytes)d bytes saved.": "Vedh?ftet fil '%(target)s' (oprindeligt navn '%(filename)s') p? %(bytes)d bytes gemt.", 'Attachments for "%(pagename)s"': 'Filer vedh?ftet "%(pagename)s"', "Bad timestamp '%s'": "Forkert datostempel '%s'", 'CSS URL': 'CSS-URL', "Can't work out query": 'Kan ikke forst? foresp?rgslen', 'Cancel': 'Annull?r', 'Case-sensitive searching': 'S?gning med skelnen mellem STORE og sm? bogstaver', 'Check Spelling': 'Stavekontrol', 'Clear message': 'Fjern besked', 'Click here to do a full-text search for this title': 'Klik her for at lave en friteksts?gning efter denne titel.', 'Comment': 'Kommentar', "Connection to mailserver '%(server)s' failed: %(reason)s": "Forbindelse til email-server '%(server)s' mislykkedes: %(reason)s", 'Create new drawing "%(filename)s"': 'Opret ny tegning "%(filename)s"', 'Create this page': 'Opret denne side', 'Date': 'Dato', 'Date format': 'Datoformat', '''Dear Wiki user, You have subscribed to a wiki page or wiki category on "%(sitename)s" for change notification. The following page has been changed by %(editor)s: %(pagelink)s ''': '''Hej Wiki-bruger! Du abonnerer p? en wiki-side eller en wiki-kategori p? "%(sitename)s". F?lgende sider er ?ndret af %(editor)s: %(pagelink)s ''', 'Default': 'Standard', 'Deletions are marked like this.': 'Slettet tekst er markeret som denne linje.', 'Describe %s here.': 'Beskriv %s her.', 'Diff for "%s"': 'Forskelle for "%s"', 'Display context of search results': 'Vis omkringliggende tekst i s?geresultater', 'Distribution of User-Agent Types': 'Fordeling af "User-Agent"-typer', 'Download XML export of this wiki': 'Download denne wiki som XML', "Drawing '%(filename)s' saved.": "Tegningen '%(filename)s' er gemt.", "ERROR in regex '%s'": "Fejl i regex '%s'", 'Edit "%(pagename)s"': 'Redig?r "%(pagename)s"', 'Edit was cancelled.': 'Redigeringen blev afbrudt.', 'EditText': 'Redig?rTekst', 'Editor': 'Forfatter', 'Editor size': 'St?rrelse p? redigeringsvindue', 'Email': 'Email', 'Entries in edit log': 'Emner i redigerings-log', 'Entries in event log': 'Emner i aktivitets-log', 'Exactly one matching page for "%s" found!': 'Netop ?t resultat fundet for "%s"!', 'Expected "=" to follow "%(token)s"': 'Forventede et "=" efter "%(token)s"', 'Expected a value for key "%(token)s"': 'Forventede en v?rdi for variablen "%(token)s"', 'File "%(filename)s for page "%(pagename)s': 'Fil "%(filename)s for siden "%(pagename)s', 'File to upload': 'Fil at upload\'e', 'FindPage': 'FindSide', 'Fri': 'fre', 'FrontPage': 'ForSide', 'Full Link List for "%s"': 'Fuld link-liste for "%s"', 'Full text search for "%s"': 'Friteksts?gning efter "%s"', 'General Information': 'Generel information', 'General options': 'Generelle valg', 'Global extension actions': 'Globale udvidelsesrutiner', 'Global extension macros': 'Globale udvidelsesmakroer', 'Go': 'Forts?t', 'HelpContents': 'Hj?lpIndhold', 'HelpOnFormatting': 'Hj?lpTilFormattering', 'Ignore changes in the amount of whitespace': 'Ignor?r ?ndringer i antallet af mellemrum', 'Info for "%s"': 'Info om "%s"', 'Installed processors': 'Installerede processorer', 'InterWiki': 'InterWiki', 'Invalid include arguments "%s"!': 'Forkerte include-argumenter "%s"!', 'Local Site Map for "%s"': 'Lokal oversigt for "%s"', 'Local extension actions': 'Lokale udvidelsesrutiner', 'Local extension macros': 'Lokale udvidelsesmakroer', 'LocalSpellingWords': 'LokalOrdliste', 'MIME Type (optional)': 'MIME-type (valfri)', 'Mail sent OK': 'Email sendt OK', 'MoinMoin Version': 'MoinMoin-version', 'Mon': 'man', 'Multiple matches for "%s...%s"': 'Flere resultater for "%s...%s"', 'N/A': 'Ikke tilg?ngelig', 'Name': 'Navn', 'Needed %(timer).1f seconds.': 'Kr?vede %(timer).1f sekunder', 'No attachments stored for %(pagename)s': 'Ingen vedh?ftede filer for %(pagename)s', '''No differences found! ''': '''Ingen forskelle fundet! ''', 'No older revisions of the page stored, diff not available.': 'Ingen ?ldre versioner af siden er gemt. Forskel ikke tilg?ngelig.', 'No orphaned pages in this wiki.': 'Ingen enlige sider i denne wiki.', 'No pages match "%s"!': 'Ingen sider matcher "%s"!', 'No quotes on %(pagename)s.': 'Ingen citater for %(pagename)s.', 'No wanted pages in this wiki.': 'Ingen ?nskede sider i denne wiki.', 'Nobody subscribed to this page, no mail sent.': 'Ingen abonnerede p? denne side. Ingen opdateringer sendt.', 'Number of backup versions': 'Antal backup-versioner', 'Number of pages': 'Antal sider', 'Open editor on double click': '?bn redigeringsvindue ved at dobbeltklikke', 'Optional comment about this change': 'Kommentar om denne redigering (valfri)', 'Optional reason for the deletion': '?rsag til denne sletning (valfri)', 'Or try one of these actions: ': 'Eller pr?v et af f?lgende: ', 'Others': 'Andre', 'Page "%s" was sucessfully deleted!': 'Siden "%s" blev korrekt slettet.', 'Page Size Distribution': 'Sidest?rrelser', 'Page hits and edits': 'Sidebes?g og -redigeringer', 'Password': 'Adgangskode', 'Plain title index': 'Titel-oversigt som tekst', 'Please use the interactive user interface to delete pages!': 'Anvend venligst den interaktive brugergr?nseflade til at slette sider!!', 'Preferred language': '?nsket sprog', 'Preview': 'Preview', 'Preview of "%(pagename)s"': 'Preview af "%(pagename)s"', 'Python Version': 'Python-version', 'Quick links': 'Kvik-links', 'Really delete this page?': 'Er du sikker p? at denne side skal slettes?', 'RecentChanges': 'Seneste?ndringer', 'Redirected from page "%(page)s"': 'Henvist fra siden "%(page)s"', 'Reduce editor size': 'Formindsk st?rrelsen p? redigeringsvinduet', 'RefreshCache': 'Opdat?rCache', 'Release %s [Revision %s]': 'Udgivelse %s [Revision %s]', 'Remember last page visited': 'Husk senest bes?gte side', 'Remove trailing whitespace from each line': 'Fjern ekstra mellemrum i slutningen af hver linje', 'Rename to (optional)': 'Omd?b til (valfri)', 'Revision History': 'Historik', 'Sat': 'l?r', 'Save Changes': 'Gem ?ndringer', 'Send mail notification': 'Send email-orientering', 'Server time is': 'Servertid er', 'Show emoticons': 'Vis smilies', 'Show fancy diffs': 'Vis detaljerede forskelle', 'Show fancy links': 'Vis detaljerede links', 'Show icon toolbar': 'Vis knap-panel', 'Show page trail': 'Vis senest bes?gte sider', 'Show question mark for non-existing pagelinks': 'Vis sp?rgsm?lstegn ved links til ikke-eksiterende sider', 'Show top/bottom links in headings': 'Vis top-/bund-links i header', 'ShowText': 'VisTekst', 'SiteNavigation': 'SiteNavigation', 'Size': 'St?rrelse', 'Skip to preview': 'Skift til preview', 'Status of sending notification mails:': 'Status for udsending af orienterings-emails:', 'Submitted form data:': 'Formular-data sendt:', 'Subscribed wiki pages
      (one regex per line)': 'Registrerede wiki-sider
      (?n regex pr. linje)', 'Sun': 's?n', 'The backupped content of this page is deprecated and will not be included in search results!': 'Backup\'ens indhold af denne side er for?ldet og vil ikke blive inkluderet i s?geresultater!', '''The comment on the change is: %(comment)s ''': '''Redigeringskommentar: %(comment)s ''', 'The external diff utility returned with error code %(rc)s!': 'Eksternt diff-program returnerede fejlkoden %(rc)s!', 'The following %(badwords)d words could not be found in the dictionary of %(totalwords)d words%(localwords)s and are highlighted below:': 'F?lgende %(badwords)d ord blev ikke fundet i den %(totalwords)d ord store ordliste %(localwords)s og er markeret herunder:', 'The following users subscribed to this page:': 'F?lgende brugere abonnerer p? denne side:', 'The page was saved %(count)d%(times)s, though!': 'Siden blev gemt %(count)d%(times)s!', 'There are %(count)s attachment(s) stored for this page.': 'Der er %(count)s vedh?ftede filer(s) gemt for denne side.', 'This list does not work, unless you have entered a valid email address!': 'Denne liste fungerer ikke, medmindre du skriver en korrekt email-adresse!', 'This page is already deleted or was never created!': 'Denne side er allerede slettet eller har aldrig eksisteret!', 'This page links to the following pages:
      ': 'Denne side har links til f?lgende sider:
      ', 'This page redirects to page "%(page)s"': 'Denne side henviser til "%(page)s"', 'Thu': 'tor', 'Time zone': 'Tidszone', 'Title search for "%s"': 'Titels?gning for "%s"', 'TitleIndex': 'Titeloversigt', 'To create you own templates, add a page with a name ending in Template.': 'Du kan oprette dine egne skabeloner ved at tilf?je sider med endelsen "Template".', 'To login on a different machine, use this URL: ': 'Anvend f?lgende URL for at logge p? fra en anden computer: ', 'Tue': 'tir', 'Unknown action': 'Ukendt rutine', 'Update my bookmark timestamp': 'Updat?r datostemplet for mit bogm?rke', 'Upload new attachment "%(filename)s"': 'Upload ny vedh?ftet fil "%(filename)s"', "Upload of attachment '%(filename)s'.": "Upload af vedh?ftet fil '%(filename)s'.", 'UserPreferences': 'BrugerIndstillinger', 'Version as of %(date)s': 'Version per %(date)s', 'Wed': 'ons', 'WordIndex': 'OrdOversigt', 'XML title index': 'XML-titeloversigt', 'XSLT option disabled!': 'XSLT sl?et fra!', 'You are not allowed to delete pages in this wiki!': 'Du har ikke tilladelse til at slette sider i denne wiki (har du logget p? under "UserPreferences"?).', 'Your email address': 'Din email-adresse', 'Your time is': 'Din tid er', '[%(hours)dh %(mins)dm ago]': '[for %(hours)dt %(mins)dm siden]', '[%(lang)s] %(recipients)s: %(status)s': '[%(lang)s] %(recipients)s: %(status)s', '[%(sitename)s] Update of "%(pagename)s"': '[%(sitename)s] opdatering af "%(pagename)s"', '[Content of new page loaded from %s]': '[Den nye sides indhold inl?st fra %s]', '[New window]': '[Nyt vindue]', '[Template %s not found]': '[Skabelon %s ikke fundet]', 'attachment:%(filename)s of %(pagename)s': 'vedh?ftet fil:%(filename)s til %(pagename)s', 'date': 'dato', 'del': 'slet', 'diff': 'forskel', 'edit': 'redig?r', 'get': 'hent', '''green=view red=edit''': '''gr?n=vis r?d=redig?r''', 'of this page': 'p? denne side', 'page size upper bound [bytes]': '?vre gr?nse for sidest?rrelse [bytes]', 'set bookmark': 's?t bogm?rke', 'view': 'vis', } Index: __init__.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/i18n/__init__.py,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -r1.24 -r1.25 *** __init__.py 21 Jun 2002 18:39:43 -0000 1.24 --- __init__.py 29 Jun 2002 06:36:15 -0000 1.25 *************** *** 23,26 **** --- 23,27 ---- # "pt" is really "pt-br", so if someone wants to adapt that to "pt", you're welcome languages = { + 'da': ('Dansk', 'iso-8859-1', '"Jonas Smedegaard" '), 'de': ('Deutsch', 'iso-8859-1', '"J?rgen Hermann" '), 'en': ('English', 'iso-8859-1', '"J?rgen Hermann" '), Index: es.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/i18n/es.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** es.py 21 Jun 2002 18:39:43 -0000 1.1 --- es.py 29 Jun 2002 06:36:15 -0000 1.2 *************** *** 10,81 **** ''': ''' !

      New Attachment

      !

      An upload will never overwrite an existing file. If there is a name ! conflict, you have to rename the file that you want to upload. ! Otherwise, if "Rename to" is left blank, the original filename will be used.

      ''', ' (including %(localwords)d %(pagelink)s)': ! ' (including %(localwords)d %(pagelink)s)', [...1597 lines suppressed...] '''green=view red=edit''': ! '''verde=ver ! rojo=editar''', 'of this page': ! 'de esta p?gina', 'page size upper bound [bytes]': ! 'tama?o de la p?gina superior al l?mite [bytes]', 'set bookmark': ! 'poner favoritos', 'view': ! 'ver', } + From jhermann at users.sourceforge.net Fri Jun 28 23:38:02 2002 From: jhermann at users.sourceforge.net (J?rgen Hermann) Date: Fri Jun 28 23:38:02 2002 Subject: [Moin-devel] CVS: MoinMoin/i18n es.py,1.2,1.3 Message-ID: Update of /cvsroot/moin/MoinMoin/i18n In directory usw-pr-cvs1:/tmp/cvs-serv18397 Modified Files: es.py Log Message: Syntax error Index: es.py =================================================================== RCS file: /cvsroot/moin/MoinMoin/i18n/es.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** es.py 29 Jun 2002 06:36:15 -0000 1.2 --- es.py 29 Jun 2002 06:37:20 -0000 1.3 *************** *** 94,98 **** '(currently set to %s)': ! '(actualmente configurado como %s)': '(last modified %s)': --- 94,98 ---- '(currently set to %s)': ! '(actualmente configurado como %s)', '(last modified %s)':