← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: Jonathan Riddell
  • Date: 2011-09-15 11:31:47 UTC
  • mto: This revision was merged to the branch mainline in revision 6143.
  • Revision ID: jriddell@canonical.com-20110915113147-bgleett47i4jjxya
add gettext() to uses of trace.note()

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
32
32
    transform,
33
33
    workingtree,
34
34
    )
 
35
from bzrlib.i18n import gettext, ngettext
35
36
""")
36
37
from bzrlib import (
37
38
    commands,
145
146
            if file_list is None:
146
147
                un_resolved, resolved = tree.auto_resolve()
147
148
                if len(un_resolved) > 0:
148
 
                    trace.note('%d conflict(s) auto-resolved.', len(resolved))
149
 
                    trace.note('Remaining conflicts:')
 
149
                    trace.note(gettext('%d conflict(s) auto-resolved.'), len(resolved))
 
150
                    trace.note(gettext('Remaining conflicts:'))
150
151
                    for conflict in un_resolved:
151
152
                        trace.note(unicode(conflict))
152
153
                    return 1
153
154
                else:
154
 
                    trace.note('All conflicts resolved.')
 
155
                    trace.note(gettext('All conflicts resolved.'))
155
156
                    return 0
156
157
            else:
157
158
                # FIXME: This can never occur but the block above needs some
160
161
                pass
161
162
        else:
162
163
            before, after = resolve(tree, file_list, action=action)
163
 
            trace.note('%d conflict(s) resolved, %d remaining'
164
 
                       % (before - after, after))
 
164
            trace.note(ngettext('{0} conflict resolved, {1} remaining',
 
165
                                '{0} conflicts resolved, {1} remaining',
 
166
                                before-after).format(before - after, after))
165
167
 
166
168
 
167
169
def resolve(tree, paths=None, ignore_misses=False, recursive=False,