/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-05-05 18:16:46 UTC
  • mto: (487.1.1 gtk)
  • mto: This revision was merged to the branch mainline in revision 490.
  • Revision ID: v.ladeuil+lp@free.fr-20080505181646-n95l8ltw2u6jtr26
Fix bug #187283 fix replacing _() by _i18n().

* genpot.sh 
Remove duplication. Add the ability to specify the genrated pot
file on command-line for debugging purposes.

* po/olive-gtk.pot:
Regenerated.

* __init__.py, branch.py, branchview/treeview.py, checkout.py,
commit.py, conflicts.py, diff.py, errors.py, initialize.py,
merge.py, nautilus-bzr.py, olive/__init__.py, olive/add.py,
olive/bookmark.py, olive/guifiles.py, olive/info.py,
olive/menu.py, olive/mkdir.py, olive/move.py, olive/remove.py,
olive/rename.py, push.py, revbrowser.py, status.py, tags.py:
Replace all calls to _() by calls to _i18n(), the latter being
defined in __init__.py and imported in the other modules from
there. This fix the problem encountered countless times when
running bzr selftest and getting silly error messages about
boolean not being callables.

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 dialog import error_dialog
 
31
from errors import show_bzr_error
 
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:
59
61
        
60
62
        self.window.show_all()
61
63
 
 
64
    @show_bzr_error
62
65
    def rename(self, widget):
63
66
        # Get entry
64
67
        old_filename = self.selected
65
68
        new_filename = self.entry.get_text()
66
69
            
67
70
        if old_filename is None:
68
 
            error_dialog(_('No file was selected'),
69
 
                         _('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.'))
70
73
            return
71
74
        
72
75
        if new_filename == "":
73
 
            error_dialog(_('Filename not given'),
74
 
                         _('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.'))
75
78
            return
76
79
        
77
80
        source = os.path.join(self.wtpath, old_filename)
78
81
        destination = os.path.join(self.wtpath, new_filename)
79
82
        
80
83
        # Rename the file
81
 
        try:
82
 
            wt1, path1 = WorkingTree.open_containing(self.wt.abspath(source))
83
 
            wt2, path2 = WorkingTree.open_containing(self.wt.abspath(source))
 
84
        wt1, path1 = WorkingTree.open_containing(self.wt.abspath(source))
 
85
        wt2, path2 = WorkingTree.open_containing(self.wt.abspath(source))
84
86
 
85
 
            if wt1.basedir != wt2.basedir:
86
 
                error_dialog(_('Not the same branch'),
87
 
                             _('The destination is not in the same branch.'))
88
 
                return
89
 
            wt1.rename_one(source, destination)
90
 
        except errors.NotBranchError:
91
 
            error_dialog(_('File is not in a branch'),
92
 
                         _('The selected file is not in a branch.'))
 
87
        if wt1.basedir != wt2.basedir:
 
88
            error_dialog(_i18n('Not the same branch'),
 
89
                         _i18n('The destination is not in the same branch.'))
93
90
            return
94
 
        except errors.BzrError, msg:
95
 
            error_dialog(_('Unknown bzr error'), str(msg))
96
 
 
 
91
        wt1.rename_one(source, destination)
97
92
        self.close()
98
93
    
99
94
    def close(self, widget=None):