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

Change subject: [bugfix] Fallback to default if mw message 
'disambiguationspage' doesn't exists
......................................................................


[bugfix] Fallback to default if mw message 'disambiguationspage' doesn't exists

Conflicts:
    pywikibot/page.py

Bug: T100928
Change-Id: Icbb97b092fcd23d09766a8e91eeccbfeeaa926d7
---
M pywikibot/page.py
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Merlijn van Deen: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/pywikibot/page.py b/pywikibot/page.py
index 2bf4bd7..3f4f1be 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -795,12 +795,14 @@
                         for index in regex.findall(content):
                             indexes.add(first_upper(index))
                         self.site._indextemplates = indexes
-                else:
+                elif self.site.has_mediawiki_message('disambiguationspage'):
                     message = self.site.mediawiki_message(
                         'disambiguationspage').split(':', 1)[1]
                     # add the default template(s) for default mw message
                     # only
                     disambigs = set([first_upper(message)]) | default
+                else:
+                    disambigs = default
                 self.site._disambigtemplates = disambigs
             else:
                 # Normalize template capitalization

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icbb97b092fcd23d09766a8e91eeccbfeeaa926d7
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: 2.0
Gerrit-Owner: Merlijn van Deen <valhall...@arctus.nl>
Gerrit-Reviewer: John Vandenberg <jay...@gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgr...@gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhall...@arctus.nl>
Gerrit-Reviewer: XZise <commodorefabia...@gmx.de>
Gerrit-Reviewer: Xqt <i...@gno.de>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to