/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/rename.py

  • Committer: Vincent Ladeuil
  • Date: 2008-06-09 15:59:13 UTC
  • mto: This revision was merged to the branch mainline in revision 503.
  • Revision ID: v.ladeuil+lp@free.fr-20080609155913-ueadh6vzmn81wwuk
Fix test failing after a feature rename in bzr.

* tests/test_diff.py:
(TestDiffView.test_unicode):
bzrlib.tests.test_diff.UnicodeFilename has benn renamed
bzrlib.tests.UnicodeFilenameFeature in bzr.

* tests/test_commit.py:
(TestCommitDialog_Commit.test_commit_unicode_messages):
bzrlib.tests.test_diff.UnicodeFilename has benn renamed
bzrlib.tests.UnicodeFilenameFeature in bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/rename.py
28
28
import bzrlib.errors as errors
29
29
from bzrlib.workingtree import WorkingTree
30
30
 
 
31
from errors import show_bzr_error
31
32
from bzrlib.plugins.gtk.dialog import error_dialog
32
33
from guifiles import GLADEFILENAME
 
34
from bzrlib.plugins.gtk import _i18n
33
35
 
34
36
 
35
37
class OliveRename:
66
68
        new_filename = self.entry.get_text()
67
69
            
68
70
        if old_filename is None:
69
 
            error_dialog(_('No file was selected'),
70
 
                         _('Please select a file from the list to proceed.'))
 
71
            error_dialog(_i18n('No file was selected'),
 
72
                         _i18n('Please select a file from the list to proceed.'))
71
73
            return
72
74
        
73
75
        if new_filename == "":
74
 
            error_dialog(_('Filename not given'),
75
 
                         _('Please specify a new name for the file.'))
 
76
            error_dialog(_i18n('Filename not given'),
 
77
                         _i18n('Please specify a new name for the file.'))
76
78
            return
77
79
        
78
80
        source = os.path.join(self.wtpath, old_filename)
83
85
        wt2, path2 = WorkingTree.open_containing(self.wt.abspath(source))
84
86
 
85
87
        if wt1.basedir != wt2.basedir:
86
 
            error_dialog(_('Not the same branch'),
87
 
                         _('The destination is not in the same branch.'))
 
88
            error_dialog(_i18n('Not the same branch'),
 
89
                         _i18n('The destination is not in the same branch.'))
88
90
            return
89
91
        wt1.rename_one(source, destination)
90
92
        self.close()