Merge branch 'master' of github.com:embolalia/willie

maxpowa · Feb 19, 2013 · 401a7f5 · 401a7f5
2 parents d418f18 + b68569d
commit 401a7f5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/wikipedia.py b/wikipedia.py
@@ -175,7 +175,7 @@ def wik(willie, trigger):
         willie.say(result)
     else: willie.say('Can\'t find anything in Wikipedia for "%s".' % origterm)
 
-wik.commands = ['wiki', 'wik']
+wik.commands = ['wiki', 'wik', 'w']
 wik.priority = 'high'
 
 if __name__ == '__main__':

diff --git a/wiktionary.py b/wiktionary.py
@@ -70,7 +70,7 @@ def format(word, definitions, number=2):
             result += ', '.join(n)
     return result.strip(' .,')
 
-def w(willie, trigger):
+def wiktionary(willie, trigger):
     """Look up a word on Wiktionary."""
     word = trigger.group(2)
     if word is None:
@@ -91,8 +91,8 @@ def w(willie, trigger):
     if len(result) > 300:
         result = result[:295] + '[...]'
     willie.say(result)
-w.commands = ['w']
-w.example = '.w bailiwick'
+wiktionary.commands = ['wt', 'define', 'dict']
+wiktionary.example = '.wt bailiwick'
 
 if __name__ == '__main__':
     print __doc__.strip()