mirror of
https://github.com/anope/anope.git
synced 2026-07-04 05:33:12 +02:00
Show proper syntax errors on CS BAN and CS KICK, patch from Adam.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2278 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
+10
-5
@@ -1761,6 +1761,14 @@ CHAN_UNSUSPEND_FAILED
|
||||
# Misc responses
|
||||
CHAN_EXCEPTED
|
||||
%s matches an except on %s and cannot be banned until the except have been removed.
|
||||
|
||||
#Kick responces
|
||||
CHAN_KICK_SYNTAX
|
||||
KICK #channel nick [reason]
|
||||
|
||||
#Ban responces
|
||||
CHAN_BAN_SYNTAX
|
||||
BAN #channel nick [reason]
|
||||
|
||||
###########################################################################
|
||||
#
|
||||
@@ -5113,12 +5121,9 @@ CHAN_HELP_UNBAN
|
||||
i major en el canal.
|
||||
|
||||
CHAN_HELP_KICK
|
||||
Sintàxi: KICK [#canal [nick [raó]]]
|
||||
Sintàxi: KICK #canal nick [raó]
|
||||
|
||||
Kickeja al nick seleccionat en el canal. Si el nick no és
|
||||
donat, et kickejara a tu. Si el canal i el nick no són donats,
|
||||
et kickejarà en tots els canals en els que
|
||||
estiguis, sempre i quan tinguis els permisos per a fer-ho.
|
||||
Kickeja al nick seleccionat en el canal.
|
||||
|
||||
Per defecte, limitat a AOPs o aquells amb nivell d'
|
||||
accés 5 i major en el canal.
|
||||
|
||||
@@ -1765,6 +1765,14 @@ CHAN_DEPROTECT_SYNTAX
|
||||
DEROTECT #channel [nick]
|
||||
CHAN_DEOWNER_SYNTAX
|
||||
DEOWNER #channel
|
||||
|
||||
#Kick responces
|
||||
CHAN_KICK_SYNTAX
|
||||
KICK #channel nick [reason]
|
||||
|
||||
#Ban responces
|
||||
CHAN_BAN_SYNTAX
|
||||
BAN #channel nick [reason]
|
||||
|
||||
###########################################################################
|
||||
#
|
||||
@@ -5125,13 +5133,9 @@ CHAN_HELP_UNBAN
|
||||
5 (oder UNBAN)ist.
|
||||
|
||||
CHAN_HELP_KICK
|
||||
Syntax: KICK [Channel [Nickname [Grund]]]
|
||||
Syntax: KICK Channel Nickname [Grund]
|
||||
|
||||
Kickt den ausgewählten Nicknamen aus dem Channel. Wird
|
||||
kein Nickname angegeben, wird ChanServ dich (!) kicken.
|
||||
Wenn weder Nickname noch Channel angegeben werden, wird
|
||||
ChanServ dich aus allen Channels kicken, in denen
|
||||
du die entsprechenden Rechte hast.
|
||||
Kickt den ausgewählten Nicknamen aus dem Channel.
|
||||
|
||||
Standardmässig ist für diese Funktion ein Level
|
||||
von mindestens 5 erforderlich.
|
||||
|
||||
+10
-5
@@ -1730,6 +1730,14 @@ CHAN_DEPROTECT_SYNTAX
|
||||
DEROTECT #channel [nick]
|
||||
CHAN_DEOWNER_SYNTAX
|
||||
DEOWNER #channel
|
||||
|
||||
#Kick responces
|
||||
CHAN_KICK_SYNTAX
|
||||
KICK #channel nick [reason]
|
||||
|
||||
#Ban responces
|
||||
CHAN_BAN_SYNTAX
|
||||
BAN #channel nick [reason]
|
||||
|
||||
###########################################################################
|
||||
#
|
||||
@@ -4890,12 +4898,9 @@ CHAN_HELP_UNBAN
|
||||
on the channel.
|
||||
|
||||
CHAN_HELP_KICK
|
||||
Syntax: KICK [#channel [nick [reason]]]
|
||||
Syntax: KICK #channel nick [reason]
|
||||
|
||||
Kicks a selected nick on a channel. If nick is not given,
|
||||
it will kick you. If channel and nick are not given,
|
||||
it will kick you on all channels you're on, provided you
|
||||
have the rights to.
|
||||
Kicks a selected nick on a channel.
|
||||
|
||||
By default, limited to AOPs or those with level 5 access
|
||||
and above on the channel.
|
||||
|
||||
@@ -1759,6 +1759,14 @@ CHAN_DEPROTECT_SYNTAX
|
||||
DEROTECT #channel [nick]
|
||||
CHAN_DEOWNER_SYNTAX
|
||||
DEOWNER #channel
|
||||
|
||||
#Kick responces
|
||||
CHAN_KICK_SYNTAX
|
||||
KICK #channel nick [reason]
|
||||
|
||||
#Ban responces
|
||||
CHAN_BAN_SYNTAX
|
||||
BAN #channel nick [reason]
|
||||
|
||||
###########################################################################
|
||||
#
|
||||
@@ -5084,12 +5092,9 @@ CHAN_HELP_UNBAN
|
||||
y mayor en el canal.
|
||||
|
||||
CHAN_HELP_KICK
|
||||
Sintaxis: KICK [#canal [nick [razon]]]
|
||||
Sintaxis: KICK #canal nick [razon]
|
||||
|
||||
Kickea al nick seleccionado en el canal. Si nick no es
|
||||
dado, te kickeara a ti. Si canal y nick no son dados,
|
||||
te kickeara en todos los canales, siempre y cuando tengas
|
||||
permiso para hacerlo.
|
||||
Kickea al nick seleccionado en el canal.
|
||||
|
||||
Por defecto, limitado a AOPs o aquellos con nivel de
|
||||
acceso 5 y mayor en el canal.
|
||||
|
||||
@@ -1771,6 +1771,14 @@ CHAN_DEPROTECT_SYNTAX
|
||||
DEROTECT #channel [nick]
|
||||
CHAN_DEOWNER_SYNTAX
|
||||
DEOWNER #channel
|
||||
|
||||
#Kick responces
|
||||
CHAN_KICK_SYNTAX
|
||||
KICK #channel nick [reason]
|
||||
|
||||
#Ban responces
|
||||
CHAN_BAN_SYNTAX
|
||||
BAN #channel nick [reason]
|
||||
|
||||
###########################################################################
|
||||
#
|
||||
@@ -5155,12 +5163,9 @@ CHAN_HELP_UNBAN
|
||||
d'accès de 5 ou plus sur le canal.
|
||||
|
||||
CHAN_HELP_KICK
|
||||
Syntaxe: KICK [#canal [pseudo [raison]]]
|
||||
Syntaxe: KICK #canal pseudo [raison]
|
||||
|
||||
Kicke le pseudo sélectionné sur un canal. Si pseudo n'est pas
|
||||
donné, vous kickera sur le canal donné. Si pseudo et
|
||||
#canal ne sont pas donnés, vous kickera sur tous
|
||||
les canaux où vous êtes.
|
||||
Kicke le pseudo sélectionné sur un canal.
|
||||
|
||||
Par défaut, limité aux AOPs ou à ceux ayant un niveau
|
||||
d'accès de 5 ou plus sur le canal.
|
||||
|
||||
@@ -1763,6 +1763,14 @@ CHAN_DEPROTECT_SYNTAX
|
||||
DEROTECT #channel [nick]
|
||||
CHAN_DEOWNER_SYNTAX
|
||||
DEOWNER #channel
|
||||
|
||||
#Kick responces
|
||||
CHAN_KICK_SYNTAX
|
||||
KICK #channel nick [reason]
|
||||
|
||||
#Ban responces
|
||||
CHAN_BAN_SYNTAX
|
||||
BAN #channel nick [reason]
|
||||
|
||||
###########################################################################
|
||||
#
|
||||
@@ -5058,13 +5066,10 @@ CHAN_HELP_UNBAN
|
||||
ðáñáðÜíù óôï êáíÜëé.
|
||||
|
||||
CHAN_HELP_KICK
|
||||
Óýíôáîç: KICK [#êáíÜëé [øåõäþíõìï [ëüãïò]]]
|
||||
Óýíôáîç: KICK #êáíÜëé øåõäþíõìï [ëüãïò]
|
||||
|
||||
ÊÜíåé kick ôï øåõäþíõìï ðïõ ôïõ äßíåéò óôï êáíÜëé.
|
||||
|
||||
ÊÜíåé kick ôï øåõäþíõìï ðïõ ôïõ äßíåéò óôï êáíÜëé. Áí äåí äþóåéò øåõäþíõìï,
|
||||
èá êÜíåé kick åóÝíá. Áí äåí äþóåéò êáíÜëé êáé øåõäþíõìï,
|
||||
èá êÜíåé kick åóÝíá óå üëá ôá êáíÜëéá ðïõ åßóáé åöüóïí Ý÷åéò ôï äéêáßùìá
|
||||
(access).
|
||||
|
||||
Áðü default, ÷ñçóéìïðïéåßôáé áðü ôïõò AOPs Þ áõôïýò ðïõ Ý÷ïõí level 5 access
|
||||
êáé ðáñáðÜíù óôï êáíÜëé.
|
||||
|
||||
|
||||
+9
-5
@@ -1756,6 +1756,14 @@ CHAN_DEPROTECT_SYNTAX
|
||||
DEROTECT #channel [nick]
|
||||
CHAN_DEOWNER_SYNTAX
|
||||
DEOWNER #channel
|
||||
|
||||
#Kick responces
|
||||
CHAN_KICK_SYNTAX
|
||||
KICK #channel nick [reason]
|
||||
|
||||
#Ban responces
|
||||
CHAN_BAN_SYNTAX
|
||||
BAN #channel nick [reason]
|
||||
|
||||
###########################################################
|
||||
#
|
||||
@@ -4996,13 +5004,9 @@ CHAN_HELP_UNBAN
|
||||
kell rendelkezned, hogy használhasd.
|
||||
|
||||
CHAN_HELP_KICK
|
||||
Syntax: KICK [#szoba [nick [indok]]]
|
||||
Syntax: KICK #szoba nick [indok]
|
||||
|
||||
A ChanServ kirúgja a megadott nicknevet a csatornáról.
|
||||
Ha nem adsz meg nicket, akkor téged fog kirúgni.
|
||||
Ha nem adsz meg szobát és nicket sem, akkor téged
|
||||
fog minden csatornáról, ahol bent vagy kirúgni, ha
|
||||
meg van a parancs használatához a szükséges szinted.
|
||||
|
||||
Alapbeállítás szerint, min. AOP vagy 5-ös access szinttel
|
||||
kell rendelkezned a csatornán, hogy használhasd.
|
||||
|
||||
@@ -1738,6 +1738,14 @@ CHAN_DEPROTECT_SYNTAX
|
||||
DEROTECT #channel [nick]
|
||||
CHAN_DEOWNER_SYNTAX
|
||||
DEOWNER #channel
|
||||
|
||||
#Kick responces
|
||||
CHAN_KICK_SYNTAX
|
||||
KICK #channel nick [reason]
|
||||
|
||||
#Ban responces
|
||||
CHAN_BAN_SYNTAX
|
||||
BAN #channel nick [reason]
|
||||
|
||||
###########################################################################
|
||||
#
|
||||
@@ -5008,13 +5016,9 @@ CHAN_HELP_UNBAN
|
||||
livello di accesso 5 o superiori sul canale.
|
||||
|
||||
CHAN_HELP_KICK
|
||||
Sintassi: KICK [canale [nick [motivo]]]
|
||||
Sintassi: KICK canale nick [motivo]
|
||||
|
||||
Espelle (kick) il nick specificato dal canale. Se non viene
|
||||
indicato alcun nick, kicka l'utente che ha inviato il comando.
|
||||
Se non viene indicato né il nick né il canale, l'utente che
|
||||
ha inviato il comando verrà kickato da tutti i canali in cui
|
||||
si trova e in cui ha abbastanza privilegi.
|
||||
Espelle (kick) il nick specificato dal canale.
|
||||
|
||||
Di default, il comando è limitato agli AOP o agli utenti con
|
||||
livello di accesso 5 o superiori sul canale.
|
||||
|
||||
@@ -1748,6 +1748,14 @@ CHAN_DEPROTECT_SYNTAX
|
||||
DEROTECT #channel [nick]
|
||||
CHAN_DEOWNER_SYNTAX
|
||||
DEOWNER #channel
|
||||
|
||||
#Kick responces
|
||||
CHAN_KICK_SYNTAX
|
||||
KICK #channel nick [reason]
|
||||
|
||||
#Ban responces
|
||||
CHAN_BAN_SYNTAX
|
||||
BAN #channel nick [reason]
|
||||
|
||||
###########################################################################
|
||||
#
|
||||
@@ -5016,12 +5024,9 @@ CHAN_HELP_UNBAN
|
||||
niveau 5 of hoger op het kanaal.
|
||||
|
||||
CHAN_HELP_KICK
|
||||
Gebruik: KICK [#kanaal [nick [reden]]]
|
||||
Gebruik: KICK #kanaal nick [reden]
|
||||
|
||||
Kickt de gegeven nick van het gegeven kanaal. Als nick niet
|
||||
is gegeven wordt je zelf gekicked. Als kanaal en nick niet
|
||||
zijn gegeven wordt je zelf gekicked op alle kanalen waar je
|
||||
bent, mits je de rechten daartoe hebt.
|
||||
Kickt de gegeven nick van het gegeven kanaal.
|
||||
|
||||
Standaard is dit gelimiteerd tot AOPs of degenen met
|
||||
niveau 5 of hoger op het kanaal.
|
||||
|
||||
@@ -2288,6 +2288,14 @@ CHAN_DEPROTECT_SYNTAX
|
||||
DEROTECT #channel [nick]
|
||||
CHAN_DEOWNER_SYNTAX
|
||||
DEOWNER #channel
|
||||
|
||||
#Kick responces
|
||||
CHAN_KICK_SYNTAX
|
||||
KICK #channel nick [reason]
|
||||
|
||||
#Ban responces
|
||||
CHAN_BAN_SYNTAX
|
||||
BAN #channel nick [reason]
|
||||
|
||||
###########################################################################
|
||||
#
|
||||
@@ -6085,15 +6093,9 @@ CHAN_HELP_UNBAN
|
||||
dostêpu 5 lub wy¿szy.
|
||||
|
||||
CHAN_HELP_KICK
|
||||
Sk³adnia: KICK [kana³ [nick [powód]]]
|
||||
Sk³adnia: KICK kana³ nick [powód]
|
||||
|
||||
Wykopuje wskazanego u¿ytkownika z kana³u.
|
||||
Pominiêcie nicka powoduje wyrzucenie osoby
|
||||
wydaj±cej polecenie. Dodatkowo pominiêcie
|
||||
nazwy kana³u powoduje wyrzucenie wydaj±cego
|
||||
polecenie ze wszystkich kana³ów, na których
|
||||
przebywa z uwzglêdnieniem uprawnieñ na nich
|
||||
przys³uguj±cych.
|
||||
|
||||
Standardowo ta komenda jest dostêpna dla u¿ytkowników
|
||||
wpisanych na listê AOP lub posiadaj±cych poziom
|
||||
|
||||
@@ -1750,6 +1750,14 @@ CHAN_DEPROTECT_SYNTAX
|
||||
DEROTECT #channel [nick]
|
||||
CHAN_DEOWNER_SYNTAX
|
||||
DEOWNER #channel
|
||||
|
||||
#Kick responces
|
||||
CHAN_KICK_SYNTAX
|
||||
KICK #channel nick [reason]
|
||||
|
||||
#Ban responces
|
||||
CHAN_BAN_SYNTAX
|
||||
BAN #channel nick [reason]
|
||||
|
||||
###########################################################################
|
||||
#
|
||||
@@ -4958,13 +4966,9 @@ CHAN_HELP_UNBAN
|
||||
nível de acesso 5 ou superior no canal.
|
||||
|
||||
CHAN_HELP_KICK
|
||||
Sintaxe: KICK [#canal [nick [motivo]]]
|
||||
Sintaxe: KICK #canal nick [motivo]
|
||||
|
||||
Kicka (expulsa) um nick dado em um determinado canal.
|
||||
Se não for fornecido um nick, você mesmo será kickado.
|
||||
Se nem canal nem nick forem fornecidos, você mesmo será
|
||||
kickado em todos os canais onde estiver, caso tenha nível
|
||||
suficiente para usar o comando em cada um.
|
||||
|
||||
Por padrão, é limitado aos AOPs ou àqueles que possuem
|
||||
nível de acesso 5 ou superior no canal.
|
||||
|
||||
@@ -1729,6 +1729,14 @@ CHAN_DEPROTECT_SYNTAX
|
||||
DEROTECT #channel [nick]
|
||||
CHAN_DEOWNER_SYNTAX
|
||||
DEOWNER #channel
|
||||
|
||||
#Kick responces
|
||||
CHAN_KICK_SYNTAX
|
||||
KICK #channel nick [reason]
|
||||
|
||||
#Ban responces
|
||||
CHAN_BAN_SYNTAX
|
||||
BAN #channel nick [reason]
|
||||
|
||||
###########################################################################
|
||||
#
|
||||
@@ -5029,12 +5037,9 @@ CHAN_HELP_UNBAN
|
||||
или лицами с уровнем доступа 5 и выше.
|
||||
|
||||
CHAN_HELP_KICK
|
||||
Синтаксис: KICK [#канал [ник [причина]]]
|
||||
Синтаксис: KICK #канал ник [причина]
|
||||
|
||||
Выкидывает указанного пользователя с указанного канала. Если ник не
|
||||
указан - выкидывает вас. Если канал и ник не указаны - выкинет вас
|
||||
со всех каналов, на которых у вас есть соответствующий уровень
|
||||
доступа.
|
||||
Выкидывает указанного пользователя с указанного канала.
|
||||
|
||||
По-умолчанию, данная команда может быть использована AOP'ами или
|
||||
лицами с уровнем доступа 5 и выше.
|
||||
|
||||
@@ -1758,6 +1758,14 @@ CHAN_DEPROTECT_SYNTAX
|
||||
DEROTECT #channel [nick]
|
||||
CHAN_DEOWNER_SYNTAX
|
||||
DEOWNER #channel
|
||||
|
||||
#Kick responces
|
||||
CHAN_KICK_SYNTAX
|
||||
KICK #channel nick [reason]
|
||||
|
||||
#Ban responces
|
||||
CHAN_BAN_SYNTAX
|
||||
BAN #channel nick [reason]
|
||||
|
||||
###########################################################################
|
||||
#
|
||||
@@ -5030,11 +5038,9 @@ CHAN_HELP_UNBAN
|
||||
kullanabilir.
|
||||
|
||||
CHAN_HELP_KICK
|
||||
Kullanımı: KICK [#kanaladı [nick [sebep]]]
|
||||
Kullanımı: KICK #kanaladı nick [sebep]
|
||||
|
||||
Belirtilen nicki kanaldan atar. Eğer nick belirtilmemişse
|
||||
sizi atar. Eğer kanal ve nick belirtilmemişse, sizi
|
||||
bulunduğunuz tüm kanallardan atar.
|
||||
Belirtilen nicki kanaldan atar.
|
||||
|
||||
Varsayılan olarak, AOP lar ile access seviyesi 5 ve üzeri
|
||||
olanlar bu komutu kullanabilir.
|
||||
|
||||
+1
-2
@@ -107,8 +107,7 @@ class CommandCSBan : public Command
|
||||
|
||||
void OnSyntaxError(User *u)
|
||||
{
|
||||
// XXX: temporary, this can be tackled when the language system isn't so goddamn hairy.
|
||||
syntax_error(s_ChanServ, u, "BAN", CHAN_UNBAN_SYNTAX);
|
||||
syntax_error(s_ChanServ, u, "BAN", CHAN_BAN_SYNTAX);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
+1
-2
@@ -89,8 +89,7 @@ class CommandCSKick : public Command
|
||||
|
||||
void OnSyntaxError(User *u)
|
||||
{
|
||||
// XXX: best I can do for now, fixme
|
||||
notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, "");
|
||||
syntax_error(s_ChanServ, u, "KICK", CHAN_KICK_SYNTAX);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user