General group marked for translation. pending: Transports and not in the roster

This commit is contained in:
Nikos Kouremenos 2005-07-04 23:18:29 +00:00
parent 5e8000419a
commit 192ccf2075
3 changed files with 5 additions and 5 deletions

View file

@ -300,7 +300,7 @@ class Connection:
self.dispatch('SUBSCRIBED', (jid.getStripped().encode('utf8'), self.dispatch('SUBSCRIBED', (jid.getStripped().encode('utf8'),
jid.getResource().encode('utf8'))) jid.getResource().encode('utf8')))
self.dispatch('UPDUSER', (jid.getStripped().encode('utf8'), self.dispatch('UPDUSER', (jid.getStripped().encode('utf8'),
jid.getNode(), ['General'])) jid.getNode(), [_('General')]))
#BE CAREFUL : no con.updateRosterItem() in a callback #BE CAREFUL : no con.updateRosterItem() in a callback
gajim.log.debug('we are now subscribed to %s' % who) gajim.log.debug('we are now subscribed to %s' % who)
elif ptype == 'unsubscribe': elif ptype == 'unsubscribe':

View file

@ -440,7 +440,7 @@ class Interface:
if 'not in the roster' in u.groups: if 'not in the roster' in u.groups:
u.groups.remove('not in the roster') u.groups.remove('not in the roster')
if len(u.groups) == 0: if len(u.groups) == 0:
u.groups = ['General'] u.groups = [_('General')]
self.roster.add_user_to_roster(u.jid, account) self.roster.add_user_to_roster(u.jid, account)
gajim.connections[account].update_user(u.jid, u.name, u.groups) gajim.connections[account].update_user(u.jid, u.name, u.groups)
else: else:
@ -450,7 +450,7 @@ class Interface:
if jid in attached_keys: if jid in attached_keys:
keyID = attached_keys[attached_keys.index(jid) + 1] keyID = attached_keys[attached_keys.index(jid) + 1]
user1 = Contact(jid = jid, name = jid.split('@')[0], user1 = Contact(jid = jid, name = jid.split('@')[0],
groups = ['General'], show = 'online', status = 'online', groups = [_('General')], show = 'online', status = 'online',
ask = 'to', resource = array[1], keyID = keyID) ask = 'to', resource = array[1], keyID = keyID)
self.roster.contacts[account][jid] = [user1] self.roster.contacts[account][jid] = [user1]
self.roster.add_user_to_roster(jid, account) self.roster.add_user_to_roster(jid, account)

View file

@ -120,7 +120,7 @@ class RosterWindow:
if user.jid.find('@') <= 0: # if not '@' or '@' starts the jid ==> agent if user.jid.find('@') <= 0: # if not '@' or '@' starts the jid ==> agent
user.groups = ['Transports'] user.groups = ['Transports']
elif user.groups == []: elif user.groups == []:
user.groups.append('General') user.groups.append(_('General'))
if (user.show == 'offline' or user.show == 'error') and \ if (user.show == 'offline' or user.show == 'error') and \
not showOffline and (not 'Transports' in user.groups or \ not showOffline and (not 'Transports' in user.groups or \
@ -803,7 +803,7 @@ class RosterWindow:
pseudo = jid pseudo = jid
gajim.connections[account].request_subscription(jid, txt) gajim.connections[account].request_subscription(jid, txt)
if not group: if not group:
group = 'General' group = _('General')
if not self.contacts[account].has_key(jid): if not self.contacts[account].has_key(jid):
keyID = '' keyID = ''
attached_keys = gajim.config.get_per('accounts', account, attached_keys = gajim.config.get_per('accounts', account,