[eggheads-patches] PATCH: language.patch

Arty arthur2 at Demoniak.hay-france.com
Fri Oct 1 15:09:44 CST 1999


A patch to remove some duplicates messages into core.english.lang file.
Moreover, I'd like the core.french/german.lang files to be removed from
the cvs. I'm working on the core.french.lang one to update it. But I'd
like those files to be hosted by the ftp.eggheads.org ftp. Could someone
please update the core.german.lang file? Michael, C_Olli?

arthur2

-------------- next part --------------
Index: language/core.english.lang
===================================================================
RCS file: /usr/local/cvsroot/eggdrop1.3/language/core.english.lang,v
retrieving revision 1.10
diff -u -r1.10 core.english.lang
--- language/core.english.lang	1999/09/26 18:46:18	1.10
+++ language/core.english.lang	1999/10/01 11:26:08
@@ -3,45 +3,33 @@
 0x001,Usage
 0x002,Failed.\n
 
+# MODES_
+0x130,Created
+0x131,last used
+0x132,inactive
+0x133,placed by
+0x135,not active on
+0x137,not active
+0x138,not placed by bot
+
 # BANS_
 
-0x100,Created
-0x101,last used
-0x102,inactive
-0x103,placed by
 0x104,Global bans
-0x105,not active on
 0x106,Channel bans for
-0x107,not active
-0x108,not placed by bot
 0x109,Use '.bans all' to see the total list
 0x10A,No longer banning
 
 # EXEMPTS_
 
-0x110,Created
-0x111,last used
-0x112,inactive
-0x113,placed by
 0x114,Global exempts
-0x115,not active on
 0x116,Channel exempts for
-0x117,not active
-0x118,not placed by bot
 0x119,Use '.exempts all' to see the total list
 0x11A,No longer ban exempting
 
-# Invites
+# INVITES_
 
-0x120,Created
-0x121,last used
-0x122,inactive
-0x123,placed by
 0x124,Global invites
-0x125,not active on
 0x126,Channel invites for
-0x127,not active
-0x128,not placed by bot
 0x129,Use '.invites all' to see the total list
 0x12A,No longer inviteing
 
Index: src/lang.h
===================================================================
RCS file: /usr/local/cvsroot/eggdrop1.3/src/lang.h,v
retrieving revision 1.4
diff -u -r1.4 lang.h
--- src/lang.h	1999/09/26 18:46:18	1.4
+++ src/lang.h	1999/10/01 11:26:09
@@ -294,42 +294,30 @@
 #define USER_ISBOT	get_language(0x801)
 #define USER_ISMASTER	get_language(0x802)
 
+/* '.bans/.invites/.exempts' common messages */
+#define MODES_CREATED		get_language(0x130)
+#define MODES_LASTUSED		get_language(0x131)
+#define MODES_INACTIVE		get_language(0x132)
+#define MODES_PLACEDBY		get_language(0x133)
+#define MODES_NOTACTIVE		get_language(0x135)
+#define MODES_NOTACTIVE2 	get_language(0x137)
+#define MODES_NOTBYBOT		get_language(0x138)
+
 /* Messages used when listing with `.bans' */
-#define BANS_CREATED	get_language(0x100)
-#define BANS_LASTUSED	get_language(0x101)
-#define BANS_INACTIVE	get_language(0x102)
-#define BANS_PLACEDBY	get_language(0x103)
 #define BANS_GLOBAL	get_language(0x104)
-#define BANS_NOTACTIVE	get_language(0x105)
 #define BANS_BYCHANNEL	get_language(0x106)
-#define BANS_NOTACTIVE2	get_language(0x107)
-#define BANS_NOTBYBOT	get_language(0x108)
 #define BANS_USEBANSALL	get_language(0x109)
 #define BANS_NOLONGER	get_language(0x10a)
 
 /* Messages used when listing with '.exempts' */
-#define EXEMPTS_CREATED	        get_language(0x110)
-#define EXEMPTS_LASTUSED	get_language(0x111)
-#define EXEMPTS_INACTIVE	get_language(0x112)
-#define EXEMPTS_PLACEDBY	get_language(0x113)
 #define EXEMPTS_GLOBAL	        get_language(0x114)
-#define EXEMPTS_NOTACTIVE	get_language(0x115)
 #define EXEMPTS_BYCHANNEL	get_language(0x116)
-#define EXEMPTS_NOTACTIVE2	get_language(0x117)
-#define EXEMPTS_NOTBYBOT	get_language(0x118)
 #define EXEMPTS_USEEXEMPTSALL	get_language(0x119)
 #define EXEMPTS_NOLONGER	get_language(0x11a)
 
 /* Messages used when listing with '.invites' */
-#define INVITES_CREATED	        get_language(0x120)
-#define INVITES_LASTUSED	get_language(0x121)
-#define INVITES_INACTIVE	get_language(0x122)
-#define INVITES_PLACEDBY	get_language(0x123)
 #define INVITES_GLOBAL	        get_language(0x124)
-#define INVITES_NOTACTIVE	get_language(0x125)
 #define INVITES_BYCHANNEL	get_language(0x126)
-#define INVITES_NOTACTIVE2	get_language(0x127)
-#define INVITES_NOTBYBOT	get_language(0x128)
 #define INVITES_USEINVITESALL	get_language(0x129)
 #define INVITES_NOLONGER	get_language(0x12a)
 
Index: src/users.c
===================================================================
RCS file: /usr/local/cvsroot/eggdrop1.3/src/users.c,v
retrieving revision 1.8
diff -u -r1.8 users.c
--- src/users.c	1999/09/26 23:14:24	1.8
+++ src/users.c	1999/10/01 11:26:09
@@ -158,7 +158,7 @@
   if (ignore->msg && ignore->msg[0])
     dprintf(idx, "        %s: %s\n", ignore->user, ignore->msg);
   else
-    dprintf(idx, "        %s %s\n", BANS_PLACEDBY, ignore->user);
+    dprintf(idx, "        %s %s\n", MODES_PLACEDBY, ignore->user);
   if (dates[0])
     dprintf(idx, "        %s\n", dates);
 }
Index: src/mod/channels.mod/userchan.c
===================================================================
RCS file: /usr/local/cvsroot/eggdrop1.3/src/mod/channels.mod/userchan.c,v
retrieving revision 1.19
diff -u -r1.19 userchan.c
--- src/mod/channels.mod/userchan.c	1999/09/26 18:46:18	1.19
+++ src/mod/channels.mod/userchan.c	1999/10/01 11:26:10
@@ -587,10 +587,10 @@
 
   if (ban->added) {
     daysago(now, ban->added, s);
-    sprintf(dates, "%s %s", BANS_CREATED, s);
+    sprintf(dates, "%s %s", MODES_CREATED, s);
     if (ban->added < ban->lastactive) {
       strcat(dates, ", ");
-      strcat(dates, BANS_LASTUSED);
+      strcat(dates, MODES_LASTUSED);
       strcat(dates, " ");
       daysago(now, ban->lastactive, s);
       strcat(dates, s);
@@ -617,7 +617,7 @@
     if (number >= 0) {
       dprintf(idx, "! [%3d] %s %s\n", number, ban->mask, s);
     } else {
-      dprintf(idx, "BAN (%s): %s %s\n", BANS_INACTIVE, ban->mask, s);
+      dprintf(idx, "BAN (%s): %s %s\n", MODES_INACTIVE, ban->mask, s);
     }
   } else
     return;
@@ -634,10 +634,10 @@
   
   if (exempt->added) {
     daysago(now, exempt->added, s);
-    sprintf(dates, "%s %s", EXEMPTS_CREATED, s);
+    sprintf(dates, "%s %s", MODES_CREATED, s);
     if (exempt->added < exempt->lastactive) {
       strcat(dates, ", ");
-      strcat(dates, EXEMPTS_LASTUSED);
+      strcat(dates, MODES_LASTUSED);
       strcat(dates, " ");
       daysago(now, exempt->lastactive, s);
       strcat(dates, s);
@@ -663,7 +663,7 @@
     if (number >= 0) {
       dprintf(idx, "! [%3d] %s %s\n", number, exempt->mask, s);
     } else {
-      dprintf(idx, "EXEMPT (%s): %s %s\n", EXEMPTS_INACTIVE, exempt->mask, s);
+      dprintf(idx, "EXEMPT (%s): %s %s\n", MODES_INACTIVE, exempt->mask, s);
     }
   } else 
     return;
@@ -680,10 +680,10 @@
   
   if (invite->added) {
     daysago(now, invite->added, s);
-    sprintf(dates, "%s %s", INVITES_CREATED, s);
+    sprintf(dates, "%s %s", MODES_CREATED, s);
     if (invite->added < invite->lastactive) {
       strcat(dates, ", ");
-      strcat(dates, INVITES_LASTUSED);
+      strcat(dates, MODES_LASTUSED);
       strcat(dates, " ");
       daysago(now, invite->lastactive, s);
       strcat(dates, s);
@@ -709,7 +709,7 @@
     if (number >= 0) {
       dprintf(idx, "! [%3d] %s %s\n", number, invite->mask, s);
     } else {
-      dprintf(idx, "INVITE (%s): %s %s\n", INVITES_INACTIVE, invite->mask, s);
+      dprintf(idx, "INVITE (%s): %s %s\n", MODES_INACTIVE, invite->mask, s);
     }
   } else 
     return;
@@ -743,7 +743,7 @@
     return;
   if (show_inact)
     dprintf(idx, "%s:   (! = %s %s)\n", BANS_GLOBAL,
-	    BANS_NOTACTIVE, chan->name);
+	    MODES_NOTACTIVE, chan->name);
   else
     dprintf(idx, "%s:\n", BANS_GLOBAL);
   context;
@@ -761,11 +761,11 @@
   if (show_inact)
     dprintf(idx, "%s %s:   (! = %s, * = %s)\n",
 	    BANS_BYCHANNEL, chan->name,
-	    BANS_NOTACTIVE2, BANS_NOTBYBOT);
+	    MODES_NOTACTIVE2, MODES_NOTBYBOT);
   else
     dprintf(idx, "%s %s:  (* = %s)\n",
 	    BANS_BYCHANNEL, chan->name,
-	    BANS_NOTBYBOT);
+	    MODES_NOTBYBOT);
   u = chan->bans;
   for (; u; u = u->next) {
     if (match[0]) {
@@ -838,7 +838,7 @@
     return;	 
   if (show_inact)
     dprintf(idx, "%s:   (! = %s %s)\n", EXEMPTS_GLOBAL, 
-	    EXEMPTS_NOTACTIVE, chan->name);
+	    MODES_NOTACTIVE, chan->name);
   else
     dprintf(idx, "%s:\n", EXEMPTS_GLOBAL);
   context;
@@ -856,12 +856,12 @@
   if (show_inact)
     dprintf(idx, "%s %s:   (! = %s, * = %s)\n",
 	    EXEMPTS_BYCHANNEL, chan->name, 
-	    EXEMPTS_NOTACTIVE2,
-	    EXEMPTS_NOTBYBOT);
+	    MODES_NOTACTIVE2,
+	    MODES_NOTBYBOT);
   else
     dprintf(idx, "%s %s:  (* = %s)\n",
 	    EXEMPTS_BYCHANNEL, chan->name, 
-	    EXEMPTS_NOTBYBOT);
+	    MODES_NOTBYBOT);
   u = chan->exempts;
   for (;u;u=u->next) {
     if (match[0]) {
@@ -933,7 +933,7 @@
     return;	 
   if (show_inact)
     dprintf(idx, "%s:   (! = %s %s)\n", INVITES_GLOBAL, 
-	    INVITES_NOTACTIVE, chan->name);
+	    MODES_NOTACTIVE, chan->name);
   else
     dprintf(idx, "%s:\n", INVITES_GLOBAL);
   context;
@@ -951,12 +951,12 @@
   if (show_inact)
     dprintf(idx, "%s %s:   (! = %s, * = %s)\n",
 	    INVITES_BYCHANNEL, chan->name, 
-	    INVITES_NOTACTIVE2,
-	    INVITES_NOTBYBOT);
+	    MODES_NOTACTIVE2,
+	    MODES_NOTBYBOT);
   else
     dprintf(idx, "%s %s:  (* = %s)\n",
 	    INVITES_BYCHANNEL, chan->name, 
-	    INVITES_NOTBYBOT);
+	    MODES_NOTBYBOT);
   u = chan->invites;
   for (;u;u=u->next) {
     if (match[0]) {


More information about the Patches mailing list