Some slight adjustments brought about by investigating Bug #1002363

This commit is contained in:
James Vega 2004-08-12 14:15:27 +00:00
parent a1a703df32
commit 25858a7c00
2 changed files with 11 additions and 9 deletions

View File

@ -151,7 +151,9 @@ def babelize(phrase, from_language, through_language, limit = 12, callback = Non
else: else:
results.append(phrase) results.append(phrase)
next = flip[next] next = flip[next]
if next != from_language: # next is set to the language of the last entry. this should be the same
# as the language we are translating to
if next != through_language:
phrase = translate(phrase, next, flip[next]) phrase = translate(phrase, next, flip[next])
results.append(phrase) results.append(phrase)
if not callback: if not callback:

View File

@ -151,7 +151,7 @@ class Babelfish(callbacks.Privmsg):
And='or')) And='or'))
return return
translations = babelfish.babelize(text, fromLang, toLang) translations = babelfish.babelize(text, fromLang, toLang)
irc.reply(translations[-1]) irc.reply(utils.htmlToText(translations[-1]))
except (KeyError, babelfish.LanguageNotAvailableError), e: except (KeyError, babelfish.LanguageNotAvailableError), e:
irc.reply('%s is not a valid language. Valid languages ' irc.reply('%s is not a valid language. Valid languages '
'include %s.' % (e, 'include %s.' % (e,