diff --git a/jTransliterate/__init__.py b/jTransliterate/__init__.py index 1cdbe01..aa56428 100644 --- a/jTransliterate/__init__.py +++ b/jTransliterate/__init__.py @@ -2,7 +2,7 @@ #!/usr/bin/python __author__ = "Ryan McGrath " -__version__ = "1.0.1" +__version__ = "1.0.2" """ A class that allows for easy transliteration of [Hirag/Katak]ana @@ -62,8 +62,8 @@ class JapaneseTransliterator(object): the class instance. """ 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 def transliterate_from_hira_to_latn(self, text): """transliterate_from_hira_to_latn(self, text) @@ -115,7 +115,7 @@ class JapaneseTransliterator(object): romaji += for_conversion index += length klength -= length - + return romaji @defaultToSelfText @@ -129,7 +129,7 @@ class JapaneseTransliterator(object): the class instance. """ # Duplicate the text... - romaji = text * 1 + romaji = (text * 1).decode('utf-8') kana = '' romaji = re.sub('/m([BbPp])/', 'n\1', romaji) diff --git a/jTransliterate/test.py b/jTransliterate/test.py index 79b710c..8e63613 100644 --- a/jTransliterate/test.py +++ b/jTransliterate/test.py @@ -13,18 +13,18 @@ print b.transliterate_from_hira_to_latn() # Should print "kanazawa" # 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" # 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 "きっとかーと" # Transliterate from Hiragana to Katakana -print b.transliterate_from_hira_to_kana(text = 'かなざわ') +#print b.transliterate_from_hira_to_kana(text = 'かなざわ') # Should print "カナザワ" # 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. ;| -b.transliterate_from_halfwidth_to_fullwidth() -b.transliterate_from_fullwidth_to_halfwidth() +#b.transliterate_from_halfwidth_to_fullwidth() +#b.transliterate_from_fullwidth_to_halfwidth() diff --git a/readme.md b/readme.md index 3e78247..2ee9e84 100644 --- a/readme.md +++ b/readme.md @@ -22,25 +22,25 @@ Examples && Documentation from jTransliterate import JapaneseTransliterator # Transliterate from Latin/English to [Hirag/Katak]ana -x = JapaneseTransliterator('kanazawa') +x = JapaneseTransliterator(u'kanazawa') print x.transliterate_from_latn_to_hrkt() # Should print "かなざわ" # Transliterate from Hiragana to Latin/English -b = JapaneseTransliterator('かなざわ') +b = JapaneseTransliterator(u'かなざわ') print b.transliterate_from_hira_to_latn() # Should print "kanazawa" # 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" # 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 "きっとかーと" # Transliterate from Hiragana to Katakana -print b.transliterate_from_hira_to_kana(text = 'かなざわ') +print b.transliterate_from_hira_to_kana(text = u'かなざわ') # Should print "カナザワ" # If you want to convert between half/full width kana, you can use the following diff --git a/setup.py b/setup.py index d9ec980..7cfddc9 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import setup from setuptools import find_packages __author__ = 'Ryan McGrath ' -__version__ = '1.0.1' +__version__ = '1.0.2' setup( # Basic package information.