diff options
| author | Sébastien Helleu <flashcode@flashtux.org> | 2023-04-27 22:58:02 +0200 |
|---|---|---|
| committer | Sébastien Helleu <flashcode@flashtux.org> | 2023-04-27 22:59:24 +0200 |
| commit | f90d8667a4d6a008d3523e29617759231399ceff (patch) | |
| tree | cd4fe89eadb14c0043792706be12d8c520f4c33e | |
| parent | 882284325481759b7d7a3ea25ace791d4c5a1b21 (diff) | |
| download | weechat-f90d8667a4d6a008d3523e29617759231399ceff.zip | |
irc: add `${username}` in server options "nicks" and "username", change their default values to use it
| -rw-r--r-- | ChangeLog.adoc | 1 | ||||
| -rw-r--r-- | po/cs.po | 25 | ||||
| -rw-r--r-- | po/de.po | 37 | ||||
| -rw-r--r-- | po/es.po | 25 | ||||
| -rw-r--r-- | po/fr.po | 32 | ||||
| -rw-r--r-- | po/hu.po | 25 | ||||
| -rw-r--r-- | po/it.po | 25 | ||||
| -rw-r--r-- | po/ja.po | 35 | ||||
| -rw-r--r-- | po/pl.po | 35 | ||||
| -rw-r--r-- | po/pt.po | 26 | ||||
| -rw-r--r-- | po/pt_BR.po | 13 | ||||
| -rw-r--r-- | po/ru.po | 25 | ||||
| -rw-r--r-- | po/sr.po | 35 | ||||
| -rw-r--r-- | po/tr.po | 35 | ||||
| -rw-r--r-- | po/weechat.pot | 10 | ||||
| -rw-r--r-- | src/plugins/irc/irc-config.c | 73 | ||||
| -rw-r--r-- | src/plugins/irc/irc-server.c | 15 | ||||
| -rw-r--r-- | tests/unit/plugins/irc/test-irc-server.cpp | 6 |
18 files changed, 313 insertions, 165 deletions
diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 4b7a035eb..539413a34 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -43,6 +43,7 @@ New features:: * irc: add command `/knock` (issue #7) * irc: add server option "registered_mode", add fields "authentication_method" and "sasl_mechanism_used" in server (issue #1625) * irc: add option `join` in command `/autojoin` + * irc: add `${username}` in server options "nicks" and "username", change their default values to use it * logger: add info "logger_log_file" * relay: rename "ssl" options and protocol to "tls" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-04-26 21:09+0200\n" +"POT-Creation-Date: 2023-04-27 22:53+0200\n" "PO-Revision-Date: 2023-03-25 21:13+0100\n" "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -8713,8 +8713,9 @@ msgstr "doba (v sekundách) před novým zkušením znovupřipojení na server" #, fuzzy msgid "" "nicknames to use on server (separated by comma) (note: content is evaluated, " -"see /help eval; server options are evaluated with ${irc_server.xxx} and " -"${server} is replaced by the server name)" +"see /help eval; ${username} is replaced by system username (fallback to " +"\"weechat\" if not found), server options are evaluated with ${irc_server." +"xxx} and ${server} is replaced by the server name)" msgstr "příkaz spuštěný při startu WeeChat, před načtením pluginů" msgid "" @@ -8727,12 +8728,10 @@ msgstr "" #, fuzzy msgid "" "user name to use on server (note: content is evaluated, see /help eval; " -"server options are evaluated with ${irc_server.xxx} and ${server} is " +"${username} is replaced by system username (fallback to \"weechat\" if not " +"found), server options are evaluated with ${irc_server.xxx} and ${server} is " "replaced by the server name)" -msgstr "" -" kanál: kanál na kterém je uživatel\n" -"přezdívka: přezdívka, kterou vykopnout\n" -" důvod: důvod pro vykopnutí" +msgstr "příkaz spuštěný při startu WeeChat, před načtením pluginů" #, fuzzy msgid "" @@ -14043,3 +14042,13 @@ msgstr "%s%s: vypršel časový limit \"%s\" pro %s" #, c-format msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: nemohu se připojit\" neočekávaná chyba (%d)" + +#, fuzzy +#~ msgid "" +#~ "user name to use on server (note: content is evaluated, see /help eval; " +#~ "server options are evaluated with ${irc_server.xxx} and ${server} is " +#~ "replaced by the server name)" +#~ msgstr "" +#~ " kanál: kanál na kterém je uživatel\n" +#~ "přezdívka: přezdívka, kterou vykopnout\n" +#~ " důvod: důvod pro vykopnutí" @@ -26,7 +26,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-04-26 21:09+0200\n" +"POT-Creation-Date: 2023-04-27 22:53+0200\n" "PO-Revision-Date: 2023-04-27 10:10+0200\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Language-Team: German - Germany <weechatter@arcor.de>\n" @@ -10817,10 +10817,16 @@ msgstr "" "Zeit (in Sekunden) die gewartet werden soll bevor ein neuer " "Verbindungsaufbau durchgeführt werden soll" +#, fuzzy +#| msgid "" +#| "nicknames to use on server (separated by comma) (note: content is " +#| "evaluated, see /help eval; server options are evaluated with ${irc_server." +#| "xxx} and ${server} is replaced by the server name)" msgid "" "nicknames to use on server (separated by comma) (note: content is evaluated, " -"see /help eval; server options are evaluated with ${irc_server.xxx} and " -"${server} is replaced by the server name)" +"see /help eval; ${username} is replaced by system username (fallback to " +"\"weechat\" if not found), server options are evaluated with ${irc_server." +"xxx} and ${server} is replaced by the server name)" msgstr "" "Nicknamen, die auf dem IRC-Server benutzt werden sollen (durch " "Kommatagetrennt) (Hinweis: Inhalt wird evaluiert, siehe /help eval; " @@ -10839,14 +10845,21 @@ msgstr "" "beiden letzten Zeichen durch eine Zahl zwischen 1 und 99 ersetzt, bis ein " "freier Nick auf dem Server gefunden wird" +#, fuzzy +#| msgid "" +#| "nicknames to use on server (separated by comma) (note: content is " +#| "evaluated, see /help eval; server options are evaluated with ${irc_server." +#| "xxx} and ${server} is replaced by the server name)" msgid "" "user name to use on server (note: content is evaluated, see /help eval; " -"server options are evaluated with ${irc_server.xxx} and ${server} is " +"${username} is replaced by system username (fallback to \"weechat\" if not " +"found), server options are evaluated with ${irc_server.xxx} and ${server} is " "replaced by the server name)" msgstr "" -"Username welcher für den Server genutzt werden soll (Hinweis: Inhalt wird " -"evaluiert, siehe /help eval; Serveroptionen sind mittels ${irc_server.xxx} " -"evaluiert und ${server} wird durch den eigentlichen Servernamen ersetzt)" +"Nicknamen, die auf dem IRC-Server benutzt werden sollen (durch " +"Kommatagetrennt) (Hinweis: Inhalt wird evaluiert, siehe /help eval; " +"Serveroptionen sind mittels ${irc_server.xxx} evaluiert und ${server} wird " +"durch den eigentlichen Servernamen ersetzt)" msgid "" "real name to use on server (note: content is evaluated, see /help eval; " @@ -16837,3 +16850,13 @@ msgstr "%s%s: Zeitüberschreitung für \"%s\" mit %s" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "" "%s%s: Verbindung konnte nicht hergestellt werden: unerwarteter Fehler (%d)" + +#~ msgid "" +#~ "user name to use on server (note: content is evaluated, see /help eval; " +#~ "server options are evaluated with ${irc_server.xxx} and ${server} is " +#~ "replaced by the server name)" +#~ msgstr "" +#~ "Username welcher für den Server genutzt werden soll (Hinweis: Inhalt wird " +#~ "evaluiert, siehe /help eval; Serveroptionen sind mittels ${irc_server." +#~ "xxx} evaluiert und ${server} wird durch den eigentlichen Servernamen " +#~ "ersetzt)" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-04-26 21:09+0200\n" +"POT-Creation-Date: 2023-04-27 22:53+0200\n" "PO-Revision-Date: 2023-03-25 21:13+0100\n" "Last-Translator: Santiago Forero <santiago@forero.xyz>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -9385,8 +9385,9 @@ msgstr "" #, fuzzy msgid "" "nicknames to use on server (separated by comma) (note: content is evaluated, " -"see /help eval; server options are evaluated with ${irc_server.xxx} and " -"${server} is replaced by the server name)" +"see /help eval; ${username} is replaced by system username (fallback to " +"\"weechat\" if not found), server options are evaluated with ${irc_server." +"xxx} and ${server} is replaced by the server name)" msgstr "comando ejecutado cuando WeeChat inicia, antes de cargar los plugins" msgid "" @@ -9399,12 +9400,10 @@ msgstr "" #, fuzzy msgid "" "user name to use on server (note: content is evaluated, see /help eval; " -"server options are evaluated with ${irc_server.xxx} and ${server} is " +"${username} is replaced by system username (fallback to \"weechat\" if not " +"found), server options are evaluated with ${irc_server.xxx} and ${server} is " "replaced by the server name)" -msgstr "" -"canal: canal donde está el usuario\n" -"apodo: usuario a expulsar\n" -"razón: razón de la expulsión" +msgstr "comando ejecutado cuando WeeChat inicia, antes de cargar los plugins" #, fuzzy msgid "" @@ -14730,3 +14729,13 @@ msgstr "%s%s: tiempo de espera máximo para \"%s\" con %s" #, c-format msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: no es posible conectarse: error (%d)" + +#, fuzzy +#~ msgid "" +#~ "user name to use on server (note: content is evaluated, see /help eval; " +#~ "server options are evaluated with ${irc_server.xxx} and ${server} is " +#~ "replaced by the server name)" +#~ msgstr "" +#~ "canal: canal donde está el usuario\n" +#~ "apodo: usuario a expulsar\n" +#~ "razón: razón de la expulsión" @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-04-26 21:09+0200\n" -"PO-Revision-Date: 2023-04-27 22:42+0200\n" +"POT-Creation-Date: 2023-04-27 22:53+0200\n" +"PO-Revision-Date: 2023-04-27 22:54+0200\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: fr\n" @@ -10626,12 +10626,15 @@ msgstr "délai (en secondes) avant de tenter une reconnexion au serveur" msgid "" "nicknames to use on server (separated by comma) (note: content is evaluated, " -"see /help eval; server options are evaluated with ${irc_server.xxx} and " -"${server} is replaced by the server name)" +"see /help eval; ${username} is replaced by system username (fallback to " +"\"weechat\" if not found), server options are evaluated with ${irc_server." +"xxx} and ${server} is replaced by the server name)" msgstr "" "pseudos à utiliser sur le serveur (séparés par des virgules) (note : le " -"contenu est évalué, voir /help eval ; les options de serveur sont évaluées " -"avec ${irc_server.xxx} et ${server} est remplacé par le nom du serveur)" +"contenu est évalué, voir /help eval ; ${username} est remplacé par " +"l'utilisateur système (\"weechat\" par défaut s'il n'est pas trouvé), les " +"options de serveur sont évaluées avec ${irc_server.xxx} et ${server} est " +"remplacé par le nom du serveur)" msgid "" "get an alternate nick when all the declared nicks are already used on " @@ -10646,12 +10649,14 @@ msgstr "" msgid "" "user name to use on server (note: content is evaluated, see /help eval; " -"server options are evaluated with ${irc_server.xxx} and ${server} is " +"${username} is replaced by system username (fallback to \"weechat\" if not " +"found), server options are evaluated with ${irc_server.xxx} and ${server} is " "replaced by the server name)" msgstr "" "nom d'utilisateur pour le serveur (note : le contenu est évalué, voir /help " -"eval ; les options de serveur sont évaluées avec ${irc_server.xxx} et " -"${server} est remplacé par le nom du serveur)" +"eval ; ${username} est remplacé par l'utilisateur système (\"weechat\" par " +"défaut s'il n'est pas trouvé), les options de serveur sont évaluées avec " +"${irc_server.xxx} et ${server} est remplacé par le nom du serveur)" msgid "" "real name to use on server (note: content is evaluated, see /help eval; " @@ -16530,3 +16535,12 @@ msgstr "%s%s : délai d'attente dépassé pour \"%s\" avec %s" #, c-format msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s : impossible de se connecter : erreur inattendue (%d)" + +#~ msgid "" +#~ "user name to use on server (note: content is evaluated, see /help eval; " +#~ "server options are evaluated with ${irc_server.xxx} and ${server} is " +#~ "replaced by the server name)" +#~ msgstr "" +#~ "nom d'utilisateur pour le serveur (note : le contenu est évalué, voir /" +#~ "help eval ; les options de serveur sont évaluées avec ${irc_server.xxx} " +#~ "et ${server} est remplacé par le nom du serveur)" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-04-26 21:09+0200\n" +"POT-Creation-Date: 2023-04-27 22:53+0200\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -8217,8 +8217,9 @@ msgstr "két újracsatlakozási próba közti szünet (másodpercben)" #, fuzzy msgid "" "nicknames to use on server (separated by comma) (note: content is evaluated, " -"see /help eval; server options are evaluated with ${irc_server.xxx} and " -"${server} is replaced by the server name)" +"see /help eval; ${username} is replaced by system username (fallback to " +"\"weechat\" if not found), server options are evaluated with ${irc_server." +"xxx} and ${server} is replaced by the server name)" msgstr "felhasználónév az IRC szerveren" msgid "" @@ -8231,12 +8232,10 @@ msgstr "" #, fuzzy msgid "" "user name to use on server (note: content is evaluated, see /help eval; " -"server options are evaluated with ${irc_server.xxx} and ${server} is " +"${username} is replaced by system username (fallback to \"weechat\" if not " +"found), server options are evaluated with ${irc_server.xxx} and ${server} is " "replaced by the server name)" -msgstr "" -" szoba: a szoba, ahol a felhasználó tartózkodik\n" -" név: a kirúgandó neve\n" -"megjegyzés: megjegyzés a kirúgáshoz" +msgstr "felhasználónév az IRC szerveren" #, fuzzy msgid "" @@ -13340,5 +13339,15 @@ msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s DCC: nem sikerült kapcsolódni a küldőhöz\n" #, fuzzy +#~ msgid "" +#~ "user name to use on server (note: content is evaluated, see /help eval; " +#~ "server options are evaluated with ${irc_server.xxx} and ${server} is " +#~ "replaced by the server name)" +#~ msgstr "" +#~ " szoba: a szoba, ahol a felhasználó tartózkodik\n" +#~ " név: a kirúgandó neve\n" +#~ "megjegyzés: megjegyzés a kirúgáshoz" + +#, fuzzy #~ msgid "Option changed" #~ msgstr "nincs a szobában" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-04-26 21:09+0200\n" +"POT-Creation-Date: 2023-04-27 22:53+0200\n" "PO-Revision-Date: 2023-03-25 21:13+0100\n" "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -9093,8 +9093,9 @@ msgstr "ritardo (in secondi) prima di riprovare a riconnettersi al server" #, fuzzy msgid "" "nicknames to use on server (separated by comma) (note: content is evaluated, " -"see /help eval; server options are evaluated with ${irc_server.xxx} and " -"${server} is replaced by the server name)" +"see /help eval; ${username} is replaced by system username (fallback to " +"\"weechat\" if not found), server options are evaluated with ${irc_server." +"xxx} and ${server} is replaced by the server name)" msgstr "" "nome utente per il server proxy (nota: il contenuto viene valutato, " "consultare /help eval)" @@ -9109,12 +9110,12 @@ msgstr "" #, fuzzy msgid "" "user name to use on server (note: content is evaluated, see /help eval; " -"server options are evaluated with ${irc_server.xxx} and ${server} is " +"${username} is replaced by system username (fallback to \"weechat\" if not " +"found), server options are evaluated with ${irc_server.xxx} and ${server} is " "replaced by the server name)" msgstr "" -"canale: canale dove si trova l'utente\n" -" nick: nick da cacciare\n" -"motivo: motivo per il kick" +"nome utente per il server proxy (nota: il contenuto viene valutato, " +"consultare /help eval)" #, fuzzy msgid "" @@ -14485,3 +14486,13 @@ msgstr "%s%s: timeout per \"%s\" con %s" #, fuzzy, c-format msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: impossibile connettersi al mittente" + +#, fuzzy +#~ msgid "" +#~ "user name to use on server (note: content is evaluated, see /help eval; " +#~ "server options are evaluated with ${irc_server.xxx} and ${server} is " +#~ "replaced by the server name)" +#~ msgstr "" +#~ "canale: canale dove si trova l'utente\n" +#~ " nick: nick da cacciare\n" +#~ "motivo: motivo per il kick" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-04-26 21:09+0200\n" +"POT-Creation-Date: 2023-04-27 22:53+0200\n" "PO-Revision-Date: 2023-03-25 21:13+0100\n" "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n" "Language-Team: Japanese <https://github.com/l/weechat/tree/master/" @@ -10236,10 +10236,16 @@ msgstr "接続が切れたときに自動的に再接続" msgid "delay (in seconds) before trying again to reconnect to server" msgstr "サーバへの再接続の際の遅延 (秒単位) 時間" +#, fuzzy +#| msgid "" +#| "nicknames to use on server (separated by comma) (note: content is " +#| "evaluated, see /help eval; server options are evaluated with ${irc_server." +#| "xxx} and ${server} is replaced by the server name)" msgid "" "nicknames to use on server (separated by comma) (note: content is evaluated, " -"see /help eval; server options are evaluated with ${irc_server.xxx} and " -"${server} is replaced by the server name)" +"see /help eval; ${username} is replaced by system username (fallback to " +"\"weechat\" if not found), server options are evaluated with ${irc_server." +"xxx} and ${server} is replaced by the server name)" msgstr "" "サーバで使用するニックネーム (コンマ区切り) (注意: 値は評価されます、/help " "eval を参照してください; ここで ${irc_server.xxx} はサーバオプショ" @@ -10256,14 +10262,20 @@ msgstr "" "す。その後利用されていないニックネームが見つかるまで、最後の 1 文字 (または最" "後の 2 文字) を 1 から 99 まで置き換えていきます" +#, fuzzy +#| msgid "" +#| "nicknames to use on server (separated by comma) (note: content is " +#| "evaluated, see /help eval; server options are evaluated with ${irc_server." +#| "xxx} and ${server} is replaced by the server name)" msgid "" "user name to use on server (note: content is evaluated, see /help eval; " -"server options are evaluated with ${irc_server.xxx} and ${server} is " +"${username} is replaced by system username (fallback to \"weechat\" if not " +"found), server options are evaluated with ${irc_server.xxx} and ${server} is " "replaced by the server name)" msgstr "" -"サーバで使用するユーザ名 (注意: 値は評価されます、/help eval を参照してくださ" -"い; ここで ${irc_server.xxx} はサーバオプション、${server} はサーバ名を意味し" -"ます)" +"サーバで使用するニックネーム (コンマ区切り) (注意: 値は評価されます、/help " +"eval を参照してください; ここで ${irc_server.xxx} はサーバオプショ" +"ン、${server} はサーバ名を意味します)" msgid "" "real name to use on server (note: content is evaluated, see /help eval; " @@ -15911,3 +15923,12 @@ msgstr "%s%s: \"%s\" のタイムアウト %s" #, c-format msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: 接続できません: 未定義のエラー (%d)" + +#~ msgid "" +#~ "user name to use on server (note: content is evaluated, see /help eval; " +#~ "server options are evaluated with ${irc_server.xxx} and ${server} is " +#~ "replaced by the server name)" +#~ msgstr "" +#~ "サーバで使用するユーザ名 (注意: 値は評価されます、/help eval を参照してく" +#~ "ださい; ここで ${irc_server.xxx} はサーバオプション、${server} はサーバ名" +#~ "を意味します)" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-04-26 21:09+0200\n" +"POT-Creation-Date: 2023-04-27 22:53+0200\n" "PO-Revision-Date: 2023-04-13 20:09+0200\n" "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n" "Language-Team: Polish <kde-i18n-doc@kde.org>\n" @@ -11184,10 +11184,16 @@ msgid "delay (in seconds) before trying again to reconnect to server" msgstr "" "opóźnienie (w sekundach) przed próbą ponownego połączenia się z serwerem" +#, fuzzy +#| msgid "" +#| "nicknames to use on server (separated by comma) (note: content is " +#| "evaluated, see /help eval; server options are evaluated with ${irc_server." +#| "xxx} and ${server} is replaced by the server name)" msgid "" "nicknames to use on server (separated by comma) (note: content is evaluated, " -"see /help eval; server options are evaluated with ${irc_server.xxx} and " -"${server} is replaced by the server name)" +"see /help eval; ${username} is replaced by system username (fallback to " +"\"weechat\" if not found), server options are evaluated with ${irc_server." +"xxx} and ${server} is replaced by the server name)" msgstr "" "nicki do użycia na serwerze (oddzielone przecinkiem) (uwaga: zawartość jest " "przetwarzana, zobacz /help eval; opcje serwera mogą zostać użytego w postaci " @@ -11204,14 +11210,20 @@ msgstr "" "ostatnie dwa znaki) na numer od 1 do 99, do czasu aż zostanie znaleziony " "nick nie użyty na swerwerze" +#, fuzzy +#| msgid "" +#| "nicknames to use on server (separated by comma) (note: content is " +#| "evaluated, see /help eval; server options are evaluated with ${irc_server." +#| "xxx} and ${server} is replaced by the server name)" msgid "" "user name to use on server (note: content is evaluated, see /help eval; " -"server options are evaluated with ${irc_server.xxx} and ${server} is " +"${username} is replaced by system username (fallback to \"weechat\" if not " +"found), server options are evaluated with ${irc_server.xxx} and ${server} is " "replaced by the server name)" msgstr "" -"nazwa użytkownika używana na serwerze (uwaga: zawartość jest przetwarzana " -"zobacz /help eval; opcje serwera mogą zostać użytego w postaci ${irc_server." -"xxx} oraz ${server} jest zastępowany nazwą serwera)" +"nicki do użycia na serwerze (oddzielone przecinkiem) (uwaga: zawartość jest " +"przetwarzana, zobacz /help eval; opcje serwera mogą zostać użytego w postaci " +"${irc_server.xxx} oraz ${server} jest zastępowany nazwą serwera)" msgid "" "real name to use on server (note: content is evaluated, see /help eval; " @@ -17051,3 +17063,12 @@ msgstr "%s%s: przekroczono czas na \"%s\" z %s" #, c-format msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: nie można połączyć: niespodziewany błąd (%d)" + +#~ msgid "" +#~ "user name to use on server (note: content is evaluated, see /help eval; " +#~ "server options are evaluated with ${irc_server.xxx} and ${server} is " +#~ "replaced by the server name)" +#~ msgstr "" +#~ "nazwa użytkownika używana na serwerze (uwaga: zawartość jest przetwarzana " +#~ "zobacz /help eval; opcje serwera mogą zostać użytego w postaci " +#~ "${irc_server.xxx} oraz ${server} jest zastępowany nazwą serwera)" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-04-26 21:09+0200\n" +"POT-Creation-Date: 2023-04-27 22:53+0200\n" "PO-Revision-Date: 2023-03-25 21:13+0100\n" "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n" "Language-Team: Portuguese <>\n" @@ -10003,8 +10003,9 @@ msgstr "atraso (em segundos) antes de tentar reconectar ao servidor novamente" #, fuzzy msgid "" "nicknames to use on server (separated by comma) (note: content is evaluated, " -"see /help eval; server options are evaluated with ${irc_server.xxx} and " -"${server} is replaced by the server name)" +"see /help eval; ${username} is replaced by system username (fallback to " +"\"weechat\" if not found), server options are evaluated with ${irc_server." +"xxx} and ${server} is replaced by the server name)" msgstr "" "nicks a usar no servidor (separados por vírgula) (nota: o conteúdo é " "avaliado, ver /help eval)" @@ -10023,12 +10024,12 @@ msgstr "" #, fuzzy msgid "" "user name to use on server (note: content is evaluated, see /help eval; " -"server options are evaluated with ${irc_server.xxx} and ${server} is " +"${username} is replaced by system username (fallback to \"weechat\" if not " +"found), server options are evaluated with ${irc_server.xxx} and ${server} is " "replaced by the server name)" msgstr "" -"mensagem de expulsão predefinida usada pelos comandos \"/kick\" e \"/" -"kickban\" (nota: conteúdo é avaliado, ver /help eval; as variáveis especiais " -"${nick}, ${channel} e ${server} são substituídas pelos respetivos valores)" +"nicks a usar no servidor (separados por vírgula) (nota: o conteúdo é " +"avaliado, ver /help eval)" #, fuzzy msgid "" @@ -15701,3 +15702,14 @@ msgstr "%s%s: tempo limite de \"%s\" com %s" #, c-format msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: não foi possível conectar: erro inesperado (%d)" + +#, fuzzy +#~ msgid "" +#~ "user name to use on server (note: content is evaluated, see /help eval; " +#~ "server options are evaluated with ${irc_server.xxx} and ${server} is " +#~ "replaced by the server name)" +#~ msgstr "" +#~ "mensagem de expulsão predefinida usada pelos comandos \"/kick\" e \"/" +#~ "kickban\" (nota: conteúdo é avaliado, ver /help eval; as variáveis " +#~ "especiais ${nick}, ${channel} e ${server} são substituídas pelos " +#~ "respetivos valores)" diff --git a/po/pt_BR.po b/po/pt_BR.po index 974f250b8..0897d80f9 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-04-26 21:09+0200\n" +"POT-Creation-Date: 2023-04-27 22:53+0200\n" "PO-Revision-Date: 2023-03-25 21:13+0100\n" "Last-Translator: Érico Nogueira <ericonr@disroot.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -8750,8 +8750,9 @@ msgstr "" #, fuzzy msgid "" "nicknames to use on server (separated by comma) (note: content is evaluated, " -"see /help eval; server options are evaluated with ${irc_server.xxx} and " -"${server} is replaced by the server name)" +"see /help eval; ${username} is replaced by system username (fallback to " +"\"weechat\" if not found), server options are evaluated with ${irc_server." +"xxx} and ${server} is replaced by the server name)" msgstr "" "comando executado quando o WeeChat inicia, antes do carregamento dos plugins " "(nota: conteúdo é avaliado, veja /help eval)" @@ -8763,11 +8764,15 @@ msgid "" "nick not used on server" msgstr "" +#, fuzzy msgid "" "user name to use on server (note: content is evaluated, see /help eval; " -"server options are evaluated with ${irc_server.xxx} and ${server} is " +"${username} is replaced by system username (fallback to \"weechat\" if not " +"found), server options are evaluated with ${irc_server.xxx} and ${server} is " "replaced by the server name)" msgstr "" +"comando executado quando o WeeChat inicia, antes do carregamento dos plugins " +"(nota: conteúdo é avaliado, veja /help eval)" msgid "" "real name to use on server (note: content is evaluated, see /help eval; " @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-04-26 21:09+0200\n" +"POT-Creation-Date: 2023-04-27 22:53+0200\n" "PO-Revision-Date: 2023-03-25 21:13+0100\n" "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -8247,8 +8247,9 @@ msgstr "задержка (в секундах) перед повторным с #, fuzzy msgid "" "nicknames to use on server (separated by comma) (note: content is evaluated, " -"see /help eval; server options are evaluated with ${irc_server.xxx} and " -"${server} is replaced by the server name)" +"see /help eval; ${username} is replaced by system username (fallback to " +"\"weechat\" if not found), server options are evaluated with ${irc_server." +"xxx} and ${server} is replaced by the server name)" msgstr "ник, используемый на IRC сервере" msgid "" @@ -8261,12 +8262,10 @@ msgstr "" #, fuzzy msgid "" "user name to use on server (note: content is evaluated, see /help eval; " -"server options are evaluated with ${irc_server.xxx} and ${server} is " +"${username} is replaced by system username (fallback to \"weechat\" if not " +"found), server options are evaluated with ${irc_server.xxx} and ${server} is " "replaced by the server name)" -msgstr "" -" канал: канал, на котором присутствует пользователь\n" -" ник: цель для кика\n" -"комментарий: причина кика" +msgstr "ник, используемый на IRC сервере" #, fuzzy msgid "" @@ -13372,3 +13371,13 @@ msgstr "%s нет аргумента для параметра \"%s\"\n" #, fuzzy, c-format msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s DCC: не могу соединиться с отправителем\n" + +#, fuzzy +#~ msgid "" +#~ "user name to use on server (note: content is evaluated, see /help eval; " +#~ "server options are evaluated with ${irc_server.xxx} and ${server} is " +#~ "replaced by the server name)" +#~ msgstr "" +#~ " канал: канал, на котором присутствует пользователь\n" +#~ " ник: цель для кика\n" +#~ "комментарий: причина кика" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-04-26 21:09+0200\n" +"POT-Creation-Date: 2023-04-27 22:53+0200\n" "PO-Revision-Date: 2023-04-13 20:10+0200\n" "Last-Translator: Ivan Pešić <ivan.pesic@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -10882,10 +10882,16 @@ msgid "delay (in seconds) before trying again to reconnect to server" msgstr "" "време (у секундама) пре него што се покуша поновно повезивање са сервером" +#, fuzzy +#| msgid "" +#| "nicknames to use on server (separated by comma) (note: content is " +#| "evaluated, see /help eval; server options are evaluated with ${irc_server." +#| "xxx} and ${server} is replaced by the server name)" msgid "" "nicknames to use on server (separated by comma) (note: content is evaluated, " -"see /help eval; server options are evaluated with ${irc_server.xxx} and " -"${server} is replaced by the server name)" +"see /help eval; ${username} is replaced by system username (fallback to " +"\"weechat\" if not found), server options are evaluated with ${irc_server." +"xxx} and ${server} is replaced by the server name)" msgstr "" "надимци који треба да се користе на серверу (раздвојени запетом) (напомена: " "садржај се израчунава, погледајте /help eval; опције сервера се израчунавају " @@ -10902,14 +10908,20 @@ msgstr "" "замењује последњи карактер (или два последња карактера) бројем од 1 до 99, " "све док се не пронађе надимак који је на серверу слободан" +#, fuzzy +#| msgid "" +#| "nicknames to use on server (separated by comma) (note: content is " +#| "evaluated, see /help eval; server options are evaluated with ${irc_server." +#| "xxx} and ${server} is replaced by the server name)" msgid "" "user name to use on server (note: content is evaluated, see /help eval; " -"server options are evaluated with ${irc_server.xxx} and ${server} is " +"${username} is replaced by system username (fallback to \"weechat\" if not " +"found), server options are evaluated with ${irc_server.xxx} and ${server} is " "replaced by the server name)" msgstr "" -"корисничко име које се користи на серверу (напомена: садржај се израчунава, " -"погледајте /help eval; опције сервера се израчунавају са ${irc_server.xxx} и " -"${server} се замењује са именом сервера)" +"надимци који треба да се користе на серверу (раздвојени запетом) (напомена: " +"садржај се израчунава, погледајте /help eval; опције сервера се израчунавају " +"са ${irc_server.xxx} и ${server} се замењује са именом сервера)" msgid "" "real name to use on server (note: content is evaluated, see /help eval; " @@ -16723,3 +16735,12 @@ msgstr "%s%s: тајмаут за „%s” са %s" #, c-format msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: повезивање није успело: неочекивана грешка (%d)" + +#~ msgid "" +#~ "user name to use on server (note: content is evaluated, see /help eval; " +#~ "server options are evaluated with ${irc_server.xxx} and ${server} is " +#~ "replaced by the server name)" +#~ msgstr "" +#~ "корисничко име које се користи на серверу (напомена: садржај се " +#~ "израчунава, погледајте /help eval; опције сервера се израчунавају са " +#~ "${irc_server.xxx} и ${server} се замењује са именом сервера)" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-04-26 21:09+0200\n" +"POT-Creation-Date: 2023-04-27 22:53+0200\n" "PO-Revision-Date: 2023-04-23 16:51+0200\n" "Last-Translator: Emir SARI <emir_sari@icloud.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -10760,10 +10760,16 @@ msgstr "bağlantı kesildiği zaman kendiliğinden yeniden bağlan" msgid "delay (in seconds) before trying again to reconnect to server" msgstr "sunucuya yeniden bağlanmayı denemeden önceki gecikme (saniye)" +#, fuzzy +#| msgid "" +#| "nicknames to use on server (separated by comma) (note: content is " +#| "evaluated, see /help eval; server options are evaluated with ${irc_server." +#| "xxx} and ${server} is replaced by the server name)" msgid "" "nicknames to use on server (separated by comma) (note: content is evaluated, " -"see /help eval; server options are evaluated with ${irc_server.xxx} and " -"${server} is replaced by the server name)" +"see /help eval; ${username} is replaced by system username (fallback to " +"\"weechat\" if not found), server options are evaluated with ${irc_server." +"xxx} and ${server} is replaced by the server name)" msgstr "" "sunucuda kullanılacak takma adlar (virgülle ayrılmış) (not: içerik " "değerlendirilir, bkz. /help eval; sunucu seçenekleri ${irc_server.xxx} ile " @@ -10780,14 +10786,20 @@ msgstr "" "uzunluğa ulaşana dek \"_\" ekler ve daha sonra son karakteri (veya son iki " "karakteri) 1'den 99'a kadar olan bir sayı ile değiştir" +#, fuzzy +#| msgid "" +#| "nicknames to use on server (separated by comma) (note: content is " +#| "evaluated, see /help eval; server options are evaluated with ${irc_server." +#| "xxx} and ${server} is replaced by the server name)" msgid "" "user name to use on server (note: content is evaluated, see /help eval; " -"server options are evaluated with ${irc_server.xxx} and ${server} is " +"${username} is replaced by system username (fallback to \"weechat\" if not " +"found), server options are evaluated with ${irc_server.xxx} and ${server} is " "replaced by the server name)" msgstr "" -"sunucuda kullanılacak kullanıcı adı (not: içerik değerlendirilir, bkz. /help " -"eval; sunucu seçenekleri ${irc_server.xxx} ile değerlendirilir ve ${server} " -"sunucu adı ile değiştirilir)" +"sunucuda kullanılacak takma adlar (virgülle ayrılmış) (not: içerik " +"değerlendirilir, bkz. /help eval; sunucu seçenekleri ${irc_server.xxx} ile " +"değerlendirilir ve ${server} sunucu adı ile değiştirilir)" msgid "" "real name to use on server (note: content is evaluated, see /help eval; " @@ -16528,3 +16540,12 @@ msgstr "%s%s: \"%s\" için %s ile zaman aşımı" #, c-format msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: Bağlanılamıyor: Beklenmedik hata (%d)" + +#~ msgid "" +#~ "user name to use on server (note: content is evaluated, see /help eval; " +#~ "server options are evaluated with ${irc_server.xxx} and ${server} is " +#~ "replaced by the server name)" +#~ msgstr "" +#~ "sunucuda kullanılacak kullanıcı adı (not: içerik değerlendirilir, bkz. /" +#~ "help eval; sunucu seçenekleri ${irc_server.xxx} ile değerlendirilir ve " +#~ "${server} sunucu adı ile değiştirilir)" diff --git a/po/weechat.pot b/po/weechat.pot index d4319e815..48837c4f7 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-04-26 21:09+0200\n" +"POT-Creation-Date: 2023-04-27 22:53+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" @@ -7381,8 +7381,9 @@ msgstr "" msgid "" "nicknames to use on server (separated by comma) (note: content is evaluated, " -"see /help eval; server options are evaluated with ${irc_server.xxx} and " -"${server} is replaced by the server name)" +"see /help eval; ${username} is replaced by system username (fallback to " +"\"weechat\" if not found), server options are evaluated with ${irc_server." +"xxx} and ${server} is replaced by the server name)" msgstr "" msgid "" @@ -7394,7 +7395,8 @@ msgstr "" msgid "" "user name to use on server (note: content is evaluated, see /help eval; " -"server options are evaluated with ${irc_server.xxx} and ${server} is " +"${username} is replaced by system username (fallback to \"weechat\" if not " +"found), server options are evaluated with ${irc_server.xxx} and ${server} is " "replaced by the server name)" msgstr "" diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c index 6e4be1606..a0bef9006 100644 --- a/src/plugins/irc/irc-config.c +++ b/src/plugins/irc/irc-config.c @@ -25,7 +25,6 @@ #include <string.h> #include <time.h> #include <limits.h> -#include <pwd.h> #include "../weechat-plugin.h" #include "irc.h" @@ -2128,9 +2127,11 @@ irc_config_server_new_option (struct t_config_file *config_file, config_file, section, option_name, "string", N_("nicknames to use on server (separated by comma) " - "(note: content is evaluated, see /help eval; server " - "options are evaluated with ${irc_server.xxx} and " - "${server} is replaced by the server name)"), + "(note: content is evaluated, see /help eval; ${username} " + "is replaced by system username (fallback to \"weechat\" " + "if not found), server options are evaluated with " + "${irc_server.xxx} and ${server} is replaced by the " + "server name)"), NULL, 0, 0, default_value, value, null_value_allowed, @@ -2167,9 +2168,11 @@ irc_config_server_new_option (struct t_config_file *config_file, config_file, section, option_name, "string", N_("user name to use on server " - "(note: content is evaluated, see /help eval; server " - "options are evaluated with ${irc_server.xxx} and " - "${server} is replaced by the server name)"), + "(note: content is evaluated, see /help eval; ${username} " + "is replaced by system username (fallback to \"weechat\" " + "if not found), server options are evaluated with " + "${irc_server.xxx} and ${server} is replaced by the " + "server name)"), NULL, 0, 0, default_value, value, null_value_allowed, @@ -2731,62 +2734,17 @@ irc_config_server_write_cb (const void *pointer, void *data, void irc_config_server_create_default_options (struct t_config_section *section) { - int i, length; - char *nicks, *username, *realname, *default_value; - struct passwd *my_passwd; - - nicks = NULL; - username = NULL; - realname = strdup (""); - - /* Get the user's name from /etc/passwd */ - if ((my_passwd = getpwuid (geteuid ())) != NULL) - { - length = (strlen (my_passwd->pw_name) + 4) * 5; - nicks = malloc (length); - if (nicks) - { - snprintf (nicks, length, "%s,%s1,%s2,%s3,%s4", - my_passwd->pw_name, - my_passwd->pw_name, - my_passwd->pw_name, - my_passwd->pw_name, - my_passwd->pw_name); - } - username = strdup (my_passwd->pw_name); - } - else - { - /* default values if /etc/passwd can't be read */ - nicks = strdup (IRC_SERVER_DEFAULT_NICKS); - username = strdup ("weechat"); - } + int i; for (i = 0; i < IRC_SERVER_NUM_OPTIONS; i++) { - default_value = NULL; - switch (i) - { - case IRC_SERVER_OPTION_NICKS: - default_value = nicks; - break; - case IRC_SERVER_OPTION_USERNAME: - default_value = username; - break; - case IRC_SERVER_OPTION_REALNAME: - default_value = realname; - break; - } - if (!default_value) - default_value = irc_server_options[i][1]; - irc_config_server_default[i] = irc_config_server_new_option ( irc_config_file, section, i, irc_server_options[i][0], irc_server_options[i][1], - default_value, + irc_server_options[i][1], 0, &irc_config_server_check_value_cb, irc_server_options[i][0], @@ -2795,13 +2753,6 @@ irc_config_server_create_default_options (struct t_config_section *section) irc_server_options[i][0], NULL); } - - if (nicks) - free (nicks); - if (username) - free (username); - if (realname) - free (realname); } /* diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c index 35c39fd25..d61e8f938 100644 --- a/src/plugins/irc/irc-server.c +++ b/src/plugins/irc/irc-server.c @@ -43,6 +43,7 @@ #include <netinet/in.h> #include <arpa/nameser.h> #include <resolv.h> +#include <pwd.h> #include <gnutls/gnutls.h> #include <gnutls/x509.h> @@ -98,9 +99,11 @@ char *irc_server_options[IRC_SERVER_NUM_OPTIONS][2] = { "autoconnect", "off" }, { "autoreconnect", "on" }, { "autoreconnect_delay", "10" }, - { "nicks", "" }, + { "nicks", + "${username},${username}2,${username}3," + "${username}4,${username}5" }, { "nicks_alternate", "on" }, - { "username", "" }, + { "username", "${username}" }, { "realname", "" }, { "local_hostname", "" }, { "usermode", "" }, @@ -361,6 +364,7 @@ irc_server_eval_expression (struct t_irc_server *server, const char *string) { struct t_hashtable *pointers, *extra_vars; char *value; + struct passwd *my_passwd; pointers = weechat_hashtable_new ( 32, @@ -381,6 +385,11 @@ irc_server_eval_expression (struct t_irc_server *server, const char *string) weechat_hashtable_set (extra_vars, "server", server->name); } + if ((my_passwd = getpwuid (geteuid ())) != NULL) + weechat_hashtable_set (extra_vars, "username", my_passwd->pw_name); + else + weechat_hashtable_set (extra_vars, "username", "weechat"); + value = weechat_string_eval_expression (string, pointers, extra_vars, NULL); @@ -1954,7 +1963,7 @@ irc_server_alloc_with_url (const char *irc_url) if (server_nicks) { snprintf (server_nicks, length, - "%s,%s1,%s2,%s3,%s4", + "%s,%s2,%s3,%s4,%s5", pos_nick, pos_nick, pos_nick, pos_nick, pos_nick); weechat_config_option_set ( ptr_server->options[IRC_SERVER_OPTION_NICKS], diff --git a/tests/unit/plugins/irc/test-irc-server.cpp b/tests/unit/plugins/irc/test-irc-server.cpp index c8ace4760..8aec7733d 100644 --- a/tests/unit/plugins/irc/test-irc-server.cpp +++ b/tests/unit/plugins/irc/test-irc-server.cpp @@ -734,7 +734,7 @@ TEST(IrcServer, AllocWithUrl) LONGS_EQUAL(0, CONFIG_BOOLEAN(server->options[IRC_SERVER_OPTION_TLS])); POINTERS_EQUAL(NULL, CONFIG_STRING(server->options[IRC_SERVER_OPTION_PASSWORD])); - STRCMP_EQUAL("alice,alice1,alice2,alice3,alice4", + STRCMP_EQUAL("alice,alice2,alice3,alice4,alice5", CONFIG_STRING(server->options[IRC_SERVER_OPTION_NICKS])); POINTERS_EQUAL(NULL, CONFIG_STRING(server->options[IRC_SERVER_OPTION_AUTOJOIN])); @@ -750,7 +750,7 @@ TEST(IrcServer, AllocWithUrl) LONGS_EQUAL(0, CONFIG_BOOLEAN(server->options[IRC_SERVER_OPTION_TLS])); STRCMP_EQUAL("secret", CONFIG_STRING(server->options[IRC_SERVER_OPTION_PASSWORD])); - STRCMP_EQUAL("alice,alice1,alice2,alice3,alice4", + STRCMP_EQUAL("alice,alice2,alice3,alice4,alice5", CONFIG_STRING(server->options[IRC_SERVER_OPTION_NICKS])); POINTERS_EQUAL(NULL, CONFIG_STRING(server->options[IRC_SERVER_OPTION_AUTOJOIN])); @@ -767,7 +767,7 @@ TEST(IrcServer, AllocWithUrl) LONGS_EQUAL(0, CONFIG_BOOLEAN(server->options[IRC_SERVER_OPTION_TLS])); STRCMP_EQUAL("secret", CONFIG_STRING(server->options[IRC_SERVER_OPTION_PASSWORD])); - STRCMP_EQUAL("alice,alice1,alice2,alice3,alice4", + STRCMP_EQUAL("alice,alice2,alice3,alice4,alice5", CONFIG_STRING(server->options[IRC_SERVER_OPTION_NICKS])); STRCMP_EQUAL("#test1,#test2", CONFIG_STRING(server->options[IRC_SERVER_OPTION_AUTOJOIN])); |