blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow no argument for command /join when /part was issued on current channel

Browse Source
This commit is contained in:
Sebastien Helleu 2009-07-27 13:57:43 +02:00
parent 3562143b51
commit 7e94691333
11 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/en/autogen/user/irc_commands.txt
View File

@ -170,7 +170,7 @@
nickname: nickname
........................................
• *`/join`* `channel[,channel] [key[,key]]`::
• *`/join`* `[channel[,channel] [key[,key]]]`::
........................................
join a channel

2
doc/fr/autogen/user/irc_commands.txt
View File

@ -170,7 +170,7 @@
pseudo: pseudo
........................................
• *`/join`* `canal[,canal] [clé[,clé]]`::
• *`/join`* `[canal[,canal] [clé[,clé]]]`::
........................................
joindre un canal

5
po/cs.po
View File

@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.0-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2009-07-22 18:00+0200\n"
"POT-Creation-Date: 2009-07-27 13:51+0200\n"
"PO-Revision-Date: 2009-05-11 13:02+0200\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -3029,7 +3029,8 @@ msgstr "přezdívka: přezdívka"
msgid "join a channel"
msgstr "připojit se ke kanálu"
msgid "channel[,channel] [key[,key]]"
#, fuzzy
msgid "[channel[,channel] [key[,key]]]"
msgstr "kanál[,kanál] [klíč[,klíč]]"
msgid ""

5
po/de.po
View File

@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.0-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2009-07-22 18:00+0200\n"
"POT-Creation-Date: 2009-07-27 13:51+0200\n"
"PO-Revision-Date: 2009-05-11 13:02+0200\n"
"Last-Translator: Thomas Schuetz <i18n@internet-villa.de>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -3028,7 +3028,8 @@ msgstr "Nickname: Nickname"
msgid "join a channel"
msgstr "einen Channel betreten"
msgid "channel[,channel] [key[,key]]"
#, fuzzy
msgid "[channel[,channel] [key[,key]]]"
msgstr "Channel[,Channel] [Passwort[,Passwort]]"
msgid ""

5
po/es.po
View File

@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.0-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2009-07-22 18:00+0200\n"
"POT-Creation-Date: 2009-07-27 13:51+0200\n"
"PO-Revision-Date: 2009-05-11 13:02+0200\n"
"Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -3006,7 +3006,8 @@ msgstr "usuario: usuario"
msgid "join a channel"
msgstr "unirse a un canal"
msgid "channel[,channel] [key[,key]]"
#, fuzzy
msgid "[channel[,channel] [key[,key]]]"
msgstr "canal[,canal] [clave[,clave]]"
msgid ""

8
po/fr.po
View File

@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.0-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2009-07-22 18:00+0200\n"
"PO-Revision-Date: 2009-07-22 18:01+0200\n"
"POT-Creation-Date: 2009-07-27 13:51+0200\n"
"PO-Revision-Date: 2009-07-27 13:54+0200\n"
"Last-Translator: FlashCode <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"MIME-Version: 1.0\n"
@ -3191,8 +3191,8 @@ msgstr "pseudo: pseudo"
msgid "join a channel"
msgstr "joindre un canal"
msgid "channel[,channel] [key[,key]]"
msgstr "canal[,canal] [clé[,clé]]"
msgid "[channel[,channel] [key[,key]]]"
msgstr "[canal[,canal] [clé[,clé]]]"
msgid ""
"channel: channel name to join\n"

5
po/hu.po
View File

@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.0-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2009-07-22 18:00+0200\n"
"POT-Creation-Date: 2009-07-27 13:51+0200\n"
"PO-Revision-Date: 2009-05-11 13:02+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -3042,7 +3042,8 @@ msgstr "név: név"
msgid "join a channel"
msgstr "belépés egy szobába"
msgid "channel[,channel] [key[,key]]"
#, fuzzy
msgid "[channel[,channel] [key[,key]]]"
msgstr "szoba[,szoba] [kulcs[,kulcs]]"
msgid ""

4
po/pl.po
View File

@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.0-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2009-07-22 18:00+0200\n"
"POT-Creation-Date: 2009-07-27 13:51+0200\n"
"PO-Revision-Date: 2009-05-11 13:02+0200\n"
"Last-Translator: <soltys@szluug.org>\n"
"Language-Team: Polish\n"
@ -2675,7 +2675,7 @@ msgstr ""
msgid "join a channel"
msgstr ""
msgid "channel[,channel] [key[,key]]"
msgid "[channel[,channel] [key[,key]]]"
msgstr ""
msgid ""

5
po/ru.po
View File

@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.0-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2009-07-22 18:00+0200\n"
"POT-Creation-Date: 2009-07-27 13:51+0200\n"
"PO-Revision-Date: 2009-05-11 13:02+0200\n"
"Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -3044,7 +3044,8 @@ msgstr "ник: ник"
msgid "join a channel"
msgstr "зайти на канал"
msgid "channel[,channel] [key[,key]]"
#, fuzzy
msgid "[channel[,channel] [key[,key]]]"
msgstr "канал[,канал] [ключ[,ключ]]"
msgid ""

4
po/weechat.pot
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2009-07-22 18:00+0200\n"
"POT-Creation-Date: 2009-07-27 13:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -2642,7 +2642,7 @@ msgstr ""
msgid "join a channel"
msgstr ""
msgid "channel[,channel] [key[,key]]"
msgid "[channel[,channel] [key[,key]]]"
msgstr ""
msgid ""

14
src/plugins/irc/irc-command.c
View File

@ -1545,7 +1545,7 @@ int
irc_command_join (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
IRC_GET_SERVER_CHANNEL(buffer);
IRC_COMMAND_CHECK_SERVER("join", 1);
/* make C compiler happy */
@ -1556,7 +1556,15 @@ irc_command_join (void *data, struct t_gui_buffer *buffer, int argc,
irc_command_join_server (ptr_server, argv_eol[1]);
else
{
IRC_COMMAND_TOO_FEW_ARGUMENTS(ptr_server->buffer, "join");
if (ptr_channel && (ptr_channel->type == IRC_CHANNEL_TYPE_CHANNEL)
&& !ptr_channel->nicks)
{
irc_command_join_server (ptr_server, ptr_channel->name);
}
else
{
IRC_COMMAND_TOO_FEW_ARGUMENTS(ptr_server->buffer, "join");
}
}
return WEECHAT_RC_OK;
@ -3822,7 +3830,7 @@ irc_command_init ()
"%(nicks)|%*", &irc_command_ison, NULL);
weechat_hook_command ("join",
N_("join a channel"),
N_("channel[,channel] [key[,key]]"),
N_("[channel[,channel] [key[,key]]]"),
N_("channel: channel name to join\n"
" key: key to join the channel"),
"%(irc_channels)", &irc_command_join, NULL);