diff --git a/ChangeLog b/ChangeLog index 8d4d5e75f..e96497e1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ Version 0.3.1 (under dev!) * core: fix terminal title bug: do not reset it when option weechat.look.set_title is off (bug #27399) * alias: allow use of wildcards for /alias list (patch #6925) +* alias: allow /unalias to remove multiple aliases (patch #6926) * alias: fix bug with arguments (bug #27440) * irc: add options for CTCP, to block/customize CTCP reply (task #9693) * irc: add missing CTCP: clientinfo, finger, source, time, userinfo (task #7270) diff --git a/doc/en/autogen/plugin_api/completions.txt b/doc/en/autogen/plugin_api/completions.txt index fa95b4ff6..cf01fe13c 100644 --- a/doc/en/autogen/plugin_api/completions.txt +++ b/doc/en/autogen/plugin_api/completions.txt @@ -1,7 +1,7 @@ [width="65%",cols="^1,^2,8",options="header"] |======================================== | Plugin | Name | Description -| alias | alias | list of alias +| alias | alias | list of aliases | aspell | aspell_langs | list of supported langs for aspell diff --git a/doc/en/autogen/plugin_api/infolists.txt b/doc/en/autogen/plugin_api/infolists.txt index 1b4f82cce..f0ad68c73 100644 --- a/doc/en/autogen/plugin_api/infolists.txt +++ b/doc/en/autogen/plugin_api/infolists.txt @@ -1,7 +1,7 @@ [width="65%",cols="^1,^2,8",options="header"] |======================================== | Plugin | Name | Description -| alias | alias | list of alias +| alias | alias | list of aliases | irc | irc_channel | list of channels for an IRC server diff --git a/po/cs.po b/po/cs.po index db733846e..75c3b1686 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-09-30 17:39+0200\n" +"POT-Creation-Date: 2009-09-30 17:50+0200\n" "PO-Revision-Date: 2009-09-14 10:56+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -2370,16 +2370,19 @@ msgstr "" "Proměnné $nick, $channel a $server jsou nahrazeny aktuální přezdívkou/" "kanálem/serverem." -msgid "remove an alias" +#, fuzzy +msgid "remove aliases" msgstr "odebere alias" -msgid "alias_name" -msgstr "jméno_aliasu" +#, fuzzy +msgid "alias_name [alias_name...]" +msgstr "přezdívka [přezdívka ...]" msgid "alias_name: name of alias to remove" msgstr "jméno_aliasu: jméno aliasu pro odebrání" -msgid "list of alias" +#, fuzzy +msgid "list of aliases" msgstr "seznam aliasů" #, c-format @@ -5635,6 +5638,12 @@ msgstr "%s%s: nemohu nastavit \"neblokovaci\" volbu na soket" msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: vypršel časový limit \"%s\" pro %s" +#~ msgid "list of alias" +#~ msgstr "seznam aliasů" + +#~ msgid "alias_name" +#~ msgstr "jméno_aliasu" + #~ msgid "Alias:" #~ msgstr "Alias:" diff --git a/po/de.po b/po/de.po index 704831fea..6c41a7a28 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-09-30 17:39+0200\n" +"POT-Creation-Date: 2009-09-30 17:50+0200\n" "PO-Revision-Date: 2009-09-20 13:58+0200\n" "Last-Translator: Thomas Schuetz \n" "Language-Team: weechat-dev \n" @@ -2245,17 +2245,20 @@ msgstr "" "Die Variablen $nick, $channel and $server werden durch den aktuellen Nick/" "Channel oder Server ersetzt." -msgid "remove an alias" +#, fuzzy +msgid "remove aliases" msgstr "einen Alias entfernen" -msgid "alias_name" -msgstr "Aliasname" +#, fuzzy +msgid "alias_name [alias_name...]" +msgstr "Nickname [Nickname ...]" msgid "alias_name: name of alias to remove" msgstr "Aliasname: Name des zu löschenden Aliases" -msgid "list of alias" -msgstr "Liste der Aliases" +#, fuzzy +msgid "list of aliases" +msgstr "Liste der Aliases:\n" #, c-format msgid "%s: \"%s\" removed" @@ -5453,6 +5456,12 @@ msgstr "%s DCC: kann die 'nonblock'-Option für den Socket nicht festlegen\n" msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s fehlende Argumente für die \"--dir\"-Option\n" +#~ msgid "list of alias" +#~ msgstr "Liste der Aliases" + +#~ msgid "alias_name" +#~ msgstr "Aliasname" + #~ msgid "Alias:" #~ msgstr "Alias:" @@ -5843,10 +5852,6 @@ msgstr "%s fehlende Argumente für die \"--dir\"-Option\n" #~ msgid "Notify levels:" #~ msgstr "Notify-Ebenen:" -#, fuzzy -#~ msgid "list of aliases" -#~ msgstr "Liste der Aliases:\n" - #, fuzzy #~ msgid "" #~ "smart completion for nicks (completes first with last speakers, " diff --git a/po/es.po b/po/es.po index 24260b348..94117fd95 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-09-30 17:39+0200\n" +"POT-Creation-Date: 2009-09-30 17:50+0200\n" "PO-Revision-Date: 2009-09-06 21:25+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -2191,17 +2191,19 @@ msgstr "" " comando: nombre del comando (comando WeeChat o IRC, sin el primer '/')\n" " argumentos: parámetros para el comando" -msgid "remove an alias" +#, fuzzy +msgid "remove aliases" msgstr "eliminar un alias" -msgid "alias_name" -msgstr "alias" +#, fuzzy +msgid "alias_name [alias_name...]" +msgstr "apodo [apodo ...]" msgid "alias_name: name of alias to remove" msgstr "alias: nombre del alias a suprimir" #, fuzzy -msgid "list of alias" +msgid "list of aliases" msgstr "Lista de alias:\n" #, fuzzy, c-format @@ -5483,6 +5485,13 @@ msgstr "%s no es posible crear el servidor\n" msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s falta un argumento para la opción --dir\n" +#, fuzzy +#~ msgid "list of alias" +#~ msgstr "Lista de alias:\n" + +#~ msgid "alias_name" +#~ msgstr "alias" + #, fuzzy #~ msgid "No alias found" #~ msgstr "Ningún alias definido.\n" @@ -5863,10 +5872,6 @@ msgstr "%s falta un argumento para la opción --dir\n" #~ msgid "Notify levels:" #~ msgstr "Niveles de notificación:" -#, fuzzy -#~ msgid "list of aliases" -#~ msgstr "Lista de alias:\n" - #~ msgid "[action [args] | number | [[server] [channel]]]" #~ msgstr "[acción [argumentos] | número | [[servidor] [canal]]]" diff --git a/po/fr.po b/po/fr.po index 25c72054b..81d634d3c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-09-30 17:39+0200\n" -"PO-Revision-Date: 2009-09-30 17:40+0200\n" +"POT-Creation-Date: 2009-09-30 17:50+0200\n" +"PO-Revision-Date: 2009-09-30 17:50+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -2428,16 +2428,16 @@ msgstr "" "Les variables $nick, $channel et $server sont remplacées par le pseudo/canal/" "serveur courant." -msgid "remove an alias" -msgstr "supprimer un alias" +msgid "remove aliases" +msgstr "supprimer des alias" -msgid "alias_name" -msgstr "nom_alias" +msgid "alias_name [alias_name...]" +msgstr "nom_alias [nom_alias...]" msgid "alias_name: name of alias to remove" msgstr "nom_alias: nom de l'alias à supprimer" -msgid "list of alias" +msgid "list of aliases" msgstr "liste des alias" #, c-format @@ -5747,26 +5747,3 @@ msgstr "%s%s: impossible de positionner l'option \"nonblock\" pour la socket" #, c-format msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: délai d'attente dépassé pour \"%s\" avec %s" - -#~ msgid "Alias:" -#~ msgstr "Alias:" - -#~ msgid "No alias found" -#~ msgstr "Aucun alias trouvé." - -#~ msgid "%s%s: cannot read data from socket, disconnecting from server..." -#~ msgstr "" -#~ "%s%s: impossible de lire des données sur la socket, déconnexion du " -#~ "serveur..." - -#~ msgid "nicks" -#~ msgstr "pseudos" - -#~ msgid "ops" -#~ msgstr "ops" - -#~ msgid "halfops" -#~ msgstr "halfops" - -#~ msgid "voices" -#~ msgstr "voices" diff --git a/po/hu.po b/po/hu.po index b6667bed5..0d53efab9 100644 --- a/po/hu.po +++ b/po/hu.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-09-30 17:39+0200\n" +"POT-Creation-Date: 2009-09-30 17:50+0200\n" "PO-Revision-Date: 2009-09-20 13:51+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -2316,17 +2316,19 @@ msgstr "" "A $nick, $channel és $server változók az aktuális névre/szobára/szerverre " "lesznek kicserélve." -msgid "remove an alias" +#, fuzzy +msgid "remove aliases" msgstr "alias eltávolítása" -msgid "alias_name" -msgstr "alias_név" +#, fuzzy +msgid "alias_name [alias_name...]" +msgstr "név [név...]" msgid "alias_name: name of alias to remove" msgstr "alias_név: az eltávolítandó alias neve" #, fuzzy -msgid "list of alias" +msgid "list of aliases" msgstr "Aliaszok listája:\n" #, fuzzy, c-format @@ -5569,6 +5571,13 @@ msgstr "%s DCC: nem sikerült 'nonblock' opciót beállítani a csatornán\n" msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n" +#, fuzzy +#~ msgid "list of alias" +#~ msgstr "Aliaszok listája:\n" + +#~ msgid "alias_name" +#~ msgstr "alias_név" + #, fuzzy #~ msgid "Alias:" #~ msgstr "Aliasz:\n" @@ -5992,10 +6001,6 @@ msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n" #~ msgid "Notify levels:" #~ msgstr "Értesítési szintek:" -#, fuzzy -#~ msgid "list of aliases" -#~ msgstr "Aliaszok listája:\n" - #, fuzzy #~ msgid "" #~ "smart completion for nicks (completes first with last speakers, " diff --git a/po/pl.po b/po/pl.po index 5f5a19ab7..353b29e75 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-09-30 17:39+0200\n" +"POT-Creation-Date: 2009-09-30 17:50+0200\n" "PO-Revision-Date: 2009-09-06 21:25+0200\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: Polish\n" @@ -2406,16 +2406,19 @@ msgstr "" "Zmienne $nick, $channel oraz $server są zastępowane przez obecny nick/kanał/" "serwer." -msgid "remove an alias" +#, fuzzy +msgid "remove aliases" msgstr "usuwa alias" -msgid "alias_name" -msgstr "nazwa_aliasu" +#, fuzzy +msgid "alias_name [alias_name...]" +msgstr "nick [nick ...]" msgid "alias_name: name of alias to remove" msgstr "nazwa_aliasu: nazwa aliasu do usunięcia" -msgid "list of alias" +#, fuzzy +msgid "list of aliases" msgstr "lista aliasów" #, c-format @@ -5680,6 +5683,12 @@ msgstr "%s%s: nie można ustawić opcji \"nonblock\" dla gniazda" msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: przekroczono czas na \"%s\" z %s" +#~ msgid "list of alias" +#~ msgstr "lista aliasów" + +#~ msgid "alias_name" +#~ msgstr "nazwa_aliasu" + #~ msgid "Alias:" #~ msgstr "Alias:" diff --git a/po/ru.po b/po/ru.po index 15680eb4f..9fb9f64f5 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-09-30 17:39+0200\n" +"POT-Creation-Date: 2009-09-30 17:50+0200\n" "PO-Revision-Date: 2009-09-20 13:50+0200\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: weechat-dev \n" @@ -2328,17 +2328,19 @@ msgstr "" "Переменные $nick, $channel и $server заменяются на ник, канал и сервер " "соответственно." -msgid "remove an alias" +#, fuzzy +msgid "remove aliases" msgstr "удалить ярлык" -msgid "alias_name" -msgstr "сокращение" +#, fuzzy +msgid "alias_name [alias_name...]" +msgstr "ник [ник ...]" msgid "alias_name: name of alias to remove" msgstr "сокращение: удаляемое сокращение" #, fuzzy -msgid "list of alias" +msgid "list of aliases" msgstr "Список сокращений:\n" #, fuzzy, c-format @@ -5566,6 +5568,13 @@ msgstr "%s DCC: не могу установить неблокирующий р msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s нет аргумента для параметра \"%s\"\n" +#, fuzzy +#~ msgid "list of alias" +#~ msgstr "Список сокращений:\n" + +#~ msgid "alias_name" +#~ msgstr "сокращение" + #, fuzzy #~ msgid "Alias:" #~ msgstr "Сокращение:\n" @@ -5979,10 +5988,6 @@ msgstr "%s нет аргумента для параметра \"%s\"\n" #~ msgid "Notify levels:" #~ msgstr "Уровни уведомления:" -#, fuzzy -#~ msgid "list of aliases" -#~ msgstr "Список сокращений:\n" - #, fuzzy #~ msgid "" #~ "smart completion for nicks (completes first with last speakers, " diff --git a/po/weechat.pot b/po/weechat.pot index efc700ec1..f9e6783fd 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-09-30 17:39+0200\n" +"POT-Creation-Date: 2009-09-30 17:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1974,16 +1974,16 @@ msgid "" "server." msgstr "" -msgid "remove an alias" +msgid "remove aliases" msgstr "" -msgid "alias_name" +msgid "alias_name [alias_name...]" msgstr "" msgid "alias_name: name of alias to remove" msgstr "" -msgid "list of alias" +msgid "list of aliases" msgstr "" #, c-format diff --git a/src/plugins/alias/alias-info.c b/src/plugins/alias/alias-info.c index 956322506..eee1ca7ea 100644 --- a/src/plugins/alias/alias-info.c +++ b/src/plugins/alias/alias-info.c @@ -93,6 +93,6 @@ void alias_info_init () { /* alias infolist hooks */ - weechat_hook_infolist ("alias", N_("list of alias"), + weechat_hook_infolist ("alias", N_("list of aliases"), &alias_info_get_infolist_cb, NULL); } diff --git a/src/plugins/alias/alias.c b/src/plugins/alias/alias.c index 9413109fe..cfe71282b 100644 --- a/src/plugins/alias/alias.c +++ b/src/plugins/alias/alias.c @@ -810,6 +810,7 @@ int unalias_command_cb (void *data, struct t_gui_buffer *buffer, int argc, char **argv, char **argv_eol) { + int i; char *alias_name; struct t_alias *ptr_alias; struct t_config_option *ptr_option; @@ -821,30 +822,34 @@ unalias_command_cb (void *data, struct t_gui_buffer *buffer, int argc, if (argc > 1) { - alias_name = (argv[1][0] == '/') ? argv[1] + 1 : argv[1]; - ptr_alias = alias_search (alias_name); - if (!ptr_alias) + for (i = 1; i < argc; i++) { - weechat_printf (NULL, - _("%sAlias \"%s\" not found"), - weechat_prefix ("error"), - alias_name); - return WEECHAT_RC_ERROR; + alias_name = (argv[i][0] == '/') ? argv[i] + 1 : argv[i]; + ptr_alias = alias_search (alias_name); + if (!ptr_alias) + { + weechat_printf (NULL, + _("%sAlias \"%s\" not found"), + weechat_prefix ("error"), + alias_name); + } + else + { + /* remove alias */ + alias_free (ptr_alias); + + /* remove option */ + ptr_option = weechat_config_search_option (alias_config_file, + alias_config_section_cmd, + alias_name); + if (ptr_option) + weechat_config_option_free (ptr_option); + + weechat_printf (NULL, + _("Alias \"%s\" removed"), + alias_name); + } } - - /* remove alias */ - alias_free (ptr_alias); - - /* remove option */ - ptr_option = weechat_config_search_option (alias_config_file, - alias_config_section_cmd, - alias_name); - if (ptr_option) - weechat_config_option_free (ptr_option); - - weechat_printf (NULL, - _("Alias \"%s\" removed"), - alias_name); } return WEECHAT_RC_OK; } @@ -944,13 +949,13 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[]) "%(alias) %(commands)", &alias_command_cb, NULL); - weechat_hook_command ("unalias", N_("remove an alias"), - N_("alias_name"), + weechat_hook_command ("unalias", N_("remove aliases"), + N_("alias_name [alias_name...]"), N_("alias_name: name of alias to remove"), - "%(alias)", + "%(alias)|%*", &unalias_command_cb, NULL); - weechat_hook_completion ("alias", N_("list of alias"), + weechat_hook_completion ("alias", N_("list of aliases"), &alias_completion_cb, NULL); alias_info_init ();