Mark Sapiro pushed to branch master at GNU Mailman / Mailman Core
Commits:
8e5db5b3 by Mark Sapiro at 2021-01-16T15:23:54-08:00
Add more i18n. Fix missing word in findmember.rst.
- - - - -
1987828a by Mark Sapiro at 2021-01-17T00:24:38+00:00
Merge branch 'find' into 'master'
Add more i18n. Fix missing word in findmember.rst.
See merge request mailman/mailman!762
- - - - -
3 changed files:
- src/mailman/commands/cli_findmember.py
- src/mailman/commands/docs/findmember.rst
- src/mailman/commands/tests/test_cli_findmember.py
Changes:
=====================================
src/mailman/commands/cli_findmember.py
=====================================
@@ -95,14 +95,14 @@ def findmember(ctx, role, pattern):
email = _get_member_email(member)
if email != last_email:
last_list_id = last_role = ''
- print('Email: {}'.format(email))
+ print(_('Email: {}').format(email))
last_email = email
if member.list_id != last_list_id:
last_role = ''
- print(' List: {}'.format(member.list_id))
+ print(' '*4 + _('List: {}').format(member.list_id))
last_list_id = member.list_id
if member.role != last_role:
- print(' {}'.format(str(member.role)))
+ print(' '*8 + _('{}').format(str(member.role)))
last_role = member.role
=====================================
src/mailman/commands/docs/findmember.rst
=====================================
@@ -2,8 +2,8 @@
Finding members
===============
-The ``mailman findmember`` reports all members with email address matching a
-case-insensitive supplied pattern by address, list and role.
+The ``mailman findmember`` command reports all members with email address
+matching a case-insensitive supplied pattern by address, list and role.
>>> from mailman.testing.documentation import cli
>>> command = cli('mailman.commands.cli_findmember.findmember')
=====================================
src/mailman/commands/tests/test_cli_findmember.py
=====================================
@@ -40,11 +40,11 @@ class TestCLIFindMember(unittest.TestCase):
subscribe(self._mlist, 'Anne')
result = self._command.invoke(findmember, ('.',))
self.assertEqual(result.exit_code, 0)
- self.assertEqual(
- result.output,
- 'Email: aper...@example.com\n'
- ' List: ant.example.com\n'
- ' MemberRole.member\n')
+ self.assertEqual(result.output, """\
+Email: aper...@example.com
+ List: ant.example.com
+ MemberRole.member
+""")
def test_no_role(self):
# Test for no matching roles.
@@ -65,11 +65,11 @@ class TestCLIFindMember(unittest.TestCase):
subscribe(self._mlist, 'Anne')
result = self._command.invoke(findmember, ('APerson',))
self.assertEqual(result.exit_code, 0)
- self.assertEqual(
- result.output,
- 'Email: aper...@example.com\n'
- ' List: ant.example.com\n'
- ' MemberRole.member\n')
+ self.assertEqual(result.output, """\
+Email: aper...@example.com
+ List: ant.example.com
+ MemberRole.member
+""")
def test_user_and_address(self):
# Test finding members subscribed as user and as address.
@@ -77,14 +77,14 @@ class TestCLIFindMember(unittest.TestCase):
subscribe(self._mlistb, 'Bart', as_user=False)
result = self._command.invoke(findmember, ('.'))
self.assertEqual(result.exit_code, 0)
- self.assertEqual(
- result.output,
- 'Email: aper...@example.com\n'
- ' List: ant.example.com\n'
- ' MemberRole.member\n'
- 'Email: bper...@example.com\n'
- ' List: bee.example.com\n'
- ' MemberRole.member\n')
+ self.assertEqual(result.output, """\
+Email: aper...@example.com
+ List: ant.example.com
+ MemberRole.member
+Email: bper...@example.com
+ List: bee.example.com
+ MemberRole.member
+""")
def test_only_role(self):
# Test only finding requested role.
@@ -92,11 +92,11 @@ class TestCLIFindMember(unittest.TestCase):
subscribe(self._mlistb, 'Bart', role=MemberRole.owner)
result = self._command.invoke(findmember, ('--role', 'owner', '.'))
self.assertEqual(result.exit_code, 0)
- self.assertEqual(
- result.output,
- 'Email: bper...@example.com\n'
- ' List: bee.example.com\n'
- ' MemberRole.owner\n')
+ self.assertEqual(result.output, """\
+Email: bper...@example.com
+ List: bee.example.com
+ MemberRole.owner
+""")
def test_find_only_admins(self):
# Test the administrators role.
@@ -108,11 +108,11 @@ class TestCLIFindMember(unittest.TestCase):
'administrator',
'.'))
self.assertEqual(result.exit_code, 0)
- self.assertEqual(
- result.output,
- 'Email: bper...@example.com\n'
- ' List: bee.example.com\n'
- ' MemberRole.owner\n'
- 'Email: cper...@example.com\n'
- ' List: ant.example.com\n'
- ' MemberRole.moderator\n')
+ self.assertEqual(result.output, """\
+Email: bper...@example.com
+ List: bee.example.com
+ MemberRole.owner
+Email: cper...@example.com
+ List: ant.example.com
+ MemberRole.moderator
+""")
View it on GitLab:
https://gitlab.com/mailman/mailman/-/compare/1e7589af57aa952cb1be3f08f10f511f16efbf14...1987828a57efb9262590f7c9338315d8450ecdda
--
View it on GitLab:
https://gitlab.com/mailman/mailman/-/compare/1e7589af57aa952cb1be3f08f10f511f16efbf14...1987828a57efb9262590f7c9338315d8450ecdda
You're receiving this email because of your account on gitlab.com.
_______________________________________________
Mailman-checkins mailing list -- mailman-checkins@python.org
To unsubscribe send an email to mailman-checkins-le...@python.org
https://mail.python.org/mailman3/lists/mailman-checkins.python.org/
Member address: arch...@jab.org
