merge with default

This commit is contained in:
Yann Leboulanger 2010-04-26 17:47:49 +02:00
commit 3d6f65defb
3 changed files with 1161 additions and 2166 deletions

979
po/ru.po

File diff suppressed because it is too large Load Diff

2344
po/uk.po

File diff suppressed because it is too large Load Diff

View File

@ -2243,10 +2243,10 @@ class JoinGroupchatWindow:
else:
if widget in self._empty_required_widgets:
self._empty_required_widgets.remove(widget)
if len(self._empty_required_widgets) == 0 and self.account:
if not self._empty_required_widgets and self.account:
self.xml.get_object('join_button').set_sensitive(True)
text = self._room_jid_entry.get_text()
if widget == self._room_jid_entry and text.find('@') > -1:
if widget == self._room_jid_entry and '@' in text:
# Don't allow @ char in room entry
room_jid, server = text.split('@', 1)
self._room_jid_entry.set_text(room_jid)