From faab65d9732147a2d20778f88170119a3b13c71e Mon Sep 17 00:00:00 2001
From: Nikos Kouremenos <kourem@gmail.com>
Date: Sat, 3 Sep 2005 16:30:01 +0000
Subject: [PATCH] fix passive voice. now translators can write more free
---
src/dialogs.py | 5 +++--
src/groupchat_window.py | 27 ++++++++++++++++++---------
2 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/src/dialogs.py b/src/dialogs.py
index 7ce09bfe52..2e0662bf39 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -1215,8 +1215,9 @@ def __init__(self, plugin, account, room_jid, contact_jid, password = None, comm
btn_deny = gtk.Button(stock = 'inv-deny')
btn_accept = gtk.Button(stock = 'inv-accept')
- #FIXME: add pano markup
- pritext = _('You have been invited to the %s room by %s') % (room_jid, contact_jid)
+ #FIXME: add pango markup
+ pritext = _('You have been invited to the %(room_jid)s room by %(contact_jid)s') % {
+ 'room_jid': room_jid, 'contact_jid': contact_jid }
if comment is not None:
string += '\n' + _('Comment: %s') % comment
diff --git a/src/groupchat_window.py b/src/groupchat_window.py
index da6d6b04ac..85f2847bea 100644
--- a/src/groupchat_window.py
+++ b/src/groupchat_window.py
@@ -335,19 +335,28 @@ def chg_contact_status(self, room_jid, nick, show, status, role, affiliation,
model = self.list_treeview[room_jid].get_model()
if show in ('offline', 'error'):
if statusCode == '307':
- self.print_conversation(_('%s has been kicked by %s: %s') % (nick,
- actor, reason), room_jid)
- #FIXME: this produced foo has been kciked by JID: reason
- #Should we show the JID to everyone? the same for ban
- #I propose we use nick
+ s = _('%(nick)s has been kicked by %(who)s: %(reason)s') % {
+ 'nick': nick,
+ 'who': actor,
+ 'reason': reason }
+ self.print_conversation(s, room_jid)
+ #FIXME: this produced foo has been kicked by JID: reason
+ # Should we show the JID to everyone? the same for ban
+ # I propose we use nick
elif statusCode == '301':
- self.print_conversation(_('%s has been banned by %s: %s') % (nick,
- actor, reason), room_jid)
+ s = _('%(nick)s has been banned by %(who)s: %(reason)s') % {
+ 'nick': nick,
+ 'who': actor,
+ 'reason': reason }
+ self.print_conversation(s, room_jid)
elif statusCode == '303': # Someone changed his nick
- self.print_conversation(_('%s is now known as %s') % (nick,
- new_nick), room_jid)
if nick == self.nicks[room_jid]: # We changed our nick
self.nicks[room_jid] = new_nick
+ s = _('You are now known as %s') % new_nick
+ else:
+ s = _('%s is now known as %s') % (nick, new_nick)
+ self.print_conversation(s, room_jid)
+
self.remove_contact(room_jid, nick)
if nick == self.nicks[room_jid] and statusCode != '303': # We became offline
self.got_disconnected(room_jid)
--
GitLab