[MediaWiki-commits] [Gerrit] [bugfix] Fallback to default if mw message 'disambiguationsp... - change (pywikibot/core)

2015-07-09 Thread jenkins-bot (Code Review) 
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 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: XZise 
Gerrit-Reviewer: Xqt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [bugfix] Fallback to default if mw message 'disambiguationsp... - change (pywikibot/core)

2015-07-09 Thread Merlijn van Deen (Code Review) 
Merlijn van Deen has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223879

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(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/79/223879/1

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: newchange
Gerrit-Change-Id: Icbb97b092fcd23d09766a8e91eeccbfeeaa926d7
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: 2.0
Gerrit-Owner: Merlijn van Deen 
Gerrit-Reviewer: Xqt 

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

[MediaWiki-commits] [Gerrit] [bugfix] Fallback to default if mw message 'disambiguationsp... - change (pywikibot/core)

2015-07-05 Thread jenkins-bot (Code Review) 
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

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

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



diff --git a/pywikibot/page.py b/pywikibot/page.py
index 392f385..25d2779 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -807,12 +807,14 @@
 disambigs = set(link.title(withNamespace=False)
 for link in disambigpages.linkedPages()
 if link.namespace() == 10)
-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/222881
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icbb97b092fcd23d09766a8e91eeccbfeeaa926d7
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [bugfix] Fallback to default if mw message 'disambiguationsp... - change (pywikibot/core)

2015-07-05 Thread Xqt (Code Review) 
Xqt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/222881

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

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

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


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/81/222881/1

diff --git a/pywikibot/page.py b/pywikibot/page.py
index 392f385..d265ceb 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -807,12 +807,13 @@
 disambigs = set(link.title(withNamespace=False)
 for link in disambigpages.linkedPages()
 if link.namespace() == 10)
-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/222881
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icbb97b092fcd23d09766a8e91eeccbfeeaa926d7
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt 

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