@autobusal/providers 1.28.1 → 1.29.0

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # Changelog
 
+
+## 1.29.0
+
+### Changed
+
+- **`getLanguage` takes the language the ORIGIN is about, and it outranks the
+  stored preference** — the only thing that does. The stored preference
+  exists so a returning visitor who last read the site in Albanian gets
+  Albanian at `busmagus.com/`, where the URL expresses no preference of its
+  own. On `busmagus.ro` the URL expresses nothing *but* a preference: the
+  domain is the request, and honouring a two-month-old `localStorage` entry
+  over it would render Albanian at a Romanian URL whose own canonical says it
+  is Romanian — reintroduced one returning visitor at a time, and invisible
+  to anybody testing in a clean browser.
+
+  It defaults to whatever `languages()` was told, so the two call sites that
+  ask outside of setup (the 500-error text in `apiClient`, the error page in
+  `Errors/Message`) answer in the language actually being read rather than
+  showing English error copy on a Romanian page.
+
+  Undefined — a single-domain brand, or an alias claiming no language —
+  leaves the ordering exactly as it was.
+
+### Added
+
+- **`SettingsData.domain` / `.domains` / `.locale`** — which origin answered,
+  every origin the brand answers on, and the language this one is about.
+  `domains` is what turns hreflang from locale-to-path-prefix into
+  locale-to-**domain** (see `@autobusal/common`'s `localeHref`); its first
+  entry is the primary. All three optional, so an older API cannot break a
+  newer build.
+
 ## 1.28.1
 
 ### Fixed

package/Setup/Setup.tsx

@@ -15,7 +15,11 @@ const Setup = ({ type, children }: Props): JSX.Element => {
   useGetMenu();
   useUserBootstrap();
 
-  languages(type, data.preferences.languages.default, data.preferences.languages.available);
+  // Edited: Ferjolt Ozuni - Date: 2026-08-06
+  // `data.locale` - the language THIS origin is about, when it is a domain
+  // about a language (a ccTLD) rather than simply the brand's address. It
+  // outranks the stored preference; see getLanguage.
+  languages(type, data.preferences.languages.default, data.preferences.languages.available, data.locale);
 
   // Edited: Ferjolt Ozuni - Date: 2026-08-01
   // The brand's GTM container, from labels_settings via the admin GUI.

package/Setup/languages.ts

@@ -2,6 +2,13 @@ import i18next from 'i18next';
 import Backend from 'i18next-http-backend';
 import { initReactI18next } from 'react-i18next';
 
+/**
+ * The language this ORIGIN is about, remembered from the one place that is
+ * told it (`languages()`, from the settings payload) so the call sites that
+ * ask outside of setup do not each have to be handed it. See getLanguage.
+ */
+let originLocale: string | null | undefined;
+
 /**
  * The language to start in.
  *
@@ -16,14 +23,42 @@ import { initReactI18next } from 'react-i18next';
  * `available` is passed in rather than read from anywhere global so this
  * stays a pure function of its inputs, and so an unrecognised first segment
  * (/city/tirana) is never mistaken for a language.
+ *
+ * Edited: Ferjolt Ozuni - Date: 2026-08-06
+ * `domainLocale` - the language THIS origin is about, when it is about one
+ * (obtapi's settings payload, `locale`). It outranks the stored preference,
+ * which nothing else does.
+ *
+ * The stored preference exists so a returning visitor who last read the site
+ * in Albanian gets Albanian at busmagus.com/, where the URL expresses no
+ * preference of its own. On busmagus.ro the URL expresses nothing BUT a
+ * preference: the domain is the request, and honouring a two-month-old
+ * localStorage entry over it would render Albanian at a Romanian URL whose
+ * own canonical says it is Romanian - the mismatch localised URLs exist to
+ * remove, reintroduced one returning visitor at a time and invisible to
+ * anybody testing in a clean browser.
+ *
+ * Undefined (a single-domain brand, or an alias claiming no language) leaves
+ * the ordering exactly as it was.
+ *
+ * It DEFAULTS to whatever `languages()` was told, so the two call sites that
+ * ask this question outside of setup - the 500-error text in apiClient and
+ * the error page in Errors/Message, both of which pass only 'en' - answer in
+ * the language the visitor is actually reading rather than dropping back to
+ * a stale localStorage entry and showing English error copy on a Romanian
+ * page.
  */
-export const getLanguage = (defaultLanguage: string, available: string[] = []): string => {
+export const getLanguage = (defaultLanguage: string, available: string[] = [], domainLocale: string | null | undefined = originLocale): string => {
   const [ , first ] = window.location.pathname.split('/');
 
   if (first && available.includes(first)) {
     return first;
   }
 
+  if (domainLocale && (available.length === 0 || available.includes(domainLocale))) {
+    return domainLocale;
+  }
+
   const stored = localStorage.getItem('language');
 
   return (stored && (available.length === 0 || available.includes(stored)))
@@ -43,7 +78,12 @@ export const getLanguage = (defaultLanguage: string, available: string[] = []):
 // consumer that hasn't set VITE_BUILD_ID yet (no worse than before).
 const buildId = import.meta.env.VITE_BUILD_ID ?? 'dev';
 
-const languages = (type: string, defaultLanguage: string, available: string[] = []): void => {
+const languages = (type: string, defaultLanguage: string, available: string[] = [], domainLocale?: string | null): void => {
+  // Before the early return, not after: the guard is about not initialising
+  // i18next twice, and getLanguage's callers need this on every render of
+  // the app's life, not only the first one.
+  originLocale = domainLocale;
+
   if (i18next.isInitialized) {
     return;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autobusal/providers",
-  "version": "1.28.1",
+  "version": "1.29.0",
   "author": "Ferjolt Ozuni",
   "type": "module",
   "main": "index.ts"

package/types/settings.ts

@@ -7,6 +7,26 @@ export interface SettingsData {
 
   url: string
 
+  /**
+   * Edited: Ferjolt Ozuni - Date: 2026-08-06
+   * Multi-TLD: which origin answered this request, every origin this brand
+   * answers on, and the language this one is about.
+   *
+   * `domains` is what turns hreflang from locale-to-path-prefix into
+   * locale-to-DOMAIN (see @autobusal/common's localeHref). Its first entry
+   * is the primary - the origin registered with the payment gateways, and
+   * the one that hosts any language without a domain of its own under a
+   * /{locale}/ prefix.
+   *
+   * `locale` is null for a single-domain brand and for an alias that claims
+   * no language; everything derived from these then resolves to exactly the
+   * previous single-origin behaviour. All three are optional so an older API
+   * cannot break a newer build.
+   */
+  domain?: string | null
+  domains?: { domain: string, locale?: string | null, primary?: boolean }[]
+  locale?: string | null
+
   // Edited: Ferjolt Ozuni - Date: 2026-08-01
   // Present ONLY while the brand is under construction - obtapi omits it
   // entirely on a live site, so its presence is the switch itself and there