From 6703da8fc3b3b1d1ecf6c06410f82d9d9ba8700c Mon Sep 17 00:00:00 2001
From: Al <albarrentine@gmail.com>
Date: Thu, 28 Apr 2016 18:04:29 -0400
Subject: [PATCH] [fix] languages and disambiguation do initialization by
 default

---
 scripts/geodata/i18n/languages.py             |  3 +++
 scripts/geodata/language_id/disambiguation.py | 10 ++--------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/scripts/geodata/i18n/languages.py b/scripts/geodata/i18n/languages.py
index 329b6d73..398ff523 100644
--- a/scripts/geodata/i18n/languages.py
+++ b/scripts/geodata/i18n/languages.py
@@ -59,6 +59,9 @@ def init_languages(languages_dir=LANGUAGES_DIR):
     languages_initialized = True
 
 
+init_languages()
+
+
 def get_country_languages(country, official=True, overrides=True):
     if official:
         languages = official_languages[country]
diff --git a/scripts/geodata/language_id/disambiguation.py b/scripts/geodata/language_id/disambiguation.py
index d988b517..3fec1e93 100644
--- a/scripts/geodata/language_id/disambiguation.py
+++ b/scripts/geodata/language_id/disambiguation.py
@@ -32,16 +32,10 @@ WELL_REPRESENTED_LANGUAGE_COUNTRIES = {
     'pt': set(['pt', 'br']),
 }
 
-char_scripts = []
-script_languages = {}
+char_scripts = get_chars_by_script()
+script_languages = {script: set(langs) for script, langs in get_script_languages().iteritems()}
 
 
-def init_disambiguation():
-    global char_scripts, script_languages
-    char_scripts[:] = []
-    char_scripts.extend(get_chars_by_script())
-    script_languages.update({script: set(langs) for script, langs in get_script_languages().iteritems()})
-
 UNKNOWN_SCRIPT = 'Unknown'
 COMMON_SCRIPT = 'Common'
 MAX_ASCII = 127