From a2b3b784b1c422372c3c93bcc416861230550ca0 Mon Sep 17 00:00:00 2001 From: Ben Kurtovic Date: Tue, 10 Jul 2012 23:46:34 -0400 Subject: [PATCH] Trying an even more complex regular expression for {{x of}} templates. --- earwigbot/commands/dictionary.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/earwigbot/commands/dictionary.py b/earwigbot/commands/dictionary.py index f230eea..4957384 100644 --- a/earwigbot/commands/dictionary.py +++ b/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 = []