From 87807ae81ab46ba76684ca080c731375d1817166 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Fri, 8 Feb 2013 15:42:41 -0600 Subject: [PATCH] - Replace 'his/her' with 'their' in various notices. It is more gramatically correct, and looks less awkward while maintaining political correctness. --- src/modules/m_invite.c | 2 +- src/modules/m_nick.c | 10 +++++----- src/modules/m_svsnick.c | 2 +- src/modules/m_who.c | 16 ++++++++-------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/modules/m_invite.c b/src/modules/m_invite.c index c219665f5..eab41c439 100644 --- a/src/modules/m_invite.c +++ b/src/modules/m_invite.c @@ -75,7 +75,7 @@ DLLFUNC int MOD_UNLOAD(m_invite)(int module_unload) return MOD_SUCCESS; } -/* Send the user his/her list of active invites */ +/* Send the user their list of active invites */ int send_invite_list(aClient *sptr) { Link *inv; diff --git a/src/modules/m_nick.c b/src/modules/m_nick.c index 042b1d1d0..38fdd2e13 100644 --- a/src/modules/m_nick.c +++ b/src/modules/m_nick.c @@ -379,13 +379,13 @@ DLLFUNC CMD_FUNC(m_nick) /* ** If acptr == sptr, then we have a client doing a nick ** change between *equivalent* nicknames as far as server - ** is concerned (user is changing the case of his/her + ** is concerned (user is changing the case of their ** nickname or somesuch) */ if (acptr == sptr) { if (strcmp(acptr->name, nick) != 0) { - /* Allows change of case in his/her nick */ + /* Allows change of case in their nick */ removemoder = 0; /* don't set the user -r */ goto nickkilldone; /* -- go and process change */ } else @@ -656,19 +656,19 @@ DLLFUNC CMD_FUNC(m_nick) } else sptr->user->flood.nick_c++; - sendto_snomask(SNO_NICKCHANGE, "*** Notice -- %s (%s@%s) has changed his/her nickname to %s", + sendto_snomask(SNO_NICKCHANGE, "*** Notice -- %s (%s@%s) has changed their nickname to %s", sptr->name, sptr->user->username, sptr->user->realhost, nick); RunHook2(HOOKTYPE_LOCAL_NICKCHANGE, sptr, nick); } else { if (!IsULine(sptr)) - sendto_snomask(SNO_FNICKCHANGE, "*** Notice -- %s (%s@%s) has changed his/her nickname to %s", + sendto_snomask(SNO_FNICKCHANGE, "*** Notice -- %s (%s@%s) has changed their nickname to %s", sptr->name, sptr->user->username, sptr->user->realhost, nick); RunHook3(HOOKTYPE_REMOTE_NICKCHANGE, cptr, sptr, nick); } /* - * Client just changing his/her nick. If he/she is + * Client just changing their nick. If he/she is * on a channel, send note of change to all clients * on that channel. Propagate notice to other servers. */ diff --git a/src/modules/m_svsnick.c b/src/modules/m_svsnick.c index eb99863cb..d0f8edbb7 100644 --- a/src/modules/m_svsnick.c +++ b/src/modules/m_svsnick.c @@ -120,7 +120,7 @@ aClient *ocptr; /* Other client */ hash_check_watch(acptr, RPL_LOGOFF); sendto_snomask(SNO_NICKCHANGE, - "*** Notice -- %s (%s@%s) has been forced to change his/her nickname to %s", + "*** Notice -- %s (%s@%s) has been forced to change their nickname to %s", acptr->name, acptr->user->username, acptr->user->realhost, parv[2]); RunHook2(HOOKTYPE_LOCAL_NICKCHANGE, acptr, parv[2]); diff --git a/src/modules/m_who.c b/src/modules/m_who.c index d65018da5..646bba05a 100644 --- a/src/modules/m_who.c +++ b/src/modules/m_who.c @@ -207,15 +207,15 @@ static void who_sendhelp(aClient *sptr) "Flag a: user is away", "Flag c : user is on ,", " no wildcards accepted", - "Flag h : user has string in his/her hostname,", + "Flag h : user has string in their hostname,", " wildcards accepted", "Flag m : user has set, only", " O/o/C/A/a/N/B are allowed", - "Flag n : user has string in his/her nickname,", + "Flag n : user has string in their nickname,", " wildcards accepted", "Flag s : user is on server ,", " wildcards not accepted", - "Flag u : user has string in his/her username,", + "Flag u : user has string in their username,", " wildcards accepted", "Behavior flags:", "Flag M: check for user in channels I am a member of", @@ -230,18 +230,18 @@ static void who_sendhelp(aClient *sptr) "Flag a: user is away", "Flag c : user is on ,", " no wildcards accepted", - "Flag g : user has string in his/her GCOS,", + "Flag g : user has string in their GCOS,", " wildcards accepted", - "Flag h : user has string in his/her hostname,", + "Flag h : user has string in their hostname,", " wildcards accepted", - "Flag i : user has string in his/her IP address,", + "Flag i : user has string in their IP address,", " wildcards accepted", "Flag m : user has set", - "Flag n : user has string in his/her nickname,", + "Flag n : user has string in their nickname,", " wildcards accepted", "Flag s : user is on server ,", " wildcards not accepted", - "Flag u : user has string in his/her username,", + "Flag u : user has string in their username,", " wildcards accepted", "Behavior flags:", "Flag M: check for user in channels I am a member of",