diff --git a/legendarium/formatter.py b/legendarium/formatter.py index 97fb77d..0e6b650 100644 --- a/legendarium/formatter.py +++ b/legendarium/formatter.py @@ -352,7 +352,7 @@ def descriptive_format(title='', short_title='', pubdate='', volume='', number=' template.append(translations['volume'][language]+': %v') if number: - template.append(translations['number'][language]+': %n') + template.append(translations['issue'][language]+': %n') if suppl: if suppl == '0': @@ -424,7 +424,7 @@ def descriptive_html_format(title='', short_title='', pubdate='', volume='', num template.append(''+translations['volume'][language]+': %v') if number: - template.append(''+translations['number'][language]+': %n') + template.append(''+translations['issue'][language]+': %n') if suppl: template.append(''+translations['supplement'][language]+' %s') @@ -478,7 +478,7 @@ def descriptive_short_format(title='', short_title='', pubdate='', volume='', nu template.append(translations['volume'][language]+': %v') if number: - template.append(translations['number'][language]+': %n') + template.append(translations['issue'][language]+': %n') if suppl: if suppl == '0': @@ -537,7 +537,7 @@ def descriptive_html_short_format(title='', short_title='', pubdate='', volume=' template.append(''+translations['volume'][language]+': %v') if number: - template.append(''+translations['number'][language]+': %n') + template.append(''+translations['issue'][language]+': %n') if suppl: template.append(''+translations['supplement'][language]+' %s') @@ -582,7 +582,7 @@ def descriptive_very_short_format(pubdate='', volume='', number='', suppl='', la template.append(translations['volume'][language]+': %v') if number: - template.append(translations['number'][language]+': %n') + template.append(translations['issue'][language]+': %n') if suppl: if suppl == '0': @@ -638,7 +638,7 @@ def descriptive_html_very_short_format(pubdate='', volume='', number='', suppl=' template.append(''+translations['volume'][language]+': %v') if number: - template.append(''+translations['number'][language]+': %n') + template.append(''+translations['issue'][language]+': %n') if suppl: template.append(''+translations['supplement'][language]+' %s') diff --git a/legendarium/utils.py b/legendarium/utils.py index e1bf793..0ddaf5f 100644 --- a/legendarium/utils.py +++ b/legendarium/utils.py @@ -6,14 +6,14 @@ "es": "Volumen", "en": "Volume" }, - "number": { + "issue": { "pt": u"Número", "es": "Numero", - "en": "Number" + "en": "Issue" }, "pages": { "pt": u"Páginas", - "es": "Paginas", + "es": "Páginas", "en": "Pages" }, "supplement": { @@ -28,7 +28,7 @@ }, "article number": { "pt": "Número do artigo", - "es": "Numero del articulo", + "es": "Numero del artículo", "en": "Article number" }, "published": { diff --git a/setup.py b/setup.py index 35aa394..c68cd27 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ setup( name='legendarium', - version='1.2.2', + version='1.4.0', description="Python library to handle SciELO's bibliographic legend", long_description=readme + '\n\n' + history, author="Jamil Atta Junior", diff --git a/tests/test_legendarium.py b/tests/test_legendarium.py index 09ec651..989fb62 100644 --- a/tests/test_legendarium.py +++ b/tests/test_legendarium.py @@ -298,7 +298,7 @@ def test_descriptive_format(self): result = descriptive_format(**self.sample) self.assertEqual( - 'Revista Mal-Estar Subjetivo, Volume: 67, Number: 9 Supplement 3, Article number: e00120416, Published: 2011', + 'Revista Mal-Estar Subjetivo, Volume: 67, Issue: 9 Supplement 3, Article number: e00120416, Published: 2011', result ) @@ -309,7 +309,7 @@ def test_descriptive_format_1(self): result = descriptive_format(**self.sample) self.assertEqual( - 'Revista Mal-Estar Subjetivo, Volume: 67, Number: 9 Supplement 3, Pages: 154-200, Published: 2011', + 'Revista Mal-Estar Subjetivo, Volume: 67, Issue: 9 Supplement 3, Pages: 154-200, Published: 2011', result ) @@ -330,7 +330,7 @@ def test_descriptive_format_number_only(self): result = descriptive_format(**data) self.assertEqual( - 'Cadernos Pagu, Number: 50, Article number: e175002, Published: 2017', + 'Cadernos Pagu, Issue: 50, Article number: e175002, Published: 2017', result ) @@ -352,7 +352,7 @@ def test_descriptive_format_suppl_number(self): result = descriptive_format(**data) self.assertEqual( - 'Revista de Odontologia da Universidade de São Paulo, Volume: 11, Number: 21 Supplement 1, Pages: 121-143, Published: 1997', + 'Revista de Odontologia da Universidade de São Paulo, Volume: 11, Issue: 21 Supplement 1, Pages: 121-143, Published: 1997', result ) @@ -374,7 +374,7 @@ def test_descriptive_format_suppl_number_1(self): result = descriptive_format(**data) self.assertEqual( - 'Revista de Odontologia da Universidade de São Paulo, Volume: 11, Number: 21 Supplement, Pages: 121-143, Published: 1997', + 'Revista de Odontologia da Universidade de São Paulo, Volume: 11, Issue: 21 Supplement, Pages: 121-143, Published: 1997', result ) @@ -432,7 +432,7 @@ def test_descriptive_short_format(self): result = descriptive_short_format(**self.sample) self.assertEqual( - 'Revista Mal-Estar Subjetivo, Volume: 67, Number: 9 Supplement 3, Published: 2011', + 'Revista Mal-Estar Subjetivo, Volume: 67, Issue: 9 Supplement 3, Published: 2011', result ) @@ -441,7 +441,7 @@ def test_descriptive_html_format(self): result = descriptive_html_format(**self.sample) self.assertEqual( - '
Revista Mal-Estar SubjetivoVolume: 67Number: 9Supplement 3Article number: e00120416Published: 2011
', + '
Revista Mal-Estar SubjetivoVolume: 67Issue: 9Supplement 3Article number: e00120416Published: 2011
', result ) @@ -454,7 +454,7 @@ def test_descriptive_html_short_format(self): result = descriptive_html_short_format(**self.sample) self.assertEqual( - '
Revista Mal-Estar SubjetivoVolume: 67Number: 9Supplement 3Published: 2011
', + '
Revista Mal-Estar SubjetivoVolume: 67Issue: 9Supplement 3Published: 2011
', result ) @@ -469,7 +469,7 @@ def test_descriptive_very_short_format(self): result = descriptive_very_short_format(**self.sample) self.assertEqual( - '2011, Volume: 67, Number: 9 Supplement 3', + '2011, Volume: 67, Issue: 9 Supplement 3', result ) @@ -484,7 +484,7 @@ def test_descriptive_html_very_short_format(self): result = descriptive_html_very_short_format(**self.sample) self.assertEqual( - '
2011Volume: 67Number: 9Supplement 3
', + '
2011Volume: 67Issue: 9Supplement 3
', result )