Overrideable messages

[naja.git] / naja / actions.py

diff --git a/naja/actions.py b/naja/actions.py
index c7717ea9062197a618172b59b9a4da6c88a3eda4..c96a219a6ec28e9382d0abc81c88d8736f7498b1 100644 (file)
--- a/naja/actions.py
+++ b/naja/actions.py
@@ -41,12 +41,16 @@ class LocationAction(object):
                 substitutions['rot_direction'],)
 
         if location is None:
-            substitutions['location_bits'] = 'bits specified by this location'
+            substitutions['location_bits'] = 'bits specified by this tile'
         else:
             substitutions['location_bits'] = bit_glyphs(
                 location.bitwise_operand)
 
-        return self.TEXT % substitutions
+        text = self.TEXT
+        if self.data.get('message', None) is not None:
+            text = self.data['message']
+
+        return text % substitutions
 
     def check_available(self, player):
         return player.bits.check_bits(self.required_bits)
@@ -169,7 +173,7 @@ class ShiftLocations(LocationAction):
 
 
 class RotateLocations(LocationAction):
-    TEXT = "Rotate adjacent locations %(rot_direction_name)s."
+    TEXT = "Rotate adjacent tiles %(rot_direction_name)s."
     GLYPHS = (ACTION_GLYPHS.CHANGE_BOARD,)
 
     def perform_action(self, board, location):