Trying an even more complex regular expression for {{x of}} templates.

earwigbot/commands/dictionary.py

@@ -131,10 +131,10 @@ class Dictionary(Command):
             ("<!--(.*?)-->", ""),
             ("\[\[[^\]|]*?\|([^\]|]*?)\]\]", r"\1"),
             ("\{\{unsupported\|(.*?)\}\}", r"\1"),
-            ("\{\{(.*?) of\|(.*?)(\||\}\})", r"\1 of \2."),
+            ("\{\{(.*?) of\|([^}|]*?)\||(?:\}\})", r"\1 of \2."),
             ("\{\{w\|(.*?)\}\}", r"\1"),
             ("\{\{surname(.*?)\}\}", r"A surname."),
-            ("\{\{given name\|(.*?)(\||\}\})", r"A \1 given name."),
+            ("\{\{given name\|([^}|]*?)\||(?:\}\})", r"A \1 given name."),
         ]
 
         senses = []