Skip to content

Commit

Permalink
Merge branch 'master' of github.com:embolalia/willie
Browse files Browse the repository at this point in the history
embolalia committed Feb 19, 2013
2 parents d418f18 + b68569d commit 401a7f5
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion wikipedia.py
Original file line number Diff line number Diff line change
@@ -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__':
6 changes: 3 additions & 3 deletions wiktionary.py
Original file line number Diff line number Diff line change
@@ -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()

0 comments on commit 401a7f5

Please sign in to comment.