mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
This commit is contained in:
parent
3e5d9cf3f1
commit
1b457d06fb
@ -12,8 +12,8 @@ from trac.wiki.macros import WikiMacroBase
|
||||
from trac.util import Markup
|
||||
|
||||
|
||||
#SVN_PATH = 'https://svn.kovidgoyal.net/code/libprs500/trunk'
|
||||
SVN_PATH = 'file:///svn/code/libprs500/trunk'
|
||||
SVN_PATH = 'https://svn.kovidgoyal.net/code/libprs500/trunk'
|
||||
#SVN_PATH = 'file:///svn/code/libprs500/trunk'
|
||||
|
||||
def svn_log_to_txt():
|
||||
cl = pysvn.Client()
|
||||
@ -36,7 +36,7 @@ def svn_log_to_txt():
|
||||
current_version = False
|
||||
for entry in log:
|
||||
msg = entry['message'].strip()
|
||||
msg = re.sub(r'\#(\d+)', r'[ticket:\1 Ticket \1]', msg)
|
||||
msg = re.sub(ur'\#(\d+)', r'[ticket:\1 Ticket \1]', msg)
|
||||
if not msg:
|
||||
continue
|
||||
match = version_pat.search(msg)
|
||||
@ -52,7 +52,7 @@ def svn_log_to_txt():
|
||||
class ChangeLogMacro(WikiMacroBase):
|
||||
|
||||
def expand_macro(self, formatter, name, args):
|
||||
txt = svn_log_to_txt()
|
||||
txt = svn_log_to_txt().encode('ascii', 'xmlcharrefreplace')
|
||||
out = StringIO()
|
||||
Formatter(formatter.env, formatter.context).format(txt, out)
|
||||
return Markup(out.getvalue())
|
||||
|
@ -18,7 +18,7 @@
|
||||
<p>
|
||||
<a style="border: 0px" href="$path">
|
||||
<img width="50" height="50" style="border:1px red solid" src="${href.chrome('/dl/images/%s_logo.png'%(name,))}" /> $installer_name
|
||||
</a> (Version: $version)
|
||||
</a> (Version: $version [wiki:Changelog Change log])
|
||||
</p>
|
||||
While you wait for the download to complete, please consider donating to support the development
|
||||
of ${app}.
|
||||
|
@ -14,6 +14,7 @@
|
||||
|
||||
<div id="content" class="download">
|
||||
<h1><img src="${href.chrome('/dl/images/%s_logo.png'%(distro.img,))}" valign="middle" width="60" height="80"/> $title</h1>
|
||||
See the [wiki:Changelog Change log] for the latest version.
|
||||
<div py:if="not distro.is_generic">
|
||||
First verify that you have a sufficiently new installation of python
|
||||
<pre class="wiki">python --version</pre> should return at least 2.5.1<br />
|
||||
|
Loading…
x
Reference in New Issue
Block a user