diff options
| -rw-r--r-- | ChangeLog.adoc | 1 | ||||
| -rw-r--r-- | ReleaseNotes.adoc | 10 | ||||
| -rw-r--r-- | po/cs.po | 33 | ||||
| -rw-r--r-- | po/de.po | 180 | ||||
| -rw-r--r-- | po/es.po | 33 | ||||
| -rw-r--r-- | po/fr.po | 48 | ||||
| -rw-r--r-- | po/hu.po | 29 | ||||
| -rw-r--r-- | po/it.po | 33 | ||||
| -rw-r--r-- | po/ja.po | 33 | ||||
| -rw-r--r-- | po/pl.po | 40 | ||||
| -rw-r--r-- | po/pt.po | 33 | ||||
| -rw-r--r-- | po/pt_BR.po | 33 | ||||
| -rw-r--r-- | po/ru.po | 29 | ||||
| -rw-r--r-- | po/sr.po | 40 | ||||
| -rw-r--r-- | po/tr.po | 40 | ||||
| -rw-r--r-- | po/weechat.pot | 26 | ||||
| -rw-r--r-- | src/core/wee-string.c | 64 | ||||
| -rw-r--r-- | src/core/wee-string.h | 2 | ||||
| -rw-r--r-- | src/gui/gui-nick.c | 36 | ||||
| -rw-r--r-- | src/gui/gui-nick.h | 4 | ||||
| -rw-r--r-- | src/plugins/irc/irc-info.c | 10 | ||||
| -rw-r--r-- | src/plugins/irc/irc-nick.c | 38 | ||||
| -rw-r--r-- | src/plugins/irc/irc-server.c | 66 | ||||
| -rw-r--r-- | src/plugins/irc/irc-server.h | 5 | ||||
| -rw-r--r-- | src/plugins/plugin-api-info.c | 100 | ||||
| -rw-r--r-- | tests/unit/core/test-core-string.cpp | 40 | ||||
| -rw-r--r-- | tests/unit/gui/test-gui-nick.cpp | 40 | ||||
| -rw-r--r-- | tests/unit/plugins/irc/test-irc-nick.cpp | 52 | ||||
| -rw-r--r-- | tests/unit/plugins/irc/test-irc-server.cpp | 58 |
29 files changed, 772 insertions, 384 deletions
diff --git a/ChangeLog.adoc b/ChangeLog.adoc index f996c3feb..2fe4e08ce 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -19,6 +19,7 @@ New features:: * core: add options weechat.buffer.* to save buffer properties set by user, add option `setauto` in command `/buffer` (issue #352) * core: add parameters and key bindings to move to edges of current area with commands `/cursor go` and `/cursor move` (issue #1282) * core: add variables "_chat_focused_line_bol" and "_chat_focused_line_eol" in focus data (issue #1955) + * api: add infos "nick_color_ignore_case" and "nick_color_name_ignore_case" (issue #194) * api: add info "buffer" (issue #1962) * buflist: increase max number of buflist items from 3 to 5 (issue #1703) * fset: add variable `allowed_values` in options, add options fset.color.allowed_values and fset.color.allowed_values_selected diff --git a/ReleaseNotes.adoc b/ReleaseNotes.adoc index c646e66d3..136c0e2e4 100644 --- a/ReleaseNotes.adoc +++ b/ReleaseNotes.adoc @@ -59,8 +59,14 @@ back with the two following commands: They will then be advertised in reply to "CTCP CLIENTINFO", which is now built dynamically with these options. -[[v4.1.0_info_irc_nick_color]] -=== Infos irc_nick_color and irc_nick_color_name +[[v4.1.0_nick_color_infos]] +=== Nick color infos + +Two infos to get nick colors have been added: nick_color_ignore_case and +nick_color_name_ignore_case. + +They are similar to nick_color and nick_color_name, except they take as second +argument a range of chars to apply on the nick: the nick is converted to lower +case using this range of chars. The infos irc_nick_color and irc_nick_color_name, that were deprecated since version 1.5 are now used again, with a change in parameter: the server is now @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-08-24 11:29+0200\n" +"POT-Creation-Date: 2023-08-24 18:16+0200\n" "PO-Revision-Date: 2023-06-26 21:34+0200\n" "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -9712,13 +9712,15 @@ msgid "IRC host (like `:nick!name@server.com`)" msgstr "IRC host (jako `:nick!name@server.com`)" msgid "" -"get nick color code (nick is first converted to lower case, following the " -"value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the server " -"is not given)" +"get nick color code, ignoring case (this calls the info " +"\"nick_color_ignore_case\" with appropriate range, according to the value of " +"CASEMAPPING on the server, defaulting to \"rfc1459\" if the server is not " +"given)" msgstr "" msgid "" -"get nick color name (nick is first converted to lower case, following the " +"get nick color name, ignoring case (this calls the info " +"\"nick_color_name_ignore_case\" with appropriate range, according to the " "value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the server " "is not given)" msgstr "" @@ -11380,6 +11382,27 @@ msgstr "" msgid "get nick color name" msgstr "získat jméno barvy přezdívky" +#, fuzzy +#| msgid "get nick color code" +msgid "get nick color code, ignoring case" +msgstr "získat kód barvy přezdívky" + +#, fuzzy +msgid "" +"nickname;range;colors (range is a number of chars (see function " +"strcasecmp_range, 0 = convert to lower case without using a range), colors " +"is an optional comma-separated list of colors to use; background is allowed " +"for a color with format text:background; if colors is present, WeeChat " +"options with nick colors and forced nick colors are ignored)" +msgstr "" +"barva textu pro přezdívky (čárkou oddělený seznam barev, pozadí je povoleno " +"ve formátu: \"fg:bg\", například: \"lightred:blue\")" + +#, fuzzy +#| msgid "get nick color name" +msgid "get nick color name, ignoring case" +msgstr "získat jméno barvy přezdívky" + msgid "WeeChat uptime (format: \"days:hh:mm:ss\")" msgstr "WeeChat uptime (formát: \"dny:hh:mm:ss\")" @@ -26,7 +26,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-08-24 11:29+0200\n" +"POT-Creation-Date: 2023-08-24 18:16+0200\n" "PO-Revision-Date: 2023-08-24 13:36+0200\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Language-Team: German <kde-i18n-de@kde.org>\n" @@ -412,7 +412,6 @@ msgid "No local variable defined for buffer \"%s\"" msgstr "Keine lokale Variable für Buffer \"%s\" definiert" #, c-format -#| msgid "%sUnable to set option \"%s\" for proxy \"%s\"" msgid "%sUnable to create option for buffer property \"%s\"" msgstr "%sOption für Buffereigenschaft „%s“ konnte nicht erstellt werden" @@ -1254,17 +1253,6 @@ msgstr "" msgid "manage buffers" msgstr "Buffer verwalten" -#| msgid "" -#| "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-" -#| "all [<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> " -#| "[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || " -#| "merge <number>|<name> || unmerge [<number>|-all] || hide [<number>|" -#| "<name>|-all [<number>|<name>...]] || unhide [<number>|<name>|-all " -#| "[<number>|<name>...]] || switch [-previous] || zoom || renumber " -#| "[<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>...] || " -#| "notify [<level>] || listvar [<number>|<name>] || setvar <name> [<value>] " -#| "|| delvar <name> || set <property> [<value>] || get <property> || jump " -#| "smart|last_displayed|prev_visited|next_visited || <number>|-|+|<name>" msgid "" "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all " "[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> " @@ -1288,83 +1276,6 @@ msgstr "" "[<value>] || setauto <property> [<value>] || get <property> || jump smart|" "last_displayed|prev_visited|next_visited || <number>|-|+|<name>" -#| msgid "" -#| " list: list buffers (without argument, this list is displayed)\n" -#| " add: add a new buffer (it can be closed with \"/buffer close\" or " -#| "input \"q\")\n" -#| " clear: clear buffer content (number for a buffer, -merged for merged " -#| "buffers, -all for all buffers, or nothing for current buffer)\n" -#| " move: move buffer in the list (may be relative, for example -1); \"-" -#| "\" = move to first buffer number, \"+\" = move to last buffer number + 1\n" -#| " swap: swap two buffers (swap with current buffer if only one number/" -#| "name given)\n" -#| " cycle: jump loop between a list of buffers\n" -#| " merge: merge current buffer to another buffer (chat area will be mix " -#| "of both buffers)\n" -#| " (by default ctrl-x switches between merged buffers)\n" -#| " unmerge: unmerge buffer from other buffers which have same number\n" -#| " hide: hide the buffer\n" -#| " unhide: unhide the buffer\n" -#| " switch: switch to next merged buffer (or to previous buffer with \"-" -#| "previous\")\n" -#| " zoom: zoom on merged buffer\n" -#| "renumber: renumber buffers (works only if option weechat.look." -#| "buffer_auto_renumber is off)\n" -#| " close: close buffer (number/range or name is optional)\n" -#| " notify: display or set notify level for current buffer: this level " -#| "determines whether buffer will be added to hotlist or not:\n" -#| " none: never\n" -#| " highlight: for highlights only\n" -#| " message: for messages from users + highlights\n" -#| " all: all messages\n" -#| " reset: reset to default value (all)\n" -#| " listvar: display local variables in a buffer\n" -#| " setvar: set a local variable in the current buffer\n" -#| " delvar: delete a local variable from the current buffer\n" -#| " set: set a property in the current buffer\n" -#| " get: display a property of current buffer\n" -#| " jump: jump to another buffer:\n" -#| " smart: next buffer with activity\n" -#| " last_displayed: last buffer displayed (before last jump to a " -#| "buffer)\n" -#| " prev_visited: previously visited buffer\n" -#| " next_visited: jump to next visited buffer\n" -#| " number: jump to buffer by number, possible prefix:\n" -#| " '+': relative jump, add number to current\n" -#| " '-': relative jump, sub number to current\n" -#| " '*': jump to number, using option \"weechat.look." -#| "jump_current_to_previous_buffer\"\n" -#| " -: jump to first buffer number\n" -#| " +: jump to last buffer number\n" -#| " name: jump to buffer by (partial) name\n" -#| "\n" -#| "Examples:\n" -#| " clear current buffer:\n" -#| " /buffer clear\n" -#| " move buffer to number 5:\n" -#| " /buffer move 5\n" -#| " swap buffer 1 with 3:\n" -#| " /buffer swap 1 3\n" -#| " swap buffer #weechat with current buffer:\n" -#| " /buffer swap #weechat\n" -#| " jump on #chan1, #chan2, #chan3 and loop:\n" -#| " /buffer cycle #chan1 #chan2 #chan3\n" -#| " merge with core buffer:\n" -#| " /buffer merge 1\n" -#| " merge with #weechat buffer:\n" -#| " /buffer merge #weechat\n" -#| " unmerge buffer:\n" -#| " /buffer unmerge\n" -#| " close current buffer:\n" -#| " /buffer close\n" -#| " close buffers 5 to 7:\n" -#| " /buffer close 5-7\n" -#| " jump to #weechat:\n" -#| " /buffer #weechat\n" -#| " jump to next buffer:\n" -#| " /buffer +1\n" -#| " jump to last buffer number:\n" -#| " /buffer +" msgid "" " list: list buffers (without argument, this list is displayed)\n" " add: add a new buffer (it can be closed with \"/buffer close\" or input " @@ -1489,9 +1400,10 @@ msgstr "" " setvar: legt eine lokale Variable für den aktuellen Buffer an\n" " delvar: löscht eine lokale Variable des aktuellen Buffers\n" " set: setzt eine Eigenschaft für den aktuellen Buffer\n" -" setauto: wie „set“ und definiert zusätzlich die Option „weechat.buffer.<name" -">.<eigenschaft>“, damit die entsprechende Eigenschaft in der Konfiguration" -" gespeichert und Anwendung findet, sobald dieser Buffer geöffnet wird\n" +" setauto: wie „set“ und definiert zusätzlich die Option „weechat.buffer." +"<name>.<eigenschaft>“, damit die entsprechende Eigenschaft in der " +"Konfiguration gespeichert und Anwendung findet, sobald dieser Buffer " +"geöffnet wird\n" " get: zeigt eine Eigenschaft für den aktuellen Buffer an\n" " jump: springt zu einem anderen Buffer:\n" " smart: nächster Buffer mit Aktivität\n" @@ -3977,7 +3889,6 @@ msgstr "Wert einer lokalen Buffervariablen" msgid "properties that can be set on a buffer" msgstr "Eigenschaften die für den Buffer gesetzt werden können" -#| msgid "properties that can be set on a buffer" msgid "properties that can be automatically set on a buffer" msgstr "Eigenschaften die für den Buffer automatisch gesetzt werden können" @@ -4170,13 +4081,11 @@ msgid "" "set property \"%s\" on any buffer matching mask \"%s\"; content is " "evaluated, see /help eval; ${buffer} is a pointer to the buffer being opened" msgstr "" -"Eigenschaft „%s“ bei jedem Buffer setzen, der mit der Maske „%s“" -" übereinstimmt; Inhalt ist" -"evaluiert, siehe /help eval; ${buffer} ist ein Zeiger auf den Buffer, der" -" geöffnet wird" +"Eigenschaft „%s“ bei jedem Buffer setzen, der mit der Maske „%s“ " +"übereinstimmt; Inhalt istevaluiert, siehe /help eval; ${buffer} ist ein " +"Zeiger auf den Buffer, der geöffnet wird" #, c-format -#| msgid "Options saved to %s" msgid "Option \"weechat.buffer.%s\" has been set to \"%s\"" msgstr "Option \"weechat.buffer.%s\" wurde auf \"%s\" gesetzt" @@ -12174,27 +12083,37 @@ msgstr "Nicknamen des IRC-Hosts erhalten" msgid "IRC host (like `:nick!name@server.com`)" msgstr "IRC host (in der Form `:nick!name@server.com`)" +#, fuzzy +#| msgid "" +#| "get nick color code (nick is first converted to lower case, following the " +#| "value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the " +#| "server is not given)" msgid "" -"get nick color code (nick is first converted to lower case, following the " -"value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the server " -"is not given)" +"get nick color code, ignoring case (this calls the info " +"\"nick_color_ignore_case\" with appropriate range, according to the value of " +"CASEMAPPING on the server, defaulting to \"rfc1459\" if the server is not " +"given)" msgstr "" -"Hole den Farbcode des Nicks (der Nick wird zuerst in Kleinbuchstaben" -" umgewandelt, dabei wird" -"der Wert des CASEMAPPING auf dem Server berücksichtigt, standardmäßig wird" -" auf „rfc1459“ zurückgegriffen, wenn der Server" -"nicht angegeben wurde)" +"Hole den Farbcode des Nicks (der Nick wird zuerst in Kleinbuchstaben " +"umgewandelt, dabei wirdder Wert des CASEMAPPING auf dem Server " +"berücksichtigt, standardmäßig wird auf „rfc1459“ zurückgegriffen, wenn der " +"Servernicht angegeben wurde)" +#, fuzzy +#| msgid "" +#| "get nick color name (nick is first converted to lower case, following the " +#| "value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the " +#| "server is not given)" msgid "" -"get nick color name (nick is first converted to lower case, following the " +"get nick color name, ignoring case (this calls the info " +"\"nick_color_name_ignore_case\" with appropriate range, according to the " "value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the server " "is not given)" msgstr "" -"Hole den Farbnamen des Nicks (der Nick wird zuerst in Kleinbuchstaben" -" konvertiert, dabei wird" -"der Wert des CASEMAPPING auf dem Server berücksichtigt, standardmäßig wird" -" auf „rfc1459“ zurückgegriffen, wenn der Server" -"nicht angegeben wurde)" +"Hole den Farbnamen des Nicks (der Nick wird zuerst in Kleinbuchstaben " +"konvertiert, dabei wirdder Wert des CASEMAPPING auf dem Server " +"berücksichtigt, standardmäßig wird auf „rfc1459“ zurückgegriffen, wenn der " +"Servernicht angegeben wurde)" msgid "get buffer pointer for an IRC server/channel/nick" msgstr "holt Buffer Pointer für einen IRC Server/Kanal/Nick" @@ -13908,6 +13827,35 @@ msgstr "" msgid "get nick color name" msgstr "zeigt Farbnamen des Nick" +#, fuzzy +#| msgid "get nick color code" +msgid "get nick color code, ignoring case" +msgstr "zeigt Farbecode des Nick" + +#, fuzzy +#| msgid "" +#| "nickname;colors (colors is an optional comma-separated list of colors to " +#| "use; background is allowed for a color with format text:background; if " +#| "colors is present, WeeChat options with nick colors and forced nick " +#| "colors are ignored)" +msgid "" +"nickname;range;colors (range is a number of chars (see function " +"strcasecmp_range, 0 = convert to lower case without using a range), colors " +"is an optional comma-separated list of colors to use; background is allowed " +"for a color with format text:background; if colors is present, WeeChat " +"options with nick colors and forced nick colors are ignored)" +msgstr "" +"Nickname;Farben (Farben ist eine optionale Kommata getrennte Liste von " +"Farben die genutzt werden sollen; wenn eine Hintergrundfarbe genutzt werden " +"muss das Format wie folgt aussehen Text:Hintergrund; sind die Farben schon " +"vorhanden, werden die WeeChat Optionen für Nickfarben und erzwungene " +"Nickfarben ignoriert)" + +#, fuzzy +#| msgid "get nick color name" +msgid "get nick color name, ignoring case" +msgstr "zeigt Farbnamen des Nick" + msgid "WeeChat uptime (format: \"days:hh:mm:ss\")" msgstr "Laufzeit von WeeChat (Format: \"days:hh:mm:ss\")" @@ -16378,8 +16326,7 @@ msgstr "verwaltet Trigger, das Schweizer Armeemesser für WeeChat" msgid "" "list [-o|-ol|-i|-il] || listfull || listdefault || add|addoff|addreplace " "<name> <hook> " -"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<" -"return_code>\" [\"<post_action>\"]]]]]] " +"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<return_code>\" [\"<post_action>\"]]]]]] " "|| addinput [<hook>] || input|output|recreate <name> || set <name> <option> " "<value> || rename|copy <name> <new_name> || enable|disable|toggle [<name>|-" "all [<name>...]] || restart <name>|-all [<name>...] || show <name> || del " @@ -16388,8 +16335,7 @@ msgid "" msgstr "" "list [-o|-ol|-i|-il] || listfull || listdefault || add|addoff|addreplace " "<name> <hook> " -"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<" -"return_code>\" [\"<post_action>\"]]]]]] " +"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<return_code>\" [\"<post_action>\"]]]]]] " "|| addinput [<hook>] || input|output|recreate <name> || set <name> <option> " "<value> || rename|copy <name> <new_name> || enable|disable|toggle [<name>|-" "all [<name>...]] || restart <name>|-all [<name>...] || show <name> || del " @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-08-24 11:29+0200\n" +"POT-Creation-Date: 2023-08-24 18:16+0200\n" "PO-Revision-Date: 2023-06-26 21:34+0200\n" "Last-Translator: Santiago Forero <santiago@forero.xyz>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -10439,13 +10439,15 @@ msgid "IRC host (like `:nick!name@server.com`)" msgstr "IRC host (como `:apodo!nombre@servidor.com`)" msgid "" -"get nick color code (nick is first converted to lower case, following the " -"value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the server " -"is not given)" +"get nick color code, ignoring case (this calls the info " +"\"nick_color_ignore_case\" with appropriate range, according to the value of " +"CASEMAPPING on the server, defaulting to \"rfc1459\" if the server is not " +"given)" msgstr "" msgid "" -"get nick color name (nick is first converted to lower case, following the " +"get nick color name, ignoring case (this calls the info " +"\"nick_color_name_ignore_case\" with appropriate range, according to the " "value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the server " "is not given)" msgstr "" @@ -12121,6 +12123,27 @@ msgstr "" msgid "get nick color name" msgstr "obtiene el nombre del color del apodo" +#, fuzzy +#| msgid "get nick color code" +msgid "get nick color code, ignoring case" +msgstr "obtiene el código del color del apodo" + +#, fuzzy +msgid "" +"nickname;range;colors (range is a number of chars (see function " +"strcasecmp_range, 0 = convert to lower case without using a range), colors " +"is an optional comma-separated list of colors to use; background is allowed " +"for a color with format text:background; if colors is present, WeeChat " +"options with nick colors and forced nick colors are ignored)" +msgstr "" +"color para los apodos (lista de colores separadas por comas, color de fondo " +"es permitido siguiendo el formato \"fg:bg\", por ejemplo: \"lightred:blue\")" + +#, fuzzy +#| msgid "get nick color name" +msgid "get nick color name, ignoring case" +msgstr "obtiene el nombre del color del apodo" + msgid "WeeChat uptime (format: \"days:hh:mm:ss\")" msgstr "" @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-08-24 11:29+0200\n" -"PO-Revision-Date: 2023-08-24 11:30+0200\n" +"POT-Creation-Date: 2023-08-24 18:16+0200\n" +"PO-Revision-Date: 2023-08-24 18:18+0200\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: fr\n" @@ -11847,22 +11847,26 @@ msgid "IRC host (like `:nick!name@server.com`)" msgstr "host IRC (comme `:pseudo!nom@serveur.com`)" msgid "" -"get nick color code (nick is first converted to lower case, following the " -"value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the server " -"is not given)" +"get nick color code, ignoring case (this calls the info " +"\"nick_color_ignore_case\" with appropriate range, according to the value of " +"CASEMAPPING on the server, defaulting to \"rfc1459\" if the server is not " +"given)" msgstr "" -"retourne le code couleur du pseudo (le pseudo est d'abord converti en " -"minuscules, en suivant la valeur de CASEMAPPING sur le serveur, par défaut " -"\"rfc1459\" si le serveur n'est pas fourni)" +"retourne le code couleur du pseudo, en ignorant la casse (cela appelle " +"l'info \"nick_color_ignore_case\" avec l'intervalle approprié, selon la " +"valeur de CASEMAPPING sur le serveur, par défaut \"rfc1459\" si le serveur " +"n'est pas fourni)" msgid "" -"get nick color name (nick is first converted to lower case, following the " +"get nick color name, ignoring case (this calls the info " +"\"nick_color_name_ignore_case\" with appropriate range, according to the " "value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the server " "is not given)" msgstr "" -"retourne le nom de la couleur du pseudo (le pseudo est d'abord converti en " -"minuscules, en suivant la valeur de CASEMAPPING sur le serveur, par défaut " -"\"rfc1459\" si le serveur n'est pas fourni)" +"retourne le nom de la couleur du pseudo, en ignorant la casse (cela appelle " +"l'info \"nick_color_name_ignore_case\" avec l'intervalle approprié, selon la " +"valeur de CASEMAPPING sur le serveur, par défaut \"rfc1459\" si le serveur " +"n'est pas fourni)" msgid "get buffer pointer for an IRC server/channel/nick" msgstr "retourne le pointeur vers le tampon pour un serveur/canal/pseudo IRC" @@ -13548,6 +13552,26 @@ msgstr "" msgid "get nick color name" msgstr "retourne le nom de la couleur du pseudo" +msgid "get nick color code, ignoring case" +msgstr "retourne le code couleur du pseudo, en ignorant la casse" + +msgid "" +"nickname;range;colors (range is a number of chars (see function " +"strcasecmp_range, 0 = convert to lower case without using a range), colors " +"is an optional comma-separated list of colors to use; background is allowed " +"for a color with format text:background; if colors is present, WeeChat " +"options with nick colors and forced nick colors are ignored)" +msgstr "" +"pseudo;intervalle;couleurs (l'intervalle est un nombre de caractères (voir " +"la fonction strcasecmp_range, 0 = convertir en minuscules sans utiliser " +"d'intervalle), couleurs est une liste de couleurs facultative, séparée par " +"des virgules ; un fond est autorisé pour la couleur avec le format texte:" +"fond ; si couleurs est présent, les options WeeChat avec les couleurs de " +"pseudos et couleurs forcées de pseudos sons ignorées)" + +msgid "get nick color name, ignoring case" +msgstr "retourne le nom de la couleur du pseudo, en ignorant la casse" + msgid "WeeChat uptime (format: \"days:hh:mm:ss\")" msgstr "Durée de fonctionnement de WeeChat (format : \"jours:hh:mm:ss\")" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-08-24 11:29+0200\n" +"POT-Creation-Date: 2023-08-24 18:16+0200\n" "PO-Revision-Date: 2023-06-17 11:47+0200\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -9147,13 +9147,15 @@ msgid "IRC host (like `:nick!name@server.com`)" msgstr "" msgid "" -"get nick color code (nick is first converted to lower case, following the " -"value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the server " -"is not given)" +"get nick color code, ignoring case (this calls the info " +"\"nick_color_ignore_case\" with appropriate range, according to the value of " +"CASEMAPPING on the server, defaulting to \"rfc1459\" if the server is not " +"given)" msgstr "" msgid "" -"get nick color name (nick is first converted to lower case, following the " +"get nick color name, ignoring case (this calls the info " +"\"nick_color_name_ignore_case\" with appropriate range, according to the " "value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the server " "is not given)" msgstr "" @@ -10755,6 +10757,23 @@ msgstr "idő színe a beszédablakban" msgid "get nick color name" msgstr "üzenetek színe" +#, fuzzy +msgid "get nick color code, ignoring case" +msgstr "üzenetek színe" + +#, fuzzy +msgid "" +"nickname;range;colors (range is a number of chars (see function " +"strcasecmp_range, 0 = convert to lower case without using a range), colors " +"is an optional comma-separated list of colors to use; background is allowed " +"for a color with format text:background; if colors is present, WeeChat " +"options with nick colors and forced nick colors are ignored)" +msgstr "idő színe a beszédablakban" + +#, fuzzy +msgid "get nick color name, ignoring case" +msgstr "üzenetek színe" + msgid "WeeChat uptime (format: \"days:hh:mm:ss\")" msgstr "" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-08-24 11:29+0200\n" +"POT-Creation-Date: 2023-08-24 18:16+0200\n" "PO-Revision-Date: 2023-06-26 21:34+0200\n" "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -10169,13 +10169,15 @@ msgid "IRC host (like `:nick!name@server.com`)" msgstr "host IRC (come `:nick!nome@server.com`)" msgid "" -"get nick color code (nick is first converted to lower case, following the " -"value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the server " -"is not given)" +"get nick color code, ignoring case (this calls the info " +"\"nick_color_ignore_case\" with appropriate range, according to the value of " +"CASEMAPPING on the server, defaulting to \"rfc1459\" if the server is not " +"given)" msgstr "" msgid "" -"get nick color name (nick is first converted to lower case, following the " +"get nick color name, ignoring case (this calls the info " +"\"nick_color_name_ignore_case\" with appropriate range, according to the " "value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the server " "is not given)" msgstr "" @@ -11841,6 +11843,27 @@ msgstr "" msgid "get nick color name" msgstr "ottiene il nome del colore del nick" +#, fuzzy +#| msgid "get nick color code" +msgid "get nick color code, ignoring case" +msgstr "ottiene il codice del colore del nick" + +#, fuzzy +msgid "" +"nickname;range;colors (range is a number of chars (see function " +"strcasecmp_range, 0 = convert to lower case without using a range), colors " +"is an optional comma-separated list of colors to use; background is allowed " +"for a color with format text:background; if colors is present, WeeChat " +"options with nick colors and forced nick colors are ignored)" +msgstr "" +"colore del testo per i nick (elenco separato da virgole di colori, quello di " +"sfondo è consentito con il formato \"fg:bg\", ad esempio: \"lightred:blue\")" + +#, fuzzy +#| msgid "get nick color name" +msgid "get nick color name, ignoring case" +msgstr "ottiene il nome del colore del nick" + msgid "WeeChat uptime (format: \"days:hh:mm:ss\")" msgstr "" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-08-24 11:29+0200\n" +"POT-Creation-Date: 2023-08-24 18:16+0200\n" "PO-Revision-Date: 2023-08-08 07:13+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n" "Language-Team: Japanese <https://github.com/l/weechat/tree/master/" @@ -11373,13 +11373,15 @@ msgid "IRC host (like `:nick!name@server.com`)" msgstr "IRC ホスト (例: `:nick!name@server.com`)" msgid "" -"get nick color code (nick is first converted to lower case, following the " -"value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the server " -"is not given)" +"get nick color code, ignoring case (this calls the info " +"\"nick_color_ignore_case\" with appropriate range, according to the value of " +"CASEMAPPING on the server, defaulting to \"rfc1459\" if the server is not " +"given)" msgstr "" msgid "" -"get nick color name (nick is first converted to lower case, following the " +"get nick color name, ignoring case (this calls the info " +"\"nick_color_name_ignore_case\" with appropriate range, according to the " "value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the server " "is not given)" msgstr "" @@ -13064,6 +13066,27 @@ msgstr "" msgid "get nick color name" msgstr "ニックネームの色名を取得" +#, fuzzy +#| msgid "get nick color code" +msgid "get nick color code, ignoring case" +msgstr "ニックネームの色コードを取得" + +#, fuzzy +msgid "" +"nickname;range;colors (range is a number of chars (see function " +"strcasecmp_range, 0 = convert to lower case without using a range), colors " +"is an optional comma-separated list of colors to use; background is allowed " +"for a color with format text:background; if colors is present, WeeChat " +"options with nick colors and forced nick colors are ignored)" +msgstr "" +"ニックネームのテキスト色 (コンマ区切りの色リスト、背景色は以下の書式で指定: " +"\"fg:bg\"、例: \"lightred:blue\")" + +#, fuzzy +#| msgid "get nick color name" +msgid "get nick color name, ignoring case" +msgstr "ニックネームの色名を取得" + msgid "WeeChat uptime (format: \"days:hh:mm:ss\")" msgstr "WeeChat 連続稼働時間 (書式: \"days:hh:mm:ss\")" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-08-24 11:29+0200\n" +"POT-Creation-Date: 2023-08-24 18:16+0200\n" "PO-Revision-Date: 2023-08-08 07:13+0200\n" "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n" "Language-Team: Polish <kde-i18n-doc@kde.org>\n" @@ -12580,13 +12580,15 @@ msgid "IRC host (like `:nick!name@server.com`)" msgstr "Host IRC (jak `:nick!nazwa@serwer.com`)" msgid "" -"get nick color code (nick is first converted to lower case, following the " -"value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the server " -"is not given)" +"get nick color code, ignoring case (this calls the info " +"\"nick_color_ignore_case\" with appropriate range, according to the value of " +"CASEMAPPING on the server, defaulting to \"rfc1459\" if the server is not " +"given)" msgstr "" msgid "" -"get nick color name (nick is first converted to lower case, following the " +"get nick color name, ignoring case (this calls the info " +"\"nick_color_name_ignore_case\" with appropriate range, according to the " "value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the server " "is not given)" msgstr "" @@ -14293,6 +14295,34 @@ msgstr "" msgid "get nick color name" msgstr "pobiera nazwę koloru nicka" +#, fuzzy +#| msgid "get nick color code" +msgid "get nick color code, ignoring case" +msgstr "pobiera kod koloru nicka" + +#, fuzzy +#| msgid "" +#| "nickname;colors (colors is an optional comma-separated list of colors to " +#| "use; background is allowed for a color with format text:background; if " +#| "colors is present, WeeChat options with nick colors and forced nick " +#| "colors are ignored)" +msgid "" +"nickname;range;colors (range is a number of chars (see function " +"strcasecmp_range, 0 = convert to lower case without using a range), colors " +"is an optional comma-separated list of colors to use; background is allowed " +"for a color with format text:background; if colors is present, WeeChat " +"options with nick colors and forced nick colors are ignored)" +msgstr "" +"nick;kolory (kolory są opcjonalną oddzieloną przecinkami listą kolorów do " +"użycia; tło dla koloru można ustawić używając formatu text:tło; jeśli kolory " +"są zdefiniowane, opcje WeeChat dla kolorów nicków i wymuszonych kolorów " +"nicków są ignorowane)" + +#, fuzzy +#| msgid "get nick color name" +msgid "get nick color name, ignoring case" +msgstr "pobiera nazwę koloru nicka" + msgid "WeeChat uptime (format: \"days:hh:mm:ss\")" msgstr "Uptime WeeChat (format: \"dni:hh:mm:ss\")" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-08-24 11:29+0200\n" +"POT-Creation-Date: 2023-08-24 18:16+0200\n" "PO-Revision-Date: 2023-06-26 21:34+0200\n" "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n" "Language-Team: Portuguese <>\n" @@ -11122,13 +11122,15 @@ msgid "IRC host (like `:nick!name@server.com`)" msgstr "host de IRC (tal como `:nick!nome@servidor.com`)" msgid "" -"get nick color code (nick is first converted to lower case, following the " -"value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the server " -"is not given)" +"get nick color code, ignoring case (this calls the info " +"\"nick_color_ignore_case\" with appropriate range, according to the value of " +"CASEMAPPING on the server, defaulting to \"rfc1459\" if the server is not " +"given)" msgstr "" msgid "" -"get nick color name (nick is first converted to lower case, following the " +"get nick color name, ignoring case (this calls the info " +"\"nick_color_name_ignore_case\" with appropriate range, according to the " "value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the server " "is not given)" msgstr "" @@ -12809,6 +12811,27 @@ msgstr "" msgid "get nick color name" msgstr "obter nome da cor do nick" +#, fuzzy +#| msgid "get nick color code" +msgid "get nick color code, ignoring case" +msgstr "obter código de cor do nick" + +#, fuzzy +msgid "" +"nickname;range;colors (range is a number of chars (see function " +"strcasecmp_range, 0 = convert to lower case without using a range), colors " +"is an optional comma-separated list of colors to use; background is allowed " +"for a color with format text:background; if colors is present, WeeChat " +"options with nick colors and forced nick colors are ignored)" +msgstr "" +"cor do texto dos nicks (lista de cores separadas por vírgula, o fundo pode " +"ser indicado com o formato: \"texto:fundo\", por exemplo: \"lightred:blue\")" + +#, fuzzy +#| msgid "get nick color name" +msgid "get nick color name, ignoring case" +msgstr "obter nome da cor do nick" + msgid "WeeChat uptime (format: \"days:hh:mm:ss\")" msgstr "WeeChat uptime (formato: \"dias:hh:mm:ss\")" diff --git a/po/pt_BR.po b/po/pt_BR.po index 071ffe4fd..0ad2eedaa 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-08-24 11:29+0200\n" +"POT-Creation-Date: 2023-08-24 18:16+0200\n" "PO-Revision-Date: 2023-06-26 21:34+0200\n" "Last-Translator: Érico Nogueira <ericonr@disroot.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -9716,13 +9716,15 @@ msgid "IRC host (like `:nick!name@server.com`)" msgstr "host IRC (exemplo: `:apelido!nome@servidor.com`)" msgid "" -"get nick color code (nick is first converted to lower case, following the " -"value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the server " -"is not given)" +"get nick color code, ignoring case (this calls the info " +"\"nick_color_ignore_case\" with appropriate range, according to the value of " +"CASEMAPPING on the server, defaulting to \"rfc1459\" if the server is not " +"given)" msgstr "" msgid "" -"get nick color name (nick is first converted to lower case, following the " +"get nick color name, ignoring case (this calls the info " +"\"nick_color_name_ignore_case\" with appropriate range, according to the " "value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the server " "is not given)" msgstr "" @@ -11347,6 +11349,27 @@ msgstr "" msgid "get nick color name" msgstr "obter nome da cor do apelido" +#, fuzzy +#| msgid "get nick color code" +msgid "get nick color code, ignoring case" +msgstr "obter código de cor do apelido" + +#, fuzzy +msgid "" +"nickname;range;colors (range is a number of chars (see function " +"strcasecmp_range, 0 = convert to lower case without using a range), colors " +"is an optional comma-separated list of colors to use; background is allowed " +"for a color with format text:background; if colors is present, WeeChat " +"options with nick colors and forced nick colors are ignored)" +msgstr "" +"cor do texto para apelidos (lista de cores separada por vírgulas, fundo é " +"permitido com o formato: \"fg:bg\", por exemplo: \"lightred:blue\")" + +#, fuzzy +#| msgid "get nick color name" +msgid "get nick color name, ignoring case" +msgstr "obter nome da cor do apelido" + msgid "WeeChat uptime (format: \"days:hh:mm:ss\")" msgstr "" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-08-24 11:29+0200\n" +"POT-Creation-Date: 2023-08-24 18:16+0200\n" "PO-Revision-Date: 2023-06-17 11:47+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -9184,13 +9184,15 @@ msgid "IRC host (like `:nick!name@server.com`)" msgstr "" msgid "" -"get nick color code (nick is first converted to lower case, following the " -"value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the server " -"is not given)" +"get nick color code, ignoring case (this calls the info " +"\"nick_color_ignore_case\" with appropriate range, according to the value of " +"CASEMAPPING on the server, defaulting to \"rfc1459\" if the server is not " +"given)" msgstr "" msgid "" -"get nick color name (nick is first converted to lower case, following the " +"get nick color name, ignoring case (this calls the info " +"\"nick_color_name_ignore_case\" with appropriate range, according to the " "value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the server " "is not given)" msgstr "" @@ -10793,6 +10795,23 @@ msgstr "цвет времени в окне чата" msgid "get nick color name" msgstr "цвет чата" +#, fuzzy +msgid "get nick color code, ignoring case" +msgstr "цвет чата" + +#, fuzzy +msgid "" +"nickname;range;colors (range is a number of chars (see function " +"strcasecmp_range, 0 = convert to lower case without using a range), colors " +"is an optional comma-separated list of colors to use; background is allowed " +"for a color with format text:background; if colors is present, WeeChat " +"options with nick colors and forced nick colors are ignored)" +msgstr "цвет времени в окне чата" + +#, fuzzy +msgid "get nick color name, ignoring case" +msgstr "цвет чата" + msgid "WeeChat uptime (format: \"days:hh:mm:ss\")" msgstr "" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-08-24 11:29+0200\n" +"POT-Creation-Date: 2023-08-24 18:16+0200\n" "PO-Revision-Date: 2023-08-08 07:14+0200\n" "Last-Translator: Ivan Pešić <ivan.pesic@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -11626,13 +11626,15 @@ msgid "IRC host (like `:nick!name@server.com`)" msgstr "IRC хост (као `:надимак!име@сервер.com`)" msgid "" -"get nick color code (nick is first converted to lower case, following the " -"value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the server " -"is not given)" +"get nick color code, ignoring case (this calls the info " +"\"nick_color_ignore_case\" with appropriate range, according to the value of " +"CASEMAPPING on the server, defaulting to \"rfc1459\" if the server is not " +"given)" msgstr "" msgid "" -"get nick color name (nick is first converted to lower case, following the " +"get nick color name, ignoring case (this calls the info " +"\"nick_color_name_ignore_case\" with appropriate range, according to the " "value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the server " "is not given)" msgstr "" @@ -13308,6 +13310,34 @@ msgstr "" msgid "get nick color name" msgstr "враћање имена боје надимка" +#, fuzzy +#| msgid "get nick color code" +msgid "get nick color code, ignoring case" +msgstr "враћање кода боје надимка" + +#, fuzzy +#| msgid "" +#| "nickname;colors (colors is an optional comma-separated list of colors to " +#| "use; background is allowed for a color with format text:background; if " +#| "colors is present, WeeChat options with nick colors and forced nick " +#| "colors are ignored)" +msgid "" +"nickname;range;colors (range is a number of chars (see function " +"strcasecmp_range, 0 = convert to lower case without using a range), colors " +"is an optional comma-separated list of colors to use; background is allowed " +"for a color with format text:background; if colors is present, WeeChat " +"options with nick colors and forced nick colors are ignored)" +msgstr "" +"надимак;боје (боје је необавезна листа боја раздвојених запетама које треба " +"да се користе; за боју је дозвољена позадина у формату текст:позадина; ако " +"су боје присутне, WeeChat опције везане за боју надимака и форсирање боја за " +"надимке се игноришу)" + +#, fuzzy +#| msgid "get nick color name" +msgid "get nick color name, ignoring case" +msgstr "враћање имена боје надимка" + msgid "WeeChat uptime (format: \"days:hh:mm:ss\")" msgstr "WeeChat време извршавања (формат: „дана:чч:мм:сс”)" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-08-24 11:29+0200\n" +"POT-Creation-Date: 2023-08-24 18:16+0200\n" "PO-Revision-Date: 2023-08-08 07:14+0200\n" "Last-Translator: Emir SARI <emir_sari@icloud.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -12065,13 +12065,15 @@ msgid "IRC host (like `:nick!name@server.com`)" msgstr "IRC makinesi (örneğin: `:nick!name@server.com`)" msgid "" -"get nick color code (nick is first converted to lower case, following the " -"value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the server " -"is not given)" +"get nick color code, ignoring case (this calls the info " +"\"nick_color_ignore_case\" with appropriate range, according to the value of " +"CASEMAPPING on the server, defaulting to \"rfc1459\" if the server is not " +"given)" msgstr "" msgid "" -"get nick color name (nick is first converted to lower case, following the " +"get nick color name, ignoring case (this calls the info " +"\"nick_color_name_ignore_case\" with appropriate range, according to the " "value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the server " "is not given)" msgstr "" @@ -13762,6 +13764,34 @@ msgstr "" msgid "get nick color name" msgstr "takma ad renk adı al" +#, fuzzy +#| msgid "get nick color code" +msgid "get nick color code, ignoring case" +msgstr "takma ad renk kodu al" + +#, fuzzy +#| msgid "" +#| "nickname;colors (colors is an optional comma-separated list of colors to " +#| "use; background is allowed for a color with format text:background; if " +#| "colors is present, WeeChat options with nick colors and forced nick " +#| "colors are ignored)" +msgid "" +"nickname;range;colors (range is a number of chars (see function " +"strcasecmp_range, 0 = convert to lower case without using a range), colors " +"is an optional comma-separated list of colors to use; background is allowed " +"for a color with format text:background; if colors is present, WeeChat " +"options with nick colors and forced nick colors are ignored)" +msgstr "" +"nickname;colors (colors, kullanılacak renklerin virgülle ayrılmış bir " +"listesidir; text:background biçimi ile bir renk için arka plana izin " +"verilir; eğer renkler mevcutsa takma ad renkleri ve zorlanan takma ad " +"renkleri içeren WeeChat seçenekleri yok sayılır)" + +#, fuzzy +#| msgid "get nick color name" +msgid "get nick color name, ignoring case" +msgstr "takma ad renk adı al" + msgid "WeeChat uptime (format: \"days:hh:mm:ss\")" msgstr "WeeChat çalışma süresi (biçim: \"gün:sa:dk:sn\"" diff --git a/po/weechat.pot b/po/weechat.pot index fd0f3609c..52120c5ad 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-08-24 11:29+0200\n" +"POT-Creation-Date: 2023-08-24 18:16+0200\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -8210,13 +8210,15 @@ msgid "IRC host (like `:nick!name@server.com`)" msgstr "" msgid "" -"get nick color code (nick is first converted to lower case, following the " -"value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the server " -"is not given)" +"get nick color code, ignoring case (this calls the info " +"\"nick_color_ignore_case\" with appropriate range, according to the value of " +"CASEMAPPING on the server, defaulting to \"rfc1459\" if the server is not " +"given)" msgstr "" msgid "" -"get nick color name (nick is first converted to lower case, following the " +"get nick color name, ignoring case (this calls the info " +"\"nick_color_name_ignore_case\" with appropriate range, according to the " "value of CASEMAPPING on the server, defaulting to \"rfc1459\" if the server " "is not given)" msgstr "" @@ -9725,6 +9727,20 @@ msgstr "" msgid "get nick color name" msgstr "" +msgid "get nick color code, ignoring case" +msgstr "" + +msgid "" +"nickname;range;colors (range is a number of chars (see function " +"strcasecmp_range, 0 = convert to lower case without using a range), colors " +"is an optional comma-separated list of colors to use; background is allowed " +"for a color with format text:background; if colors is present, WeeChat " +"options with nick colors and forced nick colors are ignored)" +msgstr "" + +msgid "get nick color name, ignoring case" +msgstr "" + msgid "WeeChat uptime (format: \"days:hh:mm:ss\")" msgstr "" diff --git a/src/core/wee-string.c b/src/core/wee-string.c index 83ee9e63c..ab0bee82e 100644 --- a/src/core/wee-string.c +++ b/src/core/wee-string.c @@ -395,6 +395,70 @@ string_toupper (const char *string) } /* + * Converts string to lower case (using a range of chars). + * + * Note: result must be freed after use. + */ + +char * +string_tolower_range (const char *string, int range) +{ + char *result, *ptr_result; + + if (!string) + return NULL; + + if (range <= 0) + return string_tolower (string); + + result = strdup (string); + if (!result) + return NULL; + + ptr_result = result; + while (ptr_result && ptr_result[0]) + { + if ((ptr_result[0] >= 'A') && (ptr_result[0] < 'A' + range)) + ptr_result[0] += ('a' - 'A'); + ptr_result = (char *)utf8_next_char (ptr_result); + } + + return result; +} + +/* + * Converts string to upper case (using a range of char). + * + * Note: result must be freed after use. + */ + +char * +string_toupper_range (const char *string, int range) +{ + char *result, *ptr_result; + + if (!string) + return NULL; + + if (range <= 0) + return string_toupper (string); + + result = strdup (string); + if (!result) + return NULL; + + ptr_result = result; + while (ptr_result && ptr_result[0]) + { + if ((ptr_result[0] >= 'a') && (ptr_result[0] < 'a' + range)) + ptr_result[0] -= ('a' - 'A'); + ptr_result = (char *)utf8_next_char (ptr_result); + } + + return result; +} + +/* * Compares two chars (case sensitive). * * Returns: arithmetic result of subtracting the first UTF-8 char in string2 diff --git a/src/core/wee-string.h b/src/core/wee-string.h index 19c616e5e..522d3e440 100644 --- a/src/core/wee-string.h +++ b/src/core/wee-string.h @@ -44,6 +44,8 @@ extern char *string_reverse_screen (const char *string); extern char *string_repeat (const char *string, int count); extern char *string_tolower (const char *string); extern char *string_toupper (const char *string); +extern char *string_tolower_range (const char *string, int range); +extern char *string_toupper_range (const char *string, int range); extern int string_charcmp (const char *string1, const char *string2); extern int string_charcasecmp (const char *string1, const char *string2); extern int string_charcasecmp_range (const char *string1, const char *string2, diff --git a/src/gui/gui-nick.c b/src/gui/gui-nick.c index 75712a654..6b4152664 100644 --- a/src/gui/gui-nick.c +++ b/src/gui/gui-nick.c @@ -243,6 +243,10 @@ gui_nick_strdup_for_color (const char *nickname) /* * Finds a color name for a nick (according to nick letters). * + * If case_range < 0, nick is case sensitive. + * If case_range == 0, nick is converted to lower case (with string_tolower). + * If case_range > 0, nick is converted to lower case (with string_tolower_range). + * * If colors is NULL (most common case), the color returned is either a forced * color (from option "weechat.look.nick_color_force") or a color from option * "weechat.color.chat_nick_colors". @@ -258,16 +262,18 @@ gui_nick_strdup_for_color (const char *nickname) */ char * -gui_nick_find_color_name (const char *nickname, const char *colors) +gui_nick_find_color_name (const char *nickname, int case_range, + const char *colors) { int color, num_colors; - char *nickname2, **list_colors, *result; + char *nickname2, *nickname3, **list_colors, *result; const char *forced_color, *ptr_result; static char *default_color = "default"; list_colors = NULL; num_colors = 0; nickname2 = NULL; + nickname3 = NULL; ptr_result = NULL; if (!nickname || !nickname[0]) @@ -281,12 +287,13 @@ gui_nick_find_color_name (const char *nickname, const char *colors) } nickname2 = gui_nick_strdup_for_color (nickname); + if (!nickname2) + goto end; if (!list_colors) { /* look if color is forced for the nick */ - forced_color = gui_nick_get_forced_color ( - (nickname2) ? nickname2 : nickname); + forced_color = gui_nick_get_forced_color (nickname2); if (forced_color) { ptr_result = forced_color; @@ -299,9 +306,18 @@ gui_nick_find_color_name (const char *nickname, const char *colors) goto end; } + if (case_range < 0) + nickname3 = strdup (nickname2); + else if (case_range == 0) + nickname3 = string_tolower (nickname2); + else + nickname3 = string_tolower_range (nickname2, case_range); + if (!nickname3) + goto end; + /* hash nickname to get color */ color = gui_nick_hash_color ( - (nickname2) ? nickname2 : nickname, + nickname3, (list_colors) ? num_colors : config_num_nick_colors); ptr_result = (list_colors) ? list_colors[color] : config_nick_colors[color]; @@ -312,12 +328,18 @@ end: string_free_split (list_colors); if (nickname2) free (nickname2); + if (nickname3) + free (nickname3); return result; } /* * Finds a color code for a nick (according to nick letters). * + * If case_range < 0, nick is case sensitive. + * If case_range == 0, nick is converted to lower case (with string_tolower). + * If case_range > 0, nick is converted to lower case (with string_tolower_range). + * * If colors is NULL (most common case), the color returned is either a forced * color (from option "weechat.look.nick_color_force") or a color from option * "weechat.color.chat_nick_colors". @@ -333,12 +355,12 @@ end: */ char * -gui_nick_find_color (const char *nickname, const char *colors) +gui_nick_find_color (const char *nickname, int case_range, const char *colors) { char *color; const char *ptr_result; - color = gui_nick_find_color_name (nickname, colors); + color = gui_nick_find_color_name (nickname, case_range, colors); ptr_result = gui_color_get_custom (color); if (color) free (color); diff --git a/src/gui/gui-nick.h b/src/gui/gui-nick.h index 45d88afa5..64f7b2c18 100644 --- a/src/gui/gui-nick.h +++ b/src/gui/gui-nick.h @@ -20,9 +20,9 @@ #ifndef WEECHAT_GUI_NICK_H #define WEECHAT_GUI_NICK_H -extern char *gui_nick_find_color_name (const char *nickname, +extern char *gui_nick_find_color_name (const char *nickname, int case_range, const char *colors); -extern char *gui_nick_find_color (const char *nickname, +extern char *gui_nick_find_color (const char *nickname, int case_range, const char *colors); #endif /* WEECHAT_GUI_NICK_H */ diff --git a/src/plugins/irc/irc-info.c b/src/plugins/irc/irc-info.c index e3318d416..ebd0265cd 100644 --- a/src/plugins/irc/irc-info.c +++ b/src/plugins/irc/irc-info.c @@ -1259,15 +1259,17 @@ irc_info_init () &irc_info_info_irc_nick_from_host_cb, NULL, NULL); weechat_hook_info ( "irc_nick_color", - N_("get nick color code (nick is first converted to lower case, " - "following the value of CASEMAPPING on the server, " + N_("get nick color code, ignoring case (this calls the info " + "\"nick_color_ignore_case\" with appropriate range, according " + "to the value of CASEMAPPING on the server, " "defaulting to \"rfc1459\" if the server is not given)"), N_("server,nickname (server is optional)"), &irc_info_info_irc_nick_color_cb, NULL, NULL); weechat_hook_info ( "irc_nick_color_name", - N_("get nick color name (nick is first converted to lower case, " - "following the value of CASEMAPPING on the server, " + N_("get nick color name, ignoring case (this calls the info " + "\"nick_color_name_ignore_case\" with appropriate range, according " + "to the value of CASEMAPPING on the server, " "defaulting to \"rfc1459\" if the server is not given)"), N_("server,nickname (server is optional)"), &irc_info_info_irc_nick_color_name_cb, NULL, NULL); diff --git a/src/plugins/irc/irc-nick.c b/src/plugins/irc/irc-nick.c index f593c9312..286907999 100644 --- a/src/plugins/irc/irc-nick.c +++ b/src/plugins/irc/irc-nick.c @@ -141,15 +141,20 @@ irc_nick_is_nick (struct t_irc_server *server, const char *string) char * irc_nick_find_color (struct t_irc_server *server, const char *nickname) { - char *nickname_lower, *result; + char str_args[4096]; + int casemapping, range; - nickname_lower = irc_server_string_tolower (server, nickname); - if (!nickname_lower) - return NULL; + casemapping = (server) ? server->casemapping : -1; + if ((casemapping < 0) || (casemapping >= IRC_SERVER_NUM_CASEMAPPING)) + casemapping = IRC_SERVER_CASEMAPPING_RFC1459; + range = irc_server_casemapping_range[casemapping]; - result = weechat_info_get ("nick_color", nickname_lower); - free (nickname_lower); - return result; + snprintf (str_args, sizeof (str_args), + "%s;%d", + (nickname) ? nickname : "", + range); + + return weechat_info_get ("nick_color_ignore_case", str_args); } /* @@ -161,15 +166,20 @@ irc_nick_find_color (struct t_irc_server *server, const char *nickname) char * irc_nick_find_color_name (struct t_irc_server *server, const char *nickname) { - char *nickname_lower, *result; + char str_args[4096]; + int casemapping, range; - nickname_lower = irc_server_string_tolower (server, nickname); - if (!nickname_lower) - return NULL; + casemapping = (server) ? server->casemapping : -1; + if ((casemapping < 0) || (casemapping >= IRC_SERVER_NUM_CASEMAPPING)) + casemapping = IRC_SERVER_CASEMAPPING_RFC1459; + range = irc_server_casemapping_range[casemapping]; - result = weechat_info_get ("nick_color_name", nickname_lower); - free (nickname_lower); - return result; + snprintf (str_args, sizeof (str_args), + "%s;%d", + (nickname) ? nickname: "", + range); + + return weechat_info_get ("nick_color_name_ignore_case", str_args); } /* diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c index 1c4106796..2cd37d1ff 100644 --- a/src/plugins/irc/irc-server.c +++ b/src/plugins/irc/irc-server.c @@ -334,72 +334,6 @@ irc_server_strncasecmp (struct t_irc_server *server, } /* - * Converts string to lower case, following server casemapping. - * - * Note: result must be freed after use. - */ - -char * -irc_server_string_tolower (struct t_irc_server *server, const char *string) -{ - char *result, *ptr_result; - int casemapping, range; - - if (!string) - return NULL; - - casemapping = (server) ? server->casemapping : -1; - if ((casemapping < 0) || (casemapping >= IRC_SERVER_NUM_CASEMAPPING)) - casemapping = IRC_SERVER_CASEMAPPING_RFC1459; - - range = irc_server_casemapping_range[casemapping]; - - result = strdup (string); - ptr_result = result; - while (ptr_result && ptr_result[0]) - { - if ((ptr_result[0] >= 'A') && (ptr_result[0] < 'A' + range)) - ptr_result[0] += ('a' - 'A'); - ptr_result = (char *)weechat_utf8_next_char (ptr_result); - } - - return result; -} - -/* - * Converts string to upper case, following server casemapping. - * - * Note: result must be freed after use. - */ - -char * -irc_server_string_toupper (struct t_irc_server *server, const char *string) -{ - char *result, *ptr_result; - int casemapping, range; - - if (!string) - return NULL; - - casemapping = (server) ? server->casemapping : -1; - if ((casemapping < 0) || (casemapping >= IRC_SERVER_NUM_CASEMAPPING)) - casemapping = IRC_SERVER_CASEMAPPING_RFC1459; - - range = irc_server_casemapping_range[casemapping]; - - result = strdup (string); - ptr_result = result; - while (ptr_result && ptr_result[0]) - { - if ((ptr_result[0] >= 'a') && (ptr_result[0] < 'a' + range)) - ptr_result[0] -= ('a' - 'A'); - ptr_result = (char *)weechat_utf8_next_char (ptr_result); - } - - return result; -} - -/* * Evaluates a string using the server as context: * ${irc_server.xxx} and ${server} are replaced by a server option and the * server name. diff --git a/src/plugins/irc/irc-server.h b/src/plugins/irc/irc-server.h index 4ae647ed2..054516a8f 100644 --- a/src/plugins/irc/irc-server.h +++ b/src/plugins/irc/irc-server.h @@ -328,6 +328,7 @@ enum t_irc_fingerprint_digest_algo IRC_FINGERPRINT_NUM_ALGOS, }; +extern int irc_server_casemapping_range[]; extern char *irc_server_prefix_modes_default; extern char *irc_server_prefix_chars_default; extern char *irc_server_chanmodes_default; @@ -348,10 +349,6 @@ extern int irc_server_strcasecmp (struct t_irc_server *server, extern int irc_server_strncasecmp (struct t_irc_server *server, const char *string1, const char *string2, int max); -extern char *irc_server_string_tolower (struct t_irc_server *server, - const char *string); -extern char *irc_server_string_toupper (struct t_irc_server *server, - const char *string); extern char *irc_server_eval_expression (struct t_irc_server *server, const char *string); extern void irc_server_sasl_get_creds (struct t_irc_server *server, diff --git a/src/plugins/plugin-api-info.c b/src/plugins/plugin-api-info.c index 86443bf22..4d9f07b42 100644 --- a/src/plugins/plugin-api-info.c +++ b/src/plugins/plugin-api-info.c @@ -815,6 +815,7 @@ plugin_api_info_nick_color_cb (const void *pointer, void *data, result = gui_nick_find_color ( (num_items >= 1) ? items[0] : NULL, + -1, (num_items >= 2) ? items[1] : NULL); if (items) @@ -844,6 +845,7 @@ plugin_api_info_nick_color_name_cb (const void *pointer, void *data, result = gui_nick_find_color_name ( (num_items >= 1) ? items[0] : NULL, + -1, (num_items >= 2) ? items[1] : NULL); if (items) @@ -853,6 +855,84 @@ plugin_api_info_nick_color_name_cb (const void *pointer, void *data, } /* + * Returns nick color code for a nickname (case ignored using a range of chars). + */ + +char * +plugin_api_info_nick_color_ignore_case_cb (const void *pointer, void *data, + const char *info_name, + const char *arguments) +{ + char **items, *result, *error; + int num_items, case_range; + long number; + + /* make C compiler happy */ + (void) pointer; + (void) data; + (void) info_name; + + items = string_split (arguments, ";", NULL, 0, 3, &num_items); + + case_range = -1; + if (num_items >= 2) + { + number = strtol (items[1], &error, 10); + if (error && !error[0]) + case_range = (int)number; + } + + result = gui_nick_find_color ( + (num_items >= 1) ? items[0] : NULL, + case_range, + (num_items >= 3) ? items[2] : NULL); + + if (items) + string_free_split (items); + + return result; +} + +/* + * Returns nick color name for a nickname (case ignored using a range of chars). + */ + +char * +plugin_api_info_nick_color_name_ignore_case_cb (const void *pointer, void *data, + const char *info_name, + const char *arguments) +{ + char **items, *result, *error; + int num_items, case_range; + long number; + + /* make C compiler happy */ + (void) pointer; + (void) data; + (void) info_name; + + items = string_split (arguments, ";", NULL, 0, 3, &num_items); + + case_range = -1; + if (num_items >= 2) + { + number = strtol (items[1], &error, 10); + if (error && !error[0]) + case_range = (int)number; + } + + result = gui_nick_find_color_name ( + (num_items >= 1) ? items[0] : NULL, + case_range, + (num_items >= 3) ? items[2] : NULL); + + if (items) + string_free_split (items); + + return result; +} + +/* * Returns uptime according to the start date and arguments. */ @@ -2083,6 +2163,26 @@ plugin_api_info_init () "options with nick colors and forced nick colors are " "ignored)"), &plugin_api_info_nick_color_name_cb, NULL, NULL); + hook_info (NULL, "nick_color_ignore_case", + N_("get nick color code, ignoring case"), + N_("nickname;range;colors (range is a number of chars (see " + "function strcasecmp_range, 0 = convert to lower case without " + "using a range), colors is an optional comma-separated list " + "of colors to use; background is allowed for a color with " + "format text:background; if colors is present, WeeChat " + "options with nick colors and forced nick colors are " + "ignored)"), + &plugin_api_info_nick_color_ignore_case_cb, NULL, NULL); + hook_info (NULL, "nick_color_name_ignore_case", + N_("get nick color name, ignoring case"), + N_("nickname;range;colors (range is a number of chars (see " + "function strcasecmp_range, 0 = convert to lower case without " + "using a range), colors is an optional comma-separated list " + "of colors to use; background is allowed for a color with " + "format text:background; if colors is present, WeeChat " + "options with nick colors and forced nick colors are " + "ignored)"), + &plugin_api_info_nick_color_name_ignore_case_cb, NULL, NULL); hook_info (NULL, "uptime", N_("WeeChat uptime (format: \"days:hh:mm:ss\")"), N_("\"days\" (number of days) or \"seconds\" (number of " diff --git a/tests/unit/core/test-core-string.cpp b/tests/unit/core/test-core-string.cpp index a267a1bc4..11a742161 100644 --- a/tests/unit/core/test-core-string.cpp +++ b/tests/unit/core/test-core-string.cpp @@ -219,6 +219,46 @@ TEST(CoreString, ToUpper) /* * Tests functions: + * string_tolower_range + */ + +TEST(CoreString, ToLowerRange) +{ + char *str; + + WEE_TEST_STR(NULL, string_tolower_range (NULL, 0)); + WEE_TEST_STR(NULL, string_tolower_range (NULL, 30)); + + WEE_TEST_STR("", string_tolower_range ("", 0)); + WEE_TEST_STR("", string_tolower_range ("", 30)); + WEE_TEST_STR("^[a]ô", string_tolower_range ("^[A]Ô", 0)); + WEE_TEST_STR("~{a}Ô", string_tolower_range ("^[A]Ô", 30)); + WEE_TEST_STR("^{a}Ô", string_tolower_range ("^[A]Ô", 29)); + WEE_TEST_STR("^[a]Ô", string_tolower_range ("^[A]Ô", 26)); +} + +/* + * Tests functions: + * string_toupper_range + */ + +TEST(CoreString, ToUpperRange) +{ + char *str; + + WEE_TEST_STR(NULL, string_toupper_range (NULL, 0)); + WEE_TEST_STR(NULL, string_toupper_range (NULL, 30)); + + WEE_TEST_STR("", string_toupper_range ("", 0)); + WEE_TEST_STR("", string_toupper_range ("", 30)); + WEE_TEST_STR("~{A}Ô", string_toupper_range ("~{a}ô", 0)); + WEE_TEST_STR("^[A]ô", string_toupper_range ("~{a}ô", 30)); + WEE_TEST_STR("~[A]ô", string_toupper_range ("~{a}ô", 29)); + WEE_TEST_STR("~{A}ô", string_toupper_range ("~{a}ô", 26)); +} + +/* + * Tests functions: * string_cut */ diff --git a/tests/unit/gui/test-gui-nick.cpp b/tests/unit/gui/test-gui-nick.cpp index ba73e2b64..2e36c4fc4 100644 --- a/tests/unit/gui/test-gui-nick.cpp +++ b/tests/unit/gui/test-gui-nick.cpp @@ -65,12 +65,12 @@ extern char *gui_nick_strdup_for_color (const char *nickname); if (nick) \ free (nick); -#define WEE_FIND_COLOR(__result, __nickname, __colors) \ - color = gui_nick_find_color_name (__nickname, __colors); \ +#define WEE_FIND_COLOR(__result, __nickname, __range, __colors) \ + color = gui_nick_find_color_name (__nickname, __range, __colors); \ STRCMP_EQUAL(__result, color); \ free (color); \ result_color = gui_color_get_custom (__result); \ - color = gui_nick_find_color (__nickname, __colors); \ + color = gui_nick_find_color (__nickname, __range, __colors); \ STRCMP_EQUAL(result_color, color); \ free (color); @@ -363,27 +363,41 @@ TEST(GuiNick, FindColor) const char *result_color; char *color; - WEE_FIND_COLOR("default", NULL, NULL); - WEE_FIND_COLOR("default", "", NULL); + WEE_FIND_COLOR("default", NULL, -1, NULL); + WEE_FIND_COLOR("default", "", -1, NULL); - WEE_FIND_COLOR("212", "abcdef", NULL); - WEE_FIND_COLOR("92", "abcdefghi", NULL); + WEE_FIND_COLOR("212", "abcdef", -1, NULL); + WEE_FIND_COLOR("92", "abcdefghi", -1, NULL); /* with forced color */ config_file_option_set (config_look_nick_color_force, "abcdef:green;abcdefghi:125", 1); - WEE_FIND_COLOR("green", "abcdef", NULL); - WEE_FIND_COLOR("125", "abcdefghi", NULL); + WEE_FIND_COLOR("green", "abcdef", -1, NULL); + WEE_FIND_COLOR("125", "abcdefghi", -1, NULL); config_file_option_reset (config_look_nick_color_force, 1); /* with custom colors */ - WEE_FIND_COLOR("214", "abcdef", "red,blue,214,magenta"); - WEE_FIND_COLOR("blue", "abcdefghi", "red,blue,214,magenta"); + WEE_FIND_COLOR("214", "abcdef", -1, "red,blue,214,magenta"); + WEE_FIND_COLOR("blue", "abcdefghi", -1, "red,blue,214,magenta"); /* with forced color and custom colors (forced color is ignored) */ config_file_option_set (config_look_nick_color_force, "abcdef:green;abcdefghi:125", 1); - WEE_FIND_COLOR("214", "abcdef", "red,blue,214,magenta"); - WEE_FIND_COLOR("blue", "abcdefghi", "red,blue,214,magenta"); + WEE_FIND_COLOR("214", "abcdef", -1, "red,blue,214,magenta"); + WEE_FIND_COLOR("blue", "abcdefghi", -1, "red,blue,214,magenta"); config_file_option_reset (config_look_nick_color_force, 1); + + /* with case range */ + WEE_FIND_COLOR("176", "ABCDEF]^", -1, NULL); + WEE_FIND_COLOR("186", "ABCDEF]^", 0, NULL); + WEE_FIND_COLOR("174", "ABCDEF]^", 30, NULL); + WEE_FIND_COLOR("148", "ABCDEF]^", 29, NULL); + WEE_FIND_COLOR("186", "ABCDEF]^", 26, NULL); + + /* with case range and custom colors */ + WEE_FIND_COLOR("214", "ABCDEF]^", -1, "red,blue,214,magenta,yellow"); + WEE_FIND_COLOR("yellow", "ABCDEF]^", 0, "red,blue,214,magenta,yellow"); + WEE_FIND_COLOR("blue", "ABCDEF]^", 30, "red,blue,214,magenta,yellow"); + WEE_FIND_COLOR("magenta", "ABCDEF]^", 29, "red,blue,214,magenta,yellow"); + WEE_FIND_COLOR("yellow", "ABCDEF]^", 26, "red,blue,214,magenta,yellow"); } diff --git a/tests/unit/plugins/irc/test-irc-nick.cpp b/tests/unit/plugins/irc/test-irc-nick.cpp index 1d48b3989..6a22879ff 100644 --- a/tests/unit/plugins/irc/test-irc-nick.cpp +++ b/tests/unit/plugins/irc/test-irc-nick.cpp @@ -190,17 +190,19 @@ TEST(IrcNick, IrcNickFindColor) server = irc_server_alloc ("my_ircd"); CHECK(server); - POINTERS_EQUAL(NULL, irc_nick_find_color (NULL, NULL)); - POINTERS_EQUAL(NULL, irc_nick_find_color_name (NULL, NULL)); + snprintf (str_color, sizeof (str_color), "%s", gui_color_get_custom ("default")); - POINTERS_EQUAL(NULL, irc_nick_find_color (server, NULL)); - POINTERS_EQUAL(NULL, irc_nick_find_color_name (server, NULL)); + WEE_TEST_STR(str_color, irc_nick_find_color (NULL, NULL)); + WEE_TEST_STR("default", irc_nick_find_color_name (NULL, NULL)); - snprintf (str_color, sizeof (str_color), "%s", gui_color_get_custom ("162")); - WEE_TEST_STR(str_color, irc_nick_find_color (NULL, "NICK[A]")); - WEE_TEST_STR(str_color, irc_nick_find_color (NULL, "nick{a}")); - WEE_TEST_STR("162", irc_nick_find_color_name (NULL, "NICK[A]")); - WEE_TEST_STR("162", irc_nick_find_color_name (NULL, "nick{a}")); + WEE_TEST_STR(str_color, irc_nick_find_color (server, NULL)); + WEE_TEST_STR("default", irc_nick_find_color_name (server, NULL)); + + snprintf (str_color, sizeof (str_color), "%s", gui_color_get_custom ("142")); + WEE_TEST_STR(str_color, irc_nick_find_color (NULL, "NICK]")); + WEE_TEST_STR(str_color, irc_nick_find_color (NULL, "nick}")); + WEE_TEST_STR("142", irc_nick_find_color_name (NULL, "NICK]")); + WEE_TEST_STR("142", irc_nick_find_color_name (NULL, "nick}")); snprintf (str_color, sizeof (str_color), "%s", gui_color_get_custom ("lightcyan")); WEE_TEST_STR(str_color, irc_nick_find_color (NULL, "NICK^A")); @@ -208,11 +210,11 @@ TEST(IrcNick, IrcNickFindColor) WEE_TEST_STR("lightcyan", irc_nick_find_color_name (NULL, "NICK^A")); WEE_TEST_STR("lightcyan", irc_nick_find_color_name (NULL, "nick~a")); - snprintf (str_color, sizeof (str_color), "%s", gui_color_get_custom ("162")); - WEE_TEST_STR(str_color, irc_nick_find_color (server, "NICK[A]")); - WEE_TEST_STR(str_color, irc_nick_find_color (server, "nick{a}")); - WEE_TEST_STR("162", irc_nick_find_color_name (server, "NICK[A]")); - WEE_TEST_STR("162", irc_nick_find_color_name (server, "nick{a}")); + snprintf (str_color, sizeof (str_color), "%s", gui_color_get_custom ("142")); + WEE_TEST_STR(str_color, irc_nick_find_color (server, "NICK]")); + WEE_TEST_STR(str_color, irc_nick_find_color (server, "nick}")); + WEE_TEST_STR("142", irc_nick_find_color_name (server, "NICK]")); + WEE_TEST_STR("142", irc_nick_find_color_name (server, "nick}")); snprintf (str_color, sizeof (str_color), "%s", gui_color_get_custom ("lightcyan")); WEE_TEST_STR(str_color, irc_nick_find_color (server, "NICK^A")); @@ -222,11 +224,11 @@ TEST(IrcNick, IrcNickFindColor) server->casemapping = IRC_SERVER_CASEMAPPING_STRICT_RFC1459; - snprintf (str_color, sizeof (str_color), "%s", gui_color_get_custom ("162")); - WEE_TEST_STR(str_color, irc_nick_find_color (server, "NICK[A]")); - WEE_TEST_STR(str_color, irc_nick_find_color (server, "nick{a}")); - WEE_TEST_STR("162", irc_nick_find_color_name (server, "NICK[A]")); - WEE_TEST_STR("162", irc_nick_find_color_name (server, "nick{a}")); + snprintf (str_color, sizeof (str_color), "%s", gui_color_get_custom ("142")); + WEE_TEST_STR(str_color, irc_nick_find_color (server, "NICK]")); + WEE_TEST_STR(str_color, irc_nick_find_color (server, "nick}")); + WEE_TEST_STR("142", irc_nick_find_color_name (server, "NICK]")); + WEE_TEST_STR("142", irc_nick_find_color_name (server, "nick}")); snprintf (str_color, sizeof (str_color), "%s", gui_color_get_custom ("176")); WEE_TEST_STR(str_color, irc_nick_find_color (server, "NICK^A")); @@ -237,12 +239,12 @@ TEST(IrcNick, IrcNickFindColor) server->casemapping = IRC_SERVER_CASEMAPPING_ASCII; - snprintf (str_color, sizeof (str_color), "%s", gui_color_get_custom ("212")); - WEE_TEST_STR(str_color, irc_nick_find_color (server, "NICK[A]")); - snprintf (str_color, sizeof (str_color), "%s", gui_color_get_custom ("162")); - WEE_TEST_STR(str_color, irc_nick_find_color (server, "nick{a}")); - WEE_TEST_STR("212", irc_nick_find_color_name (server, "NICK[A]")); - WEE_TEST_STR("162", irc_nick_find_color_name (server, "nick{a}")); + snprintf (str_color, sizeof (str_color), "%s", gui_color_get_custom ("169")); + WEE_TEST_STR(str_color, irc_nick_find_color (server, "NICK]")); + snprintf (str_color, sizeof (str_color), "%s", gui_color_get_custom ("142")); + WEE_TEST_STR(str_color, irc_nick_find_color (server, "nick}")); + WEE_TEST_STR("169", irc_nick_find_color_name (server, "NICK]")); + WEE_TEST_STR("142", irc_nick_find_color_name (server, "nick}")); snprintf (str_color, sizeof (str_color), "%s", gui_color_get_custom ("176")); WEE_TEST_STR(str_color, irc_nick_find_color (server, "NICK^A")); diff --git a/tests/unit/plugins/irc/test-irc-server.cpp b/tests/unit/plugins/irc/test-irc-server.cpp index 037f14a22..1e22fc1c4 100644 --- a/tests/unit/plugins/irc/test-irc-server.cpp +++ b/tests/unit/plugins/irc/test-irc-server.cpp @@ -215,64 +215,6 @@ TEST(IrcServer, Strcasecmp) /* * Tests functions: - * irc_server_string_tolower - * irc_server_string_toupper - */ - -TEST(IrcServer, StringToLowerUpper) -{ - struct t_irc_server *server; - char *str; - - server = irc_server_alloc ("server1"); - CHECK(server); - - POINTERS_EQUAL(NULL, irc_server_string_tolower (NULL, NULL)); - POINTERS_EQUAL(NULL, irc_server_string_toupper (NULL, NULL)); - - WEE_TEST_STR("", irc_server_string_tolower (NULL, "")); - WEE_TEST_STR("", irc_server_string_toupper (NULL, "")); - - WEE_TEST_STR("abcdÉ", irc_server_string_tolower (NULL, "ABCDÉ")); - WEE_TEST_STR("ABCDé", irc_server_string_toupper (NULL, "abcdé")); - - WEE_TEST_STR("nick{a}", irc_server_string_tolower (NULL, "NICK[A]")); - WEE_TEST_STR("NICK[A]", irc_server_string_toupper (NULL, "nick{a}")); - WEE_TEST_STR("nick~a", irc_server_string_tolower (NULL, "NICK^A")); - WEE_TEST_STR("NICK^A", irc_server_string_toupper (NULL, "nick~a")); - WEE_TEST_STR("nick_Ô", irc_server_string_tolower (NULL, "NICK_Ô")); - WEE_TEST_STR("NICK_ô", irc_server_string_toupper (NULL, "nick_ô")); - - WEE_TEST_STR("nick{a}", irc_server_string_tolower (server, "NICK[A]")); - WEE_TEST_STR("NICK[A]", irc_server_string_toupper (server, "nick{a}")); - WEE_TEST_STR("nick~a", irc_server_string_tolower (server, "NICK^A")); - WEE_TEST_STR("NICK^A", irc_server_string_toupper (server, "nick~a")); - WEE_TEST_STR("nick_Ô", irc_server_string_tolower (server, "NICK_Ô")); - WEE_TEST_STR("NICK_ô", irc_server_string_toupper (server, "nick_ô")); - - server->casemapping = IRC_SERVER_CASEMAPPING_STRICT_RFC1459; - - WEE_TEST_STR("nick{a}", irc_server_string_tolower (server, "NICK[A]")); - WEE_TEST_STR("NICK[A]", irc_server_string_toupper (server, "nick{a}")); - WEE_TEST_STR("nick^a", irc_server_string_tolower (server, "NICK^A")); - WEE_TEST_STR("NICK~A", irc_server_string_toupper (server, "nick~a")); - WEE_TEST_STR("nick_Ô", irc_server_string_tolower (server, "NICK_Ô")); - WEE_TEST_STR("NICK_ô", irc_server_string_toupper (server, "nick_ô")); - - server->casemapping = IRC_SERVER_CASEMAPPING_ASCII; - - WEE_TEST_STR("nick[a]", irc_server_string_tolower (server, "NICK[A]")); - WEE_TEST_STR("NICK{A}", irc_server_string_toupper (server, "nick{a}")); - WEE_TEST_STR("nick^a", irc_server_string_tolower (server, "NICK^A")); - WEE_TEST_STR("NICK~A", irc_server_string_toupper (server, "nick~a")); - WEE_TEST_STR("nick_Ô", irc_server_string_tolower (server, "NICK_Ô")); - WEE_TEST_STR("NICK_ô", irc_server_string_toupper (server, "nick_ô")); - - irc_server_free (server); -} - -/* - * Tests functions: * irc_server_eval_expression */ |