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

11 files changed, 36 insertions, 23 deletions

diff --git a/doc/en/autogen/user/irc_commands.txt b/doc/en/autogen/user/irc_commands.txt
index ea57239cd..0316cb7b8 100644
--- a/doc/en/autogen/user/irc_commands.txt
+++ b/doc/en/autogen/user/irc_commands.txt
@@ -170,7 +170,7 @@
   nickname: nickname
 ........................................
 
-• *`/join`* `channel[,channel] [key[,key]]`::
+• *`/join`* `[channel[,channel] [key[,key]]]`::
 
 ........................................
   join a channel
diff --git a/doc/fr/autogen/user/irc_commands.txt b/doc/fr/autogen/user/irc_commands.txt
index 08be03364..50bc721b8 100644
--- a/doc/fr/autogen/user/irc_commands.txt
+++ b/doc/fr/autogen/user/irc_commands.txt
@@ -170,7 +170,7 @@
   pseudo: pseudo
 ........................................
 
-• *`/join`* `canal[,canal] [clé[,clé]]`::
+• *`/join`* `[canal[,canal] [clé[,clé]]]`::
 
 ........................................
   joindre un canal
diff --git a/po/cs.po b/po/cs.po
index aa33f588d..f30cfac07 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -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 ""
diff --git a/po/de.po b/po/de.po
index 4b19391fa..ef4c3a3b0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -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 ""
diff --git a/po/es.po b/po/es.po
index 27099ead1..a7531b06b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -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 ""
diff --git a/po/fr.po b/po/fr.po
index d91d56c78..a15dd8508 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -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"
diff --git a/po/hu.po b/po/hu.po
index 1319e4d5c..f7cdb1d8a 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -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 ""
diff --git a/po/pl.po b/po/pl.po
index cf9ab3001..736924c19 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -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 ""
diff --git a/po/ru.po b/po/ru.po
index 08d27e2ed..54aa2107a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -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 ""
diff --git a/po/weechat.pot b/po/weechat.pot
index db111f6e1..50a2e02f5 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-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 ""
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index 3199fc05c..8c2cfb60d 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -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);