Hallöchen!
The following patch (created by "svn diff" from src/ directory) corrects _("...") messages that were untranslatable.
Tschö, Torsten.
Index: history_manager.py =================================================================== --- history_manager.py (Revision 6726) +++ history_manager.py (Arbeitskopie) @@ -464,8 +464,8 @@ except ValueError: pass
- file_.write(_('%(who)s on %(time)s said: %(message)s\n' % {'who': who, - 'time': time_, 'message': message})) + file_.write(_('%(who)s on %(time)s said: %(message)s\n') % {'who': who, + 'time': time_, 'message': message})
def _delete_jid_logs(self, liststore, list_of_paths): paths_len = len(list_of_paths) Index: config.py =================================================================== --- config.py (Revision 6726) +++ config.py (Arbeitskopie) @@ -1975,9 +1975,9 @@ self.window = self.xml.get_widget('service_registration_window') self.window.set_transient_for(gajim.interface.roster.window) if infos.has_key('registered'): - self.window.set_title(_('Edit %s' % service)) + self.window.set_title(_('Edit %s') % service) else: - self.window.set_title(_('Register to %s' % service)) + self.window.set_title(_('Register to %s') % service) self.xml.get_widget('label').set_text(infos['instructions']) self.entries = {} self.draw_table() @@ -2263,7 +2263,7 @@ self.dialog = None if gajim.connections[self.account].connected: self.dialog = dialogs.ConfirmationDialog( - _('Account "%s" is connected to the server' % self.account), + _('Account "%s" is connected to the server') % self.account, _('If you remove it, the connection will be lost.'), on_response_ok = remove) else: Index: dialogs.py =================================================================== --- dialogs.py (Revision 6726) +++ dialogs.py (Arbeitskopie) @@ -851,7 +851,7 @@
class BindPortError(HigDialog): def __init__(self, port): - ErrorDialog(_('Unable to bind to port %s.' % port), + ErrorDialog(_('Unable to bind to port %s.') % port, _('Maybe you have another running instance of Gajim. ' 'File Transfer will be canceled.'))
@@ -1206,7 +1206,7 @@ if gajim.connections[self.account].connected <= 1: #if offline or connecting ErrorDialog(_('Connection not available'), - _('Please make sure you are connected with "%s".' % self.account)) + _('Please make sure you are connected with "%s".') % self.account) return
if self.completion_dict.has_key(jid): @@ -1218,7 +1218,7 @@ ErrorDialog(_('Invalid JID'), e[0]) return except: - ErrorDialog(_('Invalid JID'), _('Unable to parse "%s".' % jid)) + ErrorDialog(_('Invalid JID'), _('Unable to parse "%s".') % jid) return gajim.interface.roster.new_chat_from_jid(self.account, jid)
@@ -1560,7 +1560,7 @@ if gajim.connections[self.account].connected <= 1: # if offline or connecting ErrorDialog(_('Connection not available'), - _('Please make sure you are connected with "%s".' % self.account)) + _('Please make sure you are connected with "%s".') % self.account) return to_whom_jid = self.to_entry.get_text().decode('utf-8') if self.completion_dict.has_key(to_whom_jid): @@ -1587,7 +1587,7 @@ def on_reply_button_clicked(self, widget): # we create a new blank window to send and we preset RE: and to jid self.subject = _('RE: %s') % self.subject - self.message = _('%s wrote:\n' % self.from_whom) + self.message + self.message = _('%s wrote:\n') % self.from_whom + self.message # add > at the begining of each line self.message = self.message.replace('\n', '\n> ') + '\n\n' self.window.destroy() @@ -1684,7 +1684,7 @@ if gajim.connections[self.account].connected <= 1: #if offline or connecting ErrorDialog(_('Connection not available'), - _('Please make sure you are connected with "%s".' % self.account)) + _('Please make sure you are connected with "%s".') % self.account) return begin_iter, end_iter = self.input_tv_buffer.get_bounds() stanza = self.input_tv_buffer.get_text(begin_iter, end_iter).decode('utf-8') Index: gajim.py =================================================================== --- gajim.py (Revision 6726) +++ gajim.py (Arbeitskopie) @@ -723,8 +723,8 @@ config.ServiceRegistrationWindow(array[0], array[1], account, array[2]) else: - dialogs.ErrorDialog(_('Contact with "%s" cannot be established'\ -% array[0]), _('Check your connection or try again later.')) + dialogs.ErrorDialog(_('Contact with "%s" cannot be established')\ +% array[0], _('Check your connection or try again later.'))
def handle_event_agent_info_items(self, account, array): #('AGENT_INFO_ITEMS', account, (agent, node, items)) Index: filetransfers_window.py =================================================================== --- filetransfers_window.py (Revision 6726) +++ filetransfers_window.py (Arbeitskopie) @@ -328,7 +328,7 @@ else: dirname = os.path.dirname(file_path) if not os.access(dirname, os.W_OK): - dialogs.ErrorDialog(_('Directory "%s" is not writable' % dirname), _('You do not have permission to create files in this directory.')) + dialogs.ErrorDialog(_('Directory "%s" is not writable') % dirname, _('You do not have permission to create files in this directory.')) return dialog2.destroy() self._start_receive(file_path, account, contact, file_props) Index: common/connection_handlers.py =================================================================== --- common/connection_handlers.py (Revision 6726) +++ common/connection_handlers.py (Arbeitskopie) @@ -585,8 +585,8 @@ iq.setID(id) # Wait the answer during 30 secondes self.awaiting_timeouts[gajim.idlequeue.current_time() + 30] = (id, - _('Registration information for transport %s has not arrived in time' % \ - agent)) + _('Registration information for transport %s has not arrived in time') % \ + agent) self.connection.SendAndCallForResponse(iq, self._ReceivedRegInfo, {'agent': agent})
Index: chat_control.py =================================================================== --- chat_control.py (Revision 6726) +++ chat_control.py (Arbeitskopie) @@ -1490,7 +1490,7 @@ # 2 seconds dialog = dialogs.ConfirmationDialog( #%s is being replaced in the code with JID - _('You just received a new message from "%s"' % self.contact.jid), + _('You just received a new message from "%s"') % self.contact.jid, _('If you close this tab and you have history disabled, '\ 'this message will be lost.')) if dialog.get_response() != gtk.RESPONSE_OK:
Torsten Bronger wrote:
Hallöchen!
The following patch (created by "svn diff" from src/ directory) corrects _("...") messages that were untranslatable.
Tschö, Torsten.
Hi,
Thanks for your patch, but I don't see what it changes: _('qwe%s' % 'asd') message are correctly handled by intltool-extract. All those message are already in gajim.pot if you run make gajim.pot in po folder.
Hallöchen!
Yann Le Boulanger writes:
Torsten Bronger wrote:
The following patch (created by "svn diff" from src/ directory) corrects _("...") messages that were untranslatable.
Thanks for your patch, but I don't see what it changes: _('qwe%s' % 'asd') message are correctly handled by intltool-extract. All those message are already in gajim.pot if you run make gajim.pot in po folder.
Yes, but the problem occurs later. _("see %s" % "blablubb") becomes _("see blablubb") at runtime, which can't be found in the dictionary.
Tschö, Torsten.
Torsten Bronger wrote:
Hallöchen!
Yes, but the problem occurs later. _("see %s" % "blablubb") becomes _("see blablubb") at runtime, which can't be found in the dictionary.
in such a case we do: _("see %s" % _("blablubb"))
and both "see %s" and "blablubb" are in pot file
I still don't see what string is not translated with the way we do things.
Hallöchen!
Yann Le Boulanger writes:
Torsten Bronger wrote:
Yes, but the problem occurs later. _("see %s" % "blablubb") becomes _("see blablubb") at runtime, which can't be found in the dictionary.
in such a case we do: _("see %s" % _("blablubb"))
and both "see %s" and "blablubb" are in pot file
I still don't see what string is not translated with the way we do things.
Okay, poor example, mea culpa. ;-)
_("see %s" % contactname)
And e.g. "see Asterix" surely is not in the pot file.
Tschö, Torsten.
Torsten Bronger wrote:
Hallöchen!
Okay, poor example, mea culpa. ;-)
_("see %s" % contactname)
And e.g. "see Asterix" surely is not in the pot file.
Tschö, Torsten.
"see Asterix" is of course not in pot file, but "see %s" is, so "see %s" is translated, then %s is replaced with Asterix, and it's fine. applying your patch doesn't change the way pot file is built.
Op di, 05-09-2006 te 17:52 +0200, schreef Yann Le Boulanger:
Torsten Bronger wrote:
Okay, poor example, mea culpa. ;-)
_("see %s" % contactname)
And e.g. "see Asterix" surely is not in the pot file.
"see Asterix" is of course not in pot file, but "see %s" is, so "see %s" is translated, then %s is replaced with Asterix, and it's fine. applying your patch doesn't change the way pot file is built.
But at run-time, the string formatting is done first, and then the result of that is passed as an argument to the _() function that looks up the translation, so then:
contactname = "Asterix" _("see %s" % contactname)
*is* the same as:
_("see Asterix")
Now gettext will look for "see Asterix" in the po file...
Jan Claeys wrote:
But at run-time, the string formatting is done first, and then the result of that is passed as an argument to the _() function that looks up the translation, so then:
contactname = "Asterix" _("see %s" % contactname)
*is* the same as:
_("see Asterix")
Now gettext will look for "see Asterix" in the po file...
I never saw this problem ... but it doesn't hurt applying this patch.
Torsten, could you open a ticket with this patch attached so I can get it ? it's not a attached file in your first mail.
Thanks
On 9/5/06, Torsten Bronger bronger@physik.rwth-aachen.de wrote:
Hallöchen!
The following patch (created by "svn diff" from src/ directory) corrects _("...") messages that were untranslatable.
Tschö, Torsten.
Not that I'm not enjoying this discussion, but this issue and patch should probably be added to the bug tracking wiki.
-
beerfan -
Jan Claeys -
Torsten Bronger -
Yann Le Boulanger