From 96371c3e9ccc5478e81fe2bdf4cecb9976e321a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=CC=81bastien=20De=CC=81le=CC=80ze?= Date: Mon, 2 Aug 2021 09:42:24 +0200 Subject: [PATCH] documents: fix `partOf` format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Displays the issue and pages even if volume is not set. * Closes #370. Co-Authored-by: Sébastien Délèze --- sonar/modules/documents/views.py | 12 ++++++------ tests/ui/documents/test_dc_schema.py | 2 +- tests/ui/documents/test_documents_views.py | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sonar/modules/documents/views.py b/sonar/modules/documents/views.py index dfca567b..ab3db62b 100644 --- a/sonar/modules/documents/views.py +++ b/sonar/modules/documents/views.py @@ -173,13 +173,13 @@ def part_of_format(part_of): items.append('{label} {value}'.format( label=_('vol.'), value=part_of['numberingVolume'])) - if 'numberingIssue' in part_of: - items.append('{label} {value}'.format( - label=_('no.'), value=part_of['numberingIssue'])) + if 'numberingIssue' in part_of: + items.append('{label} {value}'.format( + label=_('no.'), value=part_of['numberingIssue'])) - if 'numberingPages' in part_of: - items.append('{label} {value}'.format( - label=_('p.'), value=part_of['numberingPages'])) + if 'numberingPages' in part_of: + items.append('{label} {value}'.format( + label=_('p.'), value=part_of['numberingPages'])) return ', '.join(items) diff --git a/tests/ui/documents/test_dc_schema.py b/tests/ui/documents/test_dc_schema.py index afe54ec0..005ea6b2 100644 --- a/tests/ui/documents/test_dc_schema.py +++ b/tests/ui/documents/test_dc_schema.py @@ -377,7 +377,7 @@ def test_sources(minimal_document): assert result['sources'] == [ 'Document 1, 2020', 'Document 2, 2020, vol. 6, no. 12, p. 135-139', - 'Document 3, 2019', + 'Document 3, 2019, no. 12, p. 135-139', ] diff --git a/tests/ui/documents/test_documents_views.py b/tests/ui/documents/test_documents_views.py index 1610a114..60477d58 100644 --- a/tests/ui/documents/test_documents_views.py +++ b/tests/ui/documents/test_documents_views.py @@ -207,7 +207,7 @@ def test_part_of_format(): 'numberingYear': '2015', 'numberingIssue': '2', 'numberingPages': '469-480' - }) == 'Mehr oder weniger Staat?, 2015' + }) == 'Mehr oder weniger Staat?, 2015, no. 2, p. 469-480' assert views.part_of_format({ 'numberingYear': '2015',