Mercurial > moin > 1.9
changeset 3053:067a87029064
merge main
| author | Thomas Waldmann <tw AT waldmann-edv DOT de> |
|---|---|
| date | Wed, 20 Feb 2008 01:14:06 +0100 |
| parents | 1d3e65884337 (current diff) b1e7d968330d (diff) |
| children | d2e9afd64276 |
| files | |
| diffstat | 9 files changed, 22 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/MoinMoin/action/fckdialog.py Wed Feb 20 01:13:29 2008 +0100 +++ b/MoinMoin/action/fckdialog.py Wed Feb 20 01:14:06 2008 +0100 @@ -119,7 +119,7 @@ helptext = "" helptexts.append( '''<div id="%s" style="DISPLAY: none"> - <b><<%s>></b> + <b><<%s>></b> <br/> <textarea style="color:#000000" cols="37" rows="10" disabled="disabled">%s</textarea> </div>''' @@ -148,10 +148,11 @@ helppage = wikiutil.getLocalizedPage(request, "HelpOnMacros") content = helppage.get_raw_body() macro_re = re.compile( - r"\|\|(<.*?>)?\{\{\{\[\[" + - r"(?P<prototype>(?P<macro>\w*).*)" + - r"\]\]\}\}\}\s*\|\|" + - r"\s*(?P<help>.*?)\s*\|\|\s*(?P<example>.*?)\s*\|\|$", re.U + re.M) + r"\|\|(<.*?>)?\{\{\{" + + r"<<(?P<prototype>(?P<macro>\w*).*)>>" + + r"\}\}\}\s*\|\|" + + r"[^|]*\|\|[^|]*\|\|<[^>]*>" + + r"\s*(?P<help>.*?)\s*\|\|\s*(?P<example>.*?)\s*(<<[^>]*>>)*\s*\|\|$", re.U|re.M) help = {} for match in macro_re.finditer(content): help[match.group('macro')] = match
--- a/MoinMoin/config/multiconfig.py Wed Feb 20 01:13:29 2008 +0100 +++ b/MoinMoin/config/multiconfig.py Wed Feb 20 01:14:06 2008 +0100 @@ -677,7 +677,7 @@ user_checkbox_remove = [] user_form_fields = [ - ('name', _('Name'), "text", "36", _("(Use Firstname''''''Lastname)")), + ('name', _('Name'), "text", "36", _("(Use FirstnameLastname)")), ('aliasname', _('Alias-Name'), "text", "36", ''), ('email', _('Email'), "text", "36", ''), ('jid', _('Jabber ID'), "text", "36", ''),
--- a/MoinMoin/converter/text_html_text_moin_wiki.py Wed Feb 20 01:13:29 2008 +0100 +++ b/MoinMoin/converter/text_html_text_moin_wiki.py Wed Feb 20 01:14:06 2008 +0100 @@ -1269,7 +1269,7 @@ desc = self.get_desc(node.childNodes) if desc: - desc = '|' + text + desc = '|' + desc params = ','.join(['%s="%s"' % (k, v) for k, v in attrs.items()]) # if k in ('width', 'height', )])
--- a/MoinMoin/i18n/dummy.py Wed Feb 20 01:13:29 2008 +0100 +++ b/MoinMoin/i18n/dummy.py Wed Feb 20 01:14:06 2008 +0100 @@ -17,6 +17,7 @@ _('HelpContents') _('HelpOnFormatting') _('UserPreferences') +_('SendMyPassword') _('WikiLicense') _('MissingPage') _('MissingHomePage')
--- a/MoinMoin/i18n/tools/markup15to16.py Wed Feb 20 01:13:29 2008 +0100 +++ b/MoinMoin/i18n/tools/markup15to16.py Wed Feb 20 01:14:06 2008 +0100 @@ -13,7 +13,7 @@ lang = sys.argv[1] - f = codecs.open("%s.%s.po" % (langfname, DOMAIN), "r", "utf-8") + f = codecs.open("%s.%s.po" % (lang, DOMAIN), "r", "utf-8") text = f.read() f.close() @@ -25,7 +25,7 @@ #print repr(text) - f = codecs.open("%s.%s.po" % (langfname, DOMAIN), "w", "utf-8") + f = codecs.open("%s.%s.po" % (lang, DOMAIN), "w", "utf-8") f.write(text) f.close()
--- a/MoinMoin/i18n/tools/wiki2po.py Wed Feb 20 01:13:29 2008 +0100 +++ b/MoinMoin/i18n/tools/wiki2po.py Wed Feb 20 01:14:06 2008 +0100 @@ -19,7 +19,7 @@ print pagename pagedata = wiki.getPage(pagename).encode('utf-8').replace("\n", "\r\n") - f = open("%s.%s.po" % (langfname, DOMAIN), "w") + f = open("%s.%s.po" % (lang, DOMAIN), "w") f.write(pagedata) f.close()
--- a/MoinMoin/theme/__init__.py Wed Feb 20 01:13:29 2008 +0100 +++ b/MoinMoin/theme/__init__.py Wed Feb 20 01:14:06 2008 +0100 @@ -525,9 +525,12 @@ vars = {} alt, img, w, h = self.get_icon(icon) try: - alt = alt % vars + alt = vars['icon-alt-text'] # if it is possible we take the alt-text from 'page_icons_table' except KeyError, err: - alt = 'KeyError: %s' % str(err) + try: + alt = alt % vars # if not we just leave the alt-text from 'icons' + except KeyError, err: + alt = 'KeyError: %s' % str(err) alt = self.request.getText(alt, formatted=False) tag = self.request.formatter.image(src=img, alt=alt, width=w, height=h, **kw) return tag @@ -544,7 +547,7 @@ qs = {} querystr, title, icon = self.cfg.page_icons_table[which] qs.update(querystr) # do not modify the querystr dict in the cfg! - d['title'] = title % d + d['icon-alt-text'] = d['title'] = title % d d['i18ntitle'] = self.request.getText(d['title'], formatted=False) img_src = self.make_icon(icon, d) rev = d['rev']
--- a/MoinMoin/xmlrpc/__init__.py Wed Feb 20 01:13:29 2008 +0100 +++ b/MoinMoin/xmlrpc/__init__.py Wed Feb 20 01:14:06 2008 +0100 @@ -527,6 +527,9 @@ pagename = self._instr(pagename) + if not pagename: + return xmlrpclib.Fault("INVALID", "pagename can't be empty") + # check ACLs if not self.request.user.may.write(pagename): return xmlrpclib.Fault(1, "You are not allowed to edit this page")
--- a/wiki/htdocs/applets/moinFCKplugins/macro/fckplugin.js Wed Feb 20 01:13:29 2008 +0100 +++ b/wiki/htdocs/applets/moinFCKplugins/macro/fckplugin.js Wed Feb 20 01:14:06 2008 +0100 @@ -26,6 +26,5 @@ // Add a new macro at the actual selection. FCKMacros.Add = function(name) { - var oSpan = FCK.InsertHtml('<span style="background-color:#ffff11">[[' - + name + ']]</span>'); + var oSpan = FCK.InsertHtml('<span style="background-color:#ffff11"><<' + name + '>></span>'); }