Add the last of the apostrophe-related fixes. Words that end in "x"

will now get proper "'s" endings; simple_monster_message() and 
simple_god_message() will now replace all "s's" with "'s" (there's no 
need to worry about the "its" rule here, since invisible monsters are 
excluded from the former, and no gods are named "It" or are invisible 
with regard to the latter); and the tutorial will now generically 
apostrophize the one god name it has (since doing the aforementioned 
replacement would take too long on the tutorial text).  The high score 
message still appends "'s" unconditionally to user names, but they may 
not be English, so that seems okay to me.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8281 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 1 insertions, 4 deletions

diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 65485c4b76..a24afa354b 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -8269,10 +8269,7 @@ std::string do_mon_str_replacements(const std::string &in_msg,
     else
         msg = replace_all(msg, "@says@", sound_list[s_type]);
 
-    // The proper possessive for a word ending in an "s" is to
-    // put an apostrophe after the "s": "Chris" -> "Chris'",
-    // not "Chris" -> "Chris's".  Stupid English language...
-    msg = replace_all(msg, "s's", "s'");
+    msg = apostrophise_fixup(msg);
 
     return (msg);
 }