lightnet 2.18.0 → 2.18.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # lightnet
 
+## 2.18.2
+
+### Patch Changes
+
+- [#232](https://github.com/LightNetDev/LightNet/pull/232) [`1ab5c4e`](https://github.com/LightNetDev/LightNet/commit/1ab5c4ea5d081d05f99f9e668e05e8cfd23a890d) Thanks [@smn-cds](https://github.com/smn-cds)! - Simplify plural rules.
+
+## 2.18.1
+
+### Patch Changes
+
+- [#230](https://github.com/LightNetDev/LightNet/pull/230) [`afab19a`](https://github.com/LightNetDev/LightNet/commit/afab19a4aa365958289c99805bdf94c6bca978d3) Thanks [@smn-cds](https://github.com/smn-cds)! - Register uk and ru translations.
+
 ## 2.18.0
 
 ### Minor Changes

package/package.json

@@ -2,7 +2,7 @@
   "name": "lightnet",
   "type": "module",
   "license": "MIT",
-  "version": "2.18.0",
+  "version": "2.18.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/LightNetDev/lightnet",

package/src/components/CategoriesOverview.astro

@@ -15,7 +15,7 @@ const categories = await getCategories(currentLocale, t)
 
 {
   categories.length && (
-    <Section title={title ?? t("ln.category", { count: categories.length })}>
+    <Section title={title ?? t("ln.categories")}>
       <ul class="flex w-full flex-wrap gap-2 sm:gap-3">
         {categories.map((category) => (
           <li class="flex max-w-56 grow">

package/src/i18n/translations/de.yml

@@ -1,11 +1,10 @@
 ln.404.go-to-the-home-page: Zurück zur Startseite
 ln.404.page-not-found: Seite nicht gefunden
-ln.category_other: Kategorien
-ln.category_one: Kategorie
-ln.language_one: Sprache
-ln.language_other: Sprachen
-ln.type_one: Typ
-ln.type_other: Typen
+ln.categories: Kategorien
+ln.category: Kategorie
+ln.language: Sprache
+ln.languages: Sprachen
+ln.type: Typ
 ln.external-link: Externer link
 ln.details.open: Öffnen
 ln.details.part-of-collection: Teil der Sammlung

package/src/i18n/translations/en.yml

@@ -20,56 +20,33 @@ ln.home.title: Home
 
 # Label for a single media item category.
 #
-# Define the plural forms for different quantities as follows:
-# - ln.category_one : for a singular item (e.g., "1 item")
-# - ln.category_two : for exactly two items
-# - ln.category_few : for a few items (language-specific rules)
-# - ln.category_many : for many items (language-specific rules)
-# - ln.category_other: for all other cases
-#
-# For guidance on the correct plural forms for your language,
-# use this tool: https://jsfiddle.net/6bpxsgd4
-#
 # English: Category
 # Used on: https://sk8-ministries.pages.dev/en/media
-ln.category_one: Category
+ln.category: Category
 
 # Label for multiple media item categories.
 #
 # English: Categories
 # Used on: https://sk8-ministries.pages.dev/en/media/how-to-360-flip--en/
-ln.category_other: Categories
+ln.categories: Categories
 
 # Label for a single language.
 #
-# Define the plural forms for different quantities as follows:
-# - ln.language_one : for a singular item (e.g., "1 item")
-# - ln.language_two : for exactly two items
-# - ln.language_few : for a few items (language-specific rules)
-# - ln.language_many : for many items (language-specific rules)
-# - ln.language_other: for all other cases
-#
-# For guidance on the correct plural forms for your language,
-# use this tool: https://jsfiddle.net/6bpxsgd4
-#
 # English: Language
 # Used on: https://sk8-ministries.pages.dev/en/media
-ln.language_one: Language
+ln.language: Language
 
 # Label for multiple languages.
 #
 # English: Languages
 # Used on: https://sk8-ministries.pages.dev/en/media/how-to-kickflip--en/
-ln.language_other: Languages
+ln.languages: Languages
 
 # Label for a single media type.
 #
 # English: Type
 # Used on: https://sk8-ministries.pages.dev/en/media
-ln.type_one: Type
-
-# English: Types
-ln.type_other: Types
+ln.type: Type
 
 # Accessibility label for an external link.
 # This is only "visible" to a screen-reader.

package/src/i18n/translations/ru.yml

@@ -1,12 +1,11 @@
 ln.header.open-main-menu: Открыть главное меню
 ln.header.select-language: Выберите язык
 ln.home.title: Главная
-ln.category_one: Категория
-ln.category_other: Категории
-ln.language_one: Язык
-ln.language_other: Языки
-ln.type_one: Тип
-ln.type_other: Типы
+ln.category: Категория
+ln.categories: Категории
+ln.language: Язык
+ln.languages: Языки
+ln.type: Тип
 ln.external-link: Внешняя ссылка
 ln.search.title: Поиск
 ln.search.placeholder: Поиск по названию, автору, описанию...

package/src/i18n/translations/uk.yml

@@ -1,12 +1,11 @@
 ln.header.open-main-menu: Відкрити головне меню
 ln.header.select-language: Оберіть мову
 ln.home.title: Головна
-ln.category_one: Категорія
-ln.category_other: Категорії
-ln.language_one: Мова
-ln.language_other: Мови
-ln.type_one: Тип
-ln.type_other: Типи
+ln.category: Категорія
+ln.categories: Категорії
+ln.language: Мова
+ln.languages: Мови
+ln.type: Тип
 ln.external-link: Зовнішнє посилання
 ln.search.title: Пошук
 ln.search.placeholder: Пошук за назвою, автором, описом...

package/src/i18n/translations.ts

@@ -3,6 +3,8 @@ import YAML from "yaml"
 const builtInTranslations = {
   en: () => import("./translations/en.yml?raw"),
   de: () => import("./translations/de.yml?raw"),
+  uk: () => import("./translations/uk.yml?raw"),
+  ru: () => import("./translations/ru.yml?raw"),
 } as const
 
 type BuiltInLanguage = keyof typeof builtInTranslations
@@ -49,9 +51,11 @@ export type LightNetTranslationKey =
   | "ln.404.go-to-the-home-page"
   | "ln.404.page-not-found"
   | "ln.category"
+  | "ln.categories"
   | "ln.language"
+  | "ln.languages"
   | "ln.external-link"
-  | "ln.type_one"
+  | "ln.type"
   | "ln.details.open"
   | "ln.details.share"
   | "ln.details.part-of-collection"

package/src/pages/details-page/components/details/Categories.astro

@@ -17,7 +17,7 @@ const { t } = Astro.locals.i18n
 {
   !!categories?.length && (
     <div>
-      <Label>{t("ln.category", { count: categories.length })}</Label>
+      <Label>{t("ln.categories")}</Label>
       <ul class="flex flex-wrap gap-2">
         {categories.map(async (category) => (
           <li class="flex rounded-lg bg-gray-200 px-4 py-1 text-gray-500 hover:bg-gray-300">

package/src/pages/details-page/components/details/Languages.astro

@@ -24,7 +24,7 @@ const { t } = Astro.locals.i18n
 ---
 
 <div>
-  <Label>{t("ln.language", { count: translations.length + 1 })}</Label>
+  <Label>{translations.length ? t("ln.languages") : t("ln.language")}</Label>
   <ul class="flex flex-wrap gap-2">
     <li class="py-1 pe-2 text-gray-800">
       {resolveTranslatedLanguage(item.data.language, t).name}

package/src/pages/search-page/components/SearchFilter.tsx

@@ -111,7 +111,7 @@ export default function SearchFilter({
       <div className="mb-8 grid grid-cols-1 gap-2 sm:grid-cols-3 sm:gap-6 md:mb-10">
         {languageFilterEnabled && (
           <Select
-            label={t("ln.language_one")}
+            label={t("ln.language")}
             initialValue={language}
             valueChange={(val) => setLanguage(val)}
             options={[
@@ -126,7 +126,7 @@ export default function SearchFilter({
 
         {typesFilterEnabled && (
           <Select
-            label={t("ln.type_one")}
+            label={t("ln.type")}
             initialValue={type}
             valueChange={(val) => setType(val)}
             options={[
@@ -138,7 +138,7 @@ export default function SearchFilter({
 
         {categoriesFilterEnabled && (
           <Select
-            label={t("ln.category_one")}
+            label={t("ln.category")}
             initialValue={category}
             valueChange={(val) => setCategory(val)}
             options={[

package/src/pages/search-page/utils/search-translations.ts

@@ -1,12 +1,12 @@
 const translationKeys = [
   "ln.search.no-results",
   "ln.search.title",
-  "ln.language_one",
+  "ln.language",
   "ln.search.placeholder",
   "ln.search.all-languages",
-  "ln.type_one",
+  "ln.type",
   "ln.search.all-types",
-  "ln.category_one",
+  "ln.category",
   "ln.search.all-categories",
   "ln.search.more-results",
 ] as const