From 7ce05370a4bfbff80ac4fd73061539a9d9094624 Mon Sep 17 00:00:00 2001 From: columbarius Date: Fri, 7 Aug 2020 17:00:03 +0200 Subject: [PATCH 1/3] Add filter for languages with full ll_CC description --- tldr.py | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/tldr.py b/tldr.py index bccf57b..2310f81 100755 --- a/tldr.py +++ b/tldr.py @@ -30,10 +30,20 @@ 'https://tldr-pages.github.io/assets/tldr.zip' ) -DEFAULT_LANG = os.environ.get( - 'LANG', - 'C' -).split('_')[0] + +def filter_languages(lang): + if lang in ['pt_PT', 'pt_BR', 'zh_TW']: + return lang + elif lang == "pt": + return "pt_PT" + return lang.split('_')[0] + + +DEFAULT_LANG = filter_languages( + os.environ.get( + 'LANG', + 'C' + ).split('.')[0]) if DEFAULT_LANG == 'C' or DEFAULT_LANG == 'POSIX': DEFAULT_LANG = None @@ -162,9 +172,11 @@ def get_platform_list(): def get_language_list(): languages = os.environ.get('LANGUAGE', '').split(':') languages = list(map( - lambda x: x.split('_')[0], - filter(lambda x: not (x == 'C' or x == 'POSIX' or x == ''), languages) - )) + filter_languages, + map( + lambda x: x.split('.')[0], + filter(lambda x: not (x == 'C' or x == 'POSIX' or x == ''), languages) + ))) if DEFAULT_LANG is not None: if DEFAULT_LANG not in languages: languages.append(DEFAULT_LANG) From b50f7f4485f212179c70ebdd630eb2c6d47c6f64 Mon Sep 17 00:00:00 2001 From: columbarius Date: Fri, 14 Aug 2020 09:41:06 +0200 Subject: [PATCH 2/3] Rename filter_language to get_language_code and include all language manipulation --- tldr.py | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/tldr.py b/tldr.py index 2310f81..43f8317 100755 --- a/tldr.py +++ b/tldr.py @@ -31,19 +31,20 @@ ) -def filter_languages(lang): - if lang in ['pt_PT', 'pt_BR', 'zh_TW']: - return lang - elif lang == "pt": +def get_language_code(language): + language = language.split('.')[0] + if language in ['pt_PT', 'pt_BR', 'zh_TW']: + return language + elif language == "pt": return "pt_PT" - return lang.split('_')[0] + return language.split('_')[0] -DEFAULT_LANG = filter_languages( +DEFAULT_LANG = get_language_code( os.environ.get( 'LANG', 'C' - ).split('.')[0]) + )) if DEFAULT_LANG == 'C' or DEFAULT_LANG == 'POSIX': DEFAULT_LANG = None @@ -172,11 +173,9 @@ def get_platform_list(): def get_language_list(): languages = os.environ.get('LANGUAGE', '').split(':') languages = list(map( - filter_languages, - map( - lambda x: x.split('.')[0], - filter(lambda x: not (x == 'C' or x == 'POSIX' or x == ''), languages) - ))) + get_language_code, + filter(lambda x: not (x == 'C' or x == 'POSIX' or x == ''), languages) + )) if DEFAULT_LANG is not None: if DEFAULT_LANG not in languages: languages.append(DEFAULT_LANG) From b526ebe77be6dec832320aa0227f6c60d2fabbe8 Mon Sep 17 00:00:00 2001 From: columbarius Date: Fri, 14 Aug 2020 09:46:02 +0200 Subject: [PATCH 3/3] Fix indentation --- tldr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tldr.py b/tldr.py index 43f8317..0d05351 100755 --- a/tldr.py +++ b/tldr.py @@ -175,7 +175,7 @@ def get_language_list(): languages = list(map( get_language_code, filter(lambda x: not (x == 'C' or x == 'POSIX' or x == ''), languages) - )) + )) if DEFAULT_LANG is not None: if DEFAULT_LANG not in languages: languages.append(DEFAULT_LANG)