/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to olive/move.py

  • Committer: Jelmer Vernooij
  • Date: 2008-06-29 19:18:34 UTC
  • mto: This revision was merged to the branch mainline in revision 515.
  • Revision ID: jelmer@samba.org-20080629191834-ha2ecpv5szt96nge
Make sure signed testament matches repository data.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/move.py
29
29
import bzrlib.errors as errors
30
30
from bzrlib.workingtree import WorkingTree
31
31
 
 
32
from bzrlib.plugins.gtk import _i18n
32
33
from bzrlib.plugins.gtk.dialog import error_dialog
33
34
from errors import show_bzr_error
34
35
from guifiles import GLADEFILENAME
76
77
        filename = self.selected
77
78
            
78
79
        if filename is None:
79
 
            error_dialog(_('No file was selected'),
80
 
                         _('Please select a file from the list to proceed.'))
 
80
            error_dialog(_i18n('No file was selected'),
 
81
                         _i18n('Please select a file from the list to proceed.'))
81
82
            return
82
83
        
83
84
        source = os.path.join(self.wtpath, filename)
86
87
        wt1, path1 = WorkingTree.open_containing(self.wt.abspath(source))
87
88
        wt2, path2 = WorkingTree.open_containing(destination)
88
89
        if wt1.basedir != wt2.basedir:
89
 
            error_dialog(_('Not the same branch'),
90
 
                         _('The destination is not in the same branch.'))
 
90
            error_dialog(_i18n('Not the same branch'),
 
91
                         _i18n('The destination is not in the same branch.'))
91
92
            return
92
93
 
93
94
        wt1.move([source], wt1.relpath(destination))