jenkins-bot has submitted this change and it was merged.
Change subject: [BUGFIX] change Site.lang to Site.code
......................................................................
[BUGFIX] change Site.lang to Site.code
The i18n files use WMF language codes instead of ISO 639 language
codes. This means we also have to use these in our translations.
e.g. site code of the Alemannic wikipedia is 'als' whereas the
language code is 'gsw'. The i18n files use 'als', while we now
try to lookup 'gsw', which does not exist.
Change-Id: I3bd186c06ef3b0506411f944f36f1b999fb35dfe
---
M pywikibot/i18n.py
1 file changed, 8 insertions(+), 8 deletions(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py
index bb2b26d..40835c0 100644
--- a/pywikibot/i18n.py
+++ b/pywikibot/i18n.py
@@ -259,9 +259,9 @@
family = pywikibot.config.family
# If a site is given instead of a code, use its language
- if hasattr(code, 'lang'):
+ if hasattr(code, 'code'):
family = code.family.name
- code = code.lang
+ code = code.code
# Check whether xdict has multiple projects
if type(xdict) == dict:
@@ -336,8 +336,8 @@
code_needed = False
# If a site is given instead of a code, use its language
- if hasattr(code, 'lang'):
- lang = code.lang
+ if hasattr(code, 'code'):
+ lang = code.code
# check whether we need the language code back
elif type(code) == list:
lang = code.pop()
@@ -432,8 +432,8 @@
if type(parameters) == dict:
param = parameters
# If a site is given instead of a code, use its language
- if hasattr(code, 'lang'):
- code = code.lang
+ if hasattr(code, 'code'):
+ code = code.code
# we send the code via list and get the alternate code back
code = [code]
trans = twtranslate(code, twtitle, None)
@@ -484,8 +484,8 @@
package = twtitle.split("-")[0]
transdict = getattr(__import__("i18n", fromlist=[package]), package).msg
# If a site is given instead of a code, use its language
- if hasattr(code, 'lang'):
- code = code.lang
+ if hasattr(code, 'code'):
+ code = code.code
return code in transdict and twtitle in transdict[code]
--
To view, visit
https://gerrit.wikimedia.org/r/104800
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3bd186c06ef3b0506411f944f36f1b999fb35dfe
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Russell Blau <russblau(a)imapmail.org>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot