/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/add.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/add.py
28
28
import bzrlib.add
29
29
import bzrlib.errors as errors
30
30
 
 
31
from bzrlib.plugins.gtk import _i18n
31
32
from bzrlib.plugins.gtk.dialog import error_dialog
32
33
from guifiles import GLADEFILENAME
33
34
 
64
65
            filename = self.selected
65
66
            
66
67
            if filename is None:
67
 
                error_dialog(_('No file was selected'),
68
 
                             _('Please select a file from the list,\nor choose the other option.'))
 
68
                error_dialog(_i18n('No file was selected'),
 
69
                             _i18n('Please select a file from the list,\nor choose the other option.'))
69
70
                return
70
71
            
71
72
            fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
73
74
            try:
74
75
                bzrlib.add.smart_add([fullpath])
75
76
            except errors.NotBranchError:
76
 
                error_dialog(_('Directory is not a branch'),
77
 
                             _('You can perform this action only in a branch.'))
 
77
                error_dialog(_i18n('Directory is not a branch'),
 
78
                             _i18n('You can perform this action only in a branch.'))
78
79
                return
79
80
        elif radio_unknown.get_active():
80
81
            # Add unknown files recursively
83
84
            try:
84
85
                bzrlib.add.smart_add([fullpath], True)
85
86
            except errors.NotBranchError:
86
 
                error_dialog(_('Directory is not a branch'),
87
 
                             _('You can perform this action only in a branch.'))
 
87
                error_dialog(_i18n('Directory is not a branch'),
 
88
                             _i18n('You can perform this action only in a branch.'))
88
89
                return
89
90
        
90
91
        self.close()