jenkins-bot submitted this change.

View Change

Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified
[cleanup] Remove 'cosmetic_changes-append' i18n usage

- 'cosmetic_changes-append' is replaced with 'pywikibot-cosmetic-changes'
and is mandatory with pywikibot site package.
- update tests because fallback is not used any longer.
- Add a class attribute to UserInterfaceLangTestCase to modify the
userinterface_lang even if DefaultSiteTestCase is used

Change-Id: I8dbb02bd468f60ae477b3dd619f9c6ba0876f8fb
---
M pywikibot/page/_pages.py
M tests/i18n_tests.py
2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pywikibot/page/_pages.py b/pywikibot/page/_pages.py
index cb28f5e..b76c3e5 100644
--- a/pywikibot/page/_pages.py
+++ b/pywikibot/page/_pages.py
@@ -1299,14 +1299,10 @@
cc_toolkit = CosmeticChangesToolkit(self, ignore=CANCEL.MATCH)
self.text = cc_toolkit.change(old)

- # i18n package changed in Pywikibot 7.0.0
- old_i18n = i18n.twtranslate(self.site, 'cosmetic_changes-append',
- fallback_prompt='; cosmetic changes')
if summary and old.strip().replace(
'\r\n', '\n') != self.text.strip().replace('\r\n', '\n'):
summary += i18n.twtranslate(self.site,
- 'pywikibot-cosmetic-changes',
- fallback_prompt=old_i18n)
+ 'pywikibot-cosmetic-changes')
return summary

def put(self, newtext: str,
diff --git a/tests/i18n_tests.py b/tests/i18n_tests.py
index c8f6e0a..9e21ed3 100755
--- a/tests/i18n_tests.py
+++ b/tests/i18n_tests.py
@@ -362,6 +362,14 @@
fallback_prompt='dummy message')
self.assertEqual(rv, 'dummy message')

+
+class PywikibotPackageTestCase(TestCase):
+
+ """Test pywikibot i18n package."""
+
+ family = 'wikipedia'
+ code = 'de'
+
def test_cosmetic_changes_hook(self):
"""Test summary result of Page._cosmetic_changes_hook."""
page = pywikibot.Page(self.site, 'Test')
@@ -379,7 +387,7 @@

summary = f'Working on Test page at site {self.site}'
msg = page._cosmetic_changes_hook(summary)
- self.assertEqual(msg, summary + '; cosmetic changes')
+ self.assertEqual(msg, summary + '; kosmetische Ă„nderungen')


class TestExtractPlural(TestCase):

To view, visit change 835155. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: I8dbb02bd468f60ae477b3dd619f9c6ba0876f8fb
Gerrit-Change-Number: 835155
Gerrit-PatchSet: 5
Gerrit-Owner: Xqt <info@gno.de>
Gerrit-Reviewer: Xqt <info@gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged