summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrstein drstein@31f1291d-b8d6-0310-a050-a5561fc1590b <drstein drstein@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2008-02-04 17:52:13 +0000
committerdrstein drstein@31f1291d-b8d6-0310-a050-a5561fc1590b <drstein drstein@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2008-02-04 17:52:13 +0000
commit18bde8d0a06ac72f723b2e2ed71ba6fbffa59d34 (patch)
tree0d6704aad87577077352487a95d24447d8564412
parent8d6b3b17fc6ef6af58e4b0017290023469bcadf4 (diff)
BUILD : 1.7.21 (1366) BUGS : 848 NOTES : No variable for NSReleaseTimeout in NICK_RECOVERED message
git-svn-id: svn://svn.anope.org/anope/trunk@1366 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1081 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat
-rw-r--r--Changes1
-rw-r--r--Changes.lang1
-rw-r--r--lang/cat.l2
-rw-r--r--lang/de.l2
-rw-r--r--lang/en_us.l2
-rw-r--r--lang/es.l2
-rw-r--r--lang/fr.l2
-rw-r--r--lang/gr.l4
-rw-r--r--lang/hun.l4
-rw-r--r--lang/it.l2
-rw-r--r--lang/nl.l2
-rw-r--r--lang/pl.l5
-rw-r--r--lang/pt.l2
-rw-r--r--lang/ru.l4
-rw-r--r--lang/tr.l4
-rw-r--r--src/core/ns_recover.c8
-rw-r--r--version.log6
17 files changed, 32 insertions, 21 deletions
diff --git a/Changes b/Changes
index 50ca9ebbc..057b00f52 100644
--- a/Changes
+++ b/Changes
@@ -20,6 +20,7 @@ Anope Version S V N
02/04 F Memleak in botchanmsgs(), botserv.c [#850]
02/04 F Memleak in bs_fantasy_seen.c [#851]
02/04 F Memleak in bs_fantasy_unban.c [#852]
+02/04 F No variable for NSReleaseTimeout in NICK_RECOVERED message. [#848]
Provided by Jan Milants <jan_renee@msn.com> - 2008
01/16 F Server traversion with next_server() failed to list all servers. [#831]
diff --git a/Changes.lang b/Changes.lang
index 815f60c34..d940e2408 100644
--- a/Changes.lang
+++ b/Changes.lang
@@ -3,6 +3,7 @@ Anope Version S V N
*** New Strings:
*** Mod Strings:
+ NICK_RECOVERED
*** Del Strings:
diff --git a/lang/cat.l b/lang/cat.l
index cb31f90c2..8e08a7480 100644
--- a/lang/cat.l
+++ b/lang/cat.l
@@ -844,7 +844,7 @@ NICK_NO_RECOVER_SELF
No pots recuperar-te a tu mateix!
NICK_RECOVERED
L'usuari demanant el teu nick ha estat expulsat.
- %R%s RELEASE %s per recuperar-lo abans del minut de time-out.
+ %R%s RELEASE %s per recuperar-lo abans %s time-out.
# RELEASE responses
NICK_RELEASE_SYNTAX
diff --git a/lang/de.l b/lang/de.l
index f047d53c1..eced3bca0 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -861,7 +861,7 @@ NICK_NO_RECOVER_SELF
Du kannst dich nicht selber recovern!
NICK_RECOVERED
Der User, der mit deinem Nicknamen online gewesen ist, wurde entfernt.Tippe:
- %R%s RELEASE %s ein, um ihn vor dem 1-Minute-Timeout zurückzubekommen.
+ %R%s RELEASE %s ein, um ihn vor dem %s-Timeout zurückzubekommen.
# RELEASE responses
NICK_RELEASE_SYNTAX
diff --git a/lang/en_us.l b/lang/en_us.l
index f3d9d592a..a4cd69065 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -827,7 +827,7 @@ NICK_NO_RECOVER_SELF
You can't recover yourself!
NICK_RECOVERED
User claiming your nick has been killed.
- %R%s RELEASE %s to get it back before the one-minute timeout.
+ %R%s RELEASE %s to get it back before %s timeout.
# RELEASE responses
NICK_RELEASE_SYNTAX
diff --git a/lang/es.l b/lang/es.l
index 8b2ed2fcd..2f3b4acea 100644
--- a/lang/es.l
+++ b/lang/es.l
@@ -849,7 +849,7 @@ NICK_NO_RECOVER_SELF
No puedes recuperarte a ti mismo!
NICK_RECOVERED
El usuario que ocupaba tu nick ha sido killeado.
- %R%s RELEASE %s para recuperarlo antes del minuto de time-out.
+ %R%s RELEASE %s para recuperarlo antes de %s.
# RELEASE responses
NICK_RELEASE_SYNTAX
diff --git a/lang/fr.l b/lang/fr.l
index e13871c7a..7f8c4fffd 100644
--- a/lang/fr.l
+++ b/lang/fr.l
@@ -855,7 +855,7 @@ NICK_NO_RECOVER_SELF
Vous ne pouvez utiliser RECOVER sur vous-même!
NICK_RECOVERED
L'utilisateur se servant de votre pseudo a été déconnecté.
- %R%s RELEASE %s pour le récupérer avant que la minute ne s'écoule.
+ %R%s RELEASE %s pour le récupérer avant que la %s ne s'écoule.
# RELEASE responses
NICK_RELEASE_SYNTAX
diff --git a/lang/gr.l b/lang/gr.l
index ac3a5acd3..b2c95b2c5 100644
--- a/lang/gr.l
+++ b/lang/gr.l
@@ -841,8 +841,8 @@ NICK_RECOVER_SYNTAX
NICK_NO_RECOVER_SELF
Äåí ìðïñåßò íá øÜ÷íåéò ôïí åáõôü óïõ!
NICK_RECOVERED
- ¸êáíåò kill ôï ÷ñÞóôç ðïõ óïõ åß÷å ôï øåõäþíõìü óïõ.
- %R%s RELEASE %s ãéá íá ôï ðÜñåéò ðßóù ðñéí ãßíåé áõôüìáôá ìåôÜ áðü Ýíá ëåðôü.
+ User claiming your nick has been killed.
+ %R%s RELEASE %s to get it back before %s timeout.
# RELEASE responses
NICK_RELEASE_SYNTAX
diff --git a/lang/hun.l b/lang/hun.l
index 3b59e0219..9b20b88a0 100644
--- a/lang/hun.l
+++ b/lang/hun.l
@@ -840,8 +840,8 @@ NICK_RECOVER_SYNTAX
NICK_NO_RECOVER_SELF
Nem használhatod az aktiv nickedre!
NICK_RECOVERED
- A nevedet használó user killve lett.
- Írd be:%R%s RELEASE %s és visszaszerzed a nicked.
+ User claiming your nick has been killed.
+ %R%s RELEASE %s to get it back before %s timeout.
# RELEASE válaszok
NICK_RELEASE_SYNTAX
diff --git a/lang/it.l b/lang/it.l
index 31bf0b9b3..6fe34deaa 100644
--- a/lang/it.l
+++ b/lang/it.l
@@ -835,7 +835,7 @@ NICK_NO_RECOVER_SELF
Non puoi recuperare te stesso!
NICK_RECOVERED
L'utente che usava il tuo nick è stato disconnesso.
- Digita %R%s RELEASE %s per usarlo prima che termini il blocco di un minuto.
+ Digita %R%s RELEASE %s per usarlo prima che termini il blocco di %s.
# RELEASE responses
NICK_RELEASE_SYNTAX
diff --git a/lang/nl.l b/lang/nl.l
index 105399f63..1bf479714 100644
--- a/lang/nl.l
+++ b/lang/nl.l
@@ -853,7 +853,7 @@ NICK_NO_RECOVER_SELF
Je kan jezelf niet herstellen!
NICK_RECOVERED
Gebruiker die je nick claimde is gekilld.
- %R%s RELEASE %s om deze voor de 1-minuut timeout terug te krijgen.
+ %R%s RELEASE %s om deze voor de %s timeout terug te krijgen.
# RELEASE responses
NICK_RELEASE_SYNTAX
diff --git a/lang/pl.l b/lang/pl.l
index d126eacb5..e851afc74 100644
--- a/lang/pl.l
+++ b/lang/pl.l
@@ -894,9 +894,8 @@ NICK_RECOVER_SYNTAX
NICK_NO_RECOVER_SELF
Nie mo¿esz sobie samemu odzyskaæ nicka :P
NICK_RECOVERED
- Twój nick zosta³ w³a¶nie przejêty przez serwisy.
- Napisz %R%s RELEASE %s
- je¶li chcesz, by zosta³ on zwolniony teraz.
+ User claiming your nick has been killed.
+ %R%s RELEASE %s to get it back before %s timeout.
# RELEASE responses
NICK_RELEASE_SYNTAX
diff --git a/lang/pt.l b/lang/pt.l
index ac92ada12..7354c32e5 100644
--- a/lang/pt.l
+++ b/lang/pt.l
@@ -848,7 +848,7 @@ NICK_NO_RECOVER_SELF
Você não pode usar o comando RECOVER em si mesmo!
NICK_RECOVERED
Usuário que usava seu nick foi derrubado.
- %R%s RELEASE %s para liberar seu nick antes de um minuto.
+ %R%s RELEASE %s para liberar seu nick antes de %s.
# RELEASE responses
NICK_RELEASE_SYNTAX
diff --git a/lang/ru.l b/lang/ru.l
index 8a2ffe612..3feb7423b 100644
--- a/lang/ru.l
+++ b/lang/ru.l
@@ -828,8 +828,8 @@ NICK_RECOVER_SYNTAX
NICK_NO_RECOVER_SELF
Âû íå ìîæåòå ïðèìåíèòü RECOVER íà ñàìîãî ñåáÿ!
NICK_RECOVERED
- Ïî âàøåìó çàïðîñó, ïîëüçîâàòåëü, âçÿâøèé âàø íèê ñåáå, áûë ïåðåèìåíîâàí íà ñëó÷àéíûé íèê.
- Íàïèøèòå %R%s RELEASE %s â òå÷åíèå ìèíóòû, ÷òîáû ñíÿòü çàùèòó ñåðâèñîâ ñ Âàøåãî íèêà.
+ User claiming your nick has been killed.
+ %R%s RELEASE %s to get it back before %s timeout.
# RELEASE responses
NICK_RELEASE_SYNTAX
diff --git a/lang/tr.l b/lang/tr.l
index 9ca78a139..277ba8a8c 100644
--- a/lang/tr.l
+++ b/lang/tr.l
@@ -848,8 +848,8 @@ NICK_RECOVER_SYNTAX
NICK_NO_RECOVER_SELF
Kendizi recover edemezsiniz!
NICK_RECOVERED
- Nickinizi kullanan user kill lendi.
- %R%s RELEASE %s yazarak bir dakikadan önce nickinizi serbest býrakabilirsiniz.
+ User claiming your nick has been killed.
+ %R%s RELEASE %s to get it back before %s timeout.
# RELEASE responses
NICK_RELEASE_SYNTAX
diff --git a/src/core/ns_recover.c b/src/core/ns_recover.c
index 9145030c1..40e0fa301 100644
--- a/src/core/ns_recover.c
+++ b/src/core/ns_recover.c
@@ -86,9 +86,15 @@ int do_recover(User * u)
int res = enc_check_password(pass, na->nc->pass);
if (res == 1) {
+ char relstr[192];
+
notice_lang(s_NickServ, u2, FORCENICKCHANGE_NOW);
collide(na, 0);
- notice_lang(s_NickServ, u, NICK_RECOVERED, s_NickServ, nick);
+
+ /* Convert NSReleaseTimeout seconds to string format */
+ duration(u2->na, relstr, sizeof(relstr), NSReleaseTimeout);
+
+ notice_lang(s_NickServ, u, NICK_RECOVERED, s_NickServ, nick, relstr);
} else {
notice_lang(s_NickServ, u, ACCESS_DENIED);
if (res == 0) {
diff --git a/version.log b/version.log
index 2c125f83a..9ac088da3 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="21"
VERSION_EXTRA="-svn"
-VERSION_BUILD="1365"
+VERSION_BUILD="1366"
# $Log$
#
+# BUILD : 1.7.21 (1366)
+# BUGS : 848
+# NOTES : No variable for NSReleaseTimeout in NICK_RECOVERED message
+#
# BUILD : 1.7.21 (1365)
# BUGS : 850, 851, 852
# NOTES : Fixed several memory leaks reported by Trystan. Do not forget to free allocated memory!
generated by cgit (git 2.34.1) at 2025-06-18 15:18:43 +0000