diff options
author | Sebastien Helleu <flashcode@flashtux.org> | 2006-11-08 07:54:33 +0000 |
---|---|---|
committer | Sebastien Helleu <flashcode@flashtux.org> | 2006-11-08 07:54:33 +0000 |
commit | c20ce83d20526e24601c6c8acabc7a61ab3c3a78 (patch) | |
tree | a8e1b79498ef7cd410176680d9bfb585270aa576 /doc | |
parent | b5a7d8e99e372378cb47069a3d2ad0bf65ccc530 (diff) | |
download | weechat-c20ce83d20526e24601c6c8acabc7a61ab3c3a78.zip |
Added charset plugin (WeeChat is now full UTF-8 for internal data storage), fixed compilation problems with FreeBSD, fixed status bar display bug
Diffstat (limited to 'doc')
-rw-r--r-- | doc/de/config.xml | 49 | ||||
-rw-r--r-- | doc/de/weechat.de.xml | 297 | ||||
-rw-r--r-- | doc/de/weechat_commands.xml | 10 | ||||
-rw-r--r-- | doc/en/config.xml | 49 | ||||
-rw-r--r-- | doc/en/weechat.en.xml | 278 | ||||
-rw-r--r-- | doc/en/weechat_commands.xml | 10 | ||||
-rw-r--r-- | doc/fr/config.xml | 49 | ||||
-rw-r--r-- | doc/fr/weechat.fr.xml | 284 | ||||
-rw-r--r-- | doc/fr/weechat_commands.xml | 10 |
9 files changed, 767 insertions, 269 deletions
diff --git a/doc/de/config.xml b/doc/de/config.xml index b0ea5398a..60a6beb46 100644 --- a/doc/de/config.xml +++ b/doc/de/config.xml @@ -41,34 +41,6 @@ <entry>WeeChat-Slogan (wenn leer, wird keiner benutzt)</entry> </row> <row> - <entry><option>look_charset_decode_iso</option></entry> - <entry>Zeichenfolge</entry> - <entry>eine beliebige Zeichenfolge</entry> - <entry>'ISO-8859-1'</entry> - <entry>ISO-Zeichensatz zum Dekodieren von Nachrichten vom Server (wird nur benutzt, wenn UTF-8 als Locale eingestellt ist; wenn nichts angegeben wird und die Locale UTF-8 ist, findet keine Konvertierung statt)</entry> -</row> -<row> - <entry><option>look_charset_decode_utf</option></entry> - <entry>Zeichenfolge</entry> - <entry>eine beliebige Zeichenfolge</entry> - <entry>'UTF-8'</entry> - <entry>UTF-Zeichensatz zum Dekodieren von Nachrichten vom Server (wird nur benutzt, wenn die Locale nicht UTF-8 ist; wenn nichts angegeben wird und die Locale nicht UTF-8 ist, findet keine Konvertierung statt)</entry> -</row> -<row> - <entry><option>look_charset_encode</option></entry> - <entry>Zeichenfolge</entry> - <entry>eine beliebige Zeichenfolge</entry> - <entry>''</entry> - <entry>Zeichensatz zum Enkodieren von Nachrichten zum Server, wie zum Beispiel: UTF-8, ISO-8859-1 (wenn nichts angegeben wird, findet keine Konversion statt)</entry> -</row> -<row> - <entry><option>look_charset_internal</option></entry> - <entry>Zeichenfolge</entry> - <entry>eine beliebige Zeichenfolge</entry> - <entry>''</entry> - <entry>Erzwingt internen WeeChat-Zeichensatz (sollte normalerweise leer sein, dadurch wird der erkannte Zeichensatz benutzt)</entry> -</row> -<row> <entry><option>look_one_server_buffer</option></entry> <entry>Boolean</entry> <entry>eine beliebige Zeichenfolge</entry> @@ -1237,24 +1209,3 @@ <entry>''</entry> <entry>Comma separated list of notify levels for channels of this server (format: #channel:1,..), a channel name '*' is reserved for server default notify level</entry> </row> -<row> - <entry><option>server_charset_decode_iso</option></entry> - <entry>Zeichenfolge</entry> - <entry>eine beliebige Zeichenfolge</entry> - <entry>''</entry> - <entry>Durch Kommata getrennte Liste der Zeichensätze für den Server und die Channels, um ISO-Nachrichten zu dekodieren (Format: Server:Zeichensatz,#Channel:Zeichensatz)</entry> -</row> -<row> - <entry><option>server_charset_decode_utf</option></entry> - <entry>Zeichenfolge</entry> - <entry>eine beliebige Zeichenfolge</entry> - <entry>''</entry> - <entry>Durch Kommata getrennte Liste der Zeichensätze für Server und Channels, um UTF zu dekodieren (Format: Server:Zeichensatz,#Channel:Zeichensatz,..)</entry> -</row> -<row> - <entry><option>server_charset_encode</option></entry> - <entry>Zeichenfolge</entry> - <entry>eine beliebige Zeichenfolge</entry> - <entry>''</entry> - <entry>Durch Kommata getrennte Liste der Zeichensätze, um Nachrichten vom Server und aus Channels zu dekodieren (Format: Server:Zeichensatz,#Channel:Zeichensatz,..)</entry> -</row> diff --git a/doc/de/weechat.de.xml b/doc/de/weechat.de.xml index 97b444330..02a8d6dc9 100644 --- a/doc/de/weechat.de.xml +++ b/doc/de/weechat.de.xml @@ -513,6 +513,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA </entry> </row> <row> + <entry>Strg + T</entry> + <entry> + <!-- TRANSLATION NEEDED --> + Transpose chars + </entry> + </row> + <row> <entry>Strg + U</entry> <entry> Lösche vom Cursor bis zum Aanfang der Kommandozeile @@ -525,19 +532,27 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA </entry> </row> <row> - <entry> Rückschritt </entry> + <entry>Strg + Y</entry> + <entry> + <!-- TRANSLATION NEEDED --> + Paste clipboard content + </entry> + </row> + <row> + <entry>Rückschritt / Strg + H</entry> <entry> Lösche das vorhergehende Zeichen in der Kommandozeile </entry> </row> <row> - <entry> Entfernen </entry> + <entry>Entfernen</entry> <entry> Lösche das nächste Zeichen in der Kommandozeile </entry> </row> <row> - <entry> Tabulator </entry> + <!-- TRANSLATION NEEDED --> + <entry>Tabulator / Shift + Tabulator</entry> <entry> Vervollständige ein Kommando oder Nick (wiederhole: finde nächste Vervollständigung) @@ -550,7 +565,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA </entry> </row> <row> - <entry>Eingabe</entry> + <entry>Eingabe / Strg + J / Strg + M</entry> <entry> Führe ein Kommando aus oder sende eine Nachricht </entry> @@ -593,7 +608,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA </entry> </row> <row> - <entry> F6 / Alt + Rechts </entry> + <entry>F6 / Alt + Rechts</entry> <entry> Gehe zum nächsten Puffer </entry> @@ -1262,6 +1277,132 @@ fi <section id="secAPIFunctions"> <title>API Funktionen</title> + + <!-- TRANSLATION NEEDED --> + <section id="secAPI_set_charset"> + <title>set_charset</title> + + <para> + Prototype: + <command> + void set_charset (t_weechat_plugin *plugin, char *charset) + </command> + </para> + <para> + Set new plugin charset. + </para> + <para> + Arguments: + <itemizedlist> + <listitem> + <para> + <option>plugin</option>: pointer to plugin structure + </para> + </listitem> + <listitem> + <para> + <option>charset</option>: new charset to use + </para> + </listitem> + </itemizedlist> + </para> + <para> + Example: + <screen>plugin->set_charset (plugin, "ISO-8859-1");</screen> + </para> + </section> + + <!-- TRANSLATION NEEDED --> + <section id="secAPI_iconv_to_internal"> + <title>iconv_to_internal</title> + + <para> + Prototype: + <command> + void iconv_to_internal (t_weechat_plugin *plugin, char *charset, + char *string) + </command> + </para> + <para> + Convert string to WeeChat internal charset (UTF-8). + </para> + <para> + Arguments: + <itemizedlist> + <listitem> + <para> + <option>plugin</option>: pointer to plugin structure + </para> + </listitem> + <listitem> + <para> + <option>charset</option>: charset to convert + </para> + </listitem> + <listitem> + <para> + <option>string</option>: string to convert + </para> + </listitem> + </itemizedlist> + </para> + <para> + Return value: converted string. + </para> + <para> + Note: result has to be free by a call to "free" after use. + </para> + <para> + Example: + <screen>char *str = plugin->iconv_to_internal (plugin, "ISO-8859-1", "iso string: é à");</screen> + </para> + </section> + + <!-- TRANSLATION NEEDED --> + <section id="secAPI_iconv_from_internal"> + <title>iconv_from_internal</title> + + <para> + Prototype: + <command> + void iconv_from_internal (t_weechat_plugin *plugin, char *charset, + char *string) + </command> + </para> + <para> + Convert string from internal WeeChat charset (UTF-8) to another. + </para> + <para> + Arguments: + <itemizedlist> + <listitem> + <para> + <option>plugin</option>: pointer to plugin structure + </para> + </listitem> + <listitem> + <para> + <option>charset</option>: target charset + </para> + </listitem> + <listitem> + <para> + <option>string</option>: string to convert + </para> + </listitem> + </itemizedlist> + </para> + <para> + Return value: converted string. + </para> + <para> + Note: result has to be free by a call to "free" after use. + </para> + <para> + Example: + <screen>char *str = plugin->iconv_from_internal (plugin, "ISO-8859-1", "utf-8 string: é à");</screen> + </para> + </section> <section id="secAPI_ascii_strcasecmp"> <title>ascii_strcasecmp</title> @@ -2436,7 +2577,8 @@ keyb_handler = plugin->keyboard_handler_add (plugin, &my_keyb); <screen>plugin->handler_remove_all (plugin);</screen> </para> </section> - + + <!-- TRANSLATION NEEDED --> <section id="secAPI_modifier_add"> <title>modifier_add</title> @@ -2577,6 +2719,7 @@ modifier = plugin->modifier_add (plugin, "irc_in", "privmsg", </para> </section> + <!-- TRANSLATION NEEDED --> <section id="secAPI_modifier_remove"> <title>modifier_remove</title> @@ -2614,6 +2757,7 @@ modifier = plugin->modifier_add (plugin, "irc_in", "privmsg", </para> </section> + <!-- TRANSLATION NEEDED --> <section id="secAPI_modifier_remove_all"> <title>modifier_remove_all</title> @@ -4635,25 +4779,25 @@ end <para> Perl-Prototyp: <command> - weechat::register(name, version, end_function, description); + weechat::register(name, version, end_function, description, [charset]); </command> </para> <para> Python-Prototyp: <command> - weechat.register(name, version, end_function, description) + weechat.register(name, version, end_function, description, [charset]) </command> </para> <para> Ruby-Prototyp: <command> - Weechat.register(name, version, end_function, description) + Weechat.register(name, version, end_function, description, [charset]) </command> </para> <para> Lua-Prototyp: <command> - weechat.register(name, version, end_function, description) + weechat.register(name, version, end_function, description, [charset]) </command> </para> <para> @@ -4686,6 +4830,13 @@ end <option>description</option>: eine kurze Beschreibung des Skripts </para> </listitem> + <listitem> + <para> + <!-- TRANSLATION NEEDED --> + <option>charset</option>: charset used by script, you should + set this if script is not written with UTF-8 + </para> + </listitem> </itemizedlist> </para> <para> @@ -4695,16 +4846,78 @@ end Beispiele: <screen> # perl -weechat::register("test", "1.0", "end_test", "Test script!"); +weechat::register("test", "1.0", "end_test", "Test script!", "ISO-8859-1"); # python -weechat.register("test", "1.0", "end_test", "Test script!") +weechat.register("test", "1.0", "end_test", "Test script!", "ISO-8859-1") # ruby -Weechat.register("test", "1.0", "end_test", "Test script!") +Weechat.register("test", "1.0", "end_test", "Test script!", "ISO-8859-1") -- lua -weechat.register("test", "1.0", "end_test", "Test script!") +weechat.register("test", "1.0", "end_test", "Test script!", "ISO-8859-1") +</screen> + </para> + </section> + + <!-- TRANSLATION NEEDED --> + <section id="secScript_set_charset"> + <title>set_charset</title> + + <para> + Perl prototype: + <command> + weechat::set_charset(charset); + </command> + </para> + <para> + Python prototype: + <command> + weechat.set_charset(charset) + </command> + </para> + <para> + Ruby prototype: + <command> + Weechat.set_charset(charset) + </command> + </para> + <para> + Lua prototype: + <command> + weechat.set_charset(charset) + </command> + </para> + <para> + Set new script charset. + </para> + <para> + Arguments: + <itemizedlist> + <listitem> + <para> + <option>charset</option>: new script charset + </para> + </listitem> + </itemizedlist> + </para> + <para> + Return value: 1 if new charset was set, 0 if an error occured. + </para> + <para> + Examples: +<screen> +# perl +weechat::set_charset("ISO-8859-1"); + +# python +weechat.set_charset("ISO-8859-1") + +# ruby +Weechat.set_charset("ISO-8859-1") + +-- lua +weechat.set_charset("ISO-8859-1") </screen> </para> </section> @@ -5327,7 +5540,7 @@ end -- lua weechat.add_timer_handler(60, "my_timer") function my_timer() - weechat.print("this is timer handler) + weechat.print("this is timer handler") return weechat.PLUGIN_RC_OK() end </screen> @@ -5644,6 +5857,7 @@ weechat.remove_keyboard_handler("my_keyboard") </para> </section> + <!-- TRANSLATION NEEDED --> <section id="secScript_add_modifier"> <title>add_modifier</title> @@ -5738,32 +5952,49 @@ weechat.remove_keyboard_handler("my_keyboard") Examples: <screen> # perl -weechat::add_modifier("irc_in", "privmsg", "my_function"); -sub my_function +weechat::add_modifier("irc_in", "privmsg", "mod_in"); +weechat::add_modifier("irc_out", "privmsg", "mod_out"); +sub mod_in +{ + return "$_[1] [modifier IN]"; +} +sub mod_out { - # TODO + return "$_[1] [modifier OUT]"; } # python -weechat.add_modifier("irc_in", "privmsg", "my_function") -def my_function(serveur, args): - # TODO +weechat.add_modifier("irc_in", "privmsg", "mod_in") +weechat.add_modifier("irc_out", "privmsg", "mod_out") +def mod_in(serveur, args): + return args + " [modifier IN]" +def mod_out(serveur, args): + return args + " [modifier OUT]" # ruby -Weechat.add_modifier("irc_in", "privmsg", "my_function") -def my_function(server, args) - # TODO +Weechat.add_modifier("irc_in", "privmsg", "mod_in") +Weechat.add_modifier("irc_out", "privmsg", "mod_out") +def mod_in(server, args) + return args + " [modifier IN]" +end +def mod_out(server, args) + return args + " [modifier OUT]" end -- lua -weechat.add_modifier("irc_in", "privmsg", "my_function") -function my_function(server, args) - -- TODO +weechat.add_modifier("irc_in", "privmsg", "mod_in") +weechat.add_modifier("irc_out", "privmsg", "mod_out") +function mod_in(server, args) + return args .. " [modifier IN]" +end +function mod_out(server, args) + return args .. " [modifier OUT]" end </screen> </para> </section> + <!-- TRANSLATION NEEDED --> <section id="secScript_remove_modifier"> <title>remove_modifier</title> @@ -5821,16 +6052,16 @@ end Examples: <screen> # perl -weechat::remove_modifier("irc_in", "privmsg", "my_function"); +weechat::remove_modifier("irc_in", "privmsg", "mod_in"); # python -weechat.remove_modifier("irc_in", "privmsg", "my_function") +weechat.remove_modifier("irc_in", "privmsg", "mod_in") # ruby -Weechat.remove_modifier("irc_in", "privmsg", "my_function") +Weechat.remove_modifier("irc_in", "privmsg", "mod_in") -- lua -weechat.remove_modifier("irc_in", "privmsg", "my_function") +weechat.remove_modifier("irc_in", "privmsg", "mod_in") </screen> </para> </section> @@ -7121,8 +7352,8 @@ end </listitem> <listitem> <para> - <emphasis>Kolter</emphasis> - <email>kolter AT free.fr</email> - + <emphasis>kolter (Emmanuel Bouthenot)</emphasis> + <email>kolter AT openics.org</email> - Entwickler </para> </listitem> diff --git a/doc/de/weechat_commands.xml b/doc/de/weechat_commands.xml index 6e2a1a8b6..1e7b91dcd 100644 --- a/doc/de/weechat_commands.xml +++ b/doc/de/weechat_commands.xml @@ -40,16 +40,6 @@ Befehl: auszuführender Befehl (falls nicht vorhanden wird automatisch ein '/' vo </programlisting> -<command>charset [(decode_iso | decode_utf | encode) Zeichensatz]</command> -<programlisting> -ändere Zeichensatz für den Server oder Channel - -decode_iso: Zeichensatz um ISO zu decoden -decode_utf: Zeichensatz um UTF zu decoden - encode: der zum encoden benutzte Zeichensatz - Zeichensatz: Zeichensatz, der benutzt werden soll (zum Beispiel: ISO-8859-15, UTF-8,..) - -</programlisting> <command>clear [-all]</command> <programlisting> Fenster leeren diff --git a/doc/en/config.xml b/doc/en/config.xml index 2760a3002..0007ebcf8 100644 --- a/doc/en/config.xml +++ b/doc/en/config.xml @@ -41,34 +41,6 @@ <entry>WeeChat slogan (if empty, slogan is not used)</entry> </row> <row> - <entry><option>look_charset_decode_iso</option></entry> - <entry>string</entry> - <entry>any string</entry> - <entry>'ISO-8859-1'</entry> - <entry>ISO charset for decoding messages from server (used only if locale is UTF-8) (if empty, messages are not converted if locale is UTF-8)</entry> -</row> -<row> - <entry><option>look_charset_decode_utf</option></entry> - <entry>string</entry> - <entry>any string</entry> - <entry>'UTF-8'</entry> - <entry>UTF charset for decoding messages from server (used only if locale is not UTF-8) (if empty, messages are not converted if locale is not UTF-8)</entry> -</row> -<row> - <entry><option>look_charset_encode</option></entry> - <entry>string</entry> - <entry>any string</entry> - <entry>''</entry> - <entry>Charset for encoding messages sent to server, examples: UTF-8, ISO-8859-1 (if empty, messages are not converted)</entry> -</row> -<row> - <entry><option>look_charset_internal</option></entry> - <entry>string</entry> - <entry>any string</entry> - <entry>''</entry> - <entry>Forces internal WeeChat charset (should be empty in most cases, that means detected charset is used)</entry> -</row> -<row> <entry><option>look_one_server_buffer</option></entry> <entry>boolean</entry> <entry>'on' or 'off'</entry> @@ -1237,24 +1209,3 @@ <entry>''</entry> <entry>Comma separated list of notify levels for channels of this server (format: #channel:1,..), a channel name '*' is reserved for server default notify level</entry> </row> -<row> - <entry><option>server_charset_decode_iso</option></entry> - <entry>string</entry> - <entry>any string</entry> - <entry>''</entry> - <entry>Comma separated list of charsets for server and channels, to decode ISO (format: server:charset,#channel:charset,..)</entry> -</row> -<row> - <entry><option>server_charset_decode_utf</option></entry> - <entry>string</entry> - <entry>any string</entry> - <entry>''</entry> - <entry>Comma separated list of charsets for server and channels, to decode UTF (format: server:charset,#channel:charset,..)</entry> -</row> -<row> - <entry><option>server_charset_encode</option></entry> - <entry>string</entry> - <entry>any string</entry> - <entry>''</entry> - <entry>Comma separated list of charsets for server and channels, to encode messages (format: server:charset,#channel:charset,..)</entry> -</row> diff --git a/doc/en/weechat.en.xml b/doc/en/weechat.en.xml index 18cb123be..5104eceb7 100644 --- a/doc/en/weechat.en.xml +++ b/doc/en/weechat.en.xml @@ -509,6 +509,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA </entry> </row> <row> + <entry>Ctrl + T</entry> + <entry> + Transpose chars + </entry> + </row> + <row> <entry>Ctrl + U</entry> <entry> Delete from cursor until beginning of command line @@ -521,7 +527,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA </entry> </row> <row> - <entry>Backspace</entry> + <entry>Ctrl + Y</entry> + <entry> + Paste clipboard content + </entry> + </row> + <row> + <entry>Backspace / Ctrl + H</entry> <entry> Delete previous char in command line </entry> @@ -533,7 +545,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA </entry> </row> <row> - <entry>Tab</entry> + <entry>Tab / Shift + Tab</entry> <entry> Complete command or nick (Tab again: find next completion) @@ -546,7 +558,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA </entry> </row> <row> - <entry>Enter</entry> + <entry>Enter / Ctrl + J / Ctrl + M</entry> <entry> Execute command or send message </entry> @@ -1260,6 +1272,129 @@ fi <section id="secAPIFunctions"> <title>API functions</title> + <section id="secAPI_set_charset"> + <title>set_charset</title> + + <para> + Prototype: + <command> + void set_charset (t_weechat_plugin *plugin, char *charset) + </command> + </para> + <para> + Set new plugin charset. + </para> + <para> + Arguments: + <itemizedlist> + <listitem> + <para> + <option>plugin</option>: pointer to plugin structure + </para> + </listitem> + <listitem> + <para> + <option>charset</option>: new charset to use + </para> + </listitem> + </itemizedlist> + </para> + <para> + Example: + <screen>plugin->set_charset (plugin, "ISO-8859-1");</screen> + </para> + </section> + + <section id="secAPI_iconv_to_internal"> + <title>iconv_to_internal</title> + + <para> + Prototype: + <command> + void iconv_to_internal (t_weechat_plugin *plugin, char *charset, + char *string) + </command> + </para> + <para> + Convert string to WeeChat internal charset (UTF-8). + </para> + <para> + Arguments: + <itemizedlist> + <listitem> + <para> + <option>plugin</option>: pointer to plugin structure + </para> + </listitem> + <listitem> + <para> + <option>charset</option>: charset to convert + </para> + </listitem> + <listitem> + <para> + <option>string</option>: string to convert + </para> + </listitem> + </itemizedlist> + </para> + <para> + Return value: converted string. + </para> + <para> + Note: result has to be free by a call to "free" after use. + </para> + <para> + Example: + <screen>char *str = plugin->iconv_to_internal (plugin, "ISO-8859-1", "iso string: é à");</screen> + </para> + </section> + + <section id="secAPI_iconv_from_internal"> + <title>iconv_from_internal</title> + + <para> + Prototype: + <command> + void iconv_from_internal (t_weechat_plugin *plugin, char *charset, + char *string) + </command> + </para> + <para> + Convert string from internal WeeChat charset (UTF-8) to another. + </para> + <para> + Arguments: + <itemizedlist> + <listitem> + <para> + <option>plugin</option>: pointer to plugin structure + </para> + </listitem> + <listitem> + <para> + <option>charset</option>: target charset + </para> + </listitem> + <listitem> + <para> + <option>string</option>: string to convert + </para> + </listitem> + </itemizedlist> + </para> + <para> + Return value: converted string. + </para> + <para> + Note: result has to be free by a call to "free" after use. + </para> + <para> + Example: + <screen>char *str = plugin->iconv_from_internal (plugin, "ISO-8859-1", "utf-8 string: é à");</screen> + </para> + </section> + <section id="secAPI_ascii_strcasecmp"> <title>ascii_strcasecmp</title> @@ -4670,25 +4805,25 @@ end <para> Perl prototype: <command> - weechat::register(name, version, end_function, description); + weechat::register(name, version, end_function, description, [charset]); </command> </para> <para> Python prototype: <command> - weechat.register(name, version, end_function, description) + weechat.register(name, version, end_function, description, [charset]) </command> </para> <para> Ruby prototype: <command> - Weechat.register(name, version, end_function, description) + Weechat.register(name, version, end_function, description, [charset]) </command> </para> <para> Lua prototype: <command> - weechat.register(name, version, end_function, description) + weechat.register(name, version, end_function, description, [charset]) </command> </para> <para> @@ -4721,6 +4856,12 @@ end <option>description</option>: short description of script </para> </listitem> + <listitem> + <para> + <option>charset</option>: charset used by script, you should + set this if script is not written with UTF-8 + </para> + </listitem> </itemizedlist> </para> <para> @@ -4730,16 +4871,77 @@ end Examples: <screen> # perl -weechat::register("test", "1.0", "end_test", "Test script!"); +weechat::register("test", "1.0", "end_test", "Test script!", "ISO-8859-1"); + +# python +weechat.register("test", "1.0", "end_test", "Test script!", "ISO-8859-1") + +# ruby +Weechat.register("test", "1.0", "end_test", "Test script!", "ISO-8859-1") + +-- lua +weechat.register("test", "1.0", "end_test", "Test script!", "ISO-8859-1") +</screen> + </para> + </section> + + <section id="secScript_set_charset"> + <title>set_charset</title> + + <para> + Perl prototype: + <command> + weechat::set_charset(charset); + </command> + </para> + <para> + Python prototype: + <command> + weechat.set_charset(charset) + </command> + </para> + <para> + Ruby prototype: + <command> + Weechat.set_charset(charset) + </command> + </para> + <para> + Lua prototype: + <command> + weechat.set_charset(charset) + </command> + </para> + <para> + Set new script charset. + </para> + <para> + Arguments: + <itemizedlist> + <listitem> + <para> + <option>charset</option>: new script charset + </para> + </listitem> + </itemizedlist> + </para> + <para> + Return value: 1 if new charset was set, 0 if an error occured. + </para> + <para> + Examples: +<screen> +# perl +weechat::set_charset("ISO-8859-1"); # python -weechat.register("test", "1.0", "end_test", "Test script!") +weechat.set_charset("ISO-8859-1") # ruby -Weechat.register("test", "1.0", "end_test", "Test script!") +Weechat.set_charset("ISO-8859-1") -- lua -weechat.register("test", "1.0", "end_test", "Test script!") +weechat.set_charset("ISO-8859-1") </screen> </para> </section> @@ -5367,7 +5569,7 @@ end -- lua weechat.add_timer_handler(60, "my_timer") function my_timer() - weechat.print("this is timer handler) + weechat.print("this is timer handler") return weechat.PLUGIN_RC_OK() end </screen> @@ -5776,27 +5978,43 @@ weechat.remove_keyboard_handler("my_keyboard") Examples: <screen> # perl -weechat::add_modifier("irc_in", "privmsg", "my_function"); -sub my_function +weechat::add_modifier("irc_in", "privmsg", "mod_in"); +weechat::add_modifier("irc_out", "privmsg", "mod_out"); +sub mod_in +{ + return "$_[1] [modifier IN]"; +} +sub mod_out { - # TODO + return "$_[1] [modifier OUT]"; } # python -weechat.add_modifier("irc_in", "privmsg", "my_function") -def my_function(serveur, args): - # TODO +weechat.add_modifier("irc_in", "privmsg", "mod_in") +weechat.add_modifier("irc_out", "privmsg", "mod_out") +def mod_in(serveur, args): + return args + " [modifier IN]" +def mod_out(serveur, args): + return args + " [modifier OUT]" # ruby -Weechat.add_modifier("irc_in", "privmsg", "my_function") -def my_function(server, args) - # TODO +Weechat.add_modifier("irc_in", "privmsg", "mod_in") +Weechat.add_modifier("irc_out", "privmsg", "mod_out") +def mod_in(server, args) + return args + " [modifier IN]" +end +def mod_out(server, args) + return args + " [modifier OUT]" end -- lua -weechat.add_modifier("irc_in", "privmsg", "my_function") -function my_function(server, args) - -- TODO +weechat.add_modifier("irc_in", "privmsg", "mod_in") +weechat.add_modifier("irc_out", "privmsg", "mod_out") +function mod_in(server, args) + return args .. " [modifier IN]" +end +function mod_out(server, args) + return args .. " [modifier OUT]" end </screen> </para> @@ -5859,16 +6077,16 @@ end Examples: <screen> # perl -weechat::remove_modifier("irc_in", "privmsg", "my_function"); +weechat::remove_modifier("irc_in", "privmsg", "mod_in"); # python -weechat.remove_modifier("irc_in", "privmsg", "my_function") +weechat.remove_modifier("irc_in", "privmsg", "mod_in") # ruby -Weechat.remove_modifier("irc_in", "privmsg", "my_function") +Weechat.remove_modifier("irc_in", "privmsg", "mod_in") -- lua -weechat.remove_modifier("irc_in", "privmsg", "my_function") +weechat.remove_modifier("irc_in", "privmsg", "mod_in") </screen> </para> </section> @@ -7162,8 +7380,8 @@ end </listitem> <listitem> <para> - <emphasis>Kolter</emphasis> - <email>kolter AT free.fr</email> - + <emphasis>kolter (Emmanuel Bouthenot)</emphasis> + <email>kolter AT openics.org</email> - developer </para> </listitem> diff --git a/doc/en/weechat_commands.xml b/doc/en/weechat_commands.xml index 14306d528..8affaf7fb 100644 --- a/doc/en/weechat_commands.xml +++ b/doc/en/weechat_commands.xml @@ -40,16 +40,6 @@ command: command to execute (a '/' is automatically added if not found at beginn </programlisting> -<command>charset [(decode_iso | decode_utf | encode) charset]</command> -<programlisting> -change charset for server or channel - -decode_iso: charset used for decoding ISO -decode_utf: charset used for decoding UTF - encode: charset used for encoding messages - charset: charset to use (for example: ISO-8859-15, UTF-8,..) - -</programlisting> <command>clear [-all]</command> <programlisting> clear window(s) diff --git a/doc/fr/config.xml b/doc/fr/config.xml index 4907446c3..1bc4ea459 100644 --- a/doc/fr/config.xml +++ b/doc/fr/config.xml @@ -41,34 +41,6 @@ <entry>Slogan WeeChat (si vide, le slogan ne sera pas utilisé)</entry> </row> <row> - <entry><option>look_charset_decode_iso</option></entry> - <entry>chaîne</entry> - <entry>toute chaîne</entry> - <entry>'ISO-8859-1'</entry> - <entry>Jeu de caractères ISO pour décoder les messages du serveur (utilisé seulement si la locale est UTF-8) (si non renseigné, les messages ne sont pas convertis si la locale est UTF-8)</entry> -</row> -<row> - <entry><option>look_charset_decode_utf</option></entry> - <entry>chaîne</entry> - <entry>toute chaîne</entry> - <entry>'UTF-8'</entry> - <entry>Jeu de caractères UTF pour décoder les messages du serveur (utilisé seulement si la locale n'est pas UTF-8) (si non renseigné, les messages ne sont pas convertis si la locale n'est pas UTF-8)</entry> -</row> -<row> - <entry><option>look_charset_encode</option></entry> - <entry>chaîne</entry> - <entry>toute chaîne</entry> - <entry>''</entry> - <entry>Jeu de caractères pour encoder les messages envoyés au serveur, exemples: UTF-8, ISO-8859-1 (si non renseigné, les messages ne sont pas convertis)</entry> -</row> -<row> - <entry><option>look_charset_internal</option></entry> - <entry>chaîne</entry> - <entry>toute chaîne</entry> - <entry>''</entry> - <entry>Force le jeu de caractères interne à WeeChat (doit être vide dans la plupart des cas, ce qui signifie que le jeu de caractères détecté est utilisé)</entry> -</row> -<row> <entry><option>look_one_server_buffer</option></entry> <entry>booléen</entry> <entry>'on' ou 'off'</entry> @@ -1237,24 +1209,3 @@ <entry>''</entry> <entry>Liste des niveaux de notifications (séparés par des virgules) pour les canaux de ce serveur (format: #canal:1,..), un nom de canal '*' est réservé pour la notification par défaut du serveur</entry> </row> -<row> - <entry><option>server_charset_decode_iso</option></entry> - <entry>chaîne</entry> - <entry>toute chaîne</entry> - <entry>''</entry> - <entry>Liste des jeux de caractères (séparés par des virgules) pour le serveur et les canaux, pour décoder l'ISO (format: server:charset,#canal:charset,..)</entry> -</row> -<row> - <entry><option>server_charset_decode_utf</option></entry> - <entry>chaîne</entry> - <entry>toute chaîne</entry> - <entry>''</entry> - <entry>Liste des jeux de caractères (séparés par des virgules) pour le serveur et les canaux, pour décoder l'UTF (format: server:charset,#canal:charset,..)</entry> -</row> -<row> - <entry><option>server_charset_encode</option></entry> - <entry>chaîne</entry> - <entry>toute chaîne</entry> - <entry>''</entry> - <entry>Liste des jeux de caractères (séparés par des virgules) pour le serveur et les canaux, pour encoder les messages (format: server:charset,#canal:charset,..)</entry> -</row> diff --git a/doc/fr/weechat.fr.xml b/doc/fr/weechat.fr.xml index 68ba41451..a0471325a 100644 --- a/doc/fr/weechat.fr.xml +++ b/doc/fr/weechat.fr.xml @@ -518,6 +518,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA </entry> </row> <row> + <entry>Ctrl + T</entry> + <entry> + Inverser deux caractères + </entry> + </row> + <row> <entry>Ctrl + U</entry> <entry> Effacer du curseur jusqu'au début de la ligne de commande @@ -530,7 +536,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA </entry> </row> <row> - <entry>Backspace</entry> + <entry>Ctrl + Y</entry> + <entry> + Coller le contenu du presse-papiers + </entry> + </row> + <row> + <entry>Backspace / Ctrl + H</entry> <entry> Effacer le caractère précédent sur la ligne de commande </entry> @@ -542,7 +554,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA </entry> </row> <row> - <entry>Tab</entry> + <entry>Tab / Shift + Tab</entry> <entry> Compléter la commande ou le pseudo (Tab de nouveau: trouver la complétion suivante) @@ -556,7 +568,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA </entry> </row> <row> - <entry>Entrée</entry> + <entry>Entrée / Ctrl + J / Ctrl + M</entry> <entry> Exécuter la commande ou envoyer le message </entry> @@ -1276,6 +1288,136 @@ fi <section id="secFonctionsInterface"> <title>Fonctions de l'interface (API)</title> + + <section id="secAPI_set_charset"> + <title>set_charset</title> + + <para> + Prototype : + <command> + void set_charset (t_weechat_plugin *plugin, char *charset) + </command> + </para> + <para> + Change le jeu de caractères de l'extension. + </para> + <para> + Paramètres : + <itemizedlist> + <listitem> + <para> + <option>plugin</option> : pointeur vers la structure + de l'extension + </para> + </listitem> + <listitem> + <para> + <option>charset</option> : nouveau jeu de caractères à utiliser + </para> + </listitem> + </itemizedlist> + </para> + <para> + Exemple : + <screen>plugin->set_charset (plugin, "ISO-8859-1");</screen> + </para> + </section> + + <section id="secAPI_iconv_to_internal"> + <title>iconv_to_internal</title> + + <para> + Prototype : + <command> + void iconv_to_internal (t_weechat_plugin *plugin, char *charset, + char *string) + </command> + </para> + <para> + Convertit une chaîne de caractères vers le jeu de caractères + interne WeeChat (UTF-8). + </para> + <para> + Paramètres : + <itemizedlist> + <listitem> + <para> + <option>plugin</option> : pointeur vers la structure + de l'extension + </para> + </listitem> + <listitem> + <para> + <option>charset</option> : le jeu de caractères de départ + </para> + </listitem> + <listitem> + <para> + <option>string</option> : la chaîne à convertir + </para> + </listitem> + </itemizedlist> + </para> + <para> + Valeur renvoyée : la chaîne convertie. + </para> + <para> + Note : le résultat doit être libéré par un appel à la fonction + "free" après utilisation. + </para> + <para> + Exemple : + <screen>char *str = plugin->iconv_to_internal (plugin, "ISO-8859-1", "chaine iso: é à");</screen> + </para> + </section> + + <section id="secAPI_iconv_from_internal"> + <title>iconv_from_internal</title> + + <para> + Prototype : + <command> + void iconv_from_internal (t_weechat_plugin *plugin, char *charset, + char *string) + </command> + </para> + <para> + Convertit une chaîne de caractères depuis le jeu de caractères + interne WeeChat (UTF-8) vers un autre. + </para> + <para> + Paramètres : + <itemizedlist> + <listitem> + <para> + <option>plugin</option> : pointeur vers la structure + de l'extension + </para> + </listitem> + <listitem> + <para> + <option>charset</option> : le jeu de caractères voulu + </para> + </listitem> + <listitem> + <para> + <option>string</option> : la chaîne à convertir + </para> + </listitem> + </itemizedlist> + </para> + <para> + Valeur renvoyée : la chaîne convertie. + </para> + <para> + Note : le résultat doit être libéré par un appel à la fonction + "free" après utilisation. + </para> + <para> + Exemple : + <screen>char *str = plugin->iconv_from_internal (plugin, "ISO-8859-1", "chaine utf-8: é à");</screen> + </para> + </section> <section id="secAPI_ascii_strcasecmp"> <title>ascii_strcasecmp</title> @@ -4782,25 +4924,25 @@ end <para> Prototype Perl : <command> - weechat::register(nom, version, fonction_de_fin, description); + weechat::register(nom, version, fonction_de_fin, description, [charset]); </command> </para> <para> Prototype Python : <command> - weechat.register(nom, version, fonction_de_fin, description) + weechat.register(nom, version, fonction_de_fin, description, [charset]) </command> </para> <para> Prototype Ruby : <command> - Weechat.register(nom, version, fonction_de_fin, description) + Weechat.register(nom, version, fonction_de_fin, description, [charset]) </command> </para> <para> Prototype Lua : <command> - weechat.register(nom, version, fonction_de_fin, description) + weechat.register(nom, version, fonction_de_fin, description, [charset]) </command> </para> <para> @@ -4833,6 +4975,12 @@ end <option>description</option> : brève description du script </para> </listitem> + <listitem> + <para> + <option>charset</option> : jeu de caractères du script, à + préciser si le script n'est pas écrit en UTF-8 + </para> + </listitem> </itemizedlist> </para> <para> @@ -4843,20 +4991,82 @@ end Exemples : <screen> # perl -weechat::register("essai", "1.0", "fin_essai", "Script d'essai !"); +weechat::register("essai", "1.0", "fin_essai", "Script d'essai !", "ISO-8859-1"); # python -weechat.register("essai", "1.0", "fin_essai", "Script d'essai !") +weechat.register("essai", "1.0", "fin_essai", "Script d'essai !", "ISO-8859-1") # ruby -Weechat.register("essai", "1.0", "fin_essai", "Script d'essai !") +Weechat.register("essai", "1.0", "fin_essai", "Script d'essai !", "ISO-8859-1") -- lua -weechat.register("essai", "1.0", "fin_essai", "Script d'essai !") +weechat.register("essai", "1.0", "fin_essai", "Script d'essai !", "ISO-8859-1") </screen> </para> </section> + <section id="sec_script_set_charset"> + <title>set_charset</title> + + <para> + Prototype Perl : + <command> + weechat::set_charset(charset); + </command> + </para> + <para> + Prototype Python : + <command> + weechat.set_charset(charset) + </command> + </para> + <para> + Prototype Ruby : + <command> + Weechat.set_charsetr(charset) + </command> + </para> + <para> + Prototype Lua : + <command> + weechat.set_charset(charset) + </command> + </para> + <para> + Change le jeu de caractères du script. + </para> + <para> + Paramètres : + <itemizedlist> + <listitem> + <para> + <option>charset</option> : nouveau jeu de caractères + </para> + </listitem> + </itemizedlist> + </para> + <para> + Valeur renvoyée : 1 si le nouveau jeu de caractères a été + mis en place, 0 si une erreur s'est produite. + </para> + <para> + Exemples : +<screen> +# perl +weechat::set_charset("ISO-8859-1"); + +# python +weechat.set_charset("ISO-8859-1") + +# ruby +Weechat.set_charset("ISO-8859-1") + +-- lua +weechat.set_charset("ISO-8859-1") +</screen> + </para> + </section> + <section id="secScript_print"> <title>print</title> @@ -5897,27 +6107,43 @@ weechat.remove_keyboard_handler("mon_clavier") Exemples : <screen> # perl -weechat::add_modifier("irc_in", "privmsg", "ma_fonction"); -sub ma_fonction +weechat::add_modifier("irc_in", "privmsg", "mod_in"); +weechat::add_modifier("irc_out", "privmsg", "mod_out"); +sub mod_in +{ + return "$_[1] [modifier IN]"; +} +sub mod_out { - # TODO + return "$_[1] [modifier OUT]"; } # python -weechat.add_modifier("irc_in", "privmsg", "ma_fonction") -def ma_fonction(serveur, args): - # TODO +weechat.add_modifier("irc_in", "privmsg", "mod_in") +weechat.add_modifier("irc_out", "privmsg", "mod_out") +def mod_in(serveur, args): + return args + " [modifier IN]" +def mod_out(serveur, args): + return args + " [modifier OUT]" # ruby -Weechat.add_modifier("irc_in", "privmsg", "ma_fonction") -def ma_fonction(server, args) - # TODO +Weechat.add_modifier("irc_in", "privmsg", "mod_in") +Weechat.add_modifier("irc_out", "privmsg", "mod_out") +def mod_in(server, args) + return args + " [modifier IN]" +end +def mod_out(server, args) + return args + " [modifier OUT]" end -- lua -weechat.add_modifier("irc_in", "privmsg", "ma_fonction") -function ma_fonction(server, args) - -- TODO +weechat.add_modifier("irc_in", "privmsg", "mod_in") +weechat.add_modifier("irc_out", "privmsg", "mod_out") +function mod_in(server, args) + return args .. " [modifier IN]" +end +function mod_out(server, args) + return args .. " [modifier OUT]" end </screen> </para> @@ -5980,16 +6206,16 @@ end Exemples : <screen> # perl -weechat::remove_modifier("irc_in", "privmsg", "ma_fonction"); +weechat::remove_modifier("irc_in", "privmsg", "mod_in"); # python -weechat.remove_modifier("irc_in", "privmsg", "ma_fonction") +weechat.remove_modifier("irc_in", "privmsg", "mod_in") # ruby -Weechat.remove_modifier("irc_in", "privmsg", "ma_fonction") +Weechat.remove_modifier("irc_in", "privmsg", "mod_in") -- lua -weechat.remove_modifier("irc_in", "privmsg", "ma_fonction") +weechat.remove_modifier("irc_in", "privmsg", "mod_in") </screen> </para> </section> @@ -7293,8 +7519,8 @@ end </listitem> <listitem> <para> - <emphasis>Kolter</emphasis> - <email>kolter AT free.fr</email> - + <emphasis>kolter (Emmanuel Bouthenot)</emphasis> + <email>kolter AT openics.org</email> - développeur </para> </listitem> diff --git a/doc/fr/weechat_commands.xml b/doc/fr/weechat_commands.xml index 2073c5dc8..c6d9b5b91 100644 --- a/doc/fr/weechat_commands.xml +++ b/doc/fr/weechat_commands.xml @@ -40,16 +40,6 @@ commande: commande à exécuter (un '/' est automatiquement ajouté s'il n'est pas </programlisting> -<command>charset [(decode_iso | decode_utf | encode) charset]</command> -<programlisting> -changer le jeu de caractères pour le serveur ou le canal - -decode_iso: jeu de caractères utilisé pour décoder l'ISO -decode_utf: jeu de caractères utilisé pour décoder l'UTF - encode: jeu de caractères utilisé pour encoder les messages - charset: jeu de caractères à utiliser (par exemple: ISO-8859-15, UTF-8,..) - -</programlisting> <command>clear [-all]</command> <programlisting> effacer la/les fenêtre(s) |