Merge pull request #36 from spraakbanken/29-update-about-skbl

update about and contact

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.7
+FROM python:3.8
 LABEL maintainer="[email protected]"
 COPY . /skbl
 WORKDIR /skbl

babel.cfg

@@ -1,3 +1,5 @@
 [python: skbl/**.py]
 [jinja2: **/templates/**.html]
-# extensions=jinja2.ext.autoescape,jinja2.ext.with_
+
+[extractors]
+jinja2 = jinja2.ext:babel_extract

skbl/static/pages/about-skbl/en.html

@@ -12,8 +12,15 @@ <h1>Svenskt kvinnobiografiskt lexikon</h1>
         The images used in SKBL come from museums, archives and private collections. SKBL does not own any of the images
         and therefore cannot give permission for them to be reproduced.
     </p>
-    <p>SKBL is managed by KvinnSam. KvinnSam is a university-wide research infrastructure and a national library
-        for gender research, and a part of the Humanities Library at University of Gothenburg.
+    <p>
+        SKBL is managed by <a href="https://www2.ub.gu.se/kvinn/">KvinnSam</a>. KvinnSam is a university-wide research
+        infrastructure and the national library for
+        gender research located at the Humanities Library, Gothenburg University. The library staff is composed of
+        librarians, archivists, and a research coordinator. We monitor and catalog publications that deal with gender
+        research. We also collect, organize, and make searchable women's and gender historical archives. Lastly, we
+        provide reference services and assistance in planning for and executing research projects coupled to our
+        collections. Because the SKBL project is no longer active, KvinnSam makes minor edits to published texts, if
+        provided with this information. Otherwise, SKBL is not updated
     </p>
 
     <p> ISBN: 978-91-639-7594-3 <br>

skbl/static/pages/about-skbl/sv.html

@@ -12,13 +12,16 @@ <h1>Svenskt kvinnobiografiskt lexikon</h1>
         Bilderna i SKBL har hämtats från muséer, arkiv och privatpersoner. SKBL äger alltså inte bilderna och kan därmed
         inte ge tillstånd till reproduktion.
     </p>
-    <p>SKBL förvaltas av KvinnSam. KvinnSam är en universitetsgemensam forskningsinfrastruktur och ett nationellt
+    <p>
+        SKBL förvaltas av <a href="https://www2.ub.gu.se/kvinn/">KvinnSam</a>. KvinnSam är en universitetsgemensam
+        forskningsinfrastruktur och ett nationellt
         bibliotek för genusforskning samt en del av Humanistiska biblioteket vid Göteborgs universitet. Verksamheten
         består av bibliotekarier, arkivarier och en forskningssamordnare. Vi bevakar och förtecknar litteratur om
         genusfrågor, samlar, ordnar och förtecknar kvinno- och genushistoriskt arkivmaterial, ger referensservice samt
         ger stöd till utveckling och samordning av forskningsprojekt kopplade till KvinnSams samlingar. Eftersom
         projektet vilar gör KvinnSam endast mindre ändringar i texterna utifrån inskickade korrigeringar. I övrigt
-        uppdateras inte SKBL.</p>
+        uppdateras inte SKBL.
+    </p>
     <p> ISBN: 978-91-639-7594-3 <br>
         ISSN: 2003-0088
     </p>

skbl/templates/contact_active.html

@@ -13,8 +13,8 @@ <h1>{{ headline }}</h1>
     </div>
     {% endif %}
 
-    <p>{{ gettext("Send minor corrections to:") }}<br>
-        <a href="mailto:skbl@ub.gu.se">skbl [at] ub.gu.se</a>
+    <p>{{ gettext("Send in minor corrections to:") }}<br>
+        skbl [at] ub.gu.se
     </p>
     <p></p>
 </div>

skbl/translations/messages.pot

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SKBL-portal VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-04-26 13:47+0200\n"
+"POT-Creation-Date: 2024-04-29 10:36+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -18,84 +18,84 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: skbl/computeviews.py:98 skbl/views.py:38 skbl/views.py:313 skbl/views.py:521
-#: skbl/views.py:694
+#: skbl/computeviews.py:130 skbl/views.py:38 skbl/views.py:313
+#: skbl/views.py:521 skbl/views.py:694
 msgid "Contents could not be found!"
 msgstr ""
 
-#: skbl/computeviews.py:129 skbl/templates/article.html:360
+#: skbl/computeviews.py:177 skbl/templates/article.html:360
 #: skbl/templates/layout.html:146
 msgid "Organisations"
 msgstr ""
 
-#: skbl/computeviews.py:155 skbl/templates/article.html:276
+#: skbl/computeviews.py:212 skbl/templates/article.html:276
 #: skbl/templates/contact.html:42 skbl/templates/layout.html:139
 msgid "Activities"
 msgstr ""
 
-#: skbl/computeviews.py:190 skbl/computeviews.py:233
+#: skbl/computeviews.py:276 skbl/computeviews.py:349
 #: skbl/templates/layout.html:109
 msgid "Map"
 msgstr ""
 
-#: skbl/computeviews.py:197 skbl/templates/layout.html:105
+#: skbl/computeviews.py:285 skbl/templates/layout.html:105
 msgid "Women A-Z"
 msgstr ""
 
-#: skbl/computeviews.py:279
+#: skbl/computeviews.py:400
 msgid "Placenames"
 msgstr ""
 
-#: skbl/computeviews.py:347 skbl/templates/layout.html:112
+#: skbl/computeviews.py:477 skbl/templates/layout.html:112
 msgid "Article authors"
 msgstr ""
 
-#: skbl/computeviews.py:439
+#: skbl/computeviews.py:594
 msgid "Please enter all the fields!"
 msgstr ""
 
-#: skbl/computeviews.py:443
+#: skbl/computeviews.py:598
 msgid "Please enter a valid email address!"
 msgstr ""
 
-#: skbl/computeviews.py:449 skbl/templates/layout.html:116 skbl/views.py:102
+#: skbl/computeviews.py:605 skbl/templates/layout.html:116 skbl/views.py:102
 msgid "Contact"
 msgstr ""
 
-#: skbl/computeviews.py:450 skbl/views.py:103
+#: skbl/computeviews.py:606 skbl/views.py:103
 msgid "Contact SKBL"
 msgstr ""
 
-#: skbl/computeviews.py:515 skbl/computeviews.py:516
+#: skbl/computeviews.py:681 skbl/computeviews.py:682
 msgid "Thank you for your feedback"
 msgstr ""
 
-#: skbl/computeviews.py:517
+#: skbl/computeviews.py:683
 msgid "We will get back to you as soon as we can."
 msgstr ""
 
-#: skbl/helpers.py:497
+#: skbl/helpers.py:543
 msgid "Residence"
 msgstr ""
 
-#: skbl/helpers.py:498
+#: skbl/helpers.py:544
 msgid "Place of activity"
 msgstr ""
 
-#: skbl/helpers.py:499
+#: skbl/helpers.py:545
 msgid "Place of education"
 msgstr ""
 
-#: skbl/helpers.py:500 skbl/templates/article.html:318
+#: skbl/helpers.py:546 skbl/templates/article.html:318
 msgid "Contacts"
 msgstr ""
 
-#: skbl/helpers.py:501 skbl/templates/article.html:422
+#: skbl/helpers.py:547 skbl/templates/article.html:422
 #: skbl/templates/article.html:435 skbl/templates/article.html:451
 msgid "Birthplace"
 msgstr ""
 
-#: skbl/helpers.py:502 skbl/templates/article.html:428
+#: skbl/helpers.py:548 skbl/templates/article.html:428
 #: skbl/templates/article.html:441
 msgid "Place of death"
 msgstr ""
@@ -298,7 +298,7 @@ msgid "Submit"
 msgstr ""
 
 #: skbl/templates/contact_active.html:16
-msgid "Send minor corrections to:"
+msgid "Send in minor corrections to:"
 msgstr ""
 
 #: skbl/templates/layout.html:67

skbl/translations/sv/LC_MESSAGES/messages.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-04-26 13:47+0200\n"
+"POT-Creation-Date: 2024-04-29 10:36+0200\n"
 "PO-Revision-Date: 2017-02-20 14:49+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: sv\n"
@@ -18,84 +18,84 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: skbl/computeviews.py:98 skbl/views.py:38 skbl/views.py:313 skbl/views.py:521
-#: skbl/views.py:694
+#: skbl/computeviews.py:130 skbl/views.py:38 skbl/views.py:313
+#: skbl/views.py:521 skbl/views.py:694
 msgid "Contents could not be found!"
 msgstr "Innehållet kunde inte hittas!"
 
-#: skbl/computeviews.py:129 skbl/templates/article.html:360
+#: skbl/computeviews.py:177 skbl/templates/article.html:360
 #: skbl/templates/layout.html:146
 msgid "Organisations"
 msgstr "Organisationer"
 
-#: skbl/computeviews.py:155 skbl/templates/article.html:276
+#: skbl/computeviews.py:212 skbl/templates/article.html:276
 #: skbl/templates/contact.html:42 skbl/templates/layout.html:139
 msgid "Activities"
 msgstr "Verksamhet"
 
-#: skbl/computeviews.py:190 skbl/computeviews.py:233
+#: skbl/computeviews.py:276 skbl/computeviews.py:349
 #: skbl/templates/layout.html:109
 msgid "Map"
 msgstr "Karta"
 
-#: skbl/computeviews.py:197 skbl/templates/layout.html:105
+#: skbl/computeviews.py:285 skbl/templates/layout.html:105
 msgid "Women A-Z"
 msgstr "Kvinnor A-Ö"
 
-#: skbl/computeviews.py:279
+#: skbl/computeviews.py:400
 msgid "Placenames"
 msgstr "Orter"
 
-#: skbl/computeviews.py:347 skbl/templates/layout.html:112
+#: skbl/computeviews.py:477 skbl/templates/layout.html:112
 msgid "Article authors"
 msgstr "Artikelförfattare"
 
-#: skbl/computeviews.py:439
+#: skbl/computeviews.py:594
 msgid "Please enter all the fields!"
 msgstr "Alla fält måste vara ifyllda!"
 
-#: skbl/computeviews.py:443
+#: skbl/computeviews.py:598
 msgid "Please enter a valid email address!"
 msgstr "Du måste ange en giltig e-post-adress!"
 
-#: skbl/computeviews.py:449 skbl/templates/layout.html:116 skbl/views.py:102
+#: skbl/computeviews.py:605 skbl/templates/layout.html:116 skbl/views.py:102
 msgid "Contact"
 msgstr "Kontakt"
 
-#: skbl/computeviews.py:450 skbl/views.py:103
+#: skbl/computeviews.py:606 skbl/views.py:103
 msgid "Contact SKBL"
 msgstr "Kontakta SKBL"
 
-#: skbl/computeviews.py:515 skbl/computeviews.py:516
+#: skbl/computeviews.py:681 skbl/computeviews.py:682
 msgid "Thank you for your feedback"
 msgstr "Tack för din återkoppling"
 
-#: skbl/computeviews.py:517
+#: skbl/computeviews.py:683
 msgid "We will get back to you as soon as we can."
 msgstr "Vi återkommer så fort vi kan."
 
-#: skbl/helpers.py:497
+#: skbl/helpers.py:543
 msgid "Residence"
 msgstr "Bostadsort"
 
-#: skbl/helpers.py:498
+#: skbl/helpers.py:544
 msgid "Place of activity"
 msgstr "Verksamhetsort"
 
-#: skbl/helpers.py:499
+#: skbl/helpers.py:545
 msgid "Place of education"
 msgstr "Utbildningsort"
 
-#: skbl/helpers.py:500 skbl/templates/article.html:318
+#: skbl/helpers.py:546 skbl/templates/article.html:318
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: skbl/helpers.py:501 skbl/templates/article.html:422
+#: skbl/helpers.py:547 skbl/templates/article.html:422
 #: skbl/templates/article.html:435 skbl/templates/article.html:451
 msgid "Birthplace"
 msgstr "Födelseort"
 
-#: skbl/helpers.py:502 skbl/templates/article.html:428
+#: skbl/helpers.py:548 skbl/templates/article.html:428
 #: skbl/templates/article.html:441
 msgid "Place of death"
 msgstr "Dödsort"
@@ -300,7 +300,7 @@ msgid "Submit"
 msgstr "Skicka"
 
 #: skbl/templates/contact_active.html:16
-msgid "Send minor corrections to:"
+msgid "Send in minor corrections to:"
 msgstr "Skicka in mindre korrigeringar till:"
 
 #: skbl/templates/layout.html:67

tests/test_routes.py

@@ -1,7 +1,7 @@
 import pytest
 
 
-@pytest.mark.parametrize("route", ["/sv", "/en"])
+@pytest.mark.parametrize("route", ["/sv", "/en", "/sv/om-skbl", "/en/about-skbl"])
 def test_routes(client, route: str, snapshot):
     response = client.get(route)