jenkins-bot has submitted this change and it was merged.
Change subject: Revert "set default userinterface_lang in config"
......................................................................
Revert "set default userinterface_lang in config"
https://travis-ci.org/wikimedia/pywikibot-core/jobs/58265112
This reverts commit d4f4a3cfc04af148fb9db2af73cb27774c96e219.
Change-Id: I6d52c6d1d613063c1b369d8f5a905b830cc03509
---
M pywikibot/config2.py
M pywikibot/i18n.py
2 files changed, 6 insertions(+), 7 deletions(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/config2.py b/pywikibot/config2.py
index 60e6740..dbb1c28 100644
--- a/pywikibot/config2.py
+++ b/pywikibot/config2.py
@@ -29,7 +29,6 @@
import stat
import sys
-from locale import getdefaultlocale
from warnings import warn
from pywikibot.tools import default_encoding
@@ -909,9 +908,6 @@
# Fix up default console_encoding
console_encoding = default_encoding(console_encoding)
-
-if userinterface_lang is None:
- userinterface_lang = getdefaultlocale()[0].split('_')[0]
# Fix up transliteration_target
if transliteration_target == 'not set':
diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py
index 4d19b4f..2fff519 100644
--- a/pywikibot/i18n.py
+++ b/pywikibot/i18n.py
@@ -28,6 +28,7 @@
import sys
import re
+import locale
import warnings
from pywikibot import Error
@@ -616,8 +617,9 @@
"""
Ask the user a question, return the user's answer.
- The prompt message is retrieved via L{twtranslate} and uses the
- config variable 'userinterface_lang'.
+ The prompt message is retrieved via L{twtranslate} and either uses the
+ config variable 'userinterface_lang' or the default locale as the language
+ code.
@param twtitle: The TranslateWiki string title, in <package>-<key>
format
@param parameters: The values which will be applied to the translated text
@@ -633,7 +635,8 @@
else:
prompt = fallback_prompt
else:
- code = config.userinterface_lang
+ code = config.userinterface_lang or \
+ locale.getdefaultlocale()[0].split('_')[0]
prompt = twtranslate(code, twtitle, parameters)
return pywikibot.input(prompt, password)
--
To view, visit
https://gerrit.wikimedia.org/r/203834
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6d52c6d1d613063c1b369d8f5a905b830cc03509
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Siebrand <siebrand(a)kitano.nl>
Gerrit-Reviewer: jenkins-bot <>