Merge main into bundler-2/work

2026-09-24 06:34:45 +00:00 · 2026-09-24 06:34:45 +00:00 · ad6787e617
commit ad6787e617
parent 0951b91875 81cb8ad235
10 changed files with 110 additions and 84 deletions
--- a/plugin-designs/regions-dashboard/regions-list.vue
+++ b/plugin-designs/regions-dashboard/regions-list.vue
@ -430,7 +430,10 @@ useShadowStyles(
  '.country-link{ appearance:none; background:none; border:0; padding:2px 0; margin:0;' +
  '  text-align:left; cursor:pointer; color:#4e594f; font:inherit; font-size:19.5312px;' +
  '  font-weight:500; width:100%; position:relative; }' +
-  '.country-link::before{ content:""; position:absolute; left:-16px; top:0.6em; width:6px; height:6px;' +
+  // inset-inline-start, NOT left: the bullet hangs off the text's starting edge, which is the
+  // RIGHT edge in Arabic. With `left:-16px` it stayed on the physical left in RTL — measured
+  // at locale=ar, computed right was 256.938px instead of the -16px near-edge overhang.
+  '.country-link::before{ content:""; position:absolute; inset-inline-start:-16px; top:0.6em; width:6px; height:6px;' +
  '  border-radius:50%; background:#92b195; }' +
  '.country-link:hover{ text-decoration:underline; text-decoration-color:#92b195; }' +
  '.country-link:focus-visible{ outline:2px solid #92b195; outline-offset:2px; border-radius:4px; }' +
--- a/plugin-designs/regions-dashboard/regions-mfe.vue
+++ b/plugin-designs/regions-dashboard/regions-mfe.vue
@ -29,7 +29,21 @@ import { buildPaneColumn, PANE_GRID_STYLES } from '@map/layouts/pane-wrapper/pan
 import { useShadowStyles } from '@map/composables/useShadowStyles.js'
 import ViewSelect from '@map/components/ViewSelect.vue'
 import ShareButton from '@map/components/map-controls/ShareButton.vue'
+// The SELECT VIEW strip is one of the sanctioned additions, so DX-life has no equivalent
+// markup to clone — and until now its labels were hardcoded English, making it the one piece
+// of chrome that never localised (visible at locale=ar: the panes and every heading go RTL
+// and Arabic while the tabs still read "Regions List").
+//
+// t() here uses the same literal-English-as-key convention as the rest of the port, and the
+// shim FALLS BACK TO THE KEY, so today's rendering is byte-identical. Deliberately NO keys
+// were added to the catalogues: (a) translating our own additions is not this agent's call,
+// and (b) check:i18n-parity tracks a per-locale debt CEILING — it/ro/zh sit at exactly 94
+// missing because DX-life translates 8 of our 11 locales — so English-only keys would push
+// them to 97 and fail the gate. The moment someone adds these three strings to all locales,
+// the strip localises with no code change here.
+import { useRegionsI18n } from './src/useRegionsI18n.js'

+const { t }   = useRegionsI18n()
 const cfg     = inject('profileConfig', ref(null))
 const uiStore = inject('uiStore', null)
 const isDark  = computed(() => !!uiStore?.isDark)
@ -49,8 +63,8 @@ const spec = computed(() => ({
  // pages were correctly clean — the same cap-4 inheritance gap assetsBase hit.
  config: { profile: 'regions-list', instanceId: instanceId.value, pinHint: false },
  panes: [
-    { id: 'list',      label: 'Regions List',      at: [0, 0], config: { profile: 'regions-list' } },
-    { id: 'dashboard', label: 'Region Dashboards', at: [1, 0], config: { profile: 'region-dashboards' } },
+    { id: 'list',      label: t('Regions List'),      at: [0, 0], config: { profile: 'regions-list' } },
+    { id: 'dashboard', label: t('Region Dashboards'), at: [1, 0], config: { profile: 'region-dashboards' } },
  ],
  // The View switcher lives in this element's own header, so the layout's "… below ↓" pill
  // would be a second, redundant control (same call upg-100-mfe makes).
@ -176,8 +190,8 @@ useShadowStyles(PANE_GRID_STYLES + '\n' +
      <ViewSelect
        :views="spec.panes"
        :current="view"
-        legend="Select View"
-        label="Views"
+        :legend="t('Select View')"
+        :label="t('Views')"
        @select="go"
      />
      <ShareButton :is-dark="isDark" :embed-path="SHARE_EMBED_PATH" />
--- a/plugin-designs/regions-dashboard/src/RegionCountryMap.vue
+++ b/plugin-designs/regions-dashboard/src/RegionCountryMap.vue
@ -404,7 +404,10 @@ useShadowStyles(
  '.rcm__note{ position:absolute; inset:0; display:flex; align-items:center; justify-content:center;' +
  '  text-align:center; padding:24px; color:#6d766e; font-size:15.625px; background:#f3f3f1; }' +
  // Their key, overlaid bottom-left above the canvas (CountryMap.vue's .country-map__legend).
-  '.rcm__legend{ position:absolute; left:10px; bottom:28px; z-index:2; display:flex;' +
+  // Logical, so the chooser legend moves to the reading-start corner in Arabic. This is one
+  // of the sanctioned additions rather than a clone of theirs, but a legend pinned to the
+  // physical left in an RTL layout reads as broken regardless of whose design it is.
+  '.rcm__legend{ position:absolute; inset-inline-start:10px; bottom:28px; z-index:2; display:flex;' +
  '  flex-direction:column; gap:4px; padding:8px 10px; border-radius:8px;' +
  '  background:rgba(255,255,255,0.92); font-size:12.5px; font-weight:600; color:#2a332a; }' +
  '.rcm__legend span{ display:inline-flex; align-items:center; gap:6px; }' +
--- a/plugin-designs/regions-dashboard/src/UupgsList.vue
+++ b/plugin-designs/regions-dashboard/src/UupgsList.vue
@ -276,8 +276,14 @@ useShadowStyles(
  '  background:var(--dx-white); padding:10px 23.5264px; text-indent:1.5em; font:inherit;' +
  '  font-size:19.5312px; color:var(--dx-text); }' +
  '.search-box input::placeholder{ color:gray; }' +
-  '.search-icon{ position:absolute; left:16px; top:50%; transform:translateY(-50%); width:18px;' +
-  '  height:18px; fill:none; stroke:var(--dx-muted); stroke-width:2; pointer-events:none; }' +
+  // THEIRS verbatim, blocks/_form.scss:119-128 — inset-inline-start:1em, top:0/bottom:0 with
+  // margin:auto 0 for the centring, and 1em square so the icon scales with the input's type.
+  // Ours had `left:16px` with a translate, which in RTL left the icon on the physical LEFT:
+  // MEASURED against their live /ar/regions/cameroon, ours sat 566px from the inline-start edge
+  // against their 19.5px. A physical property survives a direction flip; a logical one does not.
+  // Their fixed 18px square also could not track the font, where theirs is 1em.
+  '.search-icon{ position:absolute; inset-inline-start:1em; top:0; bottom:0; margin:auto 0;' +
+  '  width:1em; height:1em; fill:none; stroke:var(--dx-muted); stroke-width:2; pointer-events:none; }' +
  // .filters__toggle — centred, chevron rotates when expanded
  '.filters__toggle{ background:none; border:0; cursor:pointer; font:inherit; font-size:15.625px;' +
  '  display:inline-flex; align-items:center; gap:7.5188px; margin-inline:auto; color:var(--dx-text); }' +
--- a/public/doxa-maps/index.html
+++ b/public/doxa-maps/index.html
--- a/public/doxa-maps/manifest.json
+++ b/public/doxa-maps/manifest.json
@ -856,7 +856,7 @@
      "bundle": "regions-dashboard",
      "scriptUrl": "./regions-dashboard/regions-dashboard.js",
      "output": "doxa-maps/regions-dashboard/regions-dashboard.js",
-      "integrity": "sha384-r0Xo6MLumWczZhDLa+U3zlxf4Wal/ZOW5zlgQiOC15aIH20NaY2RCYf1GyWKwRiG",
+      "integrity": "sha384-f2Bf2Le3VRKjVFXcXhuRzEpHcuIXiCQDY2MSdKQG/ZKsRP2+a7I2/82myqQQb6aa",
      "elements": [
        "regions-dashboard"
      ],
@ -876,7 +876,7 @@
          "scriptUrl": "./regions-dashboard/regions-dashboard.js",
          "embed": {
            "iframe": "<iframe src=\"./regions-dashboard/region-dashboards/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=\"./regions-dashboard/regions-dashboard.js\" integrity=\"sha384-r0Xo6MLumWczZhDLa+U3zlxf4Wal/ZOW5zlgQiOC15aIH20NaY2RCYf1GyWKwRiG\" crossorigin=\"anonymous\"></script>\n<regions-dashboard profile-config='{\"profile\":\"region-dashboards\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></regions-dashboard>"
+            "script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./regions-dashboard/regions-dashboard.js\" integrity=\"sha384-f2Bf2Le3VRKjVFXcXhuRzEpHcuIXiCQDY2MSdKQG/ZKsRP2+a7I2/82myqQQb6aa\" crossorigin=\"anonymous\"></script>\n<regions-dashboard profile-config='{\"profile\":\"region-dashboards\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></regions-dashboard>"
          }
        },
        {
@ -890,7 +890,7 @@
          "scriptUrl": "./regions-dashboard/regions-dashboard.js",
          "embed": {
            "iframe": "<iframe src=\"./regions-dashboard/regions-list/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=\"./regions-dashboard/regions-dashboard.js\" integrity=\"sha384-r0Xo6MLumWczZhDLa+U3zlxf4Wal/ZOW5zlgQiOC15aIH20NaY2RCYf1GyWKwRiG\" crossorigin=\"anonymous\"></script>\n<regions-dashboard profile-config='{\"profile\":\"regions-list\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></regions-dashboard>"
+            "script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./regions-dashboard/regions-dashboard.js\" integrity=\"sha384-f2Bf2Le3VRKjVFXcXhuRzEpHcuIXiCQDY2MSdKQG/ZKsRP2+a7I2/82myqQQb6aa\" crossorigin=\"anonymous\"></script>\n<regions-dashboard profile-config='{\"profile\":\"regions-list\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></regions-dashboard>"
          }
        },
        {
@ -904,7 +904,7 @@
          "scriptUrl": "./regions-dashboard/regions-dashboard.js",
          "embed": {
            "iframe": "<iframe src=\"./regions-dashboard/regions-mfe/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=\"./regions-dashboard/regions-dashboard.js\" integrity=\"sha384-r0Xo6MLumWczZhDLa+U3zlxf4Wal/ZOW5zlgQiOC15aIH20NaY2RCYf1GyWKwRiG\" crossorigin=\"anonymous\"></script>\n<regions-dashboard profile-config='{\"profile\":\"regions-mfe\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></regions-dashboard>"
+            "script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./regions-dashboard/regions-dashboard.js\" integrity=\"sha384-f2Bf2Le3VRKjVFXcXhuRzEpHcuIXiCQDY2MSdKQG/ZKsRP2+a7I2/82myqQQb6aa\" crossorigin=\"anonymous\"></script>\n<regions-dashboard profile-config='{\"profile\":\"regions-mfe\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></regions-dashboard>"
          }
        }
      ]
--- a/public/doxa-maps/regions-dashboard/region-dashboards/index.html
+++ b/public/doxa-maps/regions-dashboard/region-dashboards/index.html
@ -29,7 +29,7 @@

  <script>window.MAP_APP_API_URL = "https://pray.doxa.life";</script>
  <!-- Bundle IIFE — registers the <regions-dashboard> custom element. -->
-  <script src="../regions-dashboard.js" integrity="sha384-r0Xo6MLumWczZhDLa+U3zlxf4Wal/ZOW5zlgQiOC15aIH20NaY2RCYf1GyWKwRiG" crossorigin="anonymous"></script>
+  <script src="../regions-dashboard.js" integrity="sha384-f2Bf2Le3VRKjVFXcXhuRzEpHcuIXiCQDY2MSdKQG/ZKsRP2+a7I2/82myqQQb6aa" crossorigin="anonymous"></script>

  <script>
    // Mapbox token resolution — the A3 ladder, in precedence order:
--- a/public/doxa-maps/regions-dashboard/regions-dashboard.js
+++ b/public/doxa-maps/regions-dashboard/regions-dashboard.js
--- a/public/doxa-maps/regions-dashboard/regions-list/index.html
+++ b/public/doxa-maps/regions-dashboard/regions-list/index.html
@ -29,7 +29,7 @@

  <script>window.MAP_APP_API_URL = "https://pray.doxa.life";</script>
  <!-- Bundle IIFE — registers the <regions-dashboard> custom element. -->
-  <script src="../regions-dashboard.js" integrity="sha384-r0Xo6MLumWczZhDLa+U3zlxf4Wal/ZOW5zlgQiOC15aIH20NaY2RCYf1GyWKwRiG" crossorigin="anonymous"></script>
+  <script src="../regions-dashboard.js" integrity="sha384-f2Bf2Le3VRKjVFXcXhuRzEpHcuIXiCQDY2MSdKQG/ZKsRP2+a7I2/82myqQQb6aa" crossorigin="anonymous"></script>

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

  <script>window.MAP_APP_API_URL = "https://pray.doxa.life";</script>
  <!-- Bundle IIFE — registers the <regions-dashboard> custom element. -->
-  <script src="../regions-dashboard.js" integrity="sha384-r0Xo6MLumWczZhDLa+U3zlxf4Wal/ZOW5zlgQiOC15aIH20NaY2RCYf1GyWKwRiG" crossorigin="anonymous"></script>
+  <script src="../regions-dashboard.js" integrity="sha384-f2Bf2Le3VRKjVFXcXhuRzEpHcuIXiCQDY2MSdKQG/ZKsRP2+a7I2/82myqQQb6aa" crossorigin="anonymous"></script>

  <script>
    // Mapbox token resolution — the A3 ladder, in precedence order: