From 7dfbcce9ec4ea86024f187b241927e591df4935d Mon Sep 17 00:00:00 2001 From: Al Date: Wed, 30 Sep 2015 04:09:07 -0400 Subject: [PATCH] [languages] options for get_country_languages --- scripts/geodata/i18n/languages.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/scripts/geodata/i18n/languages.py b/scripts/geodata/i18n/languages.py index 2568957b..d5000144 100644 --- a/scripts/geodata/i18n/languages.py +++ b/scripts/geodata/i18n/languages.py @@ -59,13 +59,18 @@ def init_languages(languages_dir=LANGUAGES_DIR): initialized = True -def get_country_languages(country): - languages = official_languages[country] - overrides = road_language_overrides.get(country) - if overrides and overrides.values()[0]: - languages = overrides - elif overrides: - languages.update(overrides) +def get_country_languages(country, official=True, overrides=True): + if official: + languages = official_languages[country] + else: + languages = country_languages[country] + + if overrides: + road_overrides = road_language_overrides.get(country) + if road_overrides and road_overrides.values()[0]: + languages = road_overrides + elif road_overrides: + languages.update(road_overrides) return languages