From 6c41d9ecd49172021e908238c72acfafe3da6810 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Wed, 22 Oct 2008 17:31:45 +0000
Subject: [PATCH] show a link to wiki to restore malformed database. see #4428
---
src/common/connection_handlers.py | 14 ++++++++------
src/gajim.py | 2 +-
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index c235cc5242..c06e6a7473 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -1840,8 +1840,8 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
except exceptions.DatabaseMalformed:
pritext = _('Database Error')
sectext = _('The database file (%s) cannot be read. Try to repair '
- 'it or remove it (all history will be lost).') % \
- common.logger.LOG_DB_PATH
+ 'it (see http://trac.gajim.org/wiki/DatabaseBackup) or remove '
+ 'it (all history will be lost).') % common.logger.LOG_DB_PATH
self.dispatch('ERROR', (pritext, sectext))
self.dispatch('MSGERROR', (frm, msg.getErrorCode(), error_msg, msgtxt,
tim, session))
@@ -1886,8 +1886,8 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
except exceptions.DatabaseMalformed:
pritext = _('Database Error')
sectext = _('The database file (%s) cannot be read. Try to repair '
- 'it or remove it (all history will be lost).') % \
- common.logger.LOG_DB_PATH
+ 'it (see http://trac.gajim.org/wiki/DatabaseBackup) or remove '
+ 'it (all history will be lost).') % common.logger.LOG_DB_PATH
self.dispatch('ERROR', (pritext, sectext))
def dispatch_invite_message(self, invite, frm):
@@ -2074,7 +2074,8 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
except exceptions.DatabaseMalformed:
pritext = _('Database Error')
sectext = _('The database file (%s) cannot be read. Try to '
- 'repair it or remove it (all history will be lost).') % \
+ 'repair it (see http://trac.gajim.org/wiki/DatabaseBackup)'
+ ' or remove it (all history will be lost).') % \
common.logger.LOG_DB_PATH
self.dispatch('ERROR', (pritext, sectext))
if avatar_sha or avatar_sha == '':
@@ -2199,7 +2200,8 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
except exceptions.DatabaseMalformed:
pritext = _('Database Error')
sectext = _('The database file (%s) cannot be read. Try to '
- 'repair it or remove it (all history will be lost).') % \
+ 'repair it (see http://trac.gajim.org/wiki/DatabaseBackup) '
+ 'or remove it (all history will be lost).') % \
common.logger.LOG_DB_PATH
self.dispatch('ERROR', (pritext, sectext))
our_jid = gajim.get_jid_from_account(self.name)
diff --git a/src/gajim.py b/src/gajim.py
index 76b115825d..fda7881c88 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -168,7 +168,7 @@ try:
from common import gajim
except exceptions.DatabaseMalformed:
pritext = _('Database Error')
- sectext = _('The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost).') % common.logger.LOG_DB_PATH
+ sectext = _('The database file (%s) cannot be read. Try to repair it (see http://trac.gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost).') % common.logger.LOG_DB_PATH
else:
from common import dbus_support
if dbus_support.supported:
--
GitLab