/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-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/send.py
63
63
            submit_branch = stored_submit_branch
64
64
            remembered_submit_branch = "submit"
65
65
        else:
66
 
            if stored_submit_branch is None or remember:
 
66
            # Remembers if asked explicitly or no previous location is set
 
67
            if remember or (remember is None and stored_submit_branch is None):
67
68
                branch.set_submit_branch(submit_branch)
68
69
        if submit_branch is None:
69
70
            submit_branch = branch.get_parent()
72
73
            raise errors.BzrCommandError('No submit branch known or'
73
74
                                         ' specified')
74
75
        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,
 
76
            trace.note(gettext('Using saved %s location "%s" to determine what '
 
77
                       'changes to submit.'), remembered_submit_branch,
77
78
                       submit_branch)
78
79
 
79
80
        if mail_to is None or format is None:
95
96
        stored_public_branch = branch.get_public_branch()
96
97
        if public_branch is None:
97
98
            public_branch = stored_public_branch
98
 
        elif stored_public_branch is None or remember:
 
99
        # Remembers if asked explicitly or no previous location is set
 
100
        elif (remember
 
101
              or (remember is None and stored_public_branch is None)):
99
102
            branch.set_public_branch(public_branch)
100
103
        if no_bundle and public_branch is None:
101
104
            raise errors.BzrCommandError('No public branch specified or'