# HG changeset patch # User Yuki KODAMA <[email protected]> # Date 1244205551 -32400 # Node ID 5b460e464f818cce752ece945081ca696939baec # Parent c21176c29016e2f9c1c02065b41c67e8b40ab22c merge: add gettext wrappers
diff --git a/hggtk/merge.py b/hggtk/merge.py
--- a/hggtk/merge.py
+++ b/hggtk/merge.py
@@ -101,17 +101,19 @@
summary = ctx.description().replace('\0', '')
summary = summary.split('\n')[0]
escape = gobject.markup_escape_text
- desc = '<b>rev</b>\t\t: %s\n' % escape(revstr)
- desc += '<b>summary</b>\t: %s\n' % escape(summary[:80])
- desc += '<b>user</b>\t\t: %s\n' % escape(ctx.user())
- desc += '<b>date</b>\t\t: %s\n' % escape(hglib.displaytime(ctx.date()))
+ desc = '<b>' + _('rev') + '</b>\t\t: %s\n' % escape(revstr)
+ desc += '<b>' + _('summary') + '</b>\t: %s\n' % escape(summary[:80])
+ desc += '<b>' + _('user') + '</b>\t\t: %s\n' % escape(ctx.user())
+ desc += '<b>' + _('date') + '</b>\t\t: %s\n' \
+ % escape(hglib.displaytime(ctx.date()))
node = repo.lookup(revid)
tags = repo.nodetags(node)
- desc += '<b>branch</b>\t: ' + escape(ctx.branch())
+ desc += '<b>' + _('branch') + '</b>\t: ' + escape(ctx.branch())
if tags:
- desc += '\n<b>tags</b>\t\t: ' + escape(', '.join(tags))
+ desc += '\n<b>' + _('tags') + '</b>\t\t: ' \
+ + escape(', '.join(tags))
if node not in repo.heads():
- desc += '\n<b>Not a head revision!</b>'
+ desc += '\n<b>' + _('Not a head revision!') + '</b>'
return revstr, hglib.toutf(desc)
def set_notify_func(self, func, *args):
thg-crew-kuy_rev2701.patch
Description: Binary data
------------------------------------------------------------------------------ OpenSolaris 2009.06 is a cutting edge operating system for enterprises looking to deploy the next generation of Solaris that includes the latest innovations from Sun and the OpenSource community. Download a copy and enjoy capabilities such as Networking, Storage and Virtualization. Go to: http://p.sf.net/sfu/opensolaris-get
_______________________________________________ Tortoisehg-develop mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
