jenkins-bot has submitted this change and it was merged.

Change subject: config: userinterface_lang fallback to 'en'
......................................................................


config: userinterface_lang fallback to 'en'

getdefaultlocale()[0] can be:
* None when it cannot be determined.
* 'C' when the env variables are set so for portability.

Neither of them are languages, thus falling back to 'en'.

Bug: T129406
Change-Id: If3d81738c168be84050ac5ecb17fb6709e2f90ef
---
M pywikibot/config2.py
1 file changed, 5 insertions(+), 1 deletion(-)

Approvals:
  John Vandenberg: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/pywikibot/config2.py b/pywikibot/config2.py
index 0491846..a1aa14f 100644
--- a/pywikibot/config2.py
+++ b/pywikibot/config2.py
@@ -1087,7 +1087,11 @@
             'path delimiter.')
 
 if userinterface_lang is None:
-    userinterface_lang = getdefaultlocale()[0].split('_')[0]
+    userinterface_lang = getdefaultlocale()[0]
+    if userinterface_lang in [None, 'C']:
+        userinterface_lang = 'en'
+    else:
+        userinterface_lang = userinterface_lang.split('_')[0]
 
 # Fix up default site
 if family == 'wikipedia' and mylang == 'language':

-- 
To view, visit https://gerrit.wikimedia.org/r/276713
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If3d81738c168be84050ac5ecb17fb6709e2f90ef
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Zhuyifei1999 <[email protected]>
Gerrit-Reviewer: John Vandenberg <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: Zhuyifei1999 <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to