Fixed bugs with charset: now decodes/encodes nicks and channels in IRC messages (bug #18716)
This commit is contained in:
Sebastien Helleu
parent
09efc5333f
commit
bbe2f9093c
@ -4,6 +4,10 @@ WeeChat - Wee Enhanced Environment for Chat
|
||||
ChangeLog - 2007-01-06
|
||||
|
||||
|
||||
Version 0.2.3 (under dev!):
|
||||
* fixed bugs with charset: now decodes/encodes nicks and channels in IRC
|
||||
messages (bug #18716)
|
||||
|
||||
Version 0.2.2 (2007-01-06):
|
||||
* fixed bug with status bar (missing refresh) when closing a buffer
|
||||
* fixed bug with use of first buffer for a channel if not connected
|
||||
|
||||
36
po/cs.po
36
po/cs.po
@ -6,7 +6,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat 0.2.3-cvs\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2007-01-05 20:28+0100\n"
|
||||
"POT-Creation-Date: 2007-01-06 23:17+0100\n"
|
||||
"PO-Revision-Date: 2007-01-06 01:27+0100\n"
|
||||
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
@ -1339,38 +1339,38 @@ msgstr "nemůžu změnit mód přo ostatní uživatele"
|
||||
msgid "whois (secure connection)"
|
||||
msgstr "whois (zabezpečená část)"
|
||||
|
||||
#: src/irc/irc-display.c:375
|
||||
#: src/irc/irc-display.c:376
|
||||
#, c-format
|
||||
msgid "%sServer: %s%s %s[%s%s%s]\n"
|
||||
msgstr "%sServer: %s%s %s[%s%s%s]\n"
|
||||
|
||||
#: src/irc/irc-display.c:382
|
||||
#: src/irc/irc-display.c:383
|
||||
msgid "connected"
|
||||
msgstr "připojen"
|
||||
|
||||
#: src/irc/irc-display.c:382
|
||||
#: src/irc/irc-display.c:383
|
||||
msgid "not connected"
|
||||
msgstr "nepřipojen"
|
||||
|
||||
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390
|
||||
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401
|
||||
#: src/irc/irc-display.c:387 src/irc/irc-display.c:391
|
||||
#: src/irc/irc-display.c:400 src/irc/irc-display.c:402
|
||||
msgid "on"
|
||||
msgstr "na"
|
||||
|
||||
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390
|
||||
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401
|
||||
#: src/irc/irc-display.c:387 src/irc/irc-display.c:391
|
||||
#: src/irc/irc-display.c:400 src/irc/irc-display.c:402
|
||||
msgid "off"
|
||||
msgstr "off"
|
||||
|
||||
#: src/irc/irc-display.c:388
|
||||
#: src/irc/irc-display.c:389
|
||||
msgid " (temporary server, will not be saved)"
|
||||
msgstr " (dočasný server, nebude uložen)"
|
||||
|
||||
#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3144
|
||||
#: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3144
|
||||
msgid "seconds"
|
||||
msgstr "sekund"
|
||||
|
||||
#: src/irc/irc-display.c:404
|
||||
#: src/irc/irc-display.c:405
|
||||
msgid "(hidden)"
|
||||
msgstr "(skrytý)"
|
||||
|
||||
@ -2255,31 +2255,31 @@ msgstr "GB"
|
||||
msgid "ETA"
|
||||
msgstr "ETA"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:395
|
||||
#: src/gui/curses/gui-curses-input.c:406
|
||||
msgid " [A] Accept"
|
||||
msgstr " [A] Akceptovat"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:397 src/gui/curses/gui-curses-input.c:402
|
||||
#: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413
|
||||
msgid " [C] Cancel"
|
||||
msgstr " [C] Storno"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:408
|
||||
#: src/gui/curses/gui-curses-input.c:419
|
||||
msgid " [R] Remove"
|
||||
msgstr " [R] Odebrat"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:413
|
||||
#: src/gui/curses/gui-curses-input.c:424
|
||||
msgid " [P] Purge old DCC"
|
||||
msgstr " [P] Pročistit staré DCC"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:415
|
||||
#: src/gui/curses/gui-curses-input.c:426
|
||||
msgid " [Q] Close DCC view"
|
||||
msgstr " [Q] Zavřít DCC pohled"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:424
|
||||
#: src/gui/curses/gui-curses-input.c:435
|
||||
msgid " [C] Clear buffer"
|
||||
msgstr " [C] Vyčistit buffer"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:426
|
||||
#: src/gui/curses/gui-curses-input.c:437
|
||||
msgid " [Q] Close raw data view"
|
||||
msgstr " [Q] Zavřít čistý pohled na data"
|
||||
|
||||
|
||||
36
po/de.po
36
po/de.po
@ -9,7 +9,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat 0.2.3-cvs\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2007-01-05 20:28+0100\n"
|
||||
"POT-Creation-Date: 2007-01-06 23:17+0100\n"
|
||||
"PO-Revision-Date: 2007-01-06 01:27+0100\n"
|
||||
"Last-Translator: Thomas Schuetz <i18n@internet-villa.de>\n"
|
||||
"Language-Team: <de@li.org>\n"
|
||||
@ -1339,38 +1339,38 @@ msgstr "Modes anderer User können nicht geändert werden"
|
||||
msgid "whois (secure connection)"
|
||||
msgstr "whois (sichere Verbindung)"
|
||||
|
||||
#: src/irc/irc-display.c:375
|
||||
#: src/irc/irc-display.c:376
|
||||
#, c-format
|
||||
msgid "%sServer: %s%s %s[%s%s%s]\n"
|
||||
msgstr "%sServer: %s%s %s[%s%s%s]\n"
|
||||
|
||||
#: src/irc/irc-display.c:382
|
||||
#: src/irc/irc-display.c:383
|
||||
msgid "connected"
|
||||
msgstr "verbunden"
|
||||
|
||||
#: src/irc/irc-display.c:382
|
||||
#: src/irc/irc-display.c:383
|
||||
msgid "not connected"
|
||||
msgstr "nicht verbunden"
|
||||
|
||||
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390
|
||||
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401
|
||||
#: src/irc/irc-display.c:387 src/irc/irc-display.c:391
|
||||
#: src/irc/irc-display.c:400 src/irc/irc-display.c:402
|
||||
msgid "on"
|
||||
msgstr "an"
|
||||
|
||||
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390
|
||||
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401
|
||||
#: src/irc/irc-display.c:387 src/irc/irc-display.c:391
|
||||
#: src/irc/irc-display.c:400 src/irc/irc-display.c:402
|
||||
msgid "off"
|
||||
msgstr "aus"
|
||||
|
||||
#: src/irc/irc-display.c:388
|
||||
#: src/irc/irc-display.c:389
|
||||
msgid " (temporary server, will not be saved)"
|
||||
msgstr " (temporärer Server, wird nicht gespeichert)"
|
||||
|
||||
#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3144
|
||||
#: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3144
|
||||
msgid "seconds"
|
||||
msgstr "Sekunden"
|
||||
|
||||
#: src/irc/irc-display.c:404
|
||||
#: src/irc/irc-display.c:405
|
||||
msgid "(hidden)"
|
||||
msgstr "(versteckt)"
|
||||
|
||||
@ -2263,31 +2263,31 @@ msgstr "GB"
|
||||
msgid "ETA"
|
||||
msgstr "ETA"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:395
|
||||
#: src/gui/curses/gui-curses-input.c:406
|
||||
msgid " [A] Accept"
|
||||
msgstr " [A] annehmen"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:397 src/gui/curses/gui-curses-input.c:402
|
||||
#: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413
|
||||
msgid " [C] Cancel"
|
||||
msgstr " [C] abbrechen"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:408
|
||||
#: src/gui/curses/gui-curses-input.c:419
|
||||
msgid " [R] Remove"
|
||||
msgstr " [R] entfernen"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:413
|
||||
#: src/gui/curses/gui-curses-input.c:424
|
||||
msgid " [P] Purge old DCC"
|
||||
msgstr " [P] alte DCCs entfernen"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:415
|
||||
#: src/gui/curses/gui-curses-input.c:426
|
||||
msgid " [Q] Close DCC view"
|
||||
msgstr " [Q] DCC-Ansicht schließen"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:424
|
||||
#: src/gui/curses/gui-curses-input.c:435
|
||||
msgid " [C] Clear buffer"
|
||||
msgstr " [C] Puffer löschen"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:426
|
||||
#: src/gui/curses/gui-curses-input.c:437
|
||||
msgid " [Q] Close raw data view"
|
||||
msgstr " [Q] Rohdatenansicht schließen"
|
||||
|
||||
|
||||
36
po/es.po
36
po/es.po
@ -6,7 +6,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Weechat 0.2.3-cvs\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2007-01-05 20:28+0100\n"
|
||||
"POT-Creation-Date: 2007-01-06 23:17+0100\n"
|
||||
"PO-Revision-Date: 2007-01-06 01:27+0100\n"
|
||||
"Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
@ -1357,38 +1357,38 @@ msgstr "no es posible cambiar el modo para el resto de usuarios"
|
||||
msgid "whois (secure connection)"
|
||||
msgstr "quién es (conexión segura)"
|
||||
|
||||
#: src/irc/irc-display.c:375
|
||||
#: src/irc/irc-display.c:376
|
||||
#, c-format
|
||||
msgid "%sServer: %s%s %s[%s%s%s]\n"
|
||||
msgstr "%sServidor:%s%s %s[%s%s%s]\n"
|
||||
|
||||
#: src/irc/irc-display.c:382
|
||||
#: src/irc/irc-display.c:383
|
||||
msgid "connected"
|
||||
msgstr "conectado"
|
||||
|
||||
#: src/irc/irc-display.c:382
|
||||
#: src/irc/irc-display.c:383
|
||||
msgid "not connected"
|
||||
msgstr "no conectado"
|
||||
|
||||
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390
|
||||
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401
|
||||
#: src/irc/irc-display.c:387 src/irc/irc-display.c:391
|
||||
#: src/irc/irc-display.c:400 src/irc/irc-display.c:402
|
||||
msgid "on"
|
||||
msgstr "activo"
|
||||
|
||||
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390
|
||||
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401
|
||||
#: src/irc/irc-display.c:387 src/irc/irc-display.c:391
|
||||
#: src/irc/irc-display.c:400 src/irc/irc-display.c:402
|
||||
msgid "off"
|
||||
msgstr "inactivo"
|
||||
|
||||
#: src/irc/irc-display.c:388
|
||||
#: src/irc/irc-display.c:389
|
||||
msgid " (temporary server, will not be saved)"
|
||||
msgstr " (servidor temporal, no será guardado)"
|
||||
|
||||
#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3144
|
||||
#: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3144
|
||||
msgid "seconds"
|
||||
msgstr "segundos"
|
||||
|
||||
#: src/irc/irc-display.c:404
|
||||
#: src/irc/irc-display.c:405
|
||||
msgid "(hidden)"
|
||||
msgstr "(oculto)"
|
||||
|
||||
@ -2291,32 +2291,32 @@ msgstr ""
|
||||
msgid "ETA"
|
||||
msgstr "Tiempo estimado de llegada"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:395
|
||||
#: src/gui/curses/gui-curses-input.c:406
|
||||
msgid " [A] Accept"
|
||||
msgstr " [A] Aceptar"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:397 src/gui/curses/gui-curses-input.c:402
|
||||
#: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413
|
||||
msgid " [C] Cancel"
|
||||
msgstr " [C] Cancelar"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:408
|
||||
#: src/gui/curses/gui-curses-input.c:419
|
||||
msgid " [R] Remove"
|
||||
msgstr " [R] Eliminar"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:413
|
||||
#: src/gui/curses/gui-curses-input.c:424
|
||||
msgid " [P] Purge old DCC"
|
||||
msgstr " [P] Purgar los viejos DCC"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:415
|
||||
#: src/gui/curses/gui-curses-input.c:426
|
||||
msgid " [Q] Close DCC view"
|
||||
msgstr " [Q] Cerrar la vista DCC"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:424
|
||||
#: src/gui/curses/gui-curses-input.c:435
|
||||
#, fuzzy
|
||||
msgid " [C] Clear buffer"
|
||||
msgstr "saltar al búfer DCC"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:426
|
||||
#: src/gui/curses/gui-curses-input.c:437
|
||||
msgid " [Q] Close raw data view"
|
||||
msgstr " [Q] Cerrar vista de datos basura"
|
||||
|
||||
|
||||
36
po/fr.po
36
po/fr.po
@ -6,7 +6,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat 0.2.3-cvs\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2007-01-05 20:28+0100\n"
|
||||
"POT-Creation-Date: 2007-01-06 23:17+0100\n"
|
||||
"PO-Revision-Date: 2007-01-06 01:27+0100\n"
|
||||
"Last-Translator: FlashCode <flashcode@flashtux.org>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
@ -1345,38 +1345,38 @@ msgstr "impossible de changer le mode pour les autres utilisateurs"
|
||||
msgid "whois (secure connection)"
|
||||
msgstr "whois (connexion sécurisée)"
|
||||
|
||||
#: src/irc/irc-display.c:375
|
||||
#: src/irc/irc-display.c:376
|
||||
#, c-format
|
||||
msgid "%sServer: %s%s %s[%s%s%s]\n"
|
||||
msgstr "%sServeur: %s%s %s[%s%s%s]\n"
|
||||
|
||||
#: src/irc/irc-display.c:382
|
||||
#: src/irc/irc-display.c:383
|
||||
msgid "connected"
|
||||
msgstr "connecté"
|
||||
|
||||
#: src/irc/irc-display.c:382
|
||||
#: src/irc/irc-display.c:383
|
||||
msgid "not connected"
|
||||
msgstr "non connecté"
|
||||
|
||||
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390
|
||||
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401
|
||||
#: src/irc/irc-display.c:387 src/irc/irc-display.c:391
|
||||
#: src/irc/irc-display.c:400 src/irc/irc-display.c:402
|
||||
msgid "on"
|
||||
msgstr "activé"
|
||||
|
||||
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390
|
||||
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401
|
||||
#: src/irc/irc-display.c:387 src/irc/irc-display.c:391
|
||||
#: src/irc/irc-display.c:400 src/irc/irc-display.c:402
|
||||
msgid "off"
|
||||
msgstr "désactivé"
|
||||
|
||||
#: src/irc/irc-display.c:388
|
||||
#: src/irc/irc-display.c:389
|
||||
msgid " (temporary server, will not be saved)"
|
||||
msgstr " (serveur temporaire, ne sera pas sauvé)"
|
||||
|
||||
#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3144
|
||||
#: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3144
|
||||
msgid "seconds"
|
||||
msgstr "secondes"
|
||||
|
||||
#: src/irc/irc-display.c:404
|
||||
#: src/irc/irc-display.c:405
|
||||
msgid "(hidden)"
|
||||
msgstr "(caché)"
|
||||
|
||||
@ -2280,31 +2280,31 @@ msgstr "Go"
|
||||
msgid "ETA"
|
||||
msgstr "ETA"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:395
|
||||
#: src/gui/curses/gui-curses-input.c:406
|
||||
msgid " [A] Accept"
|
||||
msgstr " [A] Accepter"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:397 src/gui/curses/gui-curses-input.c:402
|
||||
#: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413
|
||||
msgid " [C] Cancel"
|
||||
msgstr " [C] Annuler"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:408
|
||||
#: src/gui/curses/gui-curses-input.c:419
|
||||
msgid " [R] Remove"
|
||||
msgstr " [R] Retirer"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:413
|
||||
#: src/gui/curses/gui-curses-input.c:424
|
||||
msgid " [P] Purge old DCC"
|
||||
msgstr " [P] Purger anciens DCC"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:415
|
||||
#: src/gui/curses/gui-curses-input.c:426
|
||||
msgid " [Q] Close DCC view"
|
||||
msgstr " [Q] Fermer la vue DCC"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:424
|
||||
#: src/gui/curses/gui-curses-input.c:435
|
||||
msgid " [C] Clear buffer"
|
||||
msgstr " [C] Effacer le tampon"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:426
|
||||
#: src/gui/curses/gui-curses-input.c:437
|
||||
msgid " [Q] Close raw data view"
|
||||
msgstr " [Q] Fermer la vue IRC brut"
|
||||
|
||||
|
||||
36
po/hu.po
36
po/hu.po
@ -7,7 +7,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat 0.2.3-cvs\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2007-01-05 20:28+0100\n"
|
||||
"POT-Creation-Date: 2007-01-06 23:17+0100\n"
|
||||
"PO-Revision-Date: 2007-01-06 01:27+0100\n"
|
||||
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
@ -1351,38 +1351,38 @@ msgstr "más felhasználók üzemmódját nem módosíthatja"
|
||||
msgid "whois (secure connection)"
|
||||
msgstr "kicsoda (titkosított kapcsolat)"
|
||||
|
||||
#: src/irc/irc-display.c:375
|
||||
#: src/irc/irc-display.c:376
|
||||
#, c-format
|
||||
msgid "%sServer: %s%s %s[%s%s%s]\n"
|
||||
msgstr "%s Szerver: %s%s %s[%s%s%s]\n"
|
||||
|
||||
#: src/irc/irc-display.c:382
|
||||
#: src/irc/irc-display.c:383
|
||||
msgid "connected"
|
||||
msgstr "csatlakozva"
|
||||
|
||||
#: src/irc/irc-display.c:382
|
||||
#: src/irc/irc-display.c:383
|
||||
msgid "not connected"
|
||||
msgstr "nincs csatlakozva"
|
||||
|
||||
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390
|
||||
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401
|
||||
#: src/irc/irc-display.c:387 src/irc/irc-display.c:391
|
||||
#: src/irc/irc-display.c:400 src/irc/irc-display.c:402
|
||||
msgid "on"
|
||||
msgstr "be"
|
||||
|
||||
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390
|
||||
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401
|
||||
#: src/irc/irc-display.c:387 src/irc/irc-display.c:391
|
||||
#: src/irc/irc-display.c:400 src/irc/irc-display.c:402
|
||||
msgid "off"
|
||||
msgstr "ki"
|
||||
|
||||
#: src/irc/irc-display.c:388
|
||||
#: src/irc/irc-display.c:389
|
||||
msgid " (temporary server, will not be saved)"
|
||||
msgstr " (átmeneti szerver, nem lesz mentve)"
|
||||
|
||||
#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3144
|
||||
#: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3144
|
||||
msgid "seconds"
|
||||
msgstr "másodperc"
|
||||
|
||||
#: src/irc/irc-display.c:404
|
||||
#: src/irc/irc-display.c:405
|
||||
msgid "(hidden)"
|
||||
msgstr "(rejtett)"
|
||||
|
||||
@ -2263,31 +2263,31 @@ msgstr "GB"
|
||||
msgid "ETA"
|
||||
msgstr "ETA"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:395
|
||||
#: src/gui/curses/gui-curses-input.c:406
|
||||
msgid " [A] Accept"
|
||||
msgstr " [A] Elfogadás"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:397 src/gui/curses/gui-curses-input.c:402
|
||||
#: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413
|
||||
msgid " [C] Cancel"
|
||||
msgstr " [C] Mégsem"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:408
|
||||
#: src/gui/curses/gui-curses-input.c:419
|
||||
msgid " [R] Remove"
|
||||
msgstr " [R] Eltávolítás"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:413
|
||||
#: src/gui/curses/gui-curses-input.c:424
|
||||
msgid " [P] Purge old DCC"
|
||||
msgstr " [P] Régi DCC törlése"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:415
|
||||
#: src/gui/curses/gui-curses-input.c:426
|
||||
msgid " [Q] Close DCC view"
|
||||
msgstr " [Q] DCC nézet bezárása"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:424
|
||||
#: src/gui/curses/gui-curses-input.c:435
|
||||
msgid " [C] Clear buffer"
|
||||
msgstr " [C] Puffer törlése"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:426
|
||||
#: src/gui/curses/gui-curses-input.c:437
|
||||
msgid " [Q] Close raw data view"
|
||||
msgstr " [Q] Nyers adat nézet bezárása"
|
||||
|
||||
|
||||
36
po/ru.po
36
po/ru.po
@ -6,7 +6,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat 0.2.3-cvs\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2007-01-05 20:28+0100\n"
|
||||
"POT-Creation-Date: 2007-01-06 23:17+0100\n"
|
||||
"PO-Revision-Date: 2007-01-06 01:27+0100\n"
|
||||
"Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
@ -1338,38 +1338,38 @@ msgstr "вы не можете менять режимы других польз
|
||||
msgid "whois (secure connection)"
|
||||
msgstr "whois (защищённое соединение)"
|
||||
|
||||
#: src/irc/irc-display.c:375
|
||||
#: src/irc/irc-display.c:376
|
||||
#, c-format
|
||||
msgid "%sServer: %s%s %s[%s%s%s]\n"
|
||||
msgstr "%sСервер: %s%s %s[%s%s%s]\n"
|
||||
|
||||
#: src/irc/irc-display.c:382
|
||||
#: src/irc/irc-display.c:383
|
||||
msgid "connected"
|
||||
msgstr "подключен"
|
||||
|
||||
#: src/irc/irc-display.c:382
|
||||
#: src/irc/irc-display.c:383
|
||||
msgid "not connected"
|
||||
msgstr "отключен"
|
||||
|
||||
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390
|
||||
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401
|
||||
#: src/irc/irc-display.c:387 src/irc/irc-display.c:391
|
||||
#: src/irc/irc-display.c:400 src/irc/irc-display.c:402
|
||||
msgid "on"
|
||||
msgstr "вкл."
|
||||
|
||||
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390
|
||||
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401
|
||||
#: src/irc/irc-display.c:387 src/irc/irc-display.c:391
|
||||
#: src/irc/irc-display.c:400 src/irc/irc-display.c:402
|
||||
msgid "off"
|
||||
msgstr "выкл."
|
||||
|
||||
#: src/irc/irc-display.c:388
|
||||
#: src/irc/irc-display.c:389
|
||||
msgid " (temporary server, will not be saved)"
|
||||
msgstr " (временный сервер, не будет сохранён)"
|
||||
|
||||
#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3144
|
||||
#: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3144
|
||||
msgid "seconds"
|
||||
msgstr "секунды"
|
||||
|
||||
#: src/irc/irc-display.c:404
|
||||
#: src/irc/irc-display.c:405
|
||||
msgid "(hidden)"
|
||||
msgstr "(скрытый)"
|
||||
|
||||
@ -2244,31 +2244,31 @@ msgstr "ГБ"
|
||||
msgid "ETA"
|
||||
msgstr "осталось"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:395
|
||||
#: src/gui/curses/gui-curses-input.c:406
|
||||
msgid " [A] Accept"
|
||||
msgstr " [A] Принять"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:397 src/gui/curses/gui-curses-input.c:402
|
||||
#: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413
|
||||
msgid " [C] Cancel"
|
||||
msgstr " [C] Отменить"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:408
|
||||
#: src/gui/curses/gui-curses-input.c:419
|
||||
msgid " [R] Remove"
|
||||
msgstr " [R] Удалить"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:413
|
||||
#: src/gui/curses/gui-curses-input.c:424
|
||||
msgid " [P] Purge old DCC"
|
||||
msgstr " [P] Очистить список"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:415
|
||||
#: src/gui/curses/gui-curses-input.c:426
|
||||
msgid " [Q] Close DCC view"
|
||||
msgstr " [Q] Закрыть окно"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:424
|
||||
#: src/gui/curses/gui-curses-input.c:435
|
||||
msgid " [C] Clear buffer"
|
||||
msgstr " [C] Очистить буфер"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:426
|
||||
#: src/gui/curses/gui-curses-input.c:437
|
||||
msgid " [Q] Close raw data view"
|
||||
msgstr " [Q] Закрыть окно сырых данных"
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2007-01-05 20:28+0100\n"
|
||||
"POT-Creation-Date: 2007-01-06 23:17+0100\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
@ -1235,38 +1235,38 @@ msgstr ""
|
||||
msgid "whois (secure connection)"
|
||||
msgstr ""
|
||||
|
||||
#: src/irc/irc-display.c:375
|
||||
#: src/irc/irc-display.c:376
|
||||
#, c-format
|
||||
msgid "%sServer: %s%s %s[%s%s%s]\n"
|
||||
msgstr ""
|
||||
|
||||
#: src/irc/irc-display.c:382
|
||||
#: src/irc/irc-display.c:383
|
||||
msgid "connected"
|
||||
msgstr ""
|
||||
|
||||
#: src/irc/irc-display.c:382
|
||||
#: src/irc/irc-display.c:383
|
||||
msgid "not connected"
|
||||
msgstr ""
|
||||
|
||||
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390
|
||||
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401
|
||||
#: src/irc/irc-display.c:387 src/irc/irc-display.c:391
|
||||
#: src/irc/irc-display.c:400 src/irc/irc-display.c:402
|
||||
msgid "on"
|
||||
msgstr ""
|
||||
|
||||
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390
|
||||
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401
|
||||
#: src/irc/irc-display.c:387 src/irc/irc-display.c:391
|
||||
#: src/irc/irc-display.c:400 src/irc/irc-display.c:402
|
||||
msgid "off"
|
||||
msgstr ""
|
||||
|
||||
#: src/irc/irc-display.c:388
|
||||
#: src/irc/irc-display.c:389
|
||||
msgid " (temporary server, will not be saved)"
|
||||
msgstr ""
|
||||
|
||||
#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3144
|
||||
#: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3144
|
||||
msgid "seconds"
|
||||
msgstr ""
|
||||
|
||||
#: src/irc/irc-display.c:404
|
||||
#: src/irc/irc-display.c:405
|
||||
msgid "(hidden)"
|
||||
msgstr ""
|
||||
|
||||
@ -2115,31 +2115,31 @@ msgstr ""
|
||||
msgid "ETA"
|
||||
msgstr ""
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:395
|
||||
#: src/gui/curses/gui-curses-input.c:406
|
||||
msgid " [A] Accept"
|
||||
msgstr ""
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:397 src/gui/curses/gui-curses-input.c:402
|
||||
#: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413
|
||||
msgid " [C] Cancel"
|
||||
msgstr ""
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:408
|
||||
#: src/gui/curses/gui-curses-input.c:419
|
||||
msgid " [R] Remove"
|
||||
msgstr ""
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:413
|
||||
#: src/gui/curses/gui-curses-input.c:424
|
||||
msgid " [P] Purge old DCC"
|
||||
msgstr ""
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:415
|
||||
#: src/gui/curses/gui-curses-input.c:426
|
||||
msgid " [Q] Close DCC view"
|
||||
msgstr ""
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:424
|
||||
#: src/gui/curses/gui-curses-input.c:435
|
||||
msgid " [C] Clear buffer"
|
||||
msgstr ""
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:426
|
||||
#: src/gui/curses/gui-curses-input.c:437
|
||||
msgid " [Q] Close raw data view"
|
||||
msgstr ""
|
||||
|
||||
|
||||
@ -90,11 +90,11 @@ gui_input_get_prompt_length (t_gui_window *window, char *nick)
|
||||
{
|
||||
case 'c':
|
||||
if (CHANNEL(window->buffer))
|
||||
length += utf8_strlen (CHANNEL(window->buffer)->name);
|
||||
length += utf8_width_screen (CHANNEL(window->buffer)->name);
|
||||
else
|
||||
{
|
||||
if (SERVER(window->buffer))
|
||||
length += utf8_strlen (SERVER(window->buffer)->name);
|
||||
length += utf8_width_screen (SERVER(window->buffer)->name);
|
||||
}
|
||||
pos++;
|
||||
break;
|
||||
@ -108,7 +108,7 @@ gui_input_get_prompt_length (t_gui_window *window, char *nick)
|
||||
pos++;
|
||||
break;
|
||||
case 'n':
|
||||
length += utf8_strlen (nick);
|
||||
length += utf8_width_screen (nick);
|
||||
pos++;
|
||||
break;
|
||||
default:
|
||||
@ -148,7 +148,7 @@ gui_input_get_prompt_length (t_gui_window *window, char *nick)
|
||||
void
|
||||
gui_input_draw_prompt (t_gui_window *window, char *nick)
|
||||
{
|
||||
char *pos, saved_char;
|
||||
char *pos, saved_char, *buf;
|
||||
int char_size;
|
||||
|
||||
wmove (GUI_CURSES(window)->win_input, 0, 0);
|
||||
@ -166,8 +166,12 @@ gui_input_draw_prompt (t_gui_window *window, char *nick)
|
||||
{
|
||||
gui_window_set_weechat_color (GUI_CURSES(window)->win_input,
|
||||
COLOR_WIN_INPUT_CHANNEL);
|
||||
buf = weechat_iconv_from_internal (NULL,
|
||||
CHANNEL(window->buffer)->name);
|
||||
wprintw (GUI_CURSES(window)->win_input, "%s",
|
||||
CHANNEL(window->buffer)->name);
|
||||
(buf) ? buf : CHANNEL(window->buffer)->name);
|
||||
if (buf)
|
||||
free (buf);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -175,8 +179,12 @@ gui_input_draw_prompt (t_gui_window *window, char *nick)
|
||||
{
|
||||
gui_window_set_weechat_color (GUI_CURSES(window)->win_input,
|
||||
COLOR_WIN_INPUT_SERVER);
|
||||
buf = weechat_iconv_from_internal (NULL,
|
||||
SERVER(window->buffer)->name);
|
||||
wprintw (GUI_CURSES(window)->win_input, "%s",
|
||||
SERVER(window->buffer)->name);
|
||||
(buf) ? buf : SERVER(window->buffer)->name);
|
||||
if (buf)
|
||||
free (buf);
|
||||
}
|
||||
}
|
||||
pos++;
|
||||
@ -198,7 +206,10 @@ gui_input_draw_prompt (t_gui_window *window, char *nick)
|
||||
case 'n':
|
||||
gui_window_set_weechat_color (GUI_CURSES(window)->win_input,
|
||||
COLOR_WIN_INPUT_NICK);
|
||||
wprintw (GUI_CURSES(window)->win_input, "%s", nick);
|
||||
buf = weechat_iconv_from_internal (NULL, nick);
|
||||
wprintw (GUI_CURSES(window)->win_input, "%s", (buf) ? buf : nick);
|
||||
if (buf)
|
||||
free (buf);
|
||||
pos++;
|
||||
break;
|
||||
default:
|
||||
|
||||
@ -24,8 +24,11 @@
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "../../common/weechat.h"
|
||||
#include "../gui.h"
|
||||
#include "../../common/util.h"
|
||||
#include "../../common/weeconfig.h"
|
||||
#include "../../irc/irc.h"
|
||||
#include "gui-curses.h"
|
||||
@ -40,7 +43,7 @@ gui_nicklist_draw (t_gui_buffer *buffer, int erase, int calculate_size)
|
||||
{
|
||||
t_gui_window *ptr_win;
|
||||
int i, j, x, y, x2, column, max_length, nicks_displayed;
|
||||
char format[32], format_empty[32];
|
||||
char format[32], format_empty[32], *buf;
|
||||
t_irc_nick *ptr_nick;
|
||||
|
||||
if (!gui_ok || !BUFFER_HAS_NICKLIST(buffer))
|
||||
@ -203,7 +206,11 @@ gui_nicklist_draw (t_gui_buffer *buffer, int erase, int calculate_size)
|
||||
gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick,
|
||||
((cfg_irc_away_check > 0) && (ptr_nick->flags & NICK_AWAY)) ?
|
||||
COLOR_WIN_NICK_AWAY : COLOR_WIN_NICK);
|
||||
mvwprintw (GUI_CURSES(ptr_win)->win_nick, y, x, format, ptr_nick->nick);
|
||||
buf = weechat_iconv_from_internal (NULL, ptr_nick->nick);
|
||||
mvwprintw (GUI_CURSES(ptr_win)->win_nick, y, x, format,
|
||||
(buf) ? buf : ptr_nick->nick);
|
||||
if (buf)
|
||||
free (buf);
|
||||
|
||||
ptr_nick = ptr_nick->next_nick;
|
||||
|
||||
|
||||
@ -31,6 +31,7 @@
|
||||
|
||||
#include "../common/weechat.h"
|
||||
#include "irc.h"
|
||||
#include "../common/utf8.h"
|
||||
#include "../common/weeconfig.h"
|
||||
#include "../gui/gui.h"
|
||||
|
||||
@ -159,7 +160,7 @@ irc_display_nick (t_gui_buffer *buffer, t_irc_nick *nick, char *nickname,
|
||||
ptr_nickname = strdup ((nick) ? nick->nick : nickname);
|
||||
if (!ptr_nickname)
|
||||
return;
|
||||
nickname_length = strlen (ptr_nickname);
|
||||
nickname_length = utf8_width_screen (ptr_nickname);
|
||||
external_nick = (!nick && !BUFFER_IS_PRIVATE(buffer));
|
||||
disable_prefix_suffix = ((cfg_look_align_nick != CFG_LOOK_ALIGN_NICK_NONE)
|
||||
&& ((int)strlen (cfg_look_nick_prefix) +
|
||||
|
||||
@ -31,6 +31,7 @@
|
||||
#include "../common/weechat.h"
|
||||
#include "irc.h"
|
||||
#include "../common/log.h"
|
||||
#include "../common/utf8.h"
|
||||
#include "../common/util.h"
|
||||
#include "../common/weeconfig.h"
|
||||
|
||||
@ -387,7 +388,7 @@ nick_get_max_length (t_irc_channel *channel)
|
||||
max_length = 0;
|
||||
for (ptr_nick = channel->nicks; ptr_nick; ptr_nick = ptr_nick->next_nick)
|
||||
{
|
||||
length = strlen (ptr_nick->nick);
|
||||
length = utf8_width_screen (ptr_nick->nick);
|
||||
if (length > max_length)
|
||||
max_length = length;
|
||||
}
|
||||
|
||||
@ -29,8 +29,6 @@
|
||||
#include "weechat-charset.h"
|
||||
|
||||
|
||||
char *weechat_charset_excluded_cmd[] = { "ping", "pong", NULL };
|
||||
|
||||
char *weechat_charset_terminal = NULL;
|
||||
char *weechat_charset_internal = NULL;
|
||||
|
||||
@ -185,28 +183,6 @@ weechat_charset_set_config (t_weechat_plugin *plugin,
|
||||
plugin->set_plugin_config (plugin, option, value);
|
||||
}
|
||||
|
||||
/*
|
||||
* weechat_charset_command_allowed: return 1 if command can be decoded/encoded
|
||||
*/
|
||||
|
||||
int
|
||||
weechat_charset_command_allowed (char *command)
|
||||
{
|
||||
int i;
|
||||
|
||||
if (!command)
|
||||
return 0;
|
||||
|
||||
for (i = 0; weechat_charset_excluded_cmd[i]; i++)
|
||||
{
|
||||
if (strcasecmp (weechat_charset_excluded_cmd[i], command) == 0)
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* command can be decoded/recoded */
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* weechat_charset_parse_irc_msg: return nick, command, channel and position
|
||||
* of arguments in IRC message
|
||||
@ -216,15 +192,19 @@ void
|
||||
weechat_charset_parse_irc_msg (char *message, char **nick, char **command,
|
||||
char **channel, char **pos_args)
|
||||
{
|
||||
char *pos, *pos2, *pos3;
|
||||
char *pos, *pos2, *pos3, *pos_tmp;
|
||||
|
||||
*nick = NULL;
|
||||
*command = NULL;
|
||||
*channel = NULL;
|
||||
*pos_args = NULL;
|
||||
|
||||
if (message[0] == ':')
|
||||
{
|
||||
pos = message + 1;
|
||||
pos_tmp = strchr (pos, ' ');
|
||||
if (pos_tmp)
|
||||
pos_tmp[0] = '\0';
|
||||
pos2 = strchr (pos, '!');
|
||||
if (pos2)
|
||||
*nick = weechat_charset_strndup (pos, pos2 - pos);
|
||||
@ -234,6 +214,8 @@ weechat_charset_parse_irc_msg (char *message, char **nick, char **command,
|
||||
if (pos2)
|
||||
*nick = weechat_charset_strndup (pos, pos2 - pos);
|
||||
}
|
||||
if (pos_tmp)
|
||||
pos_tmp[0] = ' ';
|
||||
pos = strchr (message, ' ');
|
||||
if (!pos)
|
||||
pos = message;
|
||||
@ -292,8 +274,7 @@ weechat_charset_irc_in (t_weechat_plugin *plugin, int argc, char **argv,
|
||||
char *handler_args, void *handler_pointer)
|
||||
{
|
||||
char *nick, *command, *channel, *charset, *ptr_args;
|
||||
char *decoded, *output;
|
||||
int length;
|
||||
char *output;
|
||||
|
||||
/* make gcc happy */
|
||||
(void) argc;
|
||||
@ -303,33 +284,20 @@ weechat_charset_irc_in (t_weechat_plugin *plugin, int argc, char **argv,
|
||||
output = NULL;
|
||||
|
||||
weechat_charset_parse_irc_msg (argv[1], &nick, &command, &channel, &ptr_args);
|
||||
|
||||
if (weechat_charset_command_allowed (command))
|
||||
|
||||
charset = weechat_charset_get_config (plugin,
|
||||
"decode", argv[0],
|
||||
(channel) ? channel : nick);
|
||||
|
||||
if (weechat_charset_debug)
|
||||
plugin->print(plugin, NULL, NULL,
|
||||
"Charset IN: srv='%s', nick='%s', chan='%s', "
|
||||
"msg='%s', ptr_args='%s' => charset: %s",
|
||||
argv[0], nick, channel, argv[1], ptr_args, charset);
|
||||
|
||||
if (charset)
|
||||
{
|
||||
charset = weechat_charset_get_config (plugin,
|
||||
"decode", argv[0],
|
||||
(channel) ? channel : nick);
|
||||
|
||||
if (weechat_charset_debug)
|
||||
plugin->print(plugin, NULL, NULL,
|
||||
"Charset IN: srv='%s', nick='%s', chan='%s', "
|
||||
"msg='%s', ptr_args='%s' => charset: %s",
|
||||
argv[0], nick, channel, argv[1], ptr_args, charset);
|
||||
|
||||
if (ptr_args && charset)
|
||||
{
|
||||
decoded = plugin->iconv_to_internal (plugin, charset, ptr_args);
|
||||
if (decoded)
|
||||
{
|
||||
length = strlen (decoded) + (ptr_args - argv[1]) + 1;
|
||||
output = (char *)malloc (length + 1);
|
||||
strncpy (output, argv[1], ptr_args - argv[1]);
|
||||
output[ptr_args - argv[1]] = '\0';
|
||||
strcat (output, decoded);
|
||||
free (decoded);
|
||||
}
|
||||
}
|
||||
|
||||
output = plugin->iconv_to_internal (plugin, charset, argv[1]);
|
||||
if (charset)
|
||||
free (charset);
|
||||
}
|
||||
@ -354,8 +322,7 @@ weechat_charset_irc_out (t_weechat_plugin *plugin, int argc, char **argv,
|
||||
char *handler_args, void *handler_pointer)
|
||||
{
|
||||
char *nick, *command, *channel, *charset, *ptr_args;
|
||||
char *encoded, *output;
|
||||
int length;
|
||||
char *output;
|
||||
|
||||
/* make gcc happy */
|
||||
(void) argc;
|
||||
@ -365,33 +332,20 @@ weechat_charset_irc_out (t_weechat_plugin *plugin, int argc, char **argv,
|
||||
output = NULL;
|
||||
|
||||
weechat_charset_parse_irc_msg (argv[1], &nick, &command, &channel, &ptr_args);
|
||||
|
||||
charset = weechat_charset_get_config (plugin,
|
||||
"encode", argv[0],
|
||||
(channel) ? channel : nick);
|
||||
|
||||
if (weechat_charset_debug)
|
||||
plugin->print(plugin, NULL, NULL,
|
||||
"Charset OUT: srv='%s', nick='%s', chan='%s', "
|
||||
"msg='%s', ptr_args='%s' => charset: %s",
|
||||
argv[0], nick, channel, argv[1], ptr_args, charset);
|
||||
|
||||
if (weechat_charset_command_allowed (command))
|
||||
if (charset)
|
||||
{
|
||||
charset = weechat_charset_get_config (plugin,
|
||||
"encode", argv[0],
|
||||
(channel) ? channel : nick);
|
||||
|
||||
if (weechat_charset_debug)
|
||||
plugin->print(plugin, NULL, NULL,
|
||||
"Charset OUT: srv='%s', nick='%s', chan='%s', "
|
||||
"msg='%s', ptr_args='%s' => charset: %s",
|
||||
argv[0], nick, channel, argv[1], ptr_args, charset);
|
||||
|
||||
if (ptr_args && charset)
|
||||
{
|
||||
encoded = plugin->iconv_from_internal (plugin, charset, ptr_args);
|
||||
if (encoded)
|
||||
{
|
||||
length = strlen (encoded) + (ptr_args - argv[1]) + 1;
|
||||
output = (char *)malloc (length + 1);
|
||||
strncpy (output, argv[1], ptr_args - argv[1]);
|
||||
output[ptr_args - argv[1]] = '\0';
|
||||
strcat (output, encoded);
|
||||
free (encoded);
|
||||
}
|
||||
}
|
||||
|
||||
output = plugin->iconv_from_internal (plugin, charset, argv[1]);
|
||||
if (charset)
|
||||
free (charset);
|
||||
}
|
||||
|
||||
@ -4,6 +4,10 @@ WeeChat - Wee Enhanced Environment for Chat
|
||||
ChangeLog - 2007-01-06
|
||||
|
||||
|
||||
Version 0.2.3 (under dev!):
|
||||
* fixed bugs with charset: now decodes/encodes nicks and channels in IRC
|
||||
messages (bug #18716)
|
||||
|
||||
Version 0.2.2 (2007-01-06):
|
||||
* fixed bug with status bar (missing refresh) when closing a buffer
|
||||
* fixed bug with use of first buffer for a channel if not connected
|
||||
|
||||
@ -6,7 +6,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat 0.2.3-cvs\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2007-01-05 20:28+0100\n"
|
||||
"POT-Creation-Date: 2007-01-06 23:17+0100\n"
|
||||
"PO-Revision-Date: 2007-01-06 01:27+0100\n"
|
||||
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
@ -1339,38 +1339,38 @@ msgstr "nemůžu změnit mód přo ostatní uživatele"
|
||||
msgid "whois (secure connection)"
|
||||
msgstr "whois (zabezpečená část)"
|
||||
|
||||
#: src/irc/irc-display.c:375
|
||||
#: src/irc/irc-display.c:376
|
||||
#, c-format
|
||||
msgid "%sServer: %s%s %s[%s%s%s]\n"
|
||||
msgstr "%sServer: %s%s %s[%s%s%s]\n"
|
||||
|
||||
#: src/irc/irc-display.c:382
|
||||
#: src/irc/irc-display.c:383
|
||||
msgid "connected"
|
||||
msgstr "připojen"
|
||||
|
||||
#: src/irc/irc-display.c:382
|
||||
#: src/irc/irc-display.c:383
|
||||
msgid "not connected"
|
||||
msgstr "nepřipojen"
|
||||
|
||||
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390
|
||||
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401
|
||||
#: src/irc/irc-display.c:387 src/irc/irc-display.c:391
|
||||
#: src/irc/irc-display.c:400 src/irc/irc-display.c:402
|
||||
msgid "on"
|
||||
msgstr "na"
|
||||
|
||||
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390
|
||||
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401
|
||||
#: src/irc/irc-display.c:387 src/irc/irc-display.c:391
|
||||
#: src/irc/irc-display.c:400 src/irc/irc-display.c:402
|
||||
msgid "off"
|
||||
msgstr "off"
|
||||
|
||||
#: src/irc/irc-display.c:388
|
||||
#: src/irc/irc-display.c:389
|
||||
msgid " (temporary server, will not be saved)"
|
||||
msgstr " (dočasný server, nebude uložen)"
|
||||
|
||||
#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3144
|
||||
#: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3144
|
||||
msgid "seconds"
|
||||
msgstr "sekund"
|
||||
|
||||
#: src/irc/irc-display.c:404
|
||||
#: src/irc/irc-display.c:405
|
||||
msgid "(hidden)"
|
||||
msgstr "(skrytý)"
|
||||
|
||||
@ -2255,31 +2255,31 @@ msgstr "GB"
|
||||
msgid "ETA"
|
||||
msgstr "ETA"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:395
|
||||
#: src/gui/curses/gui-curses-input.c:406
|
||||
msgid " [A] Accept"
|
||||
msgstr " [A] Akceptovat"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:397 src/gui/curses/gui-curses-input.c:402
|
||||
#: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413
|
||||
msgid " [C] Cancel"
|
||||
msgstr " [C] Storno"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:408
|
||||
#: src/gui/curses/gui-curses-input.c:419
|
||||
msgid " [R] Remove"
|
||||
msgstr " [R] Odebrat"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:413
|
||||
#: src/gui/curses/gui-curses-input.c:424
|
||||
msgid " [P] Purge old DCC"
|
||||
msgstr " [P] Pročistit staré DCC"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:415
|
||||
#: src/gui/curses/gui-curses-input.c:426
|
||||
msgid " [Q] Close DCC view"
|
||||
msgstr " [Q] Zavřít DCC pohled"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:424
|
||||
#: src/gui/curses/gui-curses-input.c:435
|
||||
msgid " [C] Clear buffer"
|
||||
msgstr " [C] Vyčistit buffer"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:426
|
||||
#: src/gui/curses/gui-curses-input.c:437
|
||||
msgid " [Q] Close raw data view"
|
||||
msgstr " [Q] Zavřít čistý pohled na data"
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat 0.2.3-cvs\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2007-01-05 20:28+0100\n"
|
||||
"POT-Creation-Date: 2007-01-06 23:17+0100\n"
|
||||
"PO-Revision-Date: 2007-01-06 01:27+0100\n"
|
||||
"Last-Translator: Thomas Schuetz <i18n@internet-villa.de>\n"
|
||||
"Language-Team: <de@li.org>\n"
|
||||
@ -1339,38 +1339,38 @@ msgstr "Modes anderer User können nicht geändert werden"
|
||||
msgid "whois (secure connection)"
|
||||
msgstr "whois (sichere Verbindung)"
|
||||
|
||||
#: src/irc/irc-display.c:375
|
||||
#: src/irc/irc-display.c:376
|
||||
#, c-format
|
||||
msgid "%sServer: %s%s %s[%s%s%s]\n"
|
||||
msgstr "%sServer: %s%s %s[%s%s%s]\n"
|
||||
|
||||
#: src/irc/irc-display.c:382
|
||||
#: src/irc/irc-display.c:383
|
||||
msgid "connected"
|
||||
msgstr "verbunden"
|
||||
|
||||
#: src/irc/irc-display.c:382
|
||||
#: src/irc/irc-display.c:383
|
||||
msgid "not connected"
|
||||
msgstr "nicht verbunden"
|
||||
|
||||
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390
|
||||
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401
|
||||
#: src/irc/irc-display.c:387 src/irc/irc-display.c:391
|
||||
#: src/irc/irc-display.c:400 src/irc/irc-display.c:402
|
||||
msgid "on"
|
||||
msgstr "an"
|
||||
|
||||
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390
|
||||
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401
|
||||
#: src/irc/irc-display.c:387 src/irc/irc-display.c:391
|
||||
#: src/irc/irc-display.c:400 src/irc/irc-display.c:402
|
||||
msgid "off"
|
||||
msgstr "aus"
|
||||
|
||||
#: src/irc/irc-display.c:388
|
||||
#: src/irc/irc-display.c:389
|
||||
msgid " (temporary server, will not be saved)"
|
||||
msgstr " (temporärer Server, wird nicht gespeichert)"
|
||||
|
||||
#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3144
|
||||
#: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3144
|
||||
msgid "seconds"
|
||||
msgstr "Sekunden"
|
||||
|
||||
#: src/irc/irc-display.c:404
|
||||
#: src/irc/irc-display.c:405
|
||||
msgid "(hidden)"
|
||||
msgstr "(versteckt)"
|
||||
|
||||
@ -2263,31 +2263,31 @@ msgstr "GB"
|
||||
msgid "ETA"
|
||||
msgstr "ETA"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:395
|
||||
#: src/gui/curses/gui-curses-input.c:406
|
||||
msgid " [A] Accept"
|
||||
msgstr " [A] annehmen"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:397 src/gui/curses/gui-curses-input.c:402
|
||||
#: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413
|
||||
msgid " [C] Cancel"
|
||||
msgstr " [C] abbrechen"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:408
|
||||
#: src/gui/curses/gui-curses-input.c:419
|
||||
msgid " [R] Remove"
|
||||
msgstr " [R] entfernen"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:413
|
||||
#: src/gui/curses/gui-curses-input.c:424
|
||||
msgid " [P] Purge old DCC"
|
||||
msgstr " [P] alte DCCs entfernen"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:415
|
||||
#: src/gui/curses/gui-curses-input.c:426
|
||||
msgid " [Q] Close DCC view"
|
||||
msgstr " [Q] DCC-Ansicht schließen"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:424
|
||||
#: src/gui/curses/gui-curses-input.c:435
|
||||
msgid " [C] Clear buffer"
|
||||
msgstr " [C] Puffer löschen"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:426
|
||||
#: src/gui/curses/gui-curses-input.c:437
|
||||
msgid " [Q] Close raw data view"
|
||||
msgstr " [Q] Rohdatenansicht schließen"
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Weechat 0.2.3-cvs\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2007-01-05 20:28+0100\n"
|
||||
"POT-Creation-Date: 2007-01-06 23:17+0100\n"
|
||||
"PO-Revision-Date: 2007-01-06 01:27+0100\n"
|
||||
"Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
@ -1357,38 +1357,38 @@ msgstr "no es posible cambiar el modo para el resto de usuarios"
|
||||
msgid "whois (secure connection)"
|
||||
msgstr "quién es (conexión segura)"
|
||||
|
||||
#: src/irc/irc-display.c:375
|
||||
#: src/irc/irc-display.c:376
|
||||
#, c-format
|
||||
msgid "%sServer: %s%s %s[%s%s%s]\n"
|
||||
msgstr "%sServidor:%s%s %s[%s%s%s]\n"
|
||||
|
||||
#: src/irc/irc-display.c:382
|
||||
#: src/irc/irc-display.c:383
|
||||
msgid "connected"
|
||||
msgstr "conectado"
|
||||
|
||||
#: src/irc/irc-display.c:382
|
||||
#: src/irc/irc-display.c:383
|
||||
msgid "not connected"
|
||||
msgstr "no conectado"
|
||||
|
||||
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390
|
||||
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401
|
||||
#: src/irc/irc-display.c:387 src/irc/irc-display.c:391
|
||||
#: src/irc/irc-display.c:400 src/irc/irc-display.c:402
|
||||
msgid "on"
|
||||
msgstr "activo"
|
||||
|
||||
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390
|
||||
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401
|
||||
#: src/irc/irc-display.c:387 src/irc/irc-display.c:391
|
||||
#: src/irc/irc-display.c:400 src/irc/irc-display.c:402
|
||||
msgid "off"
|
||||
msgstr "inactivo"
|
||||
|
||||
#: src/irc/irc-display.c:388
|
||||
#: src/irc/irc-display.c:389
|
||||
msgid " (temporary server, will not be saved)"
|
||||
msgstr " (servidor temporal, no será guardado)"
|
||||
|
||||
#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3144
|
||||
#: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3144
|
||||
msgid "seconds"
|
||||
msgstr "segundos"
|
||||
|
||||
#: src/irc/irc-display.c:404
|
||||
#: src/irc/irc-display.c:405
|
||||
msgid "(hidden)"
|
||||
msgstr "(oculto)"
|
||||
|
||||
@ -2291,32 +2291,32 @@ msgstr ""
|
||||
msgid "ETA"
|
||||
msgstr "Tiempo estimado de llegada"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:395
|
||||
#: src/gui/curses/gui-curses-input.c:406
|
||||
msgid " [A] Accept"
|
||||
msgstr " [A] Aceptar"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:397 src/gui/curses/gui-curses-input.c:402
|
||||
#: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413
|
||||
msgid " [C] Cancel"
|
||||
msgstr " [C] Cancelar"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:408
|
||||
#: src/gui/curses/gui-curses-input.c:419
|
||||
msgid " [R] Remove"
|
||||
msgstr " [R] Eliminar"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:413
|
||||
#: src/gui/curses/gui-curses-input.c:424
|
||||
msgid " [P] Purge old DCC"
|
||||
msgstr " [P] Purgar los viejos DCC"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:415
|
||||
#: src/gui/curses/gui-curses-input.c:426
|
||||
msgid " [Q] Close DCC view"
|
||||
msgstr " [Q] Cerrar la vista DCC"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:424
|
||||
#: src/gui/curses/gui-curses-input.c:435
|
||||
#, fuzzy
|
||||
msgid " [C] Clear buffer"
|
||||
msgstr "saltar al búfer DCC"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:426
|
||||
#: src/gui/curses/gui-curses-input.c:437
|
||||
msgid " [Q] Close raw data view"
|
||||
msgstr " [Q] Cerrar vista de datos basura"
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat 0.2.3-cvs\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2007-01-05 20:28+0100\n"
|
||||
"POT-Creation-Date: 2007-01-06 23:17+0100\n"
|
||||
"PO-Revision-Date: 2007-01-06 01:27+0100\n"
|
||||
"Last-Translator: FlashCode <flashcode@flashtux.org>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
@ -1345,38 +1345,38 @@ msgstr "impossible de changer le mode pour les autres utilisateurs"
|
||||
msgid "whois (secure connection)"
|
||||
msgstr "whois (connexion sécurisée)"
|
||||
|
||||
#: src/irc/irc-display.c:375
|
||||
#: src/irc/irc-display.c:376
|
||||
#, c-format
|
||||
msgid "%sServer: %s%s %s[%s%s%s]\n"
|
||||
msgstr "%sServeur: %s%s %s[%s%s%s]\n"
|
||||
|
||||
#: src/irc/irc-display.c:382
|
||||
#: src/irc/irc-display.c:383
|
||||
msgid "connected"
|
||||
msgstr "connecté"
|
||||
|
||||
#: src/irc/irc-display.c:382
|
||||
#: src/irc/irc-display.c:383
|
||||
msgid "not connected"
|
||||
msgstr "non connecté"
|
||||
|
||||
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390
|
||||
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401
|
||||
#: src/irc/irc-display.c:387 src/irc/irc-display.c:391
|
||||
#: src/irc/irc-display.c:400 src/irc/irc-display.c:402
|
||||
msgid "on"
|
||||
msgstr "activé"
|
||||
|
||||
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390
|
||||
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401
|
||||
#: src/irc/irc-display.c:387 src/irc/irc-display.c:391
|
||||
#: src/irc/irc-display.c:400 src/irc/irc-display.c:402
|
||||
msgid "off"
|
||||
msgstr "désactivé"
|
||||
|
||||
#: src/irc/irc-display.c:388
|
||||
#: src/irc/irc-display.c:389
|
||||
msgid " (temporary server, will not be saved)"
|
||||
msgstr " (serveur temporaire, ne sera pas sauvé)"
|
||||
|
||||
#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3144
|
||||
#: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3144
|
||||
msgid "seconds"
|
||||
msgstr "secondes"
|
||||
|
||||
#: src/irc/irc-display.c:404
|
||||
#: src/irc/irc-display.c:405
|
||||
msgid "(hidden)"
|
||||
msgstr "(caché)"
|
||||
|
||||
@ -2280,31 +2280,31 @@ msgstr "Go"
|
||||
msgid "ETA"
|
||||
msgstr "ETA"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:395
|
||||
#: src/gui/curses/gui-curses-input.c:406
|
||||
msgid " [A] Accept"
|
||||
msgstr " [A] Accepter"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:397 src/gui/curses/gui-curses-input.c:402
|
||||
#: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413
|
||||
msgid " [C] Cancel"
|
||||
msgstr " [C] Annuler"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:408
|
||||
#: src/gui/curses/gui-curses-input.c:419
|
||||
msgid " [R] Remove"
|
||||
msgstr " [R] Retirer"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:413
|
||||
#: src/gui/curses/gui-curses-input.c:424
|
||||
msgid " [P] Purge old DCC"
|
||||
msgstr " [P] Purger anciens DCC"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:415
|
||||
#: src/gui/curses/gui-curses-input.c:426
|
||||
msgid " [Q] Close DCC view"
|
||||
msgstr " [Q] Fermer la vue DCC"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:424
|
||||
#: src/gui/curses/gui-curses-input.c:435
|
||||
msgid " [C] Clear buffer"
|
||||
msgstr " [C] Effacer le tampon"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:426
|
||||
#: src/gui/curses/gui-curses-input.c:437
|
||||
msgid " [Q] Close raw data view"
|
||||
msgstr " [Q] Fermer la vue IRC brut"
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat 0.2.3-cvs\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2007-01-05 20:28+0100\n"
|
||||
"POT-Creation-Date: 2007-01-06 23:17+0100\n"
|
||||
"PO-Revision-Date: 2007-01-06 01:27+0100\n"
|
||||
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
@ -1351,38 +1351,38 @@ msgstr "más felhasználók üzemmódját nem módosíthatja"
|
||||
msgid "whois (secure connection)"
|
||||
msgstr "kicsoda (titkosított kapcsolat)"
|
||||
|
||||
#: src/irc/irc-display.c:375
|
||||
#: src/irc/irc-display.c:376
|
||||
#, c-format
|
||||
msgid "%sServer: %s%s %s[%s%s%s]\n"
|
||||
msgstr "%s Szerver: %s%s %s[%s%s%s]\n"
|
||||
|
||||
#: src/irc/irc-display.c:382
|
||||
#: src/irc/irc-display.c:383
|
||||
msgid "connected"
|
||||
msgstr "csatlakozva"
|
||||
|
||||
#: src/irc/irc-display.c:382
|
||||
#: src/irc/irc-display.c:383
|
||||
msgid "not connected"
|
||||
msgstr "nincs csatlakozva"
|
||||
|
||||
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390
|
||||
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401
|
||||
#: src/irc/irc-display.c:387 src/irc/irc-display.c:391
|
||||
#: src/irc/irc-display.c:400 src/irc/irc-display.c:402
|
||||
msgid "on"
|
||||
msgstr "be"
|
||||
|
||||
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390
|
||||
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401
|
||||
#: src/irc/irc-display.c:387 src/irc/irc-display.c:391
|
||||
#: src/irc/irc-display.c:400 src/irc/irc-display.c:402
|
||||
msgid "off"
|
||||
msgstr "ki"
|
||||
|
||||
#: src/irc/irc-display.c:388
|
||||
#: src/irc/irc-display.c:389
|
||||
msgid " (temporary server, will not be saved)"
|
||||
msgstr " (átmeneti szerver, nem lesz mentve)"
|
||||
|
||||
#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3144
|
||||
#: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3144
|
||||
msgid "seconds"
|
||||
msgstr "másodperc"
|
||||
|
||||
#: src/irc/irc-display.c:404
|
||||
#: src/irc/irc-display.c:405
|
||||
msgid "(hidden)"
|
||||
msgstr "(rejtett)"
|
||||
|
||||
@ -2263,31 +2263,31 @@ msgstr "GB"
|
||||
msgid "ETA"
|
||||
msgstr "ETA"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:395
|
||||
#: src/gui/curses/gui-curses-input.c:406
|
||||
msgid " [A] Accept"
|
||||
msgstr " [A] Elfogadás"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:397 src/gui/curses/gui-curses-input.c:402
|
||||
#: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413
|
||||
msgid " [C] Cancel"
|
||||
msgstr " [C] Mégsem"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:408
|
||||
#: src/gui/curses/gui-curses-input.c:419
|
||||
msgid " [R] Remove"
|
||||
msgstr " [R] Eltávolítás"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:413
|
||||
#: src/gui/curses/gui-curses-input.c:424
|
||||
msgid " [P] Purge old DCC"
|
||||
msgstr " [P] Régi DCC törlése"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:415
|
||||
#: src/gui/curses/gui-curses-input.c:426
|
||||
msgid " [Q] Close DCC view"
|
||||
msgstr " [Q] DCC nézet bezárása"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:424
|
||||
#: src/gui/curses/gui-curses-input.c:435
|
||||
msgid " [C] Clear buffer"
|
||||
msgstr " [C] Puffer törlése"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:426
|
||||
#: src/gui/curses/gui-curses-input.c:437
|
||||
msgid " [Q] Close raw data view"
|
||||
msgstr " [Q] Nyers adat nézet bezárása"
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat 0.2.3-cvs\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2007-01-05 20:28+0100\n"
|
||||
"POT-Creation-Date: 2007-01-06 23:17+0100\n"
|
||||
"PO-Revision-Date: 2007-01-06 01:27+0100\n"
|
||||
"Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
@ -1338,38 +1338,38 @@ msgstr "вы не можете менять режимы других польз
|
||||
msgid "whois (secure connection)"
|
||||
msgstr "whois (защищённое соединение)"
|
||||
|
||||
#: src/irc/irc-display.c:375
|
||||
#: src/irc/irc-display.c:376
|
||||
#, c-format
|
||||
msgid "%sServer: %s%s %s[%s%s%s]\n"
|
||||
msgstr "%sСервер: %s%s %s[%s%s%s]\n"
|
||||
|
||||
#: src/irc/irc-display.c:382
|
||||
#: src/irc/irc-display.c:383
|
||||
msgid "connected"
|
||||
msgstr "подключен"
|
||||
|
||||
#: src/irc/irc-display.c:382
|
||||
#: src/irc/irc-display.c:383
|
||||
msgid "not connected"
|
||||
msgstr "отключен"
|
||||
|
||||
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390
|
||||
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401
|
||||
#: src/irc/irc-display.c:387 src/irc/irc-display.c:391
|
||||
#: src/irc/irc-display.c:400 src/irc/irc-display.c:402
|
||||
msgid "on"
|
||||
msgstr "вкл."
|
||||
|
||||
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390
|
||||
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401
|
||||
#: src/irc/irc-display.c:387 src/irc/irc-display.c:391
|
||||
#: src/irc/irc-display.c:400 src/irc/irc-display.c:402
|
||||
msgid "off"
|
||||
msgstr "выкл."
|
||||
|
||||
#: src/irc/irc-display.c:388
|
||||
#: src/irc/irc-display.c:389
|
||||
msgid " (temporary server, will not be saved)"
|
||||
msgstr " (временный сервер, не будет сохранён)"
|
||||
|
||||
#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3144
|
||||
#: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3144
|
||||
msgid "seconds"
|
||||
msgstr "секунды"
|
||||
|
||||
#: src/irc/irc-display.c:404
|
||||
#: src/irc/irc-display.c:405
|
||||
msgid "(hidden)"
|
||||
msgstr "(скрытый)"
|
||||
|
||||
@ -2244,31 +2244,31 @@ msgstr "ГБ"
|
||||
msgid "ETA"
|
||||
msgstr "осталось"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:395
|
||||
#: src/gui/curses/gui-curses-input.c:406
|
||||
msgid " [A] Accept"
|
||||
msgstr " [A] Принять"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:397 src/gui/curses/gui-curses-input.c:402
|
||||
#: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413
|
||||
msgid " [C] Cancel"
|
||||
msgstr " [C] Отменить"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:408
|
||||
#: src/gui/curses/gui-curses-input.c:419
|
||||
msgid " [R] Remove"
|
||||
msgstr " [R] Удалить"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:413
|
||||
#: src/gui/curses/gui-curses-input.c:424
|
||||
msgid " [P] Purge old DCC"
|
||||
msgstr " [P] Очистить список"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:415
|
||||
#: src/gui/curses/gui-curses-input.c:426
|
||||
msgid " [Q] Close DCC view"
|
||||
msgstr " [Q] Закрыть окно"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:424
|
||||
#: src/gui/curses/gui-curses-input.c:435
|
||||
msgid " [C] Clear buffer"
|
||||
msgstr " [C] Очистить буфер"
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:426
|
||||
#: src/gui/curses/gui-curses-input.c:437
|
||||
msgid " [Q] Close raw data view"
|
||||
msgstr " [Q] Закрыть окно сырых данных"
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2007-01-05 20:28+0100\n"
|
||||
"POT-Creation-Date: 2007-01-06 23:17+0100\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
@ -1235,38 +1235,38 @@ msgstr ""
|
||||
msgid "whois (secure connection)"
|
||||
msgstr ""
|
||||
|
||||
#: src/irc/irc-display.c:375
|
||||
#: src/irc/irc-display.c:376
|
||||
#, c-format
|
||||
msgid "%sServer: %s%s %s[%s%s%s]\n"
|
||||
msgstr ""
|
||||
|
||||
#: src/irc/irc-display.c:382
|
||||
#: src/irc/irc-display.c:383
|
||||
msgid "connected"
|
||||
msgstr ""
|
||||
|
||||
#: src/irc/irc-display.c:382
|
||||
#: src/irc/irc-display.c:383
|
||||
msgid "not connected"
|
||||
msgstr ""
|
||||
|
||||
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390
|
||||
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401
|
||||
#: src/irc/irc-display.c:387 src/irc/irc-display.c:391
|
||||
#: src/irc/irc-display.c:400 src/irc/irc-display.c:402
|
||||
msgid "on"
|
||||
msgstr ""
|
||||
|
||||
#: src/irc/irc-display.c:386 src/irc/irc-display.c:390
|
||||
#: src/irc/irc-display.c:399 src/irc/irc-display.c:401
|
||||
#: src/irc/irc-display.c:387 src/irc/irc-display.c:391
|
||||
#: src/irc/irc-display.c:400 src/irc/irc-display.c:402
|
||||
msgid "off"
|
||||
msgstr ""
|
||||
|
||||
#: src/irc/irc-display.c:388
|
||||
#: src/irc/irc-display.c:389
|
||||
msgid " (temporary server, will not be saved)"
|
||||
msgstr ""
|
||||
|
||||
#: src/irc/irc-display.c:393 src/irc/irc-display.c:424 src/irc/irc-recv.c:3144
|
||||
#: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3144
|
||||
msgid "seconds"
|
||||
msgstr ""
|
||||
|
||||
#: src/irc/irc-display.c:404
|
||||
#: src/irc/irc-display.c:405
|
||||
msgid "(hidden)"
|
||||
msgstr ""
|
||||
|
||||
@ -2115,31 +2115,31 @@ msgstr ""
|
||||
msgid "ETA"
|
||||
msgstr ""
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:395
|
||||
#: src/gui/curses/gui-curses-input.c:406
|
||||
msgid " [A] Accept"
|
||||
msgstr ""
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:397 src/gui/curses/gui-curses-input.c:402
|
||||
#: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413
|
||||
msgid " [C] Cancel"
|
||||
msgstr ""
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:408
|
||||
#: src/gui/curses/gui-curses-input.c:419
|
||||
msgid " [R] Remove"
|
||||
msgstr ""
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:413
|
||||
#: src/gui/curses/gui-curses-input.c:424
|
||||
msgid " [P] Purge old DCC"
|
||||
msgstr ""
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:415
|
||||
#: src/gui/curses/gui-curses-input.c:426
|
||||
msgid " [Q] Close DCC view"
|
||||
msgstr ""
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:424
|
||||
#: src/gui/curses/gui-curses-input.c:435
|
||||
msgid " [C] Clear buffer"
|
||||
msgstr ""
|
||||
|
||||
#: src/gui/curses/gui-curses-input.c:426
|
||||
#: src/gui/curses/gui-curses-input.c:437
|
||||
msgid " [Q] Close raw data view"
|
||||
msgstr ""
|
||||
|
||||
|
||||
@ -90,11 +90,11 @@ gui_input_get_prompt_length (t_gui_window *window, char *nick)
|
||||
{
|
||||
case 'c':
|
||||
if (CHANNEL(window->buffer))
|
||||
length += utf8_strlen (CHANNEL(window->buffer)->name);
|
||||
length += utf8_width_screen (CHANNEL(window->buffer)->name);
|
||||
else
|
||||
{
|
||||
if (SERVER(window->buffer))
|
||||
length += utf8_strlen (SERVER(window->buffer)->name);
|
||||
length += utf8_width_screen (SERVER(window->buffer)->name);
|
||||
}
|
||||
pos++;
|
||||
break;
|
||||
@ -108,7 +108,7 @@ gui_input_get_prompt_length (t_gui_window *window, char *nick)
|
||||
pos++;
|
||||
break;
|
||||
case 'n':
|
||||
length += utf8_strlen (nick);
|
||||
length += utf8_width_screen (nick);
|
||||
pos++;
|
||||
break;
|
||||
default:
|
||||
@ -148,7 +148,7 @@ gui_input_get_prompt_length (t_gui_window *window, char *nick)
|
||||
void
|
||||
gui_input_draw_prompt (t_gui_window *window, char *nick)
|
||||
{
|
||||
char *pos, saved_char;
|
||||
char *pos, saved_char, *buf;
|
||||
int char_size;
|
||||
|
||||
wmove (GUI_CURSES(window)->win_input, 0, 0);
|
||||
@ -166,8 +166,12 @@ gui_input_draw_prompt (t_gui_window *window, char *nick)
|
||||
{
|
||||
gui_window_set_weechat_color (GUI_CURSES(window)->win_input,
|
||||
COLOR_WIN_INPUT_CHANNEL);
|
||||
buf = weechat_iconv_from_internal (NULL,
|
||||
CHANNEL(window->buffer)->name);
|
||||
wprintw (GUI_CURSES(window)->win_input, "%s",
|
||||
CHANNEL(window->buffer)->name);
|
||||
(buf) ? buf : CHANNEL(window->buffer)->name);
|
||||
if (buf)
|
||||
free (buf);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -175,8 +179,12 @@ gui_input_draw_prompt (t_gui_window *window, char *nick)
|
||||
{
|
||||
gui_window_set_weechat_color (GUI_CURSES(window)->win_input,
|
||||
COLOR_WIN_INPUT_SERVER);
|
||||
buf = weechat_iconv_from_internal (NULL,
|
||||
SERVER(window->buffer)->name);
|
||||
wprintw (GUI_CURSES(window)->win_input, "%s",
|
||||
SERVER(window->buffer)->name);
|
||||
(buf) ? buf : SERVER(window->buffer)->name);
|
||||
if (buf)
|
||||
free (buf);
|
||||
}
|
||||
}
|
||||
pos++;
|
||||
@ -198,7 +206,10 @@ gui_input_draw_prompt (t_gui_window *window, char *nick)
|
||||
case 'n':
|
||||
gui_window_set_weechat_color (GUI_CURSES(window)->win_input,
|
||||
COLOR_WIN_INPUT_NICK);
|
||||
wprintw (GUI_CURSES(window)->win_input, "%s", nick);
|
||||
buf = weechat_iconv_from_internal (NULL, nick);
|
||||
wprintw (GUI_CURSES(window)->win_input, "%s", (buf) ? buf : nick);
|
||||
if (buf)
|
||||
free (buf);
|
||||
pos++;
|
||||
break;
|
||||
default:
|
||||
|
||||
@ -24,8 +24,11 @@
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "../../common/weechat.h"
|
||||
#include "../gui.h"
|
||||
#include "../../common/util.h"
|
||||
#include "../../common/weeconfig.h"
|
||||
#include "../../irc/irc.h"
|
||||
#include "gui-curses.h"
|
||||
@ -40,7 +43,7 @@ gui_nicklist_draw (t_gui_buffer *buffer, int erase, int calculate_size)
|
||||
{
|
||||
t_gui_window *ptr_win;
|
||||
int i, j, x, y, x2, column, max_length, nicks_displayed;
|
||||
char format[32], format_empty[32];
|
||||
char format[32], format_empty[32], *buf;
|
||||
t_irc_nick *ptr_nick;
|
||||
|
||||
if (!gui_ok || !BUFFER_HAS_NICKLIST(buffer))
|
||||
@ -203,7 +206,11 @@ gui_nicklist_draw (t_gui_buffer *buffer, int erase, int calculate_size)
|
||||
gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick,
|
||||
((cfg_irc_away_check > 0) && (ptr_nick->flags & NICK_AWAY)) ?
|
||||
COLOR_WIN_NICK_AWAY : COLOR_WIN_NICK);
|
||||
mvwprintw (GUI_CURSES(ptr_win)->win_nick, y, x, format, ptr_nick->nick);
|
||||
buf = weechat_iconv_from_internal (NULL, ptr_nick->nick);
|
||||
mvwprintw (GUI_CURSES(ptr_win)->win_nick, y, x, format,
|
||||
(buf) ? buf : ptr_nick->nick);
|
||||
if (buf)
|
||||
free (buf);
|
||||
|
||||
ptr_nick = ptr_nick->next_nick;
|
||||
|
||||
|
||||
@ -31,6 +31,7 @@
|
||||
|
||||
#include "../common/weechat.h"
|
||||
#include "irc.h"
|
||||
#include "../common/utf8.h"
|
||||
#include "../common/weeconfig.h"
|
||||
#include "../gui/gui.h"
|
||||
|
||||
@ -159,7 +160,7 @@ irc_display_nick (t_gui_buffer *buffer, t_irc_nick *nick, char *nickname,
|
||||
ptr_nickname = strdup ((nick) ? nick->nick : nickname);
|
||||
if (!ptr_nickname)
|
||||
return;
|
||||
nickname_length = strlen (ptr_nickname);
|
||||
nickname_length = utf8_width_screen (ptr_nickname);
|
||||
external_nick = (!nick && !BUFFER_IS_PRIVATE(buffer));
|
||||
disable_prefix_suffix = ((cfg_look_align_nick != CFG_LOOK_ALIGN_NICK_NONE)
|
||||
&& ((int)strlen (cfg_look_nick_prefix) +
|
||||
|
||||
@ -31,6 +31,7 @@
|
||||
#include "../common/weechat.h"
|
||||
#include "irc.h"
|
||||
#include "../common/log.h"
|
||||
#include "../common/utf8.h"
|
||||
#include "../common/util.h"
|
||||
#include "../common/weeconfig.h"
|
||||
|
||||
@ -387,7 +388,7 @@ nick_get_max_length (t_irc_channel *channel)
|
||||
max_length = 0;
|
||||
for (ptr_nick = channel->nicks; ptr_nick; ptr_nick = ptr_nick->next_nick)
|
||||
{
|
||||
length = strlen (ptr_nick->nick);
|
||||
length = utf8_width_screen (ptr_nick->nick);
|
||||
if (length > max_length)
|
||||
max_length = length;
|
||||
}
|
||||
|
||||
@ -29,8 +29,6 @@
|
||||
#include "weechat-charset.h"
|
||||
|
||||
|
||||
char *weechat_charset_excluded_cmd[] = { "ping", "pong", NULL };
|
||||
|
||||
char *weechat_charset_terminal = NULL;
|
||||
char *weechat_charset_internal = NULL;
|
||||
|
||||
@ -185,28 +183,6 @@ weechat_charset_set_config (t_weechat_plugin *plugin,
|
||||
plugin->set_plugin_config (plugin, option, value);
|
||||
}
|
||||
|
||||
/*
|
||||
* weechat_charset_command_allowed: return 1 if command can be decoded/encoded
|
||||
*/
|
||||
|
||||
int
|
||||
weechat_charset_command_allowed (char *command)
|
||||
{
|
||||
int i;
|
||||
|
||||
if (!command)
|
||||
return 0;
|
||||
|
||||
for (i = 0; weechat_charset_excluded_cmd[i]; i++)
|
||||
{
|
||||
if (strcasecmp (weechat_charset_excluded_cmd[i], command) == 0)
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* command can be decoded/recoded */
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* weechat_charset_parse_irc_msg: return nick, command, channel and position
|
||||
* of arguments in IRC message
|
||||
@ -216,15 +192,19 @@ void
|
||||
weechat_charset_parse_irc_msg (char *message, char **nick, char **command,
|
||||
char **channel, char **pos_args)
|
||||
{
|
||||
char *pos, *pos2, *pos3;
|
||||
char *pos, *pos2, *pos3, *pos_tmp;
|
||||
|
||||
*nick = NULL;
|
||||
*command = NULL;
|
||||
*channel = NULL;
|
||||
*pos_args = NULL;
|
||||
|
||||
if (message[0] == ':')
|
||||
{
|
||||
pos = message + 1;
|
||||
pos_tmp = strchr (pos, ' ');
|
||||
if (pos_tmp)
|
||||
pos_tmp[0] = '\0';
|
||||
pos2 = strchr (pos, '!');
|
||||
if (pos2)
|
||||
*nick = weechat_charset_strndup (pos, pos2 - pos);
|
||||
@ -234,6 +214,8 @@ weechat_charset_parse_irc_msg (char *message, char **nick, char **command,
|
||||
if (pos2)
|
||||
*nick = weechat_charset_strndup (pos, pos2 - pos);
|
||||
}
|
||||
if (pos_tmp)
|
||||
pos_tmp[0] = ' ';
|
||||
pos = strchr (message, ' ');
|
||||
if (!pos)
|
||||
pos = message;
|
||||
@ -292,8 +274,7 @@ weechat_charset_irc_in (t_weechat_plugin *plugin, int argc, char **argv,
|
||||
char *handler_args, void *handler_pointer)
|
||||
{
|
||||
char *nick, *command, *channel, *charset, *ptr_args;
|
||||
char *decoded, *output;
|
||||
int length;
|
||||
char *output;
|
||||
|
||||
/* make gcc happy */
|
||||
(void) argc;
|
||||
@ -303,33 +284,20 @@ weechat_charset_irc_in (t_weechat_plugin *plugin, int argc, char **argv,
|
||||
output = NULL;
|
||||
|
||||
weechat_charset_parse_irc_msg (argv[1], &nick, &command, &channel, &ptr_args);
|
||||
|
||||
if (weechat_charset_command_allowed (command))
|
||||
|
||||
charset = weechat_charset_get_config (plugin,
|
||||
"decode", argv[0],
|
||||
(channel) ? channel : nick);
|
||||
|
||||
if (weechat_charset_debug)
|
||||
plugin->print(plugin, NULL, NULL,
|
||||
"Charset IN: srv='%s', nick='%s', chan='%s', "
|
||||
"msg='%s', ptr_args='%s' => charset: %s",
|
||||
argv[0], nick, channel, argv[1], ptr_args, charset);
|
||||
|
||||
if (charset)
|
||||
{
|
||||
charset = weechat_charset_get_config (plugin,
|
||||
"decode", argv[0],
|
||||
(channel) ? channel : nick);
|
||||
|
||||
if (weechat_charset_debug)
|
||||
plugin->print(plugin, NULL, NULL,
|
||||
"Charset IN: srv='%s', nick='%s', chan='%s', "
|
||||
"msg='%s', ptr_args='%s' => charset: %s",
|
||||
argv[0], nick, channel, argv[1], ptr_args, charset);
|
||||
|
||||
if (ptr_args && charset)
|
||||
{
|
||||
decoded = plugin->iconv_to_internal (plugin, charset, ptr_args);
|
||||
if (decoded)
|
||||
{
|
||||
length = strlen (decoded) + (ptr_args - argv[1]) + 1;
|
||||
output = (char *)malloc (length + 1);
|
||||
strncpy (output, argv[1], ptr_args - argv[1]);
|
||||
output[ptr_args - argv[1]] = '\0';
|
||||
strcat (output, decoded);
|
||||
free (decoded);
|
||||
}
|
||||
}
|
||||
|
||||
output = plugin->iconv_to_internal (plugin, charset, argv[1]);
|
||||
if (charset)
|
||||
free (charset);
|
||||
}
|
||||
@ -354,8 +322,7 @@ weechat_charset_irc_out (t_weechat_plugin *plugin, int argc, char **argv,
|
||||
char *handler_args, void *handler_pointer)
|
||||
{
|
||||
char *nick, *command, *channel, *charset, *ptr_args;
|
||||
char *encoded, *output;
|
||||
int length;
|
||||
char *output;
|
||||
|
||||
/* make gcc happy */
|
||||
(void) argc;
|
||||
@ -365,33 +332,20 @@ weechat_charset_irc_out (t_weechat_plugin *plugin, int argc, char **argv,
|
||||
output = NULL;
|
||||
|
||||
weechat_charset_parse_irc_msg (argv[1], &nick, &command, &channel, &ptr_args);
|
||||
|
||||
charset = weechat_charset_get_config (plugin,
|
||||
"encode", argv[0],
|
||||
(channel) ? channel : nick);
|
||||
|
||||
if (weechat_charset_debug)
|
||||
plugin->print(plugin, NULL, NULL,
|
||||
"Charset OUT: srv='%s', nick='%s', chan='%s', "
|
||||
"msg='%s', ptr_args='%s' => charset: %s",
|
||||
argv[0], nick, channel, argv[1], ptr_args, charset);
|
||||
|
||||
if (weechat_charset_command_allowed (command))
|
||||
if (charset)
|
||||
{
|
||||
charset = weechat_charset_get_config (plugin,
|
||||
"encode", argv[0],
|
||||
(channel) ? channel : nick);
|
||||
|
||||
if (weechat_charset_debug)
|
||||
plugin->print(plugin, NULL, NULL,
|
||||
"Charset OUT: srv='%s', nick='%s', chan='%s', "
|
||||
"msg='%s', ptr_args='%s' => charset: %s",
|
||||
argv[0], nick, channel, argv[1], ptr_args, charset);
|
||||
|
||||
if (ptr_args && charset)
|
||||
{
|
||||
encoded = plugin->iconv_from_internal (plugin, charset, ptr_args);
|
||||
if (encoded)
|
||||
{
|
||||
length = strlen (encoded) + (ptr_args - argv[1]) + 1;
|
||||
output = (char *)malloc (length + 1);
|
||||
strncpy (output, argv[1], ptr_args - argv[1]);
|
||||
output[ptr_args - argv[1]] = '\0';
|
||||
strcat (output, encoded);
|
||||
free (encoded);
|
||||
}
|
||||
}
|
||||
|
||||
output = plugin->iconv_from_internal (plugin, charset, argv[1]);
|
||||
if (charset)
|
||||
free (charset);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user