/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 checkout.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:
checkout.py
24
24
 
25
25
import gtk
26
26
 
 
27
from bzrlib.plugins.gtk import _i18n
27
28
from errors import show_bzr_error
28
29
 
29
30
from bzrlib.branch import Branch
47
48
        self.path = path
48
49
        
49
50
        # Create the widgets
50
 
        self._button_checkout = gtk.Button(_("Check_out"), use_underline=True)
 
51
        self._button_checkout = gtk.Button(_i18n("Check_out"), use_underline=True)
51
52
        self._button_revision = gtk.Button('')
52
53
        self._image_browse = gtk.Image()
53
 
        self._filechooser = gtk.FileChooserButton(_("Please select a folder"))
 
54
        self._filechooser = gtk.FileChooserButton(_i18n("Please select a folder"))
54
55
        self._combo = gtk.ComboBoxEntry()
55
 
        self._label_location = gtk.Label(_("Branch location:"))
56
 
        self._label_destination = gtk.Label(_("Destination:"))
57
 
        self._label_nick = gtk.Label(_("Branck nick:"))
58
 
        self._label_revision = gtk.Label(_("Revision:"))
 
56
        self._label_location = gtk.Label(_i18n("Branch location:"))
 
57
        self._label_destination = gtk.Label(_i18n("Destination:"))
 
58
        self._label_nick = gtk.Label(_i18n("Branck nick:"))
 
59
        self._label_revision = gtk.Label(_i18n("Revision:"))
59
60
        self._hbox_revision = gtk.HBox()
60
61
        self._entry_revision = gtk.Entry()
61
62
        self._entry_nick = gtk.Entry()
62
 
        self._check_lightweight = gtk.CheckButton(_("_Lightweight checkout"),
 
63
        self._check_lightweight = gtk.CheckButton(_i18n("_Lightweight checkout"),
63
64
                                                  use_underline=True)
64
65
        
65
66
        # Set callbacks
160
161
        """ Checkout button clicked handler. """
161
162
        location = self._combo.get_child().get_text()
162
163
        if location is '':
163
 
            error_dialog(_('Missing branch location'),
164
 
                         _('You must specify a branch location.'))
 
164
            error_dialog(_i18n('Missing branch location'),
 
165
                         _i18n('You must specify a branch location.'))
165
166
            return
166
167
        
167
168
        destination = self._filechooser.get_filename()
192
193
        """ We try to get the last revision if focus lost. """
193
194
        rev = self._get_last_revno()
194
195
        if rev is None:
195
 
            self._entry_revision.set_text(_('N/A'))
 
196
            self._entry_revision.set_text(_i18n('N/A'))
196
197
            self._button_revision.set_sensitive(False)
197
198
        else:
198
199
            self._entry_revision.set_text(str(rev))