/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/remove.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/remove.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
            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))
76
77
            added = self.wt.changes_from(self.wt.basis_tree()).added
77
78
            file_list = sorted([f[0] for f in added], reverse=True)
78
79
            if len(file_list) == 0:
79
 
                warning_dialog(_('No matching files'),
80
 
                               _('No added files were found in the working tree.'))
 
80
                warning_dialog(_i18n('No matching files'),
 
81
                               _i18n('No added files were found in the working tree.'))
81
82
                return
82
83
            self.wt.remove(file_list)
83
84
        
102
103
        self.selected = selected
103
104
        
104
105
        # Create widgets
105
 
        self._label = gtk.Label(_("Which file(s) do you want to remove?"))
106
 
        self._radio_selected = gtk.RadioButton(None, _("Selected only"), False)
107
 
        self._radio_added = gtk.RadioButton(self._radio_selected, _("All files with status 'added'"), False)
108
 
        self._button_remove = gtk.Button(_("_Remove"), use_underline=True)
 
106
        self._label = gtk.Label(_i18n("Which file(s) do you want to remove?"))
 
107
        self._radio_selected = gtk.RadioButton(None, _i18n("Selected only"), False)
 
108
        self._radio_added = gtk.RadioButton(self._radio_selected, _i18n("All files with status 'added'"), False)
 
109
        self._button_remove = gtk.Button(_i18n("_Remove"), use_underline=True)
109
110
        
110
111
        self._button_remove.connect('clicked', self._on_remove_clicked)
111
112
        
126
127
            filename = self.selected
127
128
            
128
129
            if filename is None:
129
 
                error_dialog(_('No file was selected'),
130
 
                             _('Please select a file from the list,\nor choose the other option.'))
 
130
                error_dialog(_i18n('No file was selected'),
 
131
                             _i18n('Please select a file from the list,\nor choose the other option.'))
131
132
                return
132
133
            
133
134
            self.wt.remove(os.path.join(self.wtpath, filename))
136
137
            added = self.wt.changes_from(self.wt.basis_tree()).added
137
138
            file_list = sorted([f[0] for f in added], reverse=True)
138
139
            if len(file_list) == 0:
139
 
                warning_dialog(_('No matching files'),
140
 
                               _('No added files were found in the working tree.'))
 
140
                warning_dialog(_i18n('No matching files'),
 
141
                               _i18n('No added files were found in the working tree.'))
141
142
                return
142
143
            self.wt.remove(file_list)
143
144