Merge pull request #117 from benoit-pierre/fix-suffix-folding

Fix suffix folding

Author: balshetzer

plover/test_translation.py

@@ -178,9 +178,9 @@ def listener(undo, do, prev):
 
         t.add_listener(listener)
 
-        expected = [([Translation([stroke('S')], dc)], 
-                     [Translation([stroke('S'), stroke('P')], dc)], 
-                     Translation([stroke('T')], dc))]
+        expected = [([Translation([stroke('S')], None)], 
+                     [Translation([stroke('S'), stroke('P')], 'hi')], 
+                     Translation([stroke('T')], None))]
         t.translate(stroke('P'))
         self.assertEqual(output, expected)
 
@@ -192,15 +192,15 @@ def listener(undo, do, prev):
         del output[:]
         t.clear_state()
         t.translate(stroke('P'))
-        self.assertEqual(output, [([], [Translation([stroke('P')], dc)], None)])
+        self.assertEqual(output, [([], [Translation([stroke('P')], None)], None)])
 
         del output[:]
         t.set_state(s)
         t.translate(stroke('P'))
         self.assertEqual(output, 
                          [([], 
-                           [Translation([stroke('P')], dc)], 
-                           Translation([stroke('S'), stroke('P')], dc))])
+                           [Translation([stroke('P')], None)], 
+                           Translation([stroke('S'), stroke('P')], 'hi'))])
 
     def test_translator(self):
 
@@ -335,10 +335,9 @@ def clear(self):
 class StateTestCase(unittest.TestCase):
 
     def setUp(self):
-        d = StenoDictionaryCollection()
-        self.a = Translation([stroke('S')], d)
-        self.b = Translation([stroke('T'), stroke('-D')], d)
-        self.c = Translation([stroke('-Z'), stroke('P'), stroke('T*')], d)
+        self.a = Translation([stroke('S')], None)
+        self.b = Translation([stroke('T'), stroke('-D')], None)
+        self.c = Translation([stroke('-Z'), stroke('P'), stroke('T*')], None)
 
     def test_last_list0(self):
         s = _State()

plover/translation.py

@@ -62,7 +62,7 @@ def __init__(self, outline, translation):
         self.formatting = None
 
     def __eq__(self, other):
-        return self.rtfcre == other.rtfcre
+        return self.rtfcre == other.rtfcre and self.english == other.english
 
     def __ne__(self, other):
         return not self.__eq__(other)
@@ -290,7 +290,7 @@ def _find_translation(translations, dictionary, stroke):
     t = _find_translation_helper(translations, dictionary, stroke, SUFFIX_KEYS)
     if t:
         return t
-    return Translation([stroke], _lookup([stroke], dictionary, []))
+    return Translation([stroke], _lookup([stroke], dictionary, SUFFIX_KEYS))
 
 def _find_translation_helper(translations, dictionary, stroke, suffixes):
     # The new stroke can either create a new translation or replace