@fy-/fws-vue 2.3.40 → 2.3.42

package/composables/templating.ts

@@ -1,20 +1,32 @@
 import { getLocale } from '@fy-/fws-js'
 import { format as formatDateTimeago, register } from 'timeago.js'
-import * as timeagoLocales from 'timeago.js/lib/lang'
+import de from 'timeago.js/esm/lang/de'
+import es from 'timeago.js/esm/lang/es'
+// Import common locales individually to avoid CommonJS issues
+import fr from 'timeago.js/esm/lang/fr'
+import it from 'timeago.js/esm/lang/it'
+import ja from 'timeago.js/esm/lang/ja'
+import nl from 'timeago.js/esm/lang/nl'
+import ru from 'timeago.js/esm/lang/ru'
+import zh_CN from 'timeago.js/esm/lang/zh_CN'
 import { useTranslation } from './translations'
 
-// Register all available timeago.js locales
-function registerTimeagoLocales() {
-  // Register all available locales from timeago.js
-  Object.entries(timeagoLocales).forEach(([locale, func]) => {
-    if (locale !== 'default' && typeof func === 'function') {
-      register(locale, func)
-    }
-  })
-}
-
-// Register locales when this module is imported
-registerTimeagoLocales()
+// Register common locales
+register('fr', fr)
+register('fr_FR', fr)
+register('es', es)
+register('es_ES', es)
+register('de', de)
+register('de_DE', de)
+register('it', it)
+register('it_IT', it)
+register('nl', nl)
+register('nl_NL', nl)
+register('ru', ru)
+register('ru_RU', ru)
+register('ja', ja)
+register('ja_JP', ja)
+register('zh_CN', zh_CN)
 
 // Cache common constants and patterns
 const k = 1024
@@ -123,23 +135,17 @@ function formatDatetime(dt: Date | string | number) {
 
 function formatTimeago(dt: Date | string | number) {
   const timestamp = parseDateInput(dt)
-  // Extract language code and convert dash to underscore for timeago.js format
+  const dateObj = new Date(timestamp)
+
+  // Get browser locale and format it for timeago.js
   const fullLocale = getLocale()
 
-  // First try with underscore format (en-US -> en_US)
+  // Convert locale format (e.g., fr-FR to fr_FR)
   const localeWithUnderscore = fullLocale.replace('-', '_')
 
-  // Then try just the language part (en-US -> en)
-  const langOnly = fullLocale.split('-')[0].toLowerCase()
-
-  // Try the formats in order of preference
-  // This avoids try/catch which can trigger linting issues
-  const dateObj = new Date(timestamp)
-
-  // No try/catch needed - if locale doesn't exist, timeago falls back to en_US
+  // Use the locale directly - the registration above ensures support
+  // timeago.js will fall back to en_US if no matching locale is found
   return formatDateTimeago(dateObj, localeWithUnderscore)
-    || formatDateTimeago(dateObj, langOnly)
-    || formatDateTimeago(dateObj, 'en_US')
 }
 
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fy-/fws-vue",
-  "version": "2.3.40",
+  "version": "2.3.42",
   "author": "Florian 'Fy' Gasquez <m@fy.to>",
   "license": "MIT",
   "homepage": "https://github.com/fy-to/FWJS#readme",