/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/guifiles.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/guifiles.py
12
12
# along with this program; if not, write to the Free Software
13
13
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
14
14
 
15
 
"""cmenu.ui path"""
 
15
"""Glade file name"""
16
16
 
17
17
import os
18
18
import sys
19
19
 
20
20
from bzrlib.plugins.gtk import _i18n
21
21
 
22
 
UIFILENAMES = ["/usr/share/olive/cmenu.ui",
23
 
                  "/usr/local/share/olive/cmenu.ui",
24
 
                  "/opt/share/olive/cmenu.ui",
25
 
                  "/opt/local/share/olive/cmenu.ui",
26
 
                  "~/share/olive/cmenu.ui",
 
22
GLADEFILENAMES = ["/usr/share/olive/olive.glade",
 
23
                  "/usr/local/share/olive/olive.glade",
 
24
                  "/opt/share/olive/olive.glade",
 
25
                  "/opt/local/share/olive/olive.glade",
 
26
                  "~/share/olive/olive.glade",
27
27
                 ]
28
28
 
29
29
# Get the glade file name
30
30
if sys.platform == 'win32':
31
 
    UIFILENAMES = [os.path.join(os.path.dirname(sys.executable),
32
 
                                   "share/olive/cmenu.ui")]
 
31
    GLADEFILENAMES = [os.path.join(os.path.dirname(sys.executable),
 
32
                                   "share/olive/olive.glade")]
33
33
 
34
34
dir_ = os.path.split(os.path.dirname(__file__))[0]
35
35
# Check first if we are running from source
36
 
UIFILENAMES.insert(0, os.path.join(dir_, "cmenu.ui"))
37
 
 
38
 
UIFILENAME = None
39
 
 
40
 
for path in UIFILENAMES:
 
36
GLADEFILENAMES.insert(0, os.path.join(dir_, "olive.glade"))
 
37
 
 
38
GLADEFILENAME = None
 
39
 
 
40
for path in GLADEFILENAMES:
41
41
    path = os.path.expanduser(path)
42
42
    if os.path.isfile(path):
43
 
        UIFILENAME = path
 
43
        GLADEFILENAME = path
44
44
        break
45
45
 
46
 
if UIFILENAME is None:
47
 
    # Fail
48
 
    print _i18n('Context menu file (cmenu.ui) cannot be found.')
49
 
    sys.exit(1)
 
46
if GLADEFILENAME is None:
 
47
    # Fail
 
48
    print _i18n('Glade file cannot be found.')
 
49
    sys.exit(1)
 
50
 
 
51
UIFILEDIR = os.path.dirname(GLADEFILENAME)
 
52
 
 
53
# Get the cmenu.ui file name
 
54
UIFILENAME = os.path.join(UIFILEDIR, 'cmenu.ui')
 
55
 
 
56
if not os.path.isfile(UIFILENAME):
 
57
    # Fail
 
58
    print _i18n('UI description file cannot be found.')
 
59
    sys.exit(1)
 
60
 
 
61