/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/send.py

  • Committer: Jonathan Riddell
  • Date: 2011-09-16 10:08:09 UTC
  • mto: This revision was merged to the branch mainline in revision 6145.
  • Revision ID: jriddell@canonical.com-20110916100809-uii7a1h5tp8qguhy
add gettext to progress bar strings

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/send.py
25
25
    registry,
26
26
    trace,
27
27
    )
 
28
from bzrlib.i18n import gettext
28
29
from bzrlib.branch import (
29
30
    Branch,
30
31
    )
63
64
            submit_branch = stored_submit_branch
64
65
            remembered_submit_branch = "submit"
65
66
        else:
66
 
            if stored_submit_branch is None or remember:
 
67
            # Remembers if asked explicitly or no previous location is set
 
68
            if remember or (remember is None and stored_submit_branch is None):
67
69
                branch.set_submit_branch(submit_branch)
68
70
        if submit_branch is None:
69
71
            submit_branch = branch.get_parent()
72
74
            raise errors.BzrCommandError('No submit branch known or'
73
75
                                         ' specified')
74
76
        if remembered_submit_branch is not None:
75
 
            trace.note('Using saved %s location "%s" to determine what '
76
 
                       'changes to submit.', remembered_submit_branch,
 
77
            trace.note(gettext('Using saved %s location "%s" to determine what '
 
78
                       'changes to submit.'), remembered_submit_branch,
77
79
                       submit_branch)
78
80
 
79
81
        if mail_to is None or format is None:
95
97
        stored_public_branch = branch.get_public_branch()
96
98
        if public_branch is None:
97
99
            public_branch = stored_public_branch
98
 
        elif stored_public_branch is None or remember:
 
100
        # Remembers if asked explicitly or no previous location is set
 
101
        elif (remember
 
102
              or (remember is None and stored_public_branch is None)):
99
103
            branch.set_public_branch(public_branch)
100
104
        if no_bundle and public_branch is None:
101
105
            raise errors.BzrCommandError('No public branch specified or'