/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/mkdir.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/mkdir.py
27
27
 
28
28
import bzrlib.errors as errors
29
29
 
 
30
from bzrlib.plugins.gtk import _i18n
30
31
from bzrlib.plugins.gtk.dialog import error_dialog, warning_dialog
31
32
from guifiles import GLADEFILENAME
32
33
 
64
65
        dirname = entry.get_text()
65
66
        
66
67
        if dirname == "":
67
 
            error_dialog(_('No directory name given'),
68
 
                         _('Please specify a desired name for the new directory.'))
 
68
            error_dialog(_i18n('No directory name given'),
 
69
                         _i18n('Please specify a desired name for the new directory.'))
69
70
            return
70
71
        
71
72
        if checkbox.get_active():
76
77
                self.wt.add([os.path.join(self.wtpath, dirname)])
77
78
            except OSError, e:
78
79
                if e.errno == 17:
79
 
                    error_dialog(_('Directory already exists'),
80
 
                                 _('Please specify another name to continue.'))
 
80
                    error_dialog(_i18n('Directory already exists'),
 
81
                                 _i18n('Please specify another name to continue.'))
81
82
                else:
82
83
                    raise
83
84
        else:
86
87
                os.mkdir(os.path.join(self.wt.basedir, self.wtpath, dirname))
87
88
            except OSError, e:
88
89
                if e.errno == 17:
89
 
                    error_dialog(_('Directory already exists'),
90
 
                                 _('Please specify another name to continue.'))
 
90
                    error_dialog(_i18n('Directory already exists'),
 
91
                                 _i18n('Please specify another name to continue.'))
91
92
                    return
92
93
 
93
94
        self.close()