Mercurial > kallithea
changeset 1178:f128465845c0 beta
merge with unicode fixes
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sun, 27 Mar 2011 01:34:37 +0100 |
parents | b3f48216e55e (current diff) 014c9a58a0d9 (diff) |
children | 79283d4b1bed |
files | |
diffstat | 4 files changed, 18 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/lib/helpers.py Sun Mar 27 01:34:14 2011 +0100 +++ b/rhodecode/lib/helpers.py Sun Mar 27 01:34:37 2011 +0100 @@ -36,7 +36,7 @@ from vcs.utils.annotate import annotate_highlight from rhodecode.lib.utils import repo_name_slug -from rhodecode.lib import str2bool +from rhodecode.lib import str2bool, safe_unicode def _reset(name, value=None, id=NotGiven, type="reset", **attrs): """ @@ -192,7 +192,7 @@ def __call__(self, repo_name, rev, paths): if isinstance(paths, str): - paths = paths.decode('utf-8', 'replace') + paths = safe_unicode(paths) url_l = [link_to(repo_name, url('files_home', repo_name=repo_name, revision=rev, f_path=''))] @@ -680,7 +680,7 @@ suf = '' if len(nodes) > 30: suf = '<br/>' + _(' and %s more') % (len(nodes) - 30) - return literal(pref + '<br/> '.join([x.path.decode('utf-8', 'replace') for x in nodes[:30]]) + suf) + return literal(pref + '<br/> '.join([safe_unicode(x.path) for x in nodes[:30]]) + suf) else: return ': ' + _('No Files')
--- a/rhodecode/templates/changeset/changeset.html Sun Mar 27 01:34:14 2011 +0100 +++ b/rhodecode/templates/changeset/changeset.html Sun Mar 27 01:34:37 2011 +0100 @@ -89,7 +89,7 @@ <span style="font-size:1.1em;font-weight: bold">${_('Files affected (%s)' % len(c.changeset.affected_files))}</span> <div class="cs_files"> %for change,filenode,diff,cs1,cs2 in c.changes: - <div class="cs_${change}">${h.link_to(filenode.path.decode('utf-8','replace'),h.url.current(anchor=h.repo_name_slug('C%s' % filenode.path.decode('utf-8','replace'))))}</div> + <div class="cs_${change}">${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=h.repo_name_slug('C%s' % h.safe_unicode(filenode.path))))}</div> %endfor % if c.cut_off: ${_('Changeset was to big and was cut off...')} @@ -103,19 +103,19 @@ %if change !='removed': <div style="clear:both;height:10px"></div> <div class="diffblock"> - <div id="${h.repo_name_slug('C%s' % filenode.path.decode('utf-8','replace'))}" class="code-header"> + <div id="${h.repo_name_slug('C%s' % h.safe_unicode(filenode.path))}" class="code-header"> <div class="changeset_header"> <span class="changeset_file"> - ${h.link_to_if(change!='removed',filenode.path.decode('utf-8','replace'),h.url('files_home',repo_name=c.repo_name, - revision=filenode.changeset.raw_id,f_path=filenode.path.decode('utf-8','replace')))} + ${h.link_to_if(change!='removed',h.safe_unicode(filenode.path),h.url('files_home',repo_name=c.repo_name, + revision=filenode.changeset.raw_id,f_path=h.safe_unicode(filenode.path)))} </span> %if 1: » <span>${h.link_to(_('diff'), - h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path.decode('utf-8','replace'),diff2=cs2,diff1=cs1,diff='diff'))}</span> + h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='diff'))}</span> » <span>${h.link_to(_('raw diff'), - h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path.decode('utf-8','replace'),diff2=cs2,diff1=cs1,diff='raw'))}</span> + h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='raw'))}</span> » <span>${h.link_to(_('download diff'), - h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path.decode('utf-8','replace'),diff2=cs2,diff1=cs1,diff='download'))}</span> + h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='download'))}</span> %endif </div> </div>
--- a/rhodecode/templates/changeset/changeset_range.html Sun Mar 27 01:34:14 2011 +0100 +++ b/rhodecode/templates/changeset/changeset_range.html Sun Mar 27 01:34:37 2011 +0100 @@ -54,7 +54,7 @@ %for cs in c.cs_ranges: <div class="cur_cs">r${cs}</div> %for change,filenode,diff,cs1,cs2 in c.changes[cs.raw_id]: - <div class="cs_${change}">${h.link_to(filenode.path.decode('utf-8','replace'),h.url.current(anchor=h.repo_name_slug('C%s-%s' % (cs.short_id,filenode.path.decode('utf-8','replace')))))}</div> + <div class="cs_${change}">${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=h.repo_name_slug('C%s-%s' % (cs.short_id,h.safe_unicode(filenode.path)))))}</div> %endfor %endfor </div> @@ -66,19 +66,19 @@ %if change !='removed': <div style="clear:both;height:10px"></div> <div class="diffblock"> - <div id="${h.repo_name_slug('C%s-%s' % (cs.short_id,filenode.path.decode('utf-8','replace')))}" class="code-header"> + <div id="${h.repo_name_slug('C%s-%s' % (cs.short_id,h.safe_unicode(filenode.path)))}" class="code-header"> <div class="changeset_header"> <span class="changeset_file"> - ${h.link_to_if(change!='removed',filenode.path.decode('utf-8','replace'),h.url('files_home',repo_name=c.repo_name, - revision=filenode.changeset.raw_id,f_path=filenode.path.decode('utf-8','replace')))} + ${h.link_to_if(change!='removed',h.safe_unicode(filenode.path,h.url('files_home',repo_name=c.repo_name, + revision=filenode.changeset.raw_id,f_path=h.safe_unicode(filenode.path)))} </span> %if 1: » <span>${h.link_to(_('diff'), - h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path.decode('utf-8','replace'),diff2=cs2,diff1=cs1,diff='diff'))}</span> + h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='diff'))}</span> » <span>${h.link_to(_('raw diff'), - h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path.decode('utf-8','replace'),diff2=cs2,diff1=cs1,diff='raw'))}</span> + h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='raw'))}</span> » <span>${h.link_to(_('download diff'), - h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path.decode('utf-8','replace'),diff2=cs2,diff1=cs1,diff='download'))}</span> + h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='download'))}</span> %endif </div> </div>
--- a/rhodecode/templates/files/files_browser.html Sun Mar 27 01:34:14 2011 +0100 +++ b/rhodecode/templates/files/files_browser.html Sun Mar 27 01:34:37 2011 +0100 @@ -66,7 +66,7 @@ %for cnt,node in enumerate(c.files_list): <tr class="parity${cnt%2}"> <td> - ${h.link_to(node.name,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=node.path.decode('utf-8','replace')),class_=file_class(node))} + ${h.link_to(node.name,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=h.safe_unicode(node.path)),class_=file_class(node))} </td> <td> %if node.is_file():