/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 errors.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:
errors.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
 
from bzrlib import errors
18
 
from bzrlib.plugins.gtk.dialog import (
19
 
    error_dialog,
20
 
    info_dialog,
21
 
    )
22
 
from bzrlib.plugins.gtk.i18n import _i18n
 
17
import bzrlib.errors as errors
 
18
from bzrlib.plugins.gtk import _i18n
 
19
from dialog import error_dialog
23
20
 
24
21
 
25
22
def show_bzr_error(unbound):
36
33
        except errors.PointlessCommit:
37
34
            error_dialog(_i18n('No changes to commit'),
38
35
                         _i18n('Try force commit if you want to commit anyway.'))
39
 
        except errors.PointlessMerge:
40
 
            info_dialog(_i18n('No changes to merge'),
41
 
                         _i18n('Merge location is already fully merged in working tree.'))
42
36
        except errors.ConflictsInTree:
43
37
            error_dialog(_i18n('Conflicts in tree'),
44
38
                         _i18n('You need to resolve the conflicts before committing.'))