From eabe736fc0379137d39baa303b0b695aa82439ad Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Fri, 12 Aug 2022 11:07:18 -0700 Subject: DEBUG: remove jinja2.i18n from SERP --- fatcat_scholar/templates/base.html | 48 +++++++---------- fatcat_scholar/templates/search.html | 30 +---------- fatcat_scholar/templates/search_macros.html | 82 +++++++++-------------------- fatcat_scholar/web.py | 15 +++--- 4 files changed, 56 insertions(+), 119 deletions(-) diff --git a/fatcat_scholar/templates/base.html b/fatcat_scholar/templates/base.html index 1abc216..a92525e 100644 --- a/fatcat_scholar/templates/base.html +++ b/fatcat_scholar/templates/base.html @@ -10,7 +10,6 @@ {%- endif %} {%- if settings.SCHOLAR_ENV != "prod" -%}[{{ settings.SCHOLAR_ENV|upper }}] {% endif -%} - {%- block title -%}{% trans %}Internet Archive Scholar{% endtrans %}{%- endblock %}
- @@ -125,8 +124,8 @@
- - + + {% if query and query.parsed_q %} {% endif %} @@ -141,11 +140,11 @@ {% if query.filter_type %}{% do rss_params.update(dict(filter_type= query.filter_type)) %}{% endif %} {% if query.filter_availability %}{% do rss_params.update(dict(filter_availabilty=query.filter_availability)) %}{% endif %} - {% trans %}RSS Feed{% endtrans %} + RSS   {% endif %} - {{ _("User Guide") }} + {{ "User Guide" }}
@@ -173,40 +172,33 @@

Internet Archive

- {% 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 trimmed 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") }} - {{ _("Policies") }} - {{ _("Donate") }} + {{ "About Us" }} + {{ ("Contact Us") }} + {{ ("Policies") }} + {{ ("Donate") }}
diff --git a/fatcat_scholar/templates/search.html b/fatcat_scholar/templates/search.html index 3adaf2f..2bccaaf 100644 --- a/fatcat_scholar/templates/search.html +++ b/fatcat_scholar/templates/search.html @@ -32,7 +32,7 @@
- {{ _("Filters") }} + {{ "Filters" }}
{{ search_macros.query_option(query.time_options, query.filter_time) }} {{ search_macros.query_option(query.type_options, query.filter_type) }} @@ -44,15 +44,9 @@ {% if hits %} {{ babel_numbers.format_decimal(hits.count_found, locale=locale) }} - {% trans trimmed count=hits.count_found %} Hit - {% pluralize %} Hits - {% endtrans %} - {% trans trimmed frac_sec=format_query_time(hits.query_time_ms) %} - in {{ frac_sec }}sec - {% endtrans %} {% else %}   @@ -74,17 +68,9 @@ {{ babel_numbers.format_decimal(hits.count_found, locale=locale) }} - {% trans trimmed count=hits.count_found %} - Hit - {% pluralize %} - Hits - {% endtrans %}
- {% trans trimmed frac_sec=format_query_time(hits.query_time_ms) %} - in {{ frac_sec }}sec - {% endtrans %}
@@ -106,15 +92,8 @@
- {% if search_error.type == "backend" %} - {% trans %}Backend Search Engine Error{% endtrans %} - {% elif search_error.type == "query" %} - {% trans %}Search Query Error{% endtrans %} - {% endif %}

Computer said: {{ search_error.message }} -

{% trans trimmed %}Query parsing is currently very naive. Sometimes you can fix this - problem by adding quotes around terms or entire phrases.{% endtrans %}

{% elif hits and hits.results %} @@ -145,25 +124,21 @@
- {% trans %}We didn't find any documents matching your query{% endtrans %}
{% if query.filter_type != "everything" %} {% endif %} {% if query.filter_time and query.filter_time != "all_time" %} {% endif %} {% if query.filter_availability != "everything" %} {% endif %} - {{ _("Start Over") }} + {{ "Start Over" }}
Try archive.org @@ -176,7 +151,6 @@
- {% trans %}Enter a query in the box above to get started{% endtrans %}
{% endif %} diff --git a/fatcat_scholar/templates/search_macros.html b/fatcat_scholar/templates/search_macros.html index 1b331bc..1e7a07f 100644 --- a/fatcat_scholar/templates/search_macros.html +++ b/fatcat_scholar/templates/search_macros.html @@ -1,7 +1,7 @@ {% macro tag_label(tag) -%} {% if tag == "oa" %} - {% trans %}Open Access{% endtrans %} + {% elif tag == "jstor" %} JSTOR {% elif tag == "scielo" %} @@ -18,12 +18,12 @@ {% elif tag == "doaj" %} DOAJ {% elif tag == "multiple-versions" %} - {% trans %}Multiple Versions{% endtrans %} + {% elif tag.startswith("lang:") %} {{ tag }} {% else %} {# disabling "other" tags for now #} - {# {{ _(tag) }} #} + {# {{ (tag) }} #} {% endif %} {% endmacro %} @@ -56,11 +56,11 @@ {% macro ia_access_button(access, show_thumbnail=False, other_version=False) -%} {% if access.file_mimetype == "application/pdf" %} - {% set access_alt = _('fulltext PDF download') %} + {% set access_alt = ('fulltext PDF download') %} {% elif access.access_type == "ia_sim" %} - {% set access_alt = _('read fulltext microfilm') %} + {% set access_alt = ('read fulltext microfilm') %} {% else %} - {% set access_alt = _('fulltext access') %} + {% set access_alt = ('fulltext access') %} {% endif %} {% if other_version %} {% set access_alt = access_alt + " [" + other_version + "]" %} @@ -69,21 +69,14 @@ @@ -108,7 +101,7 @@ {% else %} {% endif %} - {% set default_domain = _("Publisher / doi.org") %} + {% set default_domain = ("Publisher / doi.org") %} {% if paper._obj and paper._obj.biblio %} {{ paper._obj.biblio.doi_link_domain(default_domain) }} {% else %} @@ -141,7 +134,7 @@ {% macro journal_row(biblio, paper) -%} {# NOTE: should be able to call with paper.biblio or any paper.release[] #} {% if biblio.release_year %} - {% trans year=biblio.release_year %}{{ year }}{% endtrans %} + {% endif %} {% if biblio.container_name %} @@ -192,11 +185,11 @@ {% if paper.biblio.release_type in ("article-journal", "paper-conference") or paper.doc_type == "sim_page" %} {# pass #} {% elif paper.biblio.release_type in ("book", "chapter", "dataset") %} - [{{ _(paper.biblio.release_type) }}] + [{{ (paper.biblio.release_type) }}] {% elif not paper.biblio.release_type %} - [{{ _("unknown") }}] + [{{ ("unknown") }}] {% else %} - [{{ _(paper.biblio.release_type) }}] + [{{ (paper.biblio.release_type) }}] {% endif %} @@ -210,9 +203,8 @@ {% elif paper.doc_type == "sim_page" %} - {% 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") }}] + [{{ ("page") }}] {% endif %} @@ -233,14 +225,13 @@
{# ### FULLTEXT ACCESS OPTIONS #}

- {% trans %}Preserved Fulltext{% endtrans %}

{% if paper.fulltext and paper.fulltext.access_url %}
- + {% if paper.fulltext.thumbnail_url %}
fulltext thumbnail @@ -256,11 +247,8 @@
{% if paper.fulltext.access_type == "wayback" %} - {% trans %}Web Archive Capture{% endtrans %} {% elif paper.fulltext.access_type == "ia_file" %} - {% trans %}File Archive{% endtrans %} {% elif paper.fulltext.access_type == "ia_sim" %} - {% trans %}Digitized Microfilm{% endtrans %} {% endif %} {% if paper.fulltext.file_mimetype == "application/pdf" or (paper.fulltext.file_mimetype == None and paper.fulltext.access_type == "wayback") %} @@ -285,20 +273,15 @@ {% if paper.fulltext.access_type == "wayback" %} {% set original_url = '/'.join(paper.fulltext.access_url.split('/')[5:]) %} {% set capture_year = paper.fulltext.access_url.split('/')[4][:4] %} -

{% trans %}A copy of this work was available on the public web and has been preserved in the Wayback Machine. The capture dates from {{ capture_year }}; you can also visit the original URL.{% endtrans %} {% elif paper.fulltext.access_type == "ia_file" %} -

{% trans %}The Internet Archive has a preservation copy of this work in our general collections.{% endtrans %} {% elif paper.fulltext.access_type == "ia_sim" %} -

{% trans %}The Internet Archive has digitized a microfilm copy of this work. It may be possible to borrow a copy for reading.{% endtrans %} {% endif %} {% if paper.fulltext.file_mimetype %} - {% trans mimetype = ("" + paper.fulltext.file_mimetype + "")|safe %}The file type is {{ mimetype }}.{% endtrans %} {% endif %} {% if paper.fulltext.release_ident and (paper.biblio.release_ident != paper.fulltext.release_ident) %} {# Fulltext copy is different from biblio version! #} -

{% trans %}Note that this fulltext copy is not of the "primary" version of this work. The version it corresponds to is:{% endtrans %}

{% for release in paper.releases if release.ident == paper.fulltext.release_ident %} {{ journal_row(release, paper) }} @@ -311,7 +294,6 @@ {# currently, ia_sim access types are not linked to specific versions #} {% for access in paper.access if access.access_type != paper.fulltext.access_type and (access.release_ident == paper.fulltext.release_ident or access.release_ident == paper.biblio.release_ident or access.access_type == 'ia_sim') %} {% if loop.first %} -

{% trans %}Additional access options for the primary version of this work:{% endtrans %} {% endif %} {{ ia_access_button(access )}} {% endfor %} @@ -321,10 +303,8 @@

{% else %} {# No fulltext case #} -

{% trans %}We don't yet know of a public preservation copy of this work. You may be able to obtain a copy of this work to read from the publisher, platforms, or institutional libraries.{% endtrans %} {% if paper.doc_type == "work" %} {% set save_paper_now_url = "https://fatcat.wiki/release/" + paper.biblio.release_ident + "/save" %} -

{% trans %}If you know of a legal, public version that we should archive, please let us know via "Save Paper Now".{% endtrans %} {% endif %} {% endif %} @@ -371,7 +351,6 @@ {% if paper.abstracts[0].body|length > 550 %} {{ paper.abstracts[0].body | truncate(500, False, '') }}

- {% trans %}more »{% endtrans %} ... {{ paper.abstracts[0].body[500:] }}
{% else %} @@ -393,7 +372,7 @@ {% endif %} - + {% for tag in paper.tags|sort %} {# HACK: don't show "oa" tag if already obvious #} {% if tag != "oa" or ("doaj" not in paper.tags and "szczepanski" not in paper.tags) %} @@ -420,7 +399,7 @@ {# archive links (if available) #} {% if paper.fulltext and paper.fulltext.access_url %} {% if (paper.fulltext.release_ident and paper.fulltext.release_ident != paper.biblio.release_ident) %} - {% set other_version = _("not primary version") %} + {% set other_version = ("not primary version") %} {% else %} {% set other_version = "" %} {% endif %} @@ -437,9 +416,6 @@ {% if paper._collapsed_count and paper._collapsed_count > 0 %} {% endif %} @@ -448,12 +424,11 @@
-
+
- {% trans %}Citation{% endtrans %}

{{ paper._obj.biblio.citation_str("default") }} {% if paper.doc_type == "work" %}

@@ -467,13 +442,14 @@
- + +
- +
@@ -489,32 +465,26 @@ {% macro search_pagination(hits, locale) %} {% if hits.offset > 0 %} {% else %} - {% trans %}« Previous{% endtrans %} + « {% endif %} {% if hits.offset + hits.limit < hits.count_found %} {% else %} - {% trans %}Next »{% endtrans %} + » {% endif %} - {% trans trimmed start=babel_numbers.format_decimal(hits.offset + 1, locale=locale), - end=babel_numbers.format_decimal([hits.offset + hits.limit, hits.count_found]|min, locale=locale), - total=babel_numbers.format_decimal(hits.count_found, locale=locale) %} - Showing results {{ start }} — {{ end }} out of {{ total }} results - {% endtrans %} {% endmacro %} {% macro query_option(options, selected) -%}
- +
{% for opt in options.list %} @@ -524,7 +494,7 @@ {% else %} {% endif %} - {{ _(opt.label) }} + {{ (opt.label) }}
@@ -537,7 +507,7 @@ {% macro clear_query(query) -%} {% if query.filter_time or query.filter_type or query.filter_availability or query.sort_order %}
{% endif %} diff --git a/fatcat_scholar/web.py b/fatcat_scholar/web.py index 18299ee..b222eb9 100644 --- a/fatcat_scholar/web.py +++ b/fatcat_scholar/web.py @@ -225,14 +225,15 @@ def load_i18n_templates() -> Any: ) templates = Jinja2Templates( directory="fatcat_scholar/templates", - extensions=["jinja2.ext.i18n", "jinja2.ext.do"], - ) - templates.env.install_gettext_translations(translations, newstyle=True) # type: ignore - templates.env.install_gettext_callables( # type: ignore - locale_gettext(translations), - locale_ngettext(translations), - newstyle=True, + #extensions=["jinja2.ext.i18n", "jinja2.ext.do"], + extensions=["jinja2.ext.do"], ) + #templates.env.install_gettext_translations(translations, newstyle=True) # type: ignore + #templates.env.install_gettext_callables( # type: ignore + # locale_gettext(translations), + # locale_ngettext(translations), + # newstyle=True, + #) # remove a lot of whitespace in HTML output with these configs templates.env.trim_blocks = True templates.env.lstrip_blocks = True -- cgit v1.2.3