Merge branch 'master' into dutch-201503

Conflicts:
	wordfreq/build.py

Former-commit-id: 6cf46ee5aa
This commit is contained in:
Rob Speer 2015-04-29 14:36:24 -04:00
commit 4c44872d15

View File

@ -195,8 +195,10 @@ def load_all_data(source_dir=None, filename=None, do_it_anyway=False):
for lang in multi_wordlist:
logger.info("\tLanguage: %s" % lang)
save_wordlist_to_db(conn, 'multi', lang, multi_wordlist[lang])
# Load Dutch from a separate source. We may end up with more languages like this.
read_wordlist_into_db(conn, wordlist_path('luminoso', 'nl-combined-201503.csv'), 'stems', '*')
logger.info("Done loading.")