web: improve translation tagging

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 @@
             <p style="color: rgba(255, 255, 255, 0.5);">
             {% 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 %} <a target="_blank" rel="noopener" href="https://web.archive.org">The Wayback Machine</a>, <a target="_blank" rel="noopener" href="https://archive.org">archive.org</a>, <a target="_blank" rel="noopener" href="https://openlibrary.org">Open Library</a> and <a target="_blank" rel="noopener" href="https://archive-it.org">Archive-It</a>
+            {% trans wayback='<a target="_blank" rel="noopener" href="https://web.archive.org">The Wayback Machine</a>'|safe,
+                archive_org = '<a target="_blank" rel="noopener" href="https://archive.org">archive.org</a>'|safe,
+                openlibrary = '<a target="_blank" rel="noopener" href="https://openlibrary.org">Open Library</a>'|safe,
+                archive_it = '<a target="_blank" rel="noopener" href="https://archive-it.org">Archive-It</a>'|safe %}
+              Other projects include {{ wayback }}, {{ archive_org }}, {{ openlibrary }}, and {{ archive_it }}.
+            {% endtrans %}
             <div class="ui horizontal inverted link list">
               <a class="item" target="_blank" rel="noopener" href="https://archive.org/about/">{{ _("About Us") }}</a>
               <a class="item" target="_blank" rel="noopener" href="https://archive.org/about/contact.php">{{ _("Contact Us") }}</a>
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 %}
       <div style="width: 100%; text-align: right;">
         <h3 style="font-size: {% if hits.count_found >= 10000000 %}1.0em{% elif hits.count_found >= 1000 %}1.5em{% else %}2.0em{% endif %};">{{ "{:,}".format(hits.count_found) }}</h3>
-        Hits
+        {{ _("Hits") }}
       </div>
       <div style="text-align: right;">
         <span style="color: rgba(0,0,0,0.4);">in {{ format_query_time(hits.query_time_ms) }}</span>
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" %}
-      <a target="_blank" rel="noopener" href="https://archive.org/details/{{ paper.ia_sim.issue_item }}/page/{{ paper.ia_sim.first_page }}" style="color: #2224c7;">Page {{ paper.ia_sim.first_page }} of {{ paper.biblio.container_name }} Vol. {{ paper.biblio.volume }}, Issue {{ paper.biblio.issue }}</a>
+      <a target="_blank" rel="noopener" href="https://archive.org/details/{{ paper.ia_sim.issue_item }}/page/{{ paper.ia_sim.first_page }}" style="color: #2224c7;">{% 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 %}</a>
       <span style="font-weight: normal; text-transform: uppercase; font-weight: bold;">[{{ _("page") }}]</span>
     {% endif %}
 
@@ -167,16 +167,16 @@
   {% if (paper.access and paper.access|length > 1) or (paper.releases and paper.releases|length > 1) %}
     <div class="ui basic label blue small simple dropdown item">
       <i class="ui icon add"></i>
-      Multiple Versions
+      {% trans %}Multiple Versions{% endtrans %}
 
       <div class="menu" style="font-weight: normal;">
         <table class="ui celled table">
           <thead>
             <tr>
-              <th>Publication Stage</th>
-              <th>Date</th>
-              <th>Fulltext</th>
-              <th>Metadata</th>
+              <th>{{ _("Publication Stage") }}</th>
+              <th>{{ _("Date") }}</th>
+              <th>{{ _("Fulltext") }}</th>
+              <th>{{ _("Metadata") }}</th>
             </tr>
           </thead>
           <tbody>
@@ -184,7 +184,7 @@
             <tr>
               <td>
                 <span style="font-weight: normal; text-transform: uppercase; font-weight: bold; color: brown;">
-                  {{ release.release_stage or "unknown" }}
+                  {{ release.release_stage or _("unknown") }}
                 </span>
               </td>
               <td>
@@ -223,7 +223,7 @@
               <tr>
                 <td>
                   <span style="font-weight: normal; text-transform: uppercase; font-weight: bold; color: brown;">
-                    published
+                    {{ _("published") }}
                   </span>
                 </td>
                 <td></td>
@@ -231,7 +231,7 @@
                   <a href="{{ access.access_url }}">
                     <span class="ui blue label">
                       <i class="film icon"></i>
-                      microfilm
+                      {{ _("microfilm") }}
                     </span>
                   </a>
                 </td>
@@ -249,7 +249,9 @@
   {% if paper._collapsed_count > 0 %}
     <button class="ui basic label blue small button" form="search_form" type="submit" name="collapse_key" value="{{ paper.collapse_key }}">
       <i class="ui icon zoom-in"></i>
-      Show {{ paper._collapsed_count }} additional hits from this issue
+      {% trans trimmed count=paper._collapsed_count %}
+        Show {{ count }} additional hits from this issue
+      {% endtrans %}
     </button>
   {% endif %}
 
@@ -302,7 +304,11 @@
 {% else %}
   <span style="color:gray; margin-right: 2em;">&#xab; {% trans %}Previous{% endtrans %}</span>
 {% endif %}
-<i>Showing results {{ hits.offset }} &mdash; {{ hits.offset + hits.limit }} out of {{ "{:,}".format(hits.count_found) }} results</i>
+<i>
+  {% trans trimmed start=hits.offset, end=(hits.offset + hits.limit), total="{:,}".format(hits.count_found) %}
+    Showing results {{ start }} &mdash; {{ end }} out of {{ total }} results
+  {% endtrans %}
+</i>
 {% if hits.offset + hits.limit < hits.count_found %}
 <button class="text-button" form="search_form" type="submit" name="offset" value="{{ hits.offset + hits.limit }}" style="margin-left: 2em;">
   <a>{% trans %}Next{% endtrans %} &#xbb;</a>