← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

(jr) Add gettext() to uses of note() (Jonathan Riddell)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
55
55
    do_catching_redirections,
56
56
    local,
57
57
    )
 
58
from bzrlib.i18n import gettext
58
59
""")
59
60
 
60
61
from bzrlib.trace import (
632
633
            old_path = self.root_transport.abspath('.bzr')
633
634
            backup_dir = self._available_backup_name('backup.bzr')
634
635
            new_path = self.root_transport.abspath(backup_dir)
635
 
            ui.ui_factory.note('making backup of %s\n  to %s' % (
 
636
            ui.ui_factory.note(gettext('making backup of %s\n  to %s') % (
636
637
                urlutils.unescape_for_display(old_path, 'utf-8'),
637
638
                urlutils.unescape_for_display(new_path, 'utf-8')))
638
639
            self.root_transport.copy_tree('.bzr', backup_dir)
655
656
            try:
656
657
                to_path = '.bzr.retired.%d' % i
657
658
                self.root_transport.rename('.bzr', to_path)
658
 
                note("renamed %s to %s"
659
 
                    % (self.root_transport.abspath('.bzr'), to_path))
 
659
                note(gettext("renamed {0} to {1}").format(
 
660
                    self.root_transport.abspath('.bzr'), to_path))
660
661
                return
661
662
            except (errors.TransportError, IOError, errors.PathError):
662
663
                i += 1
847
848
            redirected_transport = transport._redirected_to(e.source, e.target)
848
849
            if redirected_transport is None:
849
850
                raise errors.NotBranchError(base)
850
 
            note('%s is%s redirected to %s',
851
 
                 transport.base, e.permanently, redirected_transport.base)
 
851
            note(gettext('{0} is{1} redirected to {2}').format(
 
852
                 transport.base, e.permanently, redirected_transport.base))
852
853
            return redirected_transport
853
854
 
854
855
        try:
1723
1724
                    new_repo_format = None
1724
1725
            if new_repo_format is not None:
1725
1726
                self.repository_format = new_repo_format
1726
 
                note('Source repository format does not support stacking,'
1727
 
                     ' using format:\n  %s',
 
1727
                note(gettext('Source repository format does not support stacking,'
 
1728
                     ' using format:\n  %s'),
1728
1729
                     new_repo_format.get_format_description())
1729
1730
 
1730
1731
        if not self.get_branch_format().supports_stacking():
1743
1744
            if new_branch_format is not None:
1744
1745
                # Does support stacking, use its format.
1745
1746
                self.set_branch_format(new_branch_format)
1746
 
                note('Source branch format does not support stacking,'
1747
 
                     ' using format:\n  %s',
 
1747
                note(gettext('Source branch format does not support stacking,'
 
1748
                     ' using format:\n  %s'),
1748
1749
                     new_branch_format.get_format_description())
1749
1750
 
1750
1751
    def get_converter(self, format=None):
1854
1855
        else:
1855
1856
            if not isinstance(repo._format, self.target_format.repository_format.__class__):
1856
1857
                from bzrlib.repository import CopyConverter
1857
 
                ui.ui_factory.note('starting repository conversion')
 
1858
                ui.ui_factory.note(gettext('starting repository conversion'))
1858
1859
                converter = CopyConverter(self.target_format.repository_format)
1859
1860
                converter.convert(repo, pb)
1860
1861
        for branch in self.bzrdir.list_branches():