fix various bugs

medialab · Dec 3, 2024 · 5e9a3ff · 5e9a3ff
1 parent b3bf1ed
commit 5e9a3ff
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 27 deletions.
diff --git a/datascripts/_fetch_content.py b/datascripts/_fetch_content.py
@@ -215,7 +215,8 @@ def make_markdown_from_viz_index(row):
             if re_match_footnote_ref:
                 footnote_id = re_match_footnote_ref.groupdict()['id']
                 footnote_ref = link
-                footnote_text_container = footnote_ref.find_next('span')
+                # footnote_text_container = footnote_ref.find_next('span')
+                footnote_text_container = footnote_ref.parent
                 footnote_text = ''.join([text.string for text in footnote_text_container.parent.find_all('span')])
                 footnote_text = footnote_text.replace('“', '«').replace('”', '»')
                 footnote_anchor = soup.find('a', {'href': str('#ftnt' + footnote_id)})

diff --git a/src/content/en/part-1.mdx b/src/content/en/part-1.mdx
diff --git a/src/content/en/part-2.mdx b/src/content/en/part-2.mdx
diff --git a/src/content/en/part-3.mdx b/src/content/en/part-3.mdx
diff --git a/src/content/en/part-5.mdx b/src/content/en/part-5.mdx
diff --git a/src/content/en/part-6.mdx b/src/content/en/part-6.mdx
diff --git a/src/content/en/part-7.mdx b/src/content/en/part-7.mdx
diff --git a/src/content/fr/part-1.mdx b/src/content/fr/part-1.mdx
diff --git a/src/content/fr/part-2.mdx b/src/content/fr/part-2.mdx
diff --git a/src/content/fr/part-3.mdx b/src/content/fr/part-3.mdx
diff --git a/src/content/fr/part-5.mdx b/src/content/fr/part-5.mdx
diff --git a/src/content/fr/part-6.mdx b/src/content/fr/part-6.mdx
diff --git a/src/content/fr/part-7.mdx b/src/content/fr/part-7.mdx
diff --git a/src/data/viz.json b/src/data/viz.json
@@ -868,7 +868,7 @@
         "n_chapitre": "1",
         "lien_permanent_visualisation": "https://medialab.github.io/portic-storymaps-2022/#/fr/visualization/carte-destinations-non-dunkerquois",
         "titre_fr": "Les destinations des non-dunkerquois",
-        "titre_en": "The destinations of non-Dunkerquois",
+        "titre_en": "Destinations for non-Dunkerquois",
         "comment_lire_fr": "",
         "comment_lire_en": "",
         "comment_cest_fait_fr": "",

diff --git a/src/i18n/catalog.yml b/src/i18n/catalog.yml
@@ -174,7 +174,7 @@ PecheMap:
     en: Herring
   Dogre Banc:
     fr: Dogre Banc
-    en: Dogre Banc
+    en: Dogger Bank
 HistoireDunkerque:
   legend_square_port_free:
     fr: Port franc
@@ -211,11 +211,11 @@ TonnagesF12:
     fr: Partenaires F12 alignés sur la classification toflit18 "grouping"
     en: F12 Partners aligned on toflit18 "grouping" classification
   hyp_with_lest:
-    fr: En supposant que la source F12 n’inclut pas les navires partis sur lest (estimation de référence)
-    en: suppose source counts ships which left in ballast
+    fr: Estimation basse de référence, en supposant que la source F12 n’inclut pas les navires partis sur lest
+    en: Low reference estimate, supposing source F12 does not include ships which left in ballast
   hyp_without_lest:
-    fr: En supposant que la source F12 inclut les navires partis sur lest (le lest est donc soustrait)
-    en: suppose source does not count ships which left in ballast (substract ballast)
+    fr: Estimation haute, en supposant que la source F12 inclut les navire partis sur lest
+    en: High estimate, supposing source F12 includes ships which left in ballast
   with_lest_title:
     fr: tonnage cumulé (hypothèse selon laquelle la source contient le lest)
     en: cumulated tonnage (we suppose the source does contains ballast)
@@ -862,12 +862,18 @@ ComparaisonLaRochelle:
   estimation_type_1:
     fr: valeur observée dans toflit18 (pondérée avec les ratios terre-mer)
     en: value observed in toflit18 (weighted with land-sea ratios)
+  # estimation_type_2:
+  #   fr: estimation haute (hyp. F12 inclut lest)
+  #   en: high estimate (supposing F12 includes ballast)
+  # estimation_type_3:
+  #   fr: estimation basse (hyp. F12 exclut lest)
+  #   en: low estimate (supposing F12 excludes ballast)
   estimation_type_2:
-    fr: estimation haute (hyp. F12 inclut lest)
-    en: high estimate (supposing F12 includes ballast)
+    fr: estimation
+    en: estimate
   estimation_type_3:
-    fr: estimation basse (hyp. F12 exclut lest)
-    en: low estimate (supposing F12 excludes ballast)
+    fr: estimation
+    en: estimate
 DestinationsDkPrProjection:
   x:
     fr: tonnage
@@ -1052,13 +1058,13 @@ AlluvialImportExport:
     en: Unknowns
   Toiles diverses:
     fr: Toiles diverses
-    en: Various canvases
+    en: Various cloths
   Blé et autres grains comestibles:
     fr: Blé et autres grains comestibles
     en: Wheat and other edible grains
   Toiles de coton:
     fr: Toiles de coton
-    en: Cotton canvasses
+    en: Cotton cloths
   Étoffes de laine:
     fr: Étoffes de laine
     en: Woolen fabrics

diff --git a/src/summary.js b/src/summary.js
@@ -116,8 +116,8 @@ export default [
       en: 'sources-and-biblio'
     },
     titles: {
-      fr: 'Sources et références bibliographiques',
-      en: 'Sources and academic references'
+      fr: 'Sources & refs.',
+      en: 'Sources & refs.'
     },
     contents: {
       fr: frBiblio,