Merge remote-tracking branch 'origin/development' into regions/country-poster-hue

2026-09-29 20:45:42 +00:00 · 2026-09-29 20:45:42 +00:00 · 1ab8524cfb
commit 1ab8524cfb
parent b605b30ae1 c934f8020e
16 changed files with 41 additions and 30 deletions
--- a/library/i18n/locales/ar/mapInfo.json
+++ b/library/i18n/locales/ar/mapInfo.json
@ -35,7 +35,8 @@
    },
    "research-map-plus-grid": {
      "lead": "الخريطة إلى جانب القائمة. اختر شعبًا على الخريطة فتتبعه القائمة، وضيِّق القائمة فتتبعها الخريطة.",
-      "takeaway": "خذ معك ملصقًا للخريطة كما تراها، جاهزًا للطباعة، وحزمة صلاة لتوزّعها."
+      "takeaway": "خذ معك ملصقًا للخريطة كما تراها، جاهزًا للطباعة، وحزمة صلاة لتوزّعها.",
+      "examplePacket": "مثال على حزمة الصلاة: قلب الشرق الأوسط"
    },
    "prayer-map": {
      "lead": "كل الشعوب غير المُبشَّرة على خريطة واحدة، ملوّنة بحسب ما إذا كان أحد يصلّي من أجلها بعد، وما إذا كانت مخدومة، وما إذا كانت مُتبنّاة.",
--- a/library/i18n/locales/de/mapInfo.json
+++ b/library/i18n/locales/de/mapInfo.json
@ -35,7 +35,8 @@
    },
    "research-map-plus-grid": {
      "lead": "Die Karte neben der Liste. Wählen Sie ein Volk auf der Karte, und die Liste folgt; grenzen Sie die Liste ein, und die Karte folgt.",
-      "takeaway": "Nehmen Sie ein Poster der Karte, wie Sie sie sehen, druckfertig, und ein Gebetspaket zum Verteilen mit."
+      "takeaway": "Nehmen Sie ein Poster der Karte, wie Sie sie sehen, druckfertig, und ein Gebetspaket zum Verteilen mit.",
+      "examplePacket": "Beispiel-Gebetsheft: Kerngebiet Naher Osten"
    },
    "prayer-map": {
      "lead": "Alle unerreichten Volksgruppen auf einer Karte, eingefärbt danach, ob schon jemand für sie betet, ob sie erreicht werden und ob sie adoptiert sind.",
--- a/library/i18n/locales/en/mapInfo.json
+++ b/library/i18n/locales/en/mapInfo.json
@ -35,7 +35,8 @@
    },
    "research-map-plus-grid": {
      "lead": "The map beside the list. Pick a people group on the map and the list follows it; narrow the list and the map follows back.",
-      "takeaway": "Take away a poster of the map as you see it, ready to print, and a prayer packet to hand out."
+      "takeaway": "Take away a poster of the map as you see it, ready to print, and a prayer packet to hand out.",
+      "examplePacket": "Example packet: Middle East Core"
    },
    "prayer-map": {
      "lead": "Every unreached people group on one map, coloured by whether anyone is praying for it yet, whether it is engaged, and whether it is adopted.",
--- a/library/i18n/locales/es/mapInfo.json
+++ b/library/i18n/locales/es/mapInfo.json
@ -35,7 +35,8 @@
    },
    "research-map-plus-grid": {
      "lead": "El mapa junto a la lista. Elija un pueblo en el mapa y la lista lo sigue; reduzca la lista y el mapa la sigue.",
-      "takeaway": "Llévese un póster del mapa tal como lo ve, listo para imprimir, y un paquete de oración para repartir."
+      "takeaway": "Llévese un póster del mapa tal como lo ve, listo para imprimir, y un paquete de oración para repartir.",
+      "examplePacket": "Paquete de oración de ejemplo: núcleo de Oriente Medio"
    },
    "prayer-map": {
      "lead": "Todos los grupos étnicos no alcanzados en un solo mapa, coloreados según si alguien ya ora por ellos, si están siendo alcanzados y si han sido adoptados.",
--- a/library/i18n/locales/fr/mapInfo.json
+++ b/library/i18n/locales/fr/mapInfo.json
@ -35,7 +35,8 @@
    },
    "research-map-plus-grid": {
      "lead": "La carte à côté de la liste. Choisissez un peuple sur la carte et la liste le suit ; réduisez la liste et la carte suit.",
-      "takeaway": "Emportez une affiche de la carte telle que vous la voyez, prête à imprimer, et un dossier de prière à distribuer."
+      "takeaway": "Emportez une affiche de la carte telle que vous la voyez, prête à imprimer, et un dossier de prière à distribuer.",
+      "examplePacket": "Livret de prière d’exemple : cœur du Moyen-Orient"
    },
    "prayer-map": {
      "lead": "Tous les peuples non atteints sur une seule carte, colorés selon que quelqu'un prie déjà pour eux, qu'ils sont engagés et qu'ils sont adoptés.",
--- a/library/i18n/locales/hi/mapInfo.json
+++ b/library/i18n/locales/hi/mapInfo.json
@ -35,7 +35,8 @@
    },
    "research-map-plus-grid": {
      "lead": "सूची के साथ नक्शा। नक्शे पर एक जनसमूह चुनें और सूची उसका अनुसरण करती है; सूची सीमित करें और नक्शा अनुसरण करता है।",
-      "takeaway": "नक्शे का पोस्टर जैसा आप देखते हैं, छपाई के लिए तैयार, और बाँटने के लिए प्रार्थना पैकेट साथ ले जाएँ।"
+      "takeaway": "नक्शे का पोस्टर जैसा आप देखते हैं, छपाई के लिए तैयार, और बाँटने के लिए प्रार्थना पैकेट साथ ले जाएँ।",
+      "examplePacket": "उदाहरण प्रार्थना पुस्तिका: मध्य पूर्व का केंद्र"
    },
    "prayer-map": {
      "lead": "सभी अपहुँचे जन-समूह एक ही नक्शे पर, इस आधार पर रंगे हुए कि क्या कोई उनके लिए अभी प्रार्थना कर रहा है, क्या उनके बीच काम हो रहा है, और क्या उन्हें गोद लिया गया है।",
--- a/library/i18n/locales/it/mapInfo.json
+++ b/library/i18n/locales/it/mapInfo.json
@ -35,7 +35,8 @@
    },
    "research-map-plus-grid": {
      "lead": "La mappa accanto all'elenco. Scegli un popolo sulla mappa e l'elenco lo segue; restringi l'elenco e la mappa lo segue.",
-      "takeaway": "Porta con te un poster della mappa così come la vedi, pronto da stampare, e un pacchetto di preghiera da distribuire."
+      "takeaway": "Porta con te un poster della mappa così come la vedi, pronto da stampare, e un pacchetto di preghiera da distribuire.",
+      "examplePacket": "Libretto di preghiera di esempio: cuore del Medio Oriente"
    },
    "prayer-map": {
      "lead": "Tutti i popoli non raggiunti su un'unica mappa, colorati secondo se qualcuno prega già per loro, se sono raggiunti e se sono adottati.",
--- a/library/i18n/locales/pt/mapInfo.json
+++ b/library/i18n/locales/pt/mapInfo.json
@ -35,7 +35,8 @@
    },
    "research-map-plus-grid": {
      "lead": "O mapa ao lado da lista. Escolha um povo no mapa e a lista segue-o; reduza a lista e o mapa segue.",
-      "takeaway": "Leve um pôster do mapa tal como o vê, pronto a imprimir, e um pacote de oração para distribuir."
+      "takeaway": "Leve um pôster do mapa tal como o vê, pronto a imprimir, e um pacote de oração para distribuir.",
+      "examplePacket": "Pacote de oração de exemplo: núcleo do Oriente Médio"
    },
    "prayer-map": {
      "lead": "Todos os povos não alcançados em um só mapa, coloridos conforme alguém já ora por eles, se estão sendo alcançados e se foram adotados.",
--- a/library/i18n/locales/ro/mapInfo.json
+++ b/library/i18n/locales/ro/mapInfo.json
@ -35,7 +35,8 @@
    },
    "research-map-plus-grid": {
      "lead": "Harta lângă listă. Alege un popor pe hartă și lista îl urmează; restrânge lista și harta o urmează.",
-      "takeaway": "Ia cu tine un poster al hărții așa cum o vezi, gata de tipărit, și un pachet de rugăciune de împărțit."
+      "takeaway": "Ia cu tine un poster al hărții așa cum o vezi, gata de tipărit, și un pachet de rugăciune de împărțit.",
+      "examplePacket": "Pachet de rugăciune exemplu: nucleul Orientului Mijlociu"
    },
    "prayer-map": {
      "lead": "Toate grupurile etnice neatinse pe o singură hartă, colorate după cum cineva se roagă deja pentru ele, dacă sunt atinse și dacă sunt adoptate.",
--- a/library/i18n/locales/ru/mapInfo.json
+++ b/library/i18n/locales/ru/mapInfo.json
@ -35,7 +35,8 @@
    },
    "research-map-plus-grid": {
      "lead": "Карта рядом со списком. Выберите народ на карте — список последует за ним; сузьте список — карта последует за ним.",
-      "takeaway": "Заберите плакат карты в том виде, как вы её видите, готовый к печати, и молитвенный пакет для раздачи."
+      "takeaway": "Заберите плакат карты в том виде, как вы её видите, готовый к печати, и молитвенный пакет для раздачи.",
+      "examplePacket": "Пример молитвенного буклета: центральная часть Ближнего Востока"
    },
    "prayer-map": {
      "lead": "Все неохваченные народы на одной карте, окрашенные по тому, молится ли уже кто-нибудь о них, ведётся ли среди них служение и усыновлены ли они.",
--- a/library/i18n/locales/zh/mapInfo.json
+++ b/library/i18n/locales/zh/mapInfo.json
@ -35,7 +35,8 @@
    },
    "research-map-plus-grid": {
      "lead": "地图与列表并排。在地图上选择一个民族，列表随之跟随；缩小列表范围，地图也随之跟随。",
-      "takeaway": "带走一张你所见地图的海报，可直接打印，以及一份可分发的祷告手册。"
+      "takeaway": "带走一张你所见地图的海报，可直接打印，以及一份可分发的祷告手册。",
+      "examplePacket": "示例祷告手册：中东核心地区"
    },
    "prayer-map": {
      "lead": "所有未得之民群体都在一张地图上，按是否已有人为他们祷告、是否已有人在其中事工、是否已被认领来着色。",
--- a/public/dx-maps/doxa-maps-spa/doxa-maps-spa.js
+++ b/public/dx-maps/doxa-maps-spa/doxa-maps-spa.js
--- a/public/dx-maps/doxa-maps-spa/doxa-maps-spa/app/index.html
+++ b/public/dx-maps/doxa-maps-spa/doxa-maps-spa/app/index.html
@ -61,7 +61,7 @@

  <script>window.MAP_APP_API_URL = "https://pray.doxa.life";</script>
  <!-- Bundle IIFE — registers the <doxa-maps-spa> custom element. -->
-  <script src="../../doxa-maps-spa.js" integrity="sha384-BNdfznP4spIiAIquJ8C9o25J8OHmcWwyNN7OaMMxz/2bk1UJa28QHmDqKhY6qzis" crossorigin="anonymous"></script>
+  <script src="../../doxa-maps-spa.js" integrity="sha384-0+sHtNWeugOjBSp/XwWGuNRgBECJkdkdiCxmGcYuYWSWVhVqQtXwWDVmvuiEXBQ5" crossorigin="anonymous"></script>

  <script>
    // Mapbox token resolution — the A3 ladder, in precedence order:
--- a/public/dx-maps/doxa-maps-spa/doxa-maps-spa/index.html
+++ b/public/dx-maps/doxa-maps-spa/doxa-maps-spa/index.html
@ -61,7 +61,7 @@

  <script>window.MAP_APP_API_URL = "https://pray.doxa.life";</script>
  <!-- Bundle IIFE — registers the <doxa-maps-spa> custom element. -->
-  <script src="../doxa-maps-spa.js" integrity="sha384-BNdfznP4spIiAIquJ8C9o25J8OHmcWwyNN7OaMMxz/2bk1UJa28QHmDqKhY6qzis" crossorigin="anonymous"></script>
+  <script src="../doxa-maps-spa.js" integrity="sha384-0+sHtNWeugOjBSp/XwWGuNRgBECJkdkdiCxmGcYuYWSWVhVqQtXwWDVmvuiEXBQ5" crossorigin="anonymous"></script>

  <script>
    // Mapbox token resolution — the A3 ladder, in precedence order:
--- a/public/dx-maps/doxa-maps-spa/manifest.json
+++ b/public/dx-maps/doxa-maps-spa/manifest.json
@ -361,7 +361,7 @@
      "bundle": "doxa-maps-spa",
      "scriptUrl": "./doxa-maps-spa/doxa-maps-spa.js",
      "output": "dx-maps/doxa-maps-spa/doxa-maps-spa.js",
-      "integrity": "sha384-BNdfznP4spIiAIquJ8C9o25J8OHmcWwyNN7OaMMxz/2bk1UJa28QHmDqKhY6qzis",
+      "integrity": "sha384-0+sHtNWeugOjBSp/XwWGuNRgBECJkdkdiCxmGcYuYWSWVhVqQtXwWDVmvuiEXBQ5",
      "elements": [
        "doxa-maps-spa"
      ],
@ -389,7 +389,7 @@
          "scriptUrl": "./doxa-maps-spa/doxa-maps-spa.js",
          "embed": {
            "iframe": "<iframe src=\"./doxa-maps-spa/doxa-maps-spa/index.html?utm_source=YOUR_SOURCE\" width=\"100%\" height=\"600\" style=\"border:none;border-radius:12px;\" allowfullscreen></iframe>",
-            "script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./doxa-maps-spa/doxa-maps-spa.js\" integrity=\"sha384-BNdfznP4spIiAIquJ8C9o25J8OHmcWwyNN7OaMMxz/2bk1UJa28QHmDqKhY6qzis\" crossorigin=\"anonymous\"></script>\n<!-- provider: \"maplibre\" is the default; change it to \"mapbox\" and fill tk to use Mapbox. -->\n<doxa-maps-spa profile-config='{\"profile\":\"doxa-maps-spa\",\"provider\":\"maplibre\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></doxa-maps-spa>"
+            "script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./doxa-maps-spa/doxa-maps-spa.js\" integrity=\"sha384-0+sHtNWeugOjBSp/XwWGuNRgBECJkdkdiCxmGcYuYWSWVhVqQtXwWDVmvuiEXBQ5\" crossorigin=\"anonymous\"></script>\n<!-- provider: \"maplibre\" is the default; change it to \"mapbox\" and fill tk to use Mapbox. -->\n<doxa-maps-spa profile-config='{\"profile\":\"doxa-maps-spa\",\"provider\":\"maplibre\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></doxa-maps-spa>"
          },
          "instances": [
            {
--- a/public/dx-maps/manifest.json
+++ b/public/dx-maps/manifest.json
@ -361,7 +361,7 @@
      "bundle": "doxa-maps-spa",
      "scriptUrl": "./doxa-maps-spa/doxa-maps-spa.js",
      "output": "dx-maps/doxa-maps-spa/doxa-maps-spa.js",
-      "integrity": "sha384-BNdfznP4spIiAIquJ8C9o25J8OHmcWwyNN7OaMMxz/2bk1UJa28QHmDqKhY6qzis",
+      "integrity": "sha384-0+sHtNWeugOjBSp/XwWGuNRgBECJkdkdiCxmGcYuYWSWVhVqQtXwWDVmvuiEXBQ5",
      "elements": [
        "doxa-maps-spa"
      ],
@ -389,7 +389,7 @@
          "scriptUrl": "./doxa-maps-spa/doxa-maps-spa.js",
          "embed": {
            "iframe": "<iframe src=\"./doxa-maps-spa/doxa-maps-spa/index.html?utm_source=YOUR_SOURCE\" width=\"100%\" height=\"600\" style=\"border:none;border-radius:12px;\" allowfullscreen></iframe>",
-            "script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./doxa-maps-spa/doxa-maps-spa.js\" integrity=\"sha384-BNdfznP4spIiAIquJ8C9o25J8OHmcWwyNN7OaMMxz/2bk1UJa28QHmDqKhY6qzis\" crossorigin=\"anonymous\"></script>\n<!-- provider: \"maplibre\" is the default; change it to \"mapbox\" and fill tk to use Mapbox. -->\n<doxa-maps-spa profile-config='{\"profile\":\"doxa-maps-spa\",\"provider\":\"maplibre\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></doxa-maps-spa>"
+            "script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./doxa-maps-spa/doxa-maps-spa.js\" integrity=\"sha384-0+sHtNWeugOjBSp/XwWGuNRgBECJkdkdiCxmGcYuYWSWVhVqQtXwWDVmvuiEXBQ5\" crossorigin=\"anonymous\"></script>\n<!-- provider: \"maplibre\" is the default; change it to \"mapbox\" and fill tk to use Mapbox. -->\n<doxa-maps-spa profile-config='{\"profile\":\"doxa-maps-spa\",\"provider\":\"maplibre\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></doxa-maps-spa>"
          },
          "instances": [
            {