Fixes, 1.0.2

This commit is contained in:
Ryan McGrath 2012-04-11 08:22:04 -04:00
parent c90ccd79a6
commit df94686813
4 changed files with 16 additions and 16 deletions

View file

@ -2,7 +2,7 @@
#!/usr/bin/python #!/usr/bin/python
__author__ = "Ryan McGrath <ryan@venodesigns.net>" __author__ = "Ryan McGrath <ryan@venodesigns.net>"
__version__ = "1.0.1" __version__ = "1.0.2"
""" """
A class that allows for easy transliteration of [Hirag/Katak]ana A class that allows for easy transliteration of [Hirag/Katak]ana
@ -62,8 +62,8 @@ class JapaneseTransliterator(object):
the class instance. the class instance.
""" """
text = self.transliterate_from_kana_to_hira(text) text = self.transliterate_from_kana_to_hira(text)
return self.transliterate_from_hira_to_latn(text) return self.transliterate_from_hira_to_latn(text.encode('utf-8'))
@defaultToSelfText @defaultToSelfText
def transliterate_from_hira_to_latn(self, text): def transliterate_from_hira_to_latn(self, text):
"""transliterate_from_hira_to_latn(self, text) """transliterate_from_hira_to_latn(self, text)
@ -115,7 +115,7 @@ class JapaneseTransliterator(object):
romaji += for_conversion romaji += for_conversion
index += length index += length
klength -= length klength -= length
return romaji return romaji
@defaultToSelfText @defaultToSelfText
@ -129,7 +129,7 @@ class JapaneseTransliterator(object):
the class instance. the class instance.
""" """
# Duplicate the text... # Duplicate the text...
romaji = text * 1 romaji = (text * 1).decode('utf-8')
kana = '' kana = ''
romaji = re.sub('/m([BbPp])/', 'n\1', romaji) romaji = re.sub('/m([BbPp])/', 'n\1', romaji)

View file

@ -13,18 +13,18 @@ print b.transliterate_from_hira_to_latn()
# Should print "kanazawa" # Should print "kanazawa"
# Transliterate from either Hiragana or Katakana to Latin/English # Transliterate from either Hiragana or Katakana to Latin/English
print b.transliterate_from_hrkt_to_latn(text = 'カナザワ') print b.transliterate_from_hrkt_to_latn(text = u'(ストロベリー)')
# Should print "kanazawa" # Should print "kanazawa"
# Transliterate from Katakan to Hiragana (You... probably never need to do this) # Transliterate from Katakan to Hiragana (You... probably never need to do this)
print b.transliterate_from_kana_to_hira(text = 'キットカート') #print b.transliterate_from_kana_to_hira(text = 'キットカート')
# Should print "きっとかーと" # Should print "きっとかーと"
# Transliterate from Hiragana to Katakana # Transliterate from Hiragana to Katakana
print b.transliterate_from_hira_to_kana(text = 'かなざわ') #print b.transliterate_from_hira_to_kana(text = 'かなざわ')
# Should print "カナザワ" # Should print "カナザワ"
# If you want to convert between half/full width kana, you can use the following # If you want to convert between half/full width kana, you can use the following
# functions. I didn't care enough to do demos here. ;| # functions. I didn't care enough to do demos here. ;|
b.transliterate_from_halfwidth_to_fullwidth() #b.transliterate_from_halfwidth_to_fullwidth()
b.transliterate_from_fullwidth_to_halfwidth() #b.transliterate_from_fullwidth_to_halfwidth()

View file

@ -22,25 +22,25 @@ Examples && Documentation
from jTransliterate import JapaneseTransliterator from jTransliterate import JapaneseTransliterator
# Transliterate from Latin/English to [Hirag/Katak]ana # Transliterate from Latin/English to [Hirag/Katak]ana
x = JapaneseTransliterator('kanazawa') x = JapaneseTransliterator(u'kanazawa')
print x.transliterate_from_latn_to_hrkt() print x.transliterate_from_latn_to_hrkt()
# Should print "かなざわ" # Should print "かなざわ"
# Transliterate from Hiragana to Latin/English # Transliterate from Hiragana to Latin/English
b = JapaneseTransliterator('かなざわ') b = JapaneseTransliterator(u'かなざわ')
print b.transliterate_from_hira_to_latn() print b.transliterate_from_hira_to_latn()
# Should print "kanazawa" # Should print "kanazawa"
# Transliterate from either Hiragana or Katakana to Latin/English # Transliterate from either Hiragana or Katakana to Latin/English
print b.transliterate_from_hrkt_to_latn(text = 'カナザワ') print b.transliterate_from_hrkt_to_latn(text = u'カナザワ')
# Should print "kanazawa" # Should print "kanazawa"
# Transliterate from Katakan to Hiragana (You... probably never need to do this) # Transliterate from Katakan to Hiragana (You... probably never need to do this)
print b.transliterate_from_kana_to_hira(text = 'キットカート') print b.transliterate_from_kana_to_hira(text = u'キットカート')
# Should print "きっとかーと" # Should print "きっとかーと"
# Transliterate from Hiragana to Katakana # Transliterate from Hiragana to Katakana
print b.transliterate_from_hira_to_kana(text = 'かなざわ') print b.transliterate_from_hira_to_kana(text = u'かなざわ')
# Should print "カナザワ" # Should print "カナザワ"
# If you want to convert between half/full width kana, you can use the following # If you want to convert between half/full width kana, you can use the following

View file

@ -4,7 +4,7 @@ from setuptools import setup
from setuptools import find_packages from setuptools import find_packages
__author__ = 'Ryan McGrath <ryan@venodesigns.net>' __author__ = 'Ryan McGrath <ryan@venodesigns.net>'
__version__ = '1.0.1' __version__ = '1.0.2'
setup( setup(
# Basic package information. # Basic package information.