From e7f1129770a7a55840c099461e8493c9950a91d1 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Wed, 14 Oct 2020 02:52:22 -0700 Subject: web: improve translation tagging --- fatcat_scholar/templates/base.html | 7 ++++++- fatcat_scholar/templates/search.html | 2 +- fatcat_scholar/templates/search_macros.html | 28 +++++++++++++++++----------- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/fatcat_scholar/templates/base.html b/fatcat_scholar/templates/base.html index 9eee76d..5178ba4 100644 --- a/fatcat_scholar/templates/base.html +++ b/fatcat_scholar/templates/base.html @@ -220,7 +220,12 @@

{% trans %}We are a US 501(c)(3) non-profit library, building a global archive of Internet sites and other cultural artifacts in digital form.{% endtrans %} - {% trans %}Other projects include{% endtrans %} The Wayback Machine, archive.org, Open Library and Archive-It + {% trans wayback='The Wayback Machine'|safe, + archive_org = 'archive.org'|safe, + openlibrary = 'Open Library'|safe, + archive_it = 'Archive-It'|safe %} + Other projects include {{ wayback }}, {{ archive_org }}, {{ openlibrary }}, and {{ archive_it }}. + {% endtrans %}

{{ _("About Us") }} {{ _("Contact Us") }} diff --git a/fatcat_scholar/templates/search.html b/fatcat_scholar/templates/search.html index 56e33c6..529162f 100644 --- a/fatcat_scholar/templates/search.html +++ b/fatcat_scholar/templates/search.html @@ -47,7 +47,7 @@ {% if hits %}

{{ "{:,}".format(hits.count_found) }}

- Hits + {{ _("Hits") }}
in {{ format_query_time(hits.query_time_ms) }} diff --git a/fatcat_scholar/templates/search_macros.html b/fatcat_scholar/templates/search_macros.html index 80d3bfc..9f92dca 100644 --- a/fatcat_scholar/templates/search_macros.html +++ b/fatcat_scholar/templates/search_macros.html @@ -61,7 +61,7 @@ {% endif %} {% elif paper.doc_type == "sim_page" %} - Page {{ paper.ia_sim.first_page }} of {{ paper.biblio.container_name }} Vol. {{ paper.biblio.volume }}, Issue {{ paper.biblio.issue }} + {% trans page_num = paper.ia_sim.first_page, journal_name = paper.biblio.container_name, volume = paper.biblio.volume, issue = paper.biblio.issue %}Page {{ page_num }} of {{ journal_name }} Vol. {{ volume }}, Issue {{ issue }}{% endtrans %} [{{ _("page") }}] {% endif %} @@ -167,16 +167,16 @@ {% if (paper.access and paper.access|length > 1) or (paper.releases and paper.releases|length > 1) %}
- Multiple Versions + {% trans %}Multiple Versions{% endtrans %}
- - - - + + + + @@ -184,7 +184,7 @@ @@ -231,7 +231,7 @@ - microfilm + {{ _("microfilm") }} @@ -249,7 +249,9 @@ {% if paper._collapsed_count > 0 %} {% endif %} @@ -302,7 +304,11 @@ {% else %} « {% trans %}Previous{% endtrans %} {% endif %} -Showing results {{ hits.offset }} — {{ hits.offset + hits.limit }} out of {{ "{:,}".format(hits.count_found) }} results + + {% trans trimmed start=hits.offset, end=(hits.offset + hits.limit), total="{:,}".format(hits.count_found) %} + Showing results {{ start }} — {{ end }} out of {{ total }} results + {% endtrans %} + {% if hits.offset + hits.limit < hits.count_found %}
Publication StageDateFulltextMetadata{{ _("Publication Stage") }}{{ _("Date") }}{{ _("Fulltext") }}{{ _("Metadata") }}
- {{ release.release_stage or "unknown" }} + {{ release.release_stage or _("unknown") }} @@ -223,7 +223,7 @@
- published + {{ _("published") }}