@oxy.so/bloom 5.2.0 → 5.4.0

package/src/avatar/messages.ts

@@ -1,23 +1,7 @@
-import type { MessageCatalog } from '../locale/messages';
+import { defineMessages, type MessageCatalog } from '../locale/messages';
 
 export interface AvatarMessages {
   live: string;
 }
 
-export const AVATAR_MESSAGES: MessageCatalog<AvatarMessages> = {
-  en: { live: 'LIVE' },
-  es: { live: 'EN VIVO' },
-  ca: { live: 'DIRECTE' },
-  de: { live: 'LIVE' },
-  fr: { live: 'DIRECT' },
-  it: { live: 'DIRETTA' },
-  pt: { live: 'AO VIVO' },
-  ru: { live: 'ЭФИР' },
-  tr: { live: 'CANLI' },
-  ja: { live: 'ライブ' },
-  zh: { live: '直播' },
-  ar: { live: 'مباشر' },
-  hi: { live: 'लाइव' },
-  bn: { live: 'লাইভ' },
-  id: { live: 'LIVE' },
-};
+export const AVATAR_MESSAGES: MessageCatalog<AvatarMessages> = defineMessages<AvatarMessages>('AVATAR_MESSAGES', { live: 'LIVE' });

package/src/avatar-group/messages.ts

@@ -1,5 +1,4 @@
-import type { MessageCatalog } from '../locale/messages';
-import { plural } from '../locale/plural';
+import { defineMessages, type MessageCatalog } from '../locale/messages';
 
 /** Every fixed string the avatar-group family announces, in each Bloom language. */
 export interface AvatarGroupMessages {
@@ -9,34 +8,4 @@ export interface AvatarGroupMessages {
   profile: string;
 }
 
-export const AVATAR_GROUP_MESSAGES: MessageCatalog<AvatarGroupMessages> = {
-  en: { more: (n) => `${n} more`, profile: 'Profile' },
-  es: { more: (n) => plural('es', n, { one: '{n} persona más', other: '{n} personas más' }), profile: 'Perfil' },
-  ca: { more: (n) => plural('ca', n, { one: '{n} persona més', other: '{n} persones més' }), profile: 'Perfil' },
-  de: { more: (n) => plural('de', n, { one: '{n} weitere Person', other: '{n} weitere Personen' }), profile: 'Profil' },
-  fr: { more: (n) => plural('fr', n, { one: '{n} autre personne', other: '{n} autres personnes' }), profile: 'Profil' },
-  it: { more: (n) => plural('it', n, { one: '{n} altra persona', other: 'altre {n} persone' }), profile: 'Profilo' },
-  pt: { more: (n) => plural('pt', n, { one: 'mais {n} pessoa', other: 'mais {n} pessoas' }), profile: 'Perfil' },
-  ru: {
-    more: (n) => plural('ru', n, { one: 'ещё {n} человек', few: 'ещё {n} человека', many: 'ещё {n} человек', other: 'ещё {n} человека' }),
-    profile: 'Профиль',
-  },
-  tr: { more: (n) => `${n} kişi daha`, profile: 'Profil' },
-  ja: { more: (n) => `他${n}人`, profile: 'プロフィール' },
-  zh: { more: (n) => `还有 ${n} 人`, profile: '个人资料' },
-  ar: {
-    more: (n) =>
-      plural('ar', n, {
-        zero: 'لا أحد آخر',
-        one: 'شخص آخر',
-        two: 'شخصان آخران',
-        few: '{n} أشخاص آخرين',
-        many: '{n} شخصًا آخر',
-        other: '{n} شخص آخر',
-      }),
-    profile: 'الملف الشخصي',
-  },
-  hi: { more: (n) => `${n} और लोग`, profile: 'प्रोफ़ाइल' },
-  bn: { more: (n) => `আরও ${n} জন`, profile: 'প্রোফাইল' },
-  id: { more: (n) => `${n} orang lainnya`, profile: 'Profil' },
-};
+export const AVATAR_GROUP_MESSAGES: MessageCatalog<AvatarGroupMessages> = defineMessages<AvatarGroupMessages>('AVATAR_GROUP_MESSAGES', { more: (n) => `${n} more`, profile: 'Profile' });

package/src/booking/message-helpers.ts

@@ -0,0 +1,17 @@
+/**
+ * Helpers the booking catalog's strings share across languages.
+ * Kept apart from `messages.ts` so a language module can use them without
+ * linking the family's English strings (see `src/locale/translations`).
+ */
+import type { BookingMessages } from './messages';
+
+/** Joins a price, its unit and its earlier price with one language's words. */
+export function priceName(
+  per: (price: string, unit: string) => string,
+  originally: (spoken: string, originalPrice: string) => string,
+): BookingMessages['priceName'] {
+  return (price, unit, originalPrice) => {
+    const spoken = unit ? per(price, unit) : price;
+    return originalPrice ? originally(spoken, originalPrice) : spoken;
+  };
+}

package/src/booking/messages.ts

@@ -1,5 +1,6 @@
-import type { MessageCatalog } from '../locale/messages';
+import { defineMessages, type MessageCatalog } from '../locale/messages';
 import type { TripStatus } from './types';
+import { priceName } from './message-helpers';
 
 /**
  * Every fixed string the booking family draws or announces, in each Bloom
@@ -25,196 +26,15 @@ export interface BookingMessages {
   priceName: (price: string, unit?: string, originalPrice?: string) => string;
 }
 
-/** Joins a price, its unit and its earlier price with one language's words. */
-function priceName(
-  per: (price: string, unit: string) => string,
-  originally: (spoken: string, originalPrice: string) => string,
-): BookingMessages['priceName'] {
-  return (price, unit, originalPrice) => {
-    const spoken = unit ? per(price, unit) : price;
-    return originalPrice ? originally(spoken, originalPrice) : spoken;
-  };
-}
-
-export const BOOKING_MESSAGES: MessageCatalog<BookingMessages> = {
-  en: {
-    checkIn: 'Check-in',
-    checkOut: 'Checkout',
-    guests: 'Guests',
-    addDate: 'Add date',
-    reserve: 'Reserve',
-    checkAvailability: 'Check availability',
-    notChargedYet: "You won't be charged yet",
-    total: 'Total',
-    tripStatus: { confirmed: 'Confirmed', pending: 'Pending', cancelled: 'Cancelled', completed: 'Completed' },
-    priceName: priceName((p, u) => `${p} per ${u}`, (s, o) => `${s}, originally ${o}`),
-  },
-  es: {
-    checkIn: 'Llegada',
-    checkOut: 'Salida',
-    guests: 'Huéspedes',
-    addDate: 'Añadir fecha',
-    reserve: 'Reservar',
-    checkAvailability: 'Comprobar disponibilidad',
-    notChargedYet: 'Todavía no se te cobrará nada',
-    total: 'Total',
-    tripStatus: { confirmed: 'Confirmada', pending: 'Pendiente', cancelled: 'Cancelada', completed: 'Completada' },
-    priceName: priceName((p, u) => `${p} por ${u}`, (s, o) => `${s}, antes ${o}`),
-  },
-  ca: {
-    checkIn: 'Arribada',
-    checkOut: 'Sortida',
-    guests: 'Hostes',
-    addDate: 'Afegeix una data',
-    reserve: 'Reserva',
-    checkAvailability: 'Consulta la disponibilitat',
-    notChargedYet: 'Encara no se’t cobrarà res',
-    total: 'Total',
-    tripStatus: { confirmed: 'Confirmada', pending: 'Pendent', cancelled: 'Cancel·lada', completed: 'Completada' },
-    priceName: priceName((p, u) => `${p} per ${u}`, (s, o) => `${s}, abans ${o}`),
-  },
-  de: {
-    checkIn: 'Check-in',
-    checkOut: 'Check-out',
-    guests: 'Gäste',
-    addDate: 'Datum hinzufügen',
-    reserve: 'Reservieren',
-    checkAvailability: 'Verfügbarkeit prüfen',
-    notChargedYet: 'Noch wird dir nichts berechnet',
-    total: 'Gesamt',
-    tripStatus: { confirmed: 'Bestätigt', pending: 'Ausstehend', cancelled: 'Storniert', completed: 'Abgeschlossen' },
-    priceName: priceName((p, u) => `${p} pro ${u}`, (s, o) => `${s}, vorher ${o}`),
-  },
-  fr: {
-    checkIn: 'Arrivée',
-    checkOut: 'Départ',
-    guests: 'Voyageurs',
-    addDate: 'Ajouter une date',
-    reserve: 'Réserver',
-    checkAvailability: 'Vérifier la disponibilité',
-    notChargedYet: 'Aucun montant ne vous sera débité pour le moment',
-    total: 'Total',
-    tripStatus: { confirmed: 'Confirmé', pending: 'En attente', cancelled: 'Annulé', completed: 'Terminé' },
-    priceName: priceName((p, u) => `${p} par ${u}`, (s, o) => `${s}, au lieu de ${o}`),
-  },
-  it: {
-    checkIn: 'Check-in',
-    checkOut: 'Check-out',
-    guests: 'Ospiti',
-    addDate: 'Aggiungi data',
-    reserve: 'Prenota',
-    checkAvailability: 'Verifica disponibilità',
-    notChargedYet: 'Non ti verrà ancora addebitato nulla',
-    total: 'Totale',
-    tripStatus: { confirmed: 'Confermato', pending: 'In attesa', cancelled: 'Cancellato', completed: 'Completato' },
-    priceName: priceName((p, u) => `${p} a ${u}`, (s, o) => `${s}, invece di ${o}`),
-  },
-  pt: {
-    checkIn: 'Check-in',
-    checkOut: 'Check-out',
-    guests: 'Hóspedes',
-    addDate: 'Adicionar data',
-    reserve: 'Reservar',
-    checkAvailability: 'Verificar disponibilidade',
-    notChargedYet: 'Você ainda não será cobrado',
-    total: 'Total',
-    tripStatus: { confirmed: 'Confirmada', pending: 'Pendente', cancelled: 'Cancelada', completed: 'Concluída' },
-    priceName: priceName((p, u) => `${p} por ${u}`, (s, o) => `${s}, antes ${o}`),
-  },
-  ru: {
-    checkIn: 'Заезд',
-    checkOut: 'Выезд',
-    guests: 'Гости',
-    addDate: 'Добавить дату',
-    reserve: 'Забронировать',
-    checkAvailability: 'Проверить наличие мест',
-    notChargedYet: 'Пока с вас ничего не спишут',
-    total: 'Итого',
-    tripStatus: { confirmed: 'Подтверждено', pending: 'Ожидает', cancelled: 'Отменено', completed: 'Завершено' },
-    priceName: priceName((p, u) => `${p} за ${u}`, (s, o) => `${s}, раньше ${o}`),
-  },
-  tr: {
-    checkIn: 'Giriş',
-    checkOut: 'Çıkış',
-    guests: 'Misafirler',
-    addDate: 'Tarih ekle',
-    reserve: 'Rezervasyon yap',
-    checkAvailability: 'Müsaitliği kontrol et',
-    notChargedYet: 'Henüz sizden ücret alınmayacak',
-    total: 'Toplam',
-    tripStatus: { confirmed: 'Onaylandı', pending: 'Beklemede', cancelled: 'İptal edildi', completed: 'Tamamlandı' },
-    priceName: priceName((p, u) => `${u} başına ${p}`, (s, o) => `${s}, önceki fiyat ${o}`),
-  },
-  ja: {
-    checkIn: 'チェックイン',
-    checkOut: 'チェックアウト',
-    guests: 'ゲスト',
-    addDate: '日付を追加',
-    reserve: '予約する',
-    checkAvailability: '空室状況を確認',
-    notChargedYet: 'まだ料金は発生しません',
-    total: '合計',
-    tripStatus: { confirmed: '確定', pending: '保留中', cancelled: 'キャンセル済み', completed: '完了' },
-    priceName: priceName((p, u) => `${u}あたり${p}`, (s, o) => `${s}（元の価格 ${o}）`),
-  },
-  zh: {
-    checkIn: '入住',
-    checkOut: '退房',
-    guests: '房客',
-    addDate: '添加日期',
-    reserve: '预订',
-    checkAvailability: '查看空房',
-    notChargedYet: '目前还不会向你收费',
-    total: '总计',
-    tripStatus: { confirmed: '已确认', pending: '待处理', cancelled: '已取消', completed: '已完成' },
-    priceName: priceName((p, u) => `每${u} ${p}`, (s, o) => `${s}，原价 ${o}`),
-  },
-  ar: {
-    checkIn: 'تسجيل الوصول',
-    checkOut: 'تسجيل المغادرة',
-    guests: 'الضيوف',
-    addDate: 'إضافة تاريخ',
-    reserve: 'احجز',
-    checkAvailability: 'تحقق من التوفر',
-    notChargedYet: 'لن يتم تحصيل أي مبلغ منك بعد',
-    total: 'الإجمالي',
-    tripStatus: { confirmed: 'مؤكد', pending: 'قيد الانتظار', cancelled: 'ملغى', completed: 'مكتمل' },
-    priceName: priceName((p, u) => `${p} لكل ${u}`, (s, o) => `${s}، بدلاً من ${o}`),
-  },
-  hi: {
-    checkIn: 'चेक-इन',
-    checkOut: 'चेक-आउट',
-    guests: 'मेहमान',
-    addDate: 'तारीख जोड़ें',
-    reserve: 'आरक्षित करें',
-    checkAvailability: 'उपलब्धता देखें',
-    notChargedYet: 'अभी आपसे कोई शुल्क नहीं लिया जाएगा',
-    total: 'कुल',
-    tripStatus: { confirmed: 'पुष्ट', pending: 'लंबित', cancelled: 'रद्द', completed: 'पूरा हुआ' },
-    priceName: priceName((p, u) => `${p} प्रति ${u}`, (s, o) => `${s}, पहले ${o}`),
-  },
-  bn: {
-    checkIn: 'চেক-ইন',
-    checkOut: 'চেক-আউট',
-    guests: 'অতিথি',
-    addDate: 'তারিখ যোগ করুন',
-    reserve: 'সংরক্ষণ করুন',
-    checkAvailability: 'প্রাপ্যতা দেখুন',
-    notChargedYet: 'এখনই আপনার কাছ থেকে কোনো টাকা নেওয়া হবে না',
-    total: 'মোট',
-    tripStatus: { confirmed: 'নিশ্চিত', pending: 'অপেক্ষমাণ', cancelled: 'বাতিল', completed: 'সম্পন্ন' },
-    priceName: priceName((p, u) => `প্রতি ${u} ${p}`, (s, o) => `${s}, আগে ${o}`),
-  },
-  id: {
-    checkIn: 'Check-in',
-    checkOut: 'Check-out',
-    guests: 'Tamu',
-    addDate: 'Tambahkan tanggal',
-    reserve: 'Pesan',
-    checkAvailability: 'Periksa ketersediaan',
-    notChargedYet: 'Anda belum akan dikenai biaya',
-    total: 'Total',
-    tripStatus: { confirmed: 'Dikonfirmasi', pending: 'Menunggu', cancelled: 'Dibatalkan', completed: 'Selesai' },
-    priceName: priceName((p, u) => `${p} per ${u}`, (s, o) => `${s}, sebelumnya ${o}`),
-  },
-};
+export const BOOKING_MESSAGES: MessageCatalog<BookingMessages> = defineMessages<BookingMessages>('BOOKING_MESSAGES', {
+  checkIn: 'Check-in',
+  checkOut: 'Checkout',
+  guests: 'Guests',
+  addDate: 'Add date',
+  reserve: 'Reserve',
+  checkAvailability: 'Check availability',
+  notChargedYet: "You won't be charged yet",
+  total: 'Total',
+  tripStatus: { confirmed: 'Confirmed', pending: 'Pending', cancelled: 'Cancelled', completed: 'Completed' },
+  priceName: priceName((p, u) => `${p} per ${u}`, (s, o) => `${s}, originally ${o}`),
+});

package/src/breadcrumb/messages.ts

@@ -1,4 +1,4 @@
-import type { MessageCatalog } from '../locale/messages';
+import { defineMessages, type MessageCatalog } from '../locale/messages';
 
 /**
  * The breadcrumb's landmark name, in each Bloom language. A caller's
@@ -8,50 +8,6 @@ export interface BreadcrumbMessages {
   breadcrumb: string;
 }
 
-export const BREADCRUMB_MESSAGES: MessageCatalog<BreadcrumbMessages> = {
-  en: {
-    breadcrumb: 'Breadcrumb',
-  },
-  es: {
-    breadcrumb: 'Ruta de navegación',
-  },
-  ca: {
-    breadcrumb: 'Ruta de navegació',
-  },
-  de: {
-    breadcrumb: 'Brotkrümelnavigation',
-  },
-  fr: {
-    breadcrumb: 'Fil d’Ariane',
-  },
-  it: {
-    breadcrumb: 'Percorso di navigazione',
-  },
-  pt: {
-    breadcrumb: 'Trilha de navegação',
-  },
-  ru: {
-    breadcrumb: 'Навигационная цепочка',
-  },
-  tr: {
-    breadcrumb: 'İçerik haritası',
-  },
-  ja: {
-    breadcrumb: 'パンくずリスト',
-  },
-  zh: {
-    breadcrumb: '面包屑导航',
-  },
-  ar: {
-    breadcrumb: 'مسار التنقل',
-  },
-  hi: {
-    breadcrumb: 'ब्रेडक्रंब',
-  },
-  bn: {
-    breadcrumb: 'ব্রেডক্রাম্ব',
-  },
-  id: {
-    breadcrumb: 'Jejak navigasi',
-  },
-};
+export const BREADCRUMB_MESSAGES: MessageCatalog<BreadcrumbMessages> = defineMessages<BreadcrumbMessages>('BREADCRUMB_MESSAGES', {
+  breadcrumb: 'Breadcrumb',
+});

package/src/calendar/message-helpers.ts

@@ -0,0 +1,13 @@
+/**
+ * Helpers the calendar catalog's strings share across languages.
+ * Kept apart from `messages.ts` so a language module can use them without
+ * linking the family's English strings (see `src/locale/translations`).
+ */
+
+/** `3h15m`-shaped durations: hour and minute units, and what joins them. */
+export function compactDuration(hourUnit: string, minuteUnit: string, joiner: string) {
+  return (hours: number, minutes: number): string => {
+    if (hours === 0) return `${minutes}${minuteUnit}`;
+    return minutes > 0 ? `${hours}${hourUnit}${joiner}${minutes}${minuteUnit}` : `${hours}${hourUnit}`;
+  };
+}