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