From c019c011393cd9aa7ae1dbb9ad067e229bff2988 Mon Sep 17 00:00:00 2001
From: Ben Busby <33362396+benbusby@users.noreply.github.com>
Date: Mon, 11 May 2020 18:48:12 -0600
Subject: [PATCH] Added more language support

Interface language is now updated using the "hl" arg

Fixed chinese traditional and simplified values

Updated decoding of characters to gb2312
---
 app/models/config.py | 4 ++--
 app/request.py       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/models/config.py b/app/models/config.py
index 8734c8a..ee3c4ac 100644
--- a/app/models/config.py
+++ b/app/models/config.py
@@ -10,8 +10,8 @@ class Config:
         {'name': 'Belarusian', 'value': 'lang_be'},
         {'name': 'Bulgarian', 'value': 'lang_bg'},
         {'name': 'Catalan', 'value': 'lang_ca'},
-        {'name': 'Chinese (Simplified)', 'value': 'lang_zh - CN'},
-        {'name': 'Chinese (Traditional)', 'value': 'lang_zh - TW'},
+        {'name': 'Chinese (Simplified)', 'value': 'lang_zh-CN'},
+        {'name': 'Chinese (Traditional)', 'value': 'lang_zh-TW'},
         {'name': 'Croatian', 'value': 'lang_hr'},
         {'name': 'Czech', 'value': 'lang_cs'},
         {'name': 'Danish', 'value': 'lang_da'},
diff --git a/app/request.py b/app/request.py
index e8914b8..3a23d97 100644
--- a/app/request.py
+++ b/app/request.py
@@ -49,8 +49,8 @@ def gen_query(query, args, near_city=None, language='lang_en'):
     if near_city is not None:
         param_dict['near'] = '&near=' + urlparse.quote(near_city)
 
-    # Set language
-    param_dict['lr'] = '&lr=' + language
+    # Set language for results (lr) and interface (hl)
+    param_dict['lr'] = '&lr=' + language + '&hl=' + language.replace('lang_', '')
 
     for val in param_dict.values():
         if not val or val is None:
@@ -83,4 +83,4 @@ class Request:
         if return_bytes:
             return b_obj.getvalue()
         else:
-            return b_obj.getvalue().decode('unicode-escape', 'ignore')
+            return b_obj.getvalue().decode('gb2312', 'ignore')