/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
69
69
                             _i18n('Please select a file from the list,\nor choose the other option.'))
70
70
                return
71
71
            
 
72
            fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
 
73
            
72
74
            try:
73
 
                self.wt.add([filename])
 
75
                bzrlib.add.smart_add([fullpath])
74
76
            except errors.NotBranchError:
75
77
                error_dialog(_i18n('Directory is not a branch'),
76
78
                             _i18n('You can perform this action only in a branch.'))
77
79
                return
78
80
        elif radio_unknown.get_active():
79
81
            # Add unknown files recursively
 
82
            fullpath = self.wt.abspath(self.wtpath)
 
83
            
80
84
            try:
81
 
                self.wt.add(self.wt.unknowns())
 
85
                bzrlib.add.smart_add([fullpath], True)
82
86
            except errors.NotBranchError:
83
87
                error_dialog(_i18n('Directory is not a branch'),
84
88
                             _i18n('You can perform this action only in a branch.'))