i18nya 0.1.3 → 0.2.0

package/astro-i18nya/README.md

@@ -36,13 +36,13 @@ export default defineConfig({
 });
 ```
 
-Then for all pages in `src/pages/[lang]/*.astro`:
+Then for all pages in `src/pages/[...lang]/*.astro`:
 
 ```ts
 import i18nya, { makeT } from "../../i18n.ts";
 import { makeGetStaticPaths } from "astro-i18nya";
 const t = makeT(Astro.params.lang);
-// generate paths only for languages in your `langs/` folder!
+// generate paths only for languages in your `[...langs]/` folder!
 export const getStaticPaths = makeGetStaticPaths(i18nya);
 ```
 

package/astro-i18nya/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-i18nya",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "description": "Astro integration for i18nya: i18n as small as a cat's paw",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/astro-i18nya/src/util.ts

@@ -7,7 +7,10 @@ import type { I18Nya } from "i18nya";
  * @returns language name
  */
 export const getLangName = (lang: string, displayLang?: string) =>
-  new Intl.DisplayNames([displayLang ?? lang], { type: "language", style: "narrow" }).of(lang);
+  new Intl.DisplayNames([displayLang ?? lang], {
+    type: "language",
+    style: "narrow",
+  }).of(lang);
 
 /**
  * List out available languages.
@@ -29,6 +32,8 @@ export const listLang = <T extends string | number | symbol>(
 export const makeGetStaticPaths =
   <T extends string | number | symbol>(i18nya: I18Nya<T>) =>
   async () =>
-    Object.keys(i18nya.translations)
-      .filter((lang) => lang !== i18nya.config.defaultLang)
-      .map((lang) => ({ params: { lang: lang } }));
+    Object.keys(i18nya.translations).map((lang) =>
+      lang === i18nya.config.defaultLang
+        ? { params: { lang: undefined } }
+        : { params: { lang: lang } },
+    );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18nya",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "description": "i18n as small as a cat's paw",
   "main": "dist/index.js",
   "type": "module",

package/src/index.ts

@@ -12,7 +12,7 @@ export type I18NyaConfig<T extends I18NyaKey> = {
 
 export type I18Nya<T extends I18NyaKey> = {
   translations: Record<string, Record<T, string>>;
-  makeT: (lang: string) => (key: T, its?: Interpolations) => string;
+  makeT: (lang?: string) => (key: T, its?: Interpolations) => string;
   config: I18NyaConfig<T>;
 };
 
@@ -25,17 +25,21 @@ export const init = async <T extends string | number | symbol = string>(
   const {
     langDir,
     defaultLang: rootLang = "en",
-    fallbackLangs: fb = {},
+    fallbackLangs = {},
     viteImports = undefined,
   } = config;
   let i18nya: I18Nya<T> = {
     translations: {},
     makeT:
-      (l) =>
-      (k, its = {}) => {
+      (lang = rootLang) =>
+      (key, its = {}) => {
         let s: string | undefined;
-        for (; !(s = i18nya.translations[l]?.[k]); l = fb[l] ?? rootLang)
-          if (l === rootLang) return String(k);
+        for (
+          ;
+          !(s = i18nya.translations[lang]?.[key]);
+          lang = fallbackLangs[lang] ?? rootLang
+        )
+          if (lang === rootLang) return String(key);
         for (const [k, v] of Object.entries(its))
           s = s.replace(`{{${k}}}`, `${v}`);
         return s;