diff --git a/build_dict.sh b/build_dict.sh index f24b19c..0c668e2 100755 --- a/build_dict.sh +++ b/build_dict.sh @@ -3,7 +3,7 @@ KANJIDIC=util/data/kanjidic KRADFILE=util/data/kradfile EDICT=util/data/edict -DICT=yomi_base/japanese/data/dictionary.db +DICT=yomi_base/japanese/dictionary.db rm $DICT util/compile.py --kanjidic $KANJIDIC --kradfile $KRADFILE --edict $EDICT $DICT diff --git a/yomi_base/japanese/data/.gitattributes b/yomi_base/japanese/.gitattributes similarity index 100% rename from yomi_base/japanese/data/.gitattributes rename to yomi_base/japanese/.gitattributes diff --git a/yomi_base/japanese/__init__.py b/yomi_base/japanese/__init__.py index cd8a6b4..30edf38 100644 --- a/yomi_base/japanese/__init__.py +++ b/yomi_base/japanese/__init__.py @@ -22,13 +22,8 @@ import os.path import translate -def buildRelPath(path): - directory = os.path.split(__file__)[0] - return os.path.join(directory, path) - - def initLanguage(): return translate.Translator( - deinflect.Deinflector(buildRelPath('data/deinflect.json')), - dictionary.Dictionary(buildRelPath('data/dictionary.db')) + deinflect.Deinflector('data/deinflect.json'), + dictionary.Dictionary('data/dictionary.db') ) diff --git a/yomi_base/japanese/data/deinflect.json b/yomi_base/japanese/deinflect.json similarity index 100% rename from yomi_base/japanese/data/deinflect.json rename to yomi_base/japanese/deinflect.json diff --git a/yomi_base/japanese/data/dictionary.db b/yomi_base/japanese/dictionary.db similarity index 100% rename from yomi_base/japanese/data/dictionary.db rename to yomi_base/japanese/dictionary.db