diff options
author | adam- <adam-@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-07-31 08:02:37 +0000 |
---|---|---|
committer | adam- <adam-@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-07-31 08:02:37 +0000 |
commit | bec179c1977644e12fbe8610e876d0ed3be87057 (patch) | |
tree | 6fd824670abdd9c3b52aea8762f334b70ac5121a | |
parent | 10be3e9bb5287f7777d6f191d5e8b3ae8edd6197 (diff) |
Removed some now unneeded and unused language strings
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2396 5417fbe8-f217-4b02-8779-1006273d7864
-rw-r--r-- | lang/cat.l | 9 | ||||
-rw-r--r-- | lang/de.l | 9 | ||||
-rw-r--r-- | lang/en_us.l | 9 | ||||
-rw-r--r-- | lang/es.l | 9 | ||||
-rw-r--r-- | lang/fr.l | 9 | ||||
-rw-r--r-- | lang/gr.l | 9 | ||||
-rw-r--r-- | lang/hun.l | 9 | ||||
-rw-r--r-- | lang/it.l | 10 | ||||
-rw-r--r-- | lang/nl.l | 9 | ||||
-rw-r--r-- | lang/pl.l | 13 | ||||
-rw-r--r-- | lang/pt.l | 9 | ||||
-rw-r--r-- | lang/ru.l | 9 | ||||
-rw-r--r-- | lang/tr.l | 9 | ||||
-rw-r--r-- | src/core/hs_group.c | 52 | ||||
-rw-r--r-- | src/core/hs_off.c | 23 | ||||
-rw-r--r-- | src/core/hs_on.c | 45 |
16 files changed, 46 insertions, 196 deletions
diff --git a/lang/cat.l b/lang/cat.l index ff1d095fa..de9aaca89 100644 --- a/lang/cat.l +++ b/lang/cat.l @@ -1038,11 +1038,6 @@ CHAN_REGISTER_DISABLED Ho sento, el registre de canals esta temporalment inhabilitat. CHAN_REGISTER_NOT_LOCAL Canals locals no poden ser enregistrats. -CHAN_MUST_REGISTER_NICK - Has de registrar el teu nickname primer. Escriu %R%s HELP per més informació de com registrar nicknames. -CHAN_MUST_IDENTIFY_NICK - Per favor primer identifica't amb %s, utilitzant la comanda: - %R%s IDENTIFY clau CHAN_MAY_NOT_BE_REGISTERED El canal %s no pot ser enregistrat. CHAN_ALREADY_REGISTERED @@ -6589,10 +6584,6 @@ HOST_ACTIVATED Your vhost of %s is now activated. HOST_IDENT_ACTIVATED Your vhost of %s@%s is now activated. -HOST_ID - Please identify to services first. -HOST_NOT_REGED - You need to register before a vhost can be assigned to you. HOST_DEL vhost for %s removed. HOST_DEL_SYNTAX @@ -1052,11 +1052,6 @@ CHAN_REGISTER_DISABLED Die Registrierung von Channels ist derzeit deaktiviert. CHAN_REGISTER_NOT_LOCAL Lokale Channels können nicht registriert werden. -CHAN_MUST_REGISTER_NICK - Du musst erst deinen Nicknamen registrieren. Tippe %R%s HELP REGISTER um Hilfe zu erhalten. -CHAN_MUST_IDENTIFY_NICK - Bitte identifiziere dich zuerst durch %s, in dem du diesen Befehl benutzt: - %R%s IDENTIFY Passwort CHAN_MAY_NOT_BE_REGISTERED Der Channel %s kann nicht registriert werden. CHAN_ALREADY_REGISTERED @@ -6581,10 +6576,6 @@ HOST_ACTIVATED Dein vHost (%s) ist jetzt aktiviert. HOST_IDENT_ACTIVATED Dein vHost (%s@%s) ist jetzt aktiviert. -HOST_ID - Bitte identifiziere dich zuerst. -HOST_NOT_REGED - Du musst erst deinen Nickname registrieren, um einen vHost zu erhalten. HOST_DEL vHost für %s wurde gelöscht. HOST_DEL_SYNTAX diff --git a/lang/en_us.l b/lang/en_us.l index 9a2bd4371..10b84fb53 100644 --- a/lang/en_us.l +++ b/lang/en_us.l @@ -1015,11 +1015,6 @@ CHAN_REGISTER_DISABLED Sorry, channel registration is temporarily disabled. CHAN_REGISTER_NOT_LOCAL Local channels cannot be registered. -CHAN_MUST_REGISTER_NICK - You must register your nickname first. Type %R%s HELP for information on registering nicknames. -CHAN_MUST_IDENTIFY_NICK - Please identify with %s first, using the command: - %R%s IDENTIFY password CHAN_MAY_NOT_BE_REGISTERED Channel %s may not be registered. CHAN_ALREADY_REGISTERED @@ -6228,10 +6223,6 @@ HOST_ACTIVATED Your vhost of %s is now activated. HOST_IDENT_ACTIVATED Your vhost of %s@%s is now activated. -HOST_ID - Please identify to services first. -HOST_NOT_REGED - You need to register before a vhost can be assigned to you. HOST_DEL vhost for %s removed. HOST_DEL_SYNTAX @@ -1036,11 +1036,6 @@ CHAN_REGISTER_DISABLED Lo siento, el registro de canales esta temporalmente deshabilitado. CHAN_REGISTER_NOT_LOCAL Canales locales no pueden ser registrados. -CHAN_MUST_REGISTER_NICK - Debes registrar tu nickname primero. Tipea %R%s HELP para informacion en como registrar nicknames. -CHAN_MUST_IDENTIFY_NICK - Por favor primero identificate con %s, usando el comando: - %R%s IDENTIFY clave CHAN_MAY_NOT_BE_REGISTERED El canal %s no puede ser registrado. CHAN_ALREADY_REGISTERED @@ -6555,10 +6550,6 @@ HOST_ACTIVATED Tu vhost %s ha sido activado. HOST_IDENT_ACTIVATED Tu vhost %s@%s ha sido activado. -HOST_ID - Por favor identificate con los servicios primero. -HOST_NOT_REGED - Necesitas registrarte antes de que un vhost sea asignado a ti. HOST_DEL vhost para %s removido. HOST_DEL_SYNTAX @@ -1049,11 +1049,6 @@ CHAN_REGISTER_DISABLED Désolés, l'enregistrement des cannaux est temporairement désactivé. CHAN_REGISTER_NOT_LOCAL Les cannaux locaux ne peuvent être enregistrés. -CHAN_MUST_REGISTER_NICK - Vous devez d'abord enregistrer votre pseudo. Tapez %R%s HELP pour savoir comment enregistrer votre pseudo. -CHAN_MUST_IDENTIFY_NICK - Vous devez d'abord vous identifier avec %s, en utilisant la commande: - %R%s IDENTIFY motdepasse CHAN_MAY_NOT_BE_REGISTERED Le canal %s ne peut être enregistré. CHAN_ALREADY_REGISTERED @@ -6638,10 +6633,6 @@ HOST_ACTIVATED Votre vhost %s est activée. HOST_IDENT_ACTIVATED Votre vhost %s@%s est activée. -HOST_ID - Veuillez vous identifier avant d'utiliser cette commande. -HOST_NOT_REGED - Vous devez être enregistré avant d'utiliser cette commande. HOST_DEL Le vhost pour %s a été supprimé. HOST_DEL_SYNTAX @@ -1036,11 +1036,6 @@ CHAN_REGISTER_DISABLED Óõãíþìç, ç õðçñåóßá êáôï÷ýñùóåéò êáíáëéþí äåí ëåéôïõñãåß ãéá ôçí þñá. CHAN_REGISTER_NOT_LOCAL ÊáíÜëéá ôïðéêÜ äåí ìðïñïýí íá êáôï÷õñùèïýí. -CHAN_MUST_REGISTER_NICK - ÐñÝðåé íá êáôï÷õñþóåéò ôï øåõäþíõìü óïõ ðñþôá. ÃñÜøå %R%s HELP ãéá ðëçñïöïñßåò ó÷åôéêÜ ìå ôá ïíüìáôá ðïõ Ý÷ïõí êáôï÷õñùèåß.. -CHAN_MUST_IDENTIFY_NICK - Ðáñáêáëþ êÜíå ôçí åíôïëÞ áíáãíþñéóçò ìå ôïí %s ðñþôá, ÷ñçóéìïðïéþíôáò ôçí åíôïëÞ: - %R%s IDENTIFY password CHAN_MAY_NOT_BE_REGISTERED Ôï êáíÜëé %s äåí ìðïñåß íá êáôï÷õñùèåß. CHAN_ALREADY_REGISTERED @@ -6471,10 +6466,6 @@ HOST_ACTIVATED Your vhost of %s is now activated. HOST_IDENT_ACTIVATED Your vhost of %s@%s is now activated. -HOST_ID - Please identify to services first. -HOST_NOT_REGED - You need to register before a vhost can be assigned to you. HOST_DEL vhost for %s removed. HOST_DEL_SYNTAX diff --git a/lang/hun.l b/lang/hun.l index eeb51ef38..4a612ed78 100644 --- a/lang/hun.l +++ b/lang/hun.l @@ -1027,11 +1027,6 @@ CHAN_REGISTER_DISABLED Sajnálom, a csatorna regisztráció jelenleg szünetel. CHAN_REGISTER_NOT_LOCAL Helyi csatornák nem regisztrálhatók. -CHAN_MUST_REGISTER_NICK - Elõször regisztrálnod kell a nevedet. %R%s help -CHAN_MUST_IDENTIFY_NICK - Kérlek azonosíts a %s-be, használd ezt a parancsot: - %R%s IDENTIFY jelszó CHAN_MAY_NOT_BE_REGISTERED Ez a csatorna %s nem regisztrálható. CHAN_ALREADY_REGISTERED @@ -6374,10 +6369,6 @@ HOST_ACTIVATED A %s virtuális hosztod aktiválva. HOST_IDENT_ACTIVATED A %s@%s virtuális hosztod aktiválva. -HOST_ID - Kérlek azonosíts elõbb a szervízben. -HOST_NOT_REGED - Csak regisztrált nickhez tudsz vhostot társítani. HOST_DEL %s vhosztja törölve lett. HOST_DEL_SYNTAX @@ -1025,12 +1025,6 @@ CHAN_REGISTER_DISABLED Spiacente, la registrazione dei canali è temporaneamente disabilitata. CHAN_REGISTER_NOT_LOCAL I canali locali non possono essere registrati. -CHAN_MUST_REGISTER_NICK - Devi prima registrare il tuo nick. - Digita %R%s HELP per avere informazioni sulla registrazione dei nick. -CHAN_MUST_IDENTIFY_NICK - Devi prima identificarti con %s, usando il comando: - %R%s IDENTIFY password CHAN_MAY_NOT_BE_REGISTERED Il canale %s non può essere registrato. CHAN_ALREADY_REGISTERED @@ -6437,10 +6431,6 @@ HOST_ACTIVATED Il tuo vhost (%s) ora è attivato. HOST_IDENT_ACTIVATED Il tuo vhost (%s@%s) ora è attivato. -HOST_ID - Per favore, identificati con NickServ. -HOST_NOT_REGED - È necessario registrarsi prima che sia possibile assegnare un vhost a un nick. HOST_DEL Il vhost di %s è stato rimosso. HOST_DEL_SYNTAX @@ -1034,11 +1034,6 @@ CHAN_REGISTER_DISABLED Sorry, kanaal registratie is tijdelijk uitgeschakeld. CHAN_REGISTER_NOT_LOCAL Lokale kanalen kunnen niet geregistreerd worden. -CHAN_MUST_REGISTER_NICK - Je moet je nickname eerst registreren. Type %R%s HELP voor meer informatie over het registreren van nicknames. -CHAN_MUST_IDENTIFY_NICK - Identificeer eerst met %s, door middel van het commando: - %R%s IDENTIFY wachtwoord CHAN_MAY_NOT_BE_REGISTERED Kanaal %s mag niet geregistreerd worden. CHAN_ALREADY_REGISTERED @@ -6401,10 +6396,6 @@ HOST_ACTIVATED Je vhost van %s is nu geactiveerd. HOST_IDENT_ACTIVATED Je vhost van %s@%s is nu geactiveerd. -HOST_ID - Identificeer eerst bij Services. -HOST_NOT_REGED - Je moet je eerst registreren voordat een vhost aan je nick kan worden gebonden. HOST_DEL vhost voor %s verwijderd. HOST_DEL_SYNTAX @@ -1331,13 +1331,6 @@ CHAN_REGISTER_DISABLED CHAN_REGISTER_NOT_LOCAL Lokalne kana³y nie mog± byæ rejestrowane. -CHAN_MUST_REGISTER_NICK - Musisz mieæ zarejestrowany nick. Napisz %R%s HELP, aby uzyskaæ wiêcej informacji. - -CHAN_MUST_IDENTIFY_NICK - Zidentyfikuj siê najpierw u %s komend±: - %R%s IDENTIFY has³o - CHAN_MAY_NOT_BE_REGISTERED Kana³u %s nie mo¿na rejestrowaæ. @@ -7404,12 +7397,6 @@ HOST_ACTIVATED HOST_IDENT_ACTIVATED Twój vhost %s@%s jest teraz aktywny. -HOST_ID - Najpierw zidentyfikuj siê u serwisów. - -HOST_NOT_REGED - Aby uzyskaæ vhosta musisz byæ najpierw zarejestrowany. - HOST_DEL Vhost dla %s zosta³ usuniêty. @@ -1036,11 +1036,6 @@ CHAN_REGISTER_DISABLED Desculpe, o registro de canais está temporariamente desativado. CHAN_REGISTER_NOT_LOCAL Canais locais não podem ser registrados. -CHAN_MUST_REGISTER_NICK - Você deve registrar seu nick primeiro. Digite %R%s HELP para maiores informações sobre registro de nick. -CHAN_MUST_IDENTIFY_NICK - Por favor se identifique com o %s primeiro, usando o comando: - %R%s IDENTIFY senha CHAN_MAY_NOT_BE_REGISTERED O canal %s não pode ser registrado. CHAN_ALREADY_REGISTERED @@ -6363,10 +6358,6 @@ HOST_ACTIVATED Seu vhost %s está agora ativado. HOST_IDENT_ACTIVATED Seu vhost %s@%s está agora ativado. -HOST_ID - Por favor, identifique-se aos Services primeiro. -HOST_NOT_REGED - Primeiro você precisa registrar seu nick senão um vhost não pode ser associado a você. HOST_DEL vhost para %s removido. HOST_DEL_SYNTAX @@ -1016,11 +1016,6 @@ CHAN_REGISTER_DISABLED Èçâèíèòå, ðåãèñòðàöèÿ êàíàëîâ âðåìåííî ïðèîñòàíîâëåíà. CHAN_REGISTER_NOT_LOCAL Ëîêàëüíûå êàíàëû íå ìîãóò áûòü çàðåãèñòðèðîâàíû. -CHAN_MUST_REGISTER_NICK - Ñíà÷àëà âû äîëæíû çàðåãèñòðèðîâàòü ñâîé íèê. Íàïèøèòå %R%s HELP äëÿ ïîëó÷åíèÿ èíôîðìàöèè î ðåãèñòðàöèè íèêà. -CHAN_MUST_IDENTIFY_NICK - Ñíà÷àëà âû äîëæíû èäåíòèôèöèðîâàòü ñâîé íèê íà %s, èñïîëüçóÿ êîìàíäó: - %R%s IDENTIFY ïàðîëü CHAN_MAY_NOT_BE_REGISTERED Êàíàë %s íå ìîæåò áûòü çàðåãèñòðèðîâàí. CHAN_ALREADY_REGISTERED @@ -6510,10 +6505,6 @@ HOST_ACTIVATED Âàø âèðòóàëüíûé õîñò %s àêòèâèðîâàí. HOST_IDENT_ACTIVATED Âàø âèðòóàëüíûé õîñò %s@%s àêòèâèðîâàí. -HOST_ID - Èäåíòèôèöèðóéòåñü ê ñâîåìó íèêó è ïîâòîðèòå çàïðîñ íà àêòèâàöèþ. -HOST_NOT_REGED - Êàêîé âèðòóàëüíûé õîñò, âàø íèê äàæå íå çàðåãèñòðèðîâàí... HOST_DEL Âèðòóàëüíûé õîñò äëÿ %s óäàëåí. HOST_DEL_SYNTAX @@ -1043,11 +1043,6 @@ CHAN_REGISTER_DISABLED Kanal kaydý geçici olarak devre dýþýdýr. CHAN_REGISTER_NOT_LOCAL Local kanallar kayýt edilemezler. -CHAN_MUST_REGISTER_NICK - Önce nickinizi kayýt etmeniz gerekiyor. Nick kayýt hakkýnda bilgi için %R%s HELP yazýnýz. -CHAN_MUST_IDENTIFY_NICK - Lütfen önce %s ile bu komutu kullanarak nickinizi tanýtýn: - %R%s IDENTIFY þifreniz CHAN_MAY_NOT_BE_REGISTERED %s kanalý kayýt edilemez. CHAN_ALREADY_REGISTERED @@ -6403,10 +6398,6 @@ HOST_ACTIVATED Your vhost of %s is now activated. HOST_IDENT_ACTIVATED Your vhost of %s@%s is now activated. -HOST_ID - Please identify to services first. -HOST_NOT_REGED - You need to register before a vhost can be assigned to you. HOST_DEL vhost for %s removed. HOST_DEL_SYNTAX diff --git a/src/core/hs_group.c b/src/core/hs_group.c index c63766e17..3011e3203 100644 --- a/src/core/hs_group.c +++ b/src/core/hs_group.c @@ -26,7 +26,6 @@ class CommandHSGroup : public Command CommandReturn Execute(User *u, std::vector<ci::string> ¶ms) { - NickAlias *na; HostCore *tmp; char *vHost = NULL; char *vIdent = NULL; @@ -37,42 +36,33 @@ class CommandHSGroup : public Command head = hostCoreListHead(); - if ((na = findnick(u->nick))) + tmp = findHostCore(head, u->nick, &found); + if (found) { - if (na->status & NS_IDENTIFIED) - { - tmp = findHostCore(head, u->nick, &found); - if (found) - { - if (!tmp) - tmp = head; /* incase first in list */ - else if (tmp->next) /* we dont want the previous entry were not inserting! */ - tmp = tmp->next; /* jump to the next */ + if (!tmp) + tmp = head; /* incase first in list */ + else if (tmp->next) /* we dont want the previous entry were not inserting! */ + tmp = tmp->next; /* jump to the next */ - vHost = sstrdup(tmp->vHost); - if (tmp->vIdent) - vIdent = sstrdup(tmp->vIdent); - creator = sstrdup(tmp->creator); - time = tmp->time; + vHost = sstrdup(tmp->vHost); + if (tmp->vIdent) + vIdent = sstrdup(tmp->vIdent); + creator = sstrdup(tmp->creator); + time = tmp->time; - do_hs_sync(na->nc, vIdent, vHost, creator, time); - if (tmp->vIdent) - notice_lang(s_HostServ, u, HOST_IDENT_GROUP, na->nc->display, vIdent, vHost); - else - notice_lang(s_HostServ, u, HOST_GROUP, na->nc->display, vHost); - delete [] vHost; - if (vIdent) - delete [] vIdent; - delete [] creator; - } - else - notice_lang(s_HostServ, u, HOST_NOT_ASSIGNED); - } + do_hs_sync(u->nc, vIdent, vHost, creator, time); + if (tmp->vIdent) + notice_lang(s_HostServ, u, HOST_IDENT_GROUP, u->nc->display, vIdent, vHost); else - notice_lang(s_HostServ, u, HOST_ID); + notice_lang(s_HostServ, u, HOST_GROUP, u->nc->display, vHost); + delete [] vHost; + if (vIdent) + delete [] vIdent; + delete [] creator; } else - notice_lang(s_HostServ, u, HOST_NOT_REGED); + notice_lang(s_HostServ, u, HOST_NOT_ASSIGNED); + return MOD_CONT; } diff --git a/src/core/hs_off.c b/src/core/hs_off.c index 086381fee..b8aabfcc2 100644 --- a/src/core/hs_off.c +++ b/src/core/hs_off.c @@ -24,25 +24,16 @@ class CommandHSOff : public Command CommandReturn Execute(User *u, std::vector<ci::string> ¶ms) { - NickAlias *na; char *vhost; char *vident = NULL; - if ((na = findnick(u->nick))) - { - if (na->status & NS_IDENTIFIED) - { - vhost = getvHost(u->nick); - vident = getvIdent(u->nick); - if (!vhost && !vident) - notice_lang(s_HostServ, u, HOST_NOT_ASSIGNED); - else - ircdproto->SendVhostDel(u); - } - else - notice_lang(s_HostServ, u, HOST_ID); - } + + vhost = getvHost(u->nick); + vident = getvIdent(u->nick); + if (!vhost && !vident) + notice_lang(s_HostServ, u, HOST_NOT_ASSIGNED); else - notice_lang(s_HostServ, u, HOST_NOT_REGED); + ircdproto->SendVhostDel(u); + return MOD_CONT; } diff --git a/src/core/hs_on.c b/src/core/hs_on.c index d1c2b391f..5d102273c 100644 --- a/src/core/hs_on.c +++ b/src/core/hs_on.c @@ -24,39 +24,30 @@ class CommandHSOn : public Command CommandReturn Execute(User *u, std::vector<ci::string> ¶ms) { - NickAlias *na; char *vHost; char *vIdent = NULL; - if ((na = findnick(u->nick))) + + vHost = getvHost(u->nick); + vIdent = getvIdent(u->nick); + if (!vHost) + notice_lang(s_HostServ, u, HOST_NOT_ASSIGNED); + else { - if (na->status & NS_IDENTIFIED) + if (vIdent) + notice_lang(s_HostServ, u, HOST_IDENT_ACTIVATED, vIdent, vHost); + else + notice_lang(s_HostServ, u, HOST_ACTIVATED, vHost); + ircdproto->SendVhost(u->nick, vIdent, vHost); + if (ircd->vhost) + u->vhost = sstrdup(vHost); + if (ircd->vident) { - vHost = getvHost(u->nick); - vIdent = getvIdent(u->nick); - if (!vHost) - notice_lang(s_HostServ, u, HOST_NOT_ASSIGNED); - else - { - if (vIdent) - notice_lang(s_HostServ, u, HOST_IDENT_ACTIVATED, vIdent, vHost); - else - notice_lang(s_HostServ, u, HOST_ACTIVATED, vHost); - ircdproto->SendVhost(u->nick, vIdent, vHost); - if (ircd->vhost) - u->vhost = sstrdup(vHost); - if (ircd->vident) - { - if (vIdent) - u->SetVIdent(vIdent); - } - set_lastmask(u); - } + if (vIdent) + u->SetVIdent(vIdent); } - else - notice_lang(s_HostServ, u, HOST_ID); + set_lastmask(u); } - else - notice_lang(s_HostServ, u, HOST_NOT_REGED); + return MOD_CONT; } |