/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/info.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/info.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
import sys
18
 
 
19
17
try:
20
18
    import pygtk
21
19
    pygtk.require("2.0")
22
20
except:
23
21
    pass
24
 
try:
25
 
    import gtk
26
 
    import gtk.glade
27
 
    import gobject
28
 
    import pango
29
 
except:
30
 
    sys.exit(1)
 
22
 
 
23
import gtk
 
24
import gtk.glade
31
25
 
32
26
import bzrlib.errors as errors
33
27
 
 
28
from bzrlib.plugins.gtk import _i18n
 
29
from bzrlib.plugins.gtk.dialog import error_dialog
 
30
from guifiles import GLADEFILENAME
 
31
 
 
32
 
34
33
def info(location):
35
34
    """ Get info about branch, working tree, and repository
36
35
    
81
80
    try:
82
81
        a_bzrdir = bzrdir.BzrDir.open_containing(location)[0]
83
82
    except errors.NotBranchError:
84
 
        raise NotBranchError(location)
 
83
        raise errors.NotBranchError(location)
85
84
 
86
85
    try:
87
86
        working = a_bzrdir.open_workingtree()
110
109
 
111
110
    try:
112
111
        branch = a_bzrdir.open_branch()
 
112
        repository = branch.repository
 
113
        control = a_bzrdir
113
114
        branch.lock_read()
114
115
        try:
115
116
            ret['location'] = info_helper.get_location_info(repository, branch)
144
145
 
145
146
class OliveInfo:
146
147
    """ Display Informations window and perform the needed actions. """
147
 
    def __init__(self, gladefile, comm, dialog):
 
148
    def __init__(self, branch):
148
149
        """ Initialize the Informations window. """
149
 
        self.gladefile = gladefile
150
 
        self.glade = gtk.glade.XML(self.gladefile, 'window_info', 'olive-gtk')
151
 
        
152
 
        # Communication object
153
 
        self.comm = comm
154
 
        # Dialog object
155
 
        self.dialog = dialog
 
150
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_info', 'olive-gtk')
156
151
        
157
152
        # Get the Informations window widget
158
153
        self.window = self.glade.get_widget('window_info')
160
155
        # Check if current location is a branch
161
156
        self.notbranch = False
162
157
        try:
163
 
            self.ret = info(self.comm.get_path())
 
158
            self.ret = info(branch.base)
164
159
        except errors.NotBranchError:
165
160
            self.notbranch = True
166
161
            return
559
554
    def display(self):
560
555
        """ Display the Informations window. """
561
556
        if self.notbranch:
562
 
            self.dialog.error_dialog(_('Directory is not a branch'),
563
 
                                     _('You can perform this action only in a branch.'))
 
557
            error_dialog(_i18n('Directory is not a branch'),
 
558
                         _i18n('You can perform this action only in a branch.'))
564
559
            self.close()
565
560
        else:
566
561
            self.window.show()