Mercurial > public > mercurial-scm > hg-stable
diff mercurial/obsutil.py @ 35609:c026547454dd
visibility: make the filtered message translatable
Introduce a filtered message table to ease translation of these messages.
Differential Revision: https://phab.mercurial-scm.org/D1852
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Fri, 12 Jan 2018 11:10:18 +0000 |
parents | 265cd9e19d26 |
children | 22c42bfbe7ab |
line wrap: on
line diff
--- a/mercurial/obsutil.py Fri Jan 12 11:09:04 2018 +0000 +++ b/mercurial/obsutil.py Fri Jan 12 11:10:18 2018 +0000 @@ -865,7 +865,17 @@ return "".join(line) -def _getfilteredreason(unfilteredrepo, ctx): + +filteredmsgtable = { + "pruned": _("hidden revision '%s' is pruned"), + "diverged": _("hidden revision '%s' has diverged"), + "superseded": _("hidden revision '%s' was rewritten as: %s"), + "superseded_split": _("hidden revision '%s' was split as: %s"), + "superseded_split_several": _("hidden revision '%s' was split as: %s and " + "%d more"), +} + +def _getfilteredreason(unfilteredrepo, changeid, ctx): """return a human-friendly string on why a obsolete changeset is hidden """ successors = successorssets(unfilteredrepo, ctx.node()) @@ -873,11 +883,12 @@ # Be more precise in case the revision is superseded if fate == 'pruned': - reason = _('is pruned') + return filteredmsgtable['pruned'] % changeid elif fate == 'diverged': - reason = _('has diverged') + return filteredmsgtable['diverged'] % changeid elif fate == 'superseded': - reason = _("was rewritten as: %s") % nodemod.short(successors[0][0]) + single_successor = nodemod.short(successors[0][0]) + return filteredmsgtable['superseded'] % (changeid, single_successor) elif fate == 'superseded_split': succs = [] @@ -885,13 +896,11 @@ succs.append(nodemod.short(node_id)) if len(succs) <= 2: - reason = _("was split as: %s") % ", ".join(succs) + fmtsuccs = ', '.join(succs) + return filteredmsgtable['superseded_split'] % (changeid, fmtsuccs) else: - firstsuccessors = ", ".join(succs[:2]) + firstsuccessors = ', '.join(succs[:2]) remainingnumber = len(succs) - 2 - args = (firstsuccessors, remainingnumber) - successorsmsg = _("%s and %d more") % args - reason = _("was split as: %s") % successorsmsg - - return reason + args = (changeid, firstsuccessors, remainingnumber) + return filteredmsgtable['superseded_split_several'] % args