From 24bc0be495ced4cd20cb4b1ccdd5217862503e09 Mon Sep 17 00:00:00 2001 From: Rashif Ray Rahman Date: Fri, 28 Nov 2025 23:41:38 +0600 Subject: [PATCH 1/2] fix: remove some leftover crude pluralization --- dqgen/resources/asciidoc_templates/instance.jinja2 | 4 ++-- dqgen/resources/html_templates/instance.jinja2 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dqgen/resources/asciidoc_templates/instance.jinja2 b/dqgen/resources/asciidoc_templates/instance.jinja2 index de27817..a0fca5b 100644 --- a/dqgen/resources/asciidoc_templates/instance.jinja2 +++ b/dqgen/resources/asciidoc_templates/instance.jinja2 @@ -7,8 +7,8 @@ {% call mc.render_fetch_results(content, error) %} {% set compress_uris = simplify_uri_columns_in_tabular(data_frame=content,namespace_inventory=namespaces,error_fail=False) %} {% endraw %} -=== {{ operation|title }} {{ class_name }}s - {{ "{{" }} mc.pandas_table(content, "{{ operation|title }} {{ class_name }}s") {{ "}}" }} +=== {{ operation|title }} {{ class_name }} + {{ "{{" }} mc.pandas_table(content, "{{ operation|title }} {{ class_name }}") {{ "}}" }} {% raw %} {% endcall %} {% endif %} diff --git a/dqgen/resources/html_templates/instance.jinja2 b/dqgen/resources/html_templates/instance.jinja2 index c74139b..56d3d5a 100644 --- a/dqgen/resources/html_templates/instance.jinja2 +++ b/dqgen/resources/html_templates/instance.jinja2 @@ -7,12 +7,12 @@ {% call mc.render_fetch_results(content, error) %} {% set compress_uris = simplify_uri_columns_in_tabular(data_frame=content,namespace_inventory=namespaces,error_fail=False) %} {% endraw %} -

{{ operation|title }} {{ class_name }}s

+

{{ operation|title }} {{ class_name }}

The table below lists the {{ operation }} {{ cls }}

Query identifier: {{ query_file }}

- {{ "{{" }} mc.pandas_table(content, "{{ operation|title }} {{ class_name }}s") {{ "}}" }} + {{ "{{" }} mc.pandas_table(content, "{{ operation|title }} {{ class_name }}") {{ "}}" }}
{% raw %} {% endcall %} From e1533afc2c3efee2fb2f244d398c792f50426c4a Mon Sep 17 00:00:00 2001 From: Rashif Ray Rahman Date: Fri, 28 Nov 2025 23:51:18 +0600 Subject: [PATCH 2/2] fix(test): update tests for pluralization fix --- tests/unit/test_asciidoc_generator.py | 2 +- tests/unit/test_html_generator.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/test_asciidoc_generator.py b/tests/unit/test_asciidoc_generator.py index fa3e510..87bc3aa 100644 --- a/tests/unit/test_asciidoc_generator.py +++ b/tests/unit/test_asciidoc_generator.py @@ -12,7 +12,7 @@ def test_instance_asciidoc_generator(tmp_path): - expected_text = """== Added concepts""" + expected_text = """== Added concept""" asciidoc_generator = AsciiDocGenerator(cls="skos:Concept", operation="added_instance", class_name="concept", output_folder_path=str(tmp_path), template=ASCII_DOC_TEMPLATES.get_template("instance.jinja2")) diff --git a/tests/unit/test_html_generator.py b/tests/unit/test_html_generator.py index a5fe28a..213e8e2 100644 --- a/tests/unit/test_html_generator.py +++ b/tests/unit/test_html_generator.py @@ -12,7 +12,7 @@ def test_instance_html_generator(tmp_path): - expected_text = """

Added concepts

""" + expected_text = """

Added concept

""" html_generator = HtmlGenerator(cls="skos:Concept", operation="added_instance", class_name="concept", output_folder_path=str(tmp_path), template=HTML_TEMPLATES.get_template("instance.jinja2"))