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, 3 insertions, 2 deletions

diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc
index 47bd310ab4..691dc8296f 100644
--- a/crawl-ref/source/tutorial.cc
+++ b/crawl-ref/source/tutorial.cc
@@ -28,6 +28,7 @@ REVISION("$Rev$");
 #include "itemname.h"
 #include "itemprop.h"
 #include "items.h"
+#include "Kills.h"
 #include "menu.h"
 #include "message.h"
 #include "misc.h"
@@ -2418,8 +2419,8 @@ void learned_something_new(tutorial_event_type seen_what, coord_def gc)
             && you.hunger_state >= HS_SATIATED)
         {
             text << "\nAlso, with "
-                 << god_name(you.religion)
-                 << "'s support you can use your Berserk ability (<w>a</w>) "
+                 << apostrophise(god_name(you.religion))
+                 << " support you can use your Berserk ability (<w>a</w>) "
                     "to temporarily gain more hitpoints and greater "
                     "strength. ";
         }