# HG changeset patch # User Martin Geisler # Date 1286573029 -7200 # Node ID 3c31c0e42b11b103ba438653cd4164c150331297 # Parent 17f28de168a40583ba19a03851c74dcfa72c1fdb minirst: pull admonition titles out formatblock function diff -r 17f28de168a4 -r 3c31c0e42b11 mercurial/minirst.py --- a/mercurial/minirst.py Fri Oct 08 23:19:26 2010 +0200 +++ b/mercurial/minirst.py Fri Oct 08 23:23:49 2010 +0200 @@ -317,23 +317,23 @@ i = i + 1 return blocks +_admonitiontitles = {'attention': _('Attention:'), + 'caution': _('Caution:'), + 'danger': _('!Danger!') , + 'error': _('Error:'), + 'hint': _('Hint:'), + 'important': _('Important:'), + 'note': _('Note:'), + 'tip': _('Tip:'), + 'warning': _('Warning!')} + def formatblock(block, width): """Format a block according to width.""" if width <= 0: width = 78 indent = ' ' * block['indent'] if block['type'] == 'admonition': - titles = {'attention': _('Attention:'), - 'caution': _('Caution:'), - 'danger': _('!Danger!') , - 'error': _('Error:'), - 'hint': _('Hint:'), - 'important': _('Important:'), - 'note': _('Note:'), - 'tip': _('Tip:'), - 'warning': _('Warning!')} - - admonition = titles[block['admonitiontitle']] + admonition = _admonitiontitles[block['admonitiontitle']] hang = len(block['lines'][-1]) - len(block['lines'][-1].lstrip()) defindent = indent + hang * ' '