Merge remote-tracking branch 'remotes/origin/ghl' into test

Controller/UserController.py

@@ -1800,7 +1800,7 @@ class v2LoginView(TemplateView):
             data={'userID': userID, 'lang': response.lang, 'user': users['username'], 'm_code': '123413243214'})
         if tko.code == 0:
             now_time = datetime.datetime.utcnow().replace(tzinfo=utc).astimezone(utc)
-            if not number:
+            if not number or number == '0':
                 user_qs.update(last_login=now_time, language=response.lang)
             else:
                 user_qs.update(last_login=now_time, language=response.lang, region_country=number)
@@ -2045,7 +2045,7 @@ class v3LoginView(TemplateView):
                                            push_type=push_type, token_val=token_val, m_code=m_code, lang=lang, tz=tz)
 
         now_time = datetime.datetime.utcnow().replace(tzinfo=utc).astimezone(utc)
-        if not number:
+        if not number or number == '0':
             user_qs.update(last_login=now_time, language=response.lang)
         else:
             user_qs.update(last_login=now_time, language=response.lang, region_country=number)