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

Change subject: Use site.lang instead of site.code ......................................................................

Use site.lang instead of site.code

It can cause bugs when i18n is being used on wikis when code is not the same as language (like test wikis, etc.)

Change-Id: Ic96ac272c95a54a5b42ad2777dce9b32114f7418 --- M pywikibot/i18n.py 1 file changed, 8 insertions(+), 8 deletions(-)

Approvals: XZise: Looks good to me, approved Gerardduenas: Looks good to me, but someone else must approve jenkins-bot: Verified

diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index 1be4248..2da6de8 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -390,9 +390,9 @@ """ family = pywikibot.config.family # If a site is given instead of a code, use its language - if hasattr(code, 'code'): + if hasattr(code, 'lang'): family = code.family.name - code = code.code + code = code.lang

# Check whether xdict has multiple projects if isinstance(xdict, dict): @@ -457,8 +457,8 @@ transdict = _get_messages_bundle(package) code_needed = False # If a site is given instead of a code, use its language - if hasattr(code, 'code'): - lang = code.code + if hasattr(code, 'lang'): + lang = code.lang # check whether we need the language code back elif isinstance(code, list): lang = code.pop() @@ -553,8 +553,8 @@

""" # If a site is given instead of a code, use its language - if hasattr(code, 'code'): - code = code.code + if hasattr(code, 'lang'): + code = code.lang # we send the code via list and get the alternate code back code = [code] trans = twtranslate(code, twtitle) @@ -592,8 +592,8 @@ return False

# If a site is given instead of a code, use its language - if hasattr(code, 'code'): - code = code.code + if hasattr(code, 'lang'): + code = code.lang return code in transdict and twtitle in transdict[code]