/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 16:04:32 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-20080505160432-hrhie62i03vcu3cw
Fix genpot.sh and prepare for bug #187283 fixing.

* po/olive-gtk.pot: 
Regenerated so that we can test for regressions in the "'_'
replaced by '_i18n'" modification.

* genpot.sh: 
Handle all python files.

* olive/__init__.py:
Delete coding line. It looks like an emacs coding line, it smells
like an emacs coding line, but emacs doesn't like it and it's
useless anyway.

Show diffs side-by-side

added added

removed removed

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