@oxy.so/bloom 5.2.0 → 5.3.0

package/src/vendor-card/messages.ts

@@ -1,7 +1,6 @@
-import type { BloomLanguage } from '../locale/languages';
-import type { MessageCatalog } from '../locale/messages';
-import { plural, pluralCategory, type PluralCategory } from '../locale/plural';
+import { defineMessages, type MessageCatalog } from '../locale/messages';
 import type { VendorAvailability, VendorFactKey } from './types';
+import { counted, has } from './message-helpers';
 
 /**
  * Every fixed string the vendor card draws or announces, in each Bloom
@@ -22,124 +21,10 @@ export interface VendorCardMessages {
   rated: (value: string, reviews?: number | string) => string;
 }
 
-/** A count the app may hand over as a number or as its own text ("1.2k"). */
-function counted(
-  language: BloomLanguage,
-  count: number | string,
-  forms: Partial<Record<PluralCategory, string>> & { other: string },
-): string {
-  if (typeof count === 'number') return plural(language, count, forms);
-  const form = /^\d+$/.test(count) ? forms[pluralCategory(language, Number(count))] : undefined;
-  return (form ?? forms.other).replace('{n}', count);
-}
-
-const has = (reviews: number | string | undefined): reviews is number | string =>
-  reviews != null && reviews !== '';
-
-export const VENDOR_CARD_MESSAGES: MessageCatalog<VendorCardMessages> = {
-  en: {
-    facts: { deliveryTime: 'Delivery time', deliveryFee: 'Delivery', distance: 'Distance', minimumOrder: 'Minimum order' },
-    availability: { paused: 'Paused', closed: 'Closed' },
-    new: 'New',
-    rated: (value, reviews) =>
-      `Rated ${value} out of 5${has(reviews) ? `, ${counted('en', reviews, { one: '{n} review', other: '{n} reviews' })}` : ''}`,
-  },
-  es: {
-    facts: { deliveryTime: 'Tiempo de entrega', deliveryFee: 'Envío', distance: 'Distancia', minimumOrder: 'Pedido mínimo' },
-    availability: { paused: 'En pausa', closed: 'Cerrado' },
-    new: 'Nuevo',
-    rated: (value, reviews) =>
-      `Valoración: ${value} de 5${has(reviews) ? `, ${counted('es', reviews, { one: '{n} reseña', other: '{n} reseñas' })}` : ''}`,
-  },
-  ca: {
-    facts: { deliveryTime: "Temps d'entrega", deliveryFee: 'Enviament', distance: 'Distància', minimumOrder: 'Comanda mínima' },
-    availability: { paused: 'En pausa', closed: 'Tancat' },
-    new: 'Nou',
-    rated: (value, reviews) =>
-      `Valoració: ${value} de 5${has(reviews) ? `, ${counted('ca', reviews, { one: '{n} ressenya', other: '{n} ressenyes' })}` : ''}`,
-  },
-  de: {
-    facts: { deliveryTime: 'Lieferzeit', deliveryFee: 'Liefergebühr', distance: 'Entfernung', minimumOrder: 'Mindestbestellwert' },
-    availability: { paused: 'Pausiert', closed: 'Geschlossen' },
-    new: 'Neu',
-    rated: (value, reviews) =>
-      `Bewertet mit ${value} von 5${has(reviews) ? `, ${counted('de', reviews, { one: '{n} Bewertung', other: '{n} Bewertungen' })}` : ''}`,
-  },
-  fr: {
-    facts: { deliveryTime: 'Délai de livraison', deliveryFee: 'Livraison', distance: 'Distance', minimumOrder: 'Commande minimum' },
-    availability: { paused: 'En pause', closed: 'Fermé' },
-    new: 'Nouveau',
-    rated: (value, reviews) =>
-      `Noté ${value} sur 5${has(reviews) ? `, ${counted('fr', reviews, { one: '{n} avis', other: '{n} avis' })}` : ''}`,
-  },
-  it: {
-    facts: { deliveryTime: 'Tempo di consegna', deliveryFee: 'Consegna', distance: 'Distanza', minimumOrder: 'Ordine minimo' },
-    availability: { paused: 'In pausa', closed: 'Chiuso' },
-    new: 'Nuovo',
-    rated: (value, reviews) =>
-      `Valutazione ${value} su 5${has(reviews) ? `, ${counted('it', reviews, { one: '{n} recensione', other: '{n} recensioni' })}` : ''}`,
-  },
-  pt: {
-    facts: { deliveryTime: 'Tempo de entrega', deliveryFee: 'Entrega', distance: 'Distância', minimumOrder: 'Pedido mínimo' },
-    availability: { paused: 'Pausado', closed: 'Fechado' },
-    new: 'Novo',
-    rated: (value, reviews) =>
-      `Avaliação ${value} de 5${has(reviews) ? `, ${counted('pt', reviews, { one: '{n} avaliação', other: '{n} avaliações' })}` : ''}`,
-  },
-  ru: {
-    facts: { deliveryTime: 'Время доставки', deliveryFee: 'Доставка', distance: 'Расстояние', minimumOrder: 'Минимальный заказ' },
-    availability: { paused: 'Приостановлено', closed: 'Закрыто' },
-    new: 'Новое',
-    rated: (value, reviews) =>
-      `Оценка ${value} из 5${has(reviews) ? `, ${counted('ru', reviews, { one: '{n} отзыв', few: '{n} отзыва', many: '{n} отзывов', other: '{n} отзыва' })}` : ''}`,
-  },
-  tr: {
-    facts: { deliveryTime: 'Teslimat süresi', deliveryFee: 'Teslimat', distance: 'Mesafe', minimumOrder: 'Minimum sipariş' },
-    availability: { paused: 'Duraklatıldı', closed: 'Kapalı' },
-    new: 'Yeni',
-    rated: (value, reviews) =>
-      `5 üzerinden ${value} puan${has(reviews) ? `, ${counted('tr', reviews, { other: '{n} değerlendirme' })}` : ''}`,
-  },
-  ja: {
-    facts: { deliveryTime: '配達時間', deliveryFee: '配達料', distance: '距離', minimumOrder: '最低注文金額' },
-    availability: { paused: '一時停止中', closed: '営業時間外' },
-    new: '新着',
-    rated: (value, reviews) =>
-      `評価 ${value}（5点満点）${has(reviews) ? `、${counted('ja', reviews, { other: 'レビュー{n}件' })}` : ''}`,
-  },
-  zh: {
-    facts: { deliveryTime: '配送时间', deliveryFee: '配送费', distance: '距离', minimumOrder: '起送价' },
-    availability: { paused: '暂停营业', closed: '已打烊' },
-    new: '新店',
-    rated: (value, reviews) =>
-      `评分 ${value}（满分 5 分）${has(reviews) ? `，${counted('zh', reviews, { other: '{n} 条评价' })}` : ''}`,
-  },
-  ar: {
-    facts: { deliveryTime: 'وقت التوصيل', deliveryFee: 'التوصيل', distance: 'المسافة', minimumOrder: 'الحد الأدنى للطلب' },
-    availability: { paused: 'متوقف مؤقتًا', closed: 'مغلق' },
-    new: 'جديد',
-    rated: (value, reviews) =>
-      `التقييم ${value} من 5${has(reviews) ? `، ${counted('ar', reviews, { zero: 'لا مراجعات', one: 'مراجعة واحدة', two: 'مراجعتان', few: '{n} مراجعات', many: '{n} مراجعة', other: '{n} مراجعة' })}` : ''}`,
-  },
-  hi: {
-    facts: { deliveryTime: 'डिलीवरी का समय', deliveryFee: 'डिलीवरी', distance: 'दूरी', minimumOrder: 'न्यूनतम ऑर्डर' },
-    availability: { paused: 'रुका हुआ', closed: 'बंद' },
-    new: 'नया',
-    rated: (value, reviews) =>
-      `5 में से ${value} रेटिंग${has(reviews) ? `, ${counted('hi', reviews, { one: '{n} समीक्षा', other: '{n} समीक्षाएँ' })}` : ''}`,
-  },
-  bn: {
-    facts: { deliveryTime: 'ডেলিভারির সময়', deliveryFee: 'ডেলিভারি', distance: 'দূরত্ব', minimumOrder: 'ন্যূনতম অর্ডার' },
-    availability: { paused: 'বিরতিতে', closed: 'বন্ধ' },
-    new: 'নতুন',
-    rated: (value, reviews) =>
-      `৫-এর মধ্যে ${value} রেটিং${has(reviews) ? `, ${counted('bn', reviews, { other: '{n}টি রিভিউ' })}` : ''}`,
-  },
-  id: {
-    facts: { deliveryTime: 'Waktu pengantaran', deliveryFee: 'Ongkos kirim', distance: 'Jarak', minimumOrder: 'Pesanan minimum' },
-    availability: { paused: 'Dijeda', closed: 'Tutup' },
-    new: 'Baru',
-    rated: (value, reviews) =>
-      `Rating ${value} dari 5${has(reviews) ? `, ${counted('id', reviews, { other: '{n} ulasan' })}` : ''}`,
-  },
-};
+export const VENDOR_CARD_MESSAGES: MessageCatalog<VendorCardMessages> = defineMessages<VendorCardMessages>('VENDOR_CARD_MESSAGES', {
+  facts: { deliveryTime: 'Delivery time', deliveryFee: 'Delivery', distance: 'Distance', minimumOrder: 'Minimum order' },
+  availability: { paused: 'Paused', closed: 'Closed' },
+  new: 'New',
+  rated: (value, reviews) =>
+    `Rated ${value} out of 5${has(reviews) ? `, ${counted('en', reviews, { one: '{n} review', other: '{n} reviews' })}` : ''}`,
+});

package/src/web-search/messages.ts

@@ -1,4 +1,4 @@
-import type { MessageCatalog } from '../locale/messages';
+import { defineMessages, type MessageCatalog } from '../locale/messages';
 
 /**
  * Every fixed string `WebSearch` draws or announces, in each Bloom language.
@@ -11,20 +11,4 @@ export interface WebSearchMessages {
   working: string;
 }
 
-export const WEB_SEARCH_MESSAGES: MessageCatalog<WebSearchMessages> = {
-  en: { sources: 'Sources', working: 'Working' },
-  es: { sources: 'Fuentes', working: 'Trabajando' },
-  ca: { sources: 'Fonts', working: 'Treballant' },
-  de: { sources: 'Quellen', working: 'Arbeitet' },
-  fr: { sources: 'Sources consultées', working: 'En cours' },
-  it: { sources: 'Fonti', working: 'In corso' },
-  pt: { sources: 'Fontes', working: 'Trabalhando' },
-  ru: { sources: 'Источники', working: 'Работаю' },
-  tr: { sources: 'Kaynaklar', working: 'Çalışıyor' },
-  ja: { sources: '情報源', working: '作業中' },
-  zh: { sources: '来源', working: '处理中' },
-  ar: { sources: 'المصادر', working: 'جارٍ العمل' },
-  hi: { sources: 'स्रोत', working: 'काम चल रहा है' },
-  bn: { sources: 'উৎস', working: 'কাজ চলছে' },
-  id: { sources: 'Sumber', working: 'Sedang bekerja' },
-};
+export const WEB_SEARCH_MESSAGES: MessageCatalog<WebSearchMessages> = defineMessages<WebSearchMessages>('WEB_SEARCH_MESSAGES', { sources: 'Sources', working: 'Working' });

package/src/zoomable-media-gallery/messages.ts

@@ -1,114 +1,14 @@
-import type { MessageCatalog } from '../locale/messages';
+import { defineMessages, type MessageCatalog } from '../locale/messages';
 import type { ZoomableMediaGalleryLabels } from './types';
 
 /**
  * Every fixed string the media viewer announces, in each Bloom language. A
  * caller's `labels` still wins over any entry.
  */
-export const ZOOMABLE_MEDIA_GALLERY_MESSAGES: MessageCatalog<ZoomableMediaGalleryLabels> = {
-  en: {
-    close: 'Close media viewer',
-    previous: 'Previous item',
-    next: 'Next item',
-    goTo: (i, n) => `Go to item ${i} of ${n}`,
-    share: 'Share media',
-  },
-  es: {
-    close: 'Cerrar visor multimedia',
-    previous: 'Elemento anterior',
-    next: 'Elemento siguiente',
-    goTo: (i, n) => `Ir al elemento ${i} de ${n}`,
-    share: 'Compartir contenido',
-  },
-  ca: {
-    close: 'Tanca el visualitzador multimèdia',
-    previous: 'Element anterior',
-    next: 'Element següent',
-    goTo: (i, n) => `Ves a l'element ${i} de ${n}`,
-    share: 'Comparteix el contingut',
-  },
-  de: {
-    close: 'Medienansicht schließen',
-    previous: 'Vorheriges Element',
-    next: 'Nächstes Element',
-    goTo: (i, n) => `Zu Element ${i} von ${n}`,
-    share: 'Medien teilen',
-  },
-  fr: {
-    close: 'Fermer la visionneuse',
-    previous: 'Élément précédent',
-    next: 'Élément suivant',
-    goTo: (i, n) => `Aller à l'élément ${i} sur ${n}`,
-    share: 'Partager le média',
-  },
-  it: {
-    close: 'Chiudi il visualizzatore',
-    previous: 'Elemento precedente',
-    next: 'Elemento successivo',
-    goTo: (i, n) => `Vai all'elemento ${i} di ${n}`,
-    share: 'Condividi contenuto',
-  },
-  pt: {
-    close: 'Fechar visualizador de mídia',
-    previous: 'Item anterior',
-    next: 'Próximo item',
-    goTo: (i, n) => `Ir para o item ${i} de ${n}`,
-    share: 'Compartilhar mídia',
-  },
-  ru: {
-    close: 'Закрыть просмотр',
-    previous: 'Предыдущий элемент',
-    next: 'Следующий элемент',
-    goTo: (i, n) => `Перейти к элементу ${i} из ${n}`,
-    share: 'Поделиться медиафайлом',
-  },
-  tr: {
-    close: 'Medya görüntüleyiciyi kapat',
-    previous: 'Önceki öğe',
-    next: 'Sonraki öğe',
-    goTo: (i, n) => `${n} öğeden ${i}. öğeye git`,
-    share: 'Medyayı paylaş',
-  },
-  ja: {
-    close: 'メディアビューアを閉じる',
-    previous: '前の項目',
-    next: '次の項目',
-    goTo: (i, n) => `${n}件中${i}件目に移動`,
-    share: 'メディアを共有',
-  },
-  zh: {
-    close: '关闭媒体查看器',
-    previous: '上一项',
-    next: '下一项',
-    goTo: (i, n) => `转到第 ${i} 项，共 ${n} 项`,
-    share: '分享媒体',
-  },
-  ar: {
-    close: 'إغلاق عارض الوسائط',
-    previous: 'العنصر السابق',
-    next: 'العنصر التالي',
-    goTo: (i, n) => `الانتقال إلى العنصر ${i} من ${n}`,
-    share: 'مشاركة الوسائط',
-  },
-  hi: {
-    close: 'मीडिया व्यूअर बंद करें',
-    previous: 'पिछला आइटम',
-    next: 'अगला आइटम',
-    goTo: (i, n) => `${n} में से आइटम ${i} पर जाएं`,
-    share: 'मीडिया शेयर करें',
-  },
-  bn: {
-    close: 'মিডিয়া ভিউয়ার বন্ধ করুন',
-    previous: 'আগের আইটেম',
-    next: 'পরের আইটেম',
-    goTo: (i, n) => `${n}টির মধ্যে ${i} নম্বর আইটেমে যান`,
-    share: 'মিডিয়া শেয়ার করুন',
-  },
-  id: {
-    close: 'Tutup penampil media',
-    previous: 'Item sebelumnya',
-    next: 'Item berikutnya',
-    goTo: (i, n) => `Buka item ${i} dari ${n}`,
-    share: 'Bagikan media',
-  },
-};
+export const ZOOMABLE_MEDIA_GALLERY_MESSAGES: MessageCatalog<ZoomableMediaGalleryLabels> = defineMessages<ZoomableMediaGalleryLabels>('ZOOMABLE_MEDIA_GALLERY_MESSAGES', {
+  close: 'Close media viewer',
+  previous: 'Previous item',
+  next: 'Next item',
+  goTo: (i, n) => `Go to item ${i} of ${n}`,
+  share: 'Share media',
+});