Compare commits

...

2 Commits

Author SHA1 Message Date
Michael Genson
b1278b45e2 fix: Invalid Pydantic Definition On Group Model (#3264)
* fixed ambiguous pydantic definition

* removed unused import
2024-03-07 14:25:26 -09:00
Hayden
e7ae76ea48 New Crowdin updates (#3262)
* New translations en-us.json (Spanish)

* New translations en-us.json (Swedish)

* New translations en-us.json (English, United Kingdom)

* New translations en-us.json (Polish)

* New translations en-us.json (Romanian)

* New translations en-us.json (French)

* New translations en-us.json (Afrikaans)

* New translations en-us.json (Arabic)

* New translations en-us.json (Bulgarian)

* New translations en-us.json (Catalan)

* New translations en-us.json (Czech)

* New translations en-us.json (Danish)

* New translations en-us.json (German)

* New translations en-us.json (Greek)

* New translations en-us.json (Finnish)

* New translations en-us.json (Hebrew)

* New translations en-us.json (Hungarian)

* New translations en-us.json (Italian)

* New translations en-us.json (Japanese)

* New translations en-us.json (Korean)

* New translations en-us.json (Lithuanian)

* New translations en-us.json (Dutch)

* New translations en-us.json (Norwegian)

* New translations en-us.json (Portuguese)

* New translations en-us.json (Russian)

* New translations en-us.json (Slovak)

* New translations en-us.json (Slovenian)

* New translations en-us.json (Serbian (Cyrillic))

* New translations en-us.json (Turkish)

* New translations en-us.json (Ukrainian)

* New translations en-us.json (Chinese Simplified)

* New translations en-us.json (Chinese Traditional)

* New translations en-us.json (Vietnamese)

* New translations en-us.json (Galician)

* New translations en-us.json (Icelandic)

* New translations en-us.json (Portuguese, Brazilian)

* New translations en-us.json (Croatian)

* New translations en-us.json (Latvian)

* New translations en-us.json (French, Canada)
2024-03-07 13:55:36 +01:00
40 changed files with 46 additions and 4 deletions

View File

@@ -142,6 +142,7 @@
"save": "Stoor", "save": "Stoor",
"settings": "Verstellings", "settings": "Verstellings",
"share": "Deel", "share": "Deel",
"show-all": "Show All",
"shuffle": "Skommel", "shuffle": "Skommel",
"sort": "Sorteer", "sort": "Sorteer",
"sort-alphabetically": "Alfabeties", "sort-alphabetically": "Alfabeties",

View File

@@ -142,6 +142,7 @@
"save": "حفظ", "save": "حفظ",
"settings": "الإعدادات", "settings": "الإعدادات",
"share": "مشاركة", "share": "مشاركة",
"show-all": "Show All",
"shuffle": "ترتيب عشوائي", "shuffle": "ترتيب عشوائي",
"sort": "ترتيب", "sort": "ترتيب",
"sort-alphabetically": "ترتيب حَسَبَ الحروف الأبجدية", "sort-alphabetically": "ترتيب حَسَبَ الحروف الأبجدية",

View File

@@ -142,6 +142,7 @@
"save": "Запази", "save": "Запази",
"settings": "Настройки", "settings": "Настройки",
"share": "Сподели", "share": "Сподели",
"show-all": "Show All",
"shuffle": "Разбъркано", "shuffle": "Разбъркано",
"sort": "Сортирай", "sort": "Сортирай",
"sort-alphabetically": "По азбучен ред", "sort-alphabetically": "По азбучен ред",

View File

@@ -142,6 +142,7 @@
"save": "Desa", "save": "Desa",
"settings": "Configuració", "settings": "Configuració",
"share": "Compartiu", "share": "Compartiu",
"show-all": "Show All",
"shuffle": "Barreja", "shuffle": "Barreja",
"sort": "Ordena", "sort": "Ordena",
"sort-alphabetically": "Alfabèticament", "sort-alphabetically": "Alfabèticament",

View File

@@ -142,6 +142,7 @@
"save": "Uložit", "save": "Uložit",
"settings": "Nastavení", "settings": "Nastavení",
"share": "Sdílet", "share": "Sdílet",
"show-all": "Show All",
"shuffle": "Náhodně", "shuffle": "Náhodně",
"sort": "Seřadit", "sort": "Seřadit",
"sort-alphabetically": "Abecedně", "sort-alphabetically": "Abecedně",

View File

@@ -142,6 +142,7 @@
"save": "Gem", "save": "Gem",
"settings": "Indstillinger", "settings": "Indstillinger",
"share": "Del", "share": "Del",
"show-all": "Show All",
"shuffle": "Bland", "shuffle": "Bland",
"sort": "Sorter", "sort": "Sorter",
"sort-alphabetically": "Alfabetisk", "sort-alphabetically": "Alfabetisk",

View File

@@ -142,6 +142,7 @@
"save": "Speichern", "save": "Speichern",
"settings": "Einstellungen", "settings": "Einstellungen",
"share": "Teilen", "share": "Teilen",
"show-all": "Show All",
"shuffle": "Mischen", "shuffle": "Mischen",
"sort": "Sortierung", "sort": "Sortierung",
"sort-alphabetically": "Alphabetisch", "sort-alphabetically": "Alphabetisch",

View File

@@ -142,6 +142,7 @@
"save": "Αποθήκευση", "save": "Αποθήκευση",
"settings": "Ρυθμίσεις", "settings": "Ρυθμίσεις",
"share": "Κοινοποίηση", "share": "Κοινοποίηση",
"show-all": "Show All",
"shuffle": "Τυχαία", "shuffle": "Τυχαία",
"sort": "Ταξινόμηση", "sort": "Ταξινόμηση",
"sort-alphabetically": "Αλφαβητική", "sort-alphabetically": "Αλφαβητική",

View File

@@ -142,6 +142,7 @@
"save": "Save", "save": "Save",
"settings": "Settings", "settings": "Settings",
"share": "Share", "share": "Share",
"show-all": "Show All",
"shuffle": "Shuffle", "shuffle": "Shuffle",
"sort": "Sort", "sort": "Sort",
"sort-alphabetically": "Alphabetical", "sort-alphabetically": "Alphabetical",

View File

@@ -142,6 +142,7 @@
"save": "Guardar", "save": "Guardar",
"settings": "Ajustes", "settings": "Ajustes",
"share": "Compartir", "share": "Compartir",
"show-all": "Show All",
"shuffle": "Aleatorio", "shuffle": "Aleatorio",
"sort": "Ordenar", "sort": "Ordenar",
"sort-alphabetically": "Alfabéticamente", "sort-alphabetically": "Alfabéticamente",

View File

@@ -142,6 +142,7 @@
"save": "Tallenna", "save": "Tallenna",
"settings": "Asetukset", "settings": "Asetukset",
"share": "Jaa", "share": "Jaa",
"show-all": "Show All",
"shuffle": "Sekoita", "shuffle": "Sekoita",
"sort": "Järjestä", "sort": "Järjestä",
"sort-alphabetically": "Aakkosjärjestyksessä", "sort-alphabetically": "Aakkosjärjestyksessä",

View File

@@ -142,6 +142,7 @@
"save": "Sauvegarder", "save": "Sauvegarder",
"settings": "Paramètres", "settings": "Paramètres",
"share": "Partager", "share": "Partager",
"show-all": "Show All",
"shuffle": "Mélanger", "shuffle": "Mélanger",
"sort": "Trier", "sort": "Trier",
"sort-alphabetically": "Alphabétique", "sort-alphabetically": "Alphabétique",
@@ -494,8 +495,8 @@
"cook-mode": "Mode Cuisine", "cook-mode": "Mode Cuisine",
"link-ingredients": "Ingrédients du lien", "link-ingredients": "Ingrédients du lien",
"merge-above": "Fusionner avec au-dessus", "merge-above": "Fusionner avec au-dessus",
"move-to-bottom": "Move To Bottom", "move-to-bottom": "Déplacer à la fin",
"move-to-top": "Move To Top", "move-to-top": "Déplacer au début",
"reset-scale": "Réinitialiser échelle", "reset-scale": "Réinitialiser échelle",
"decrease-scale-label": "Diminuer l'échelle de 1", "decrease-scale-label": "Diminuer l'échelle de 1",
"increase-scale-label": "Augmenter l'échelle de 1", "increase-scale-label": "Augmenter l'échelle de 1",

View File

@@ -142,6 +142,7 @@
"save": "Sauvegarder", "save": "Sauvegarder",
"settings": "Paramètres", "settings": "Paramètres",
"share": "Partager", "share": "Partager",
"show-all": "Show All",
"shuffle": "Aléatoire", "shuffle": "Aléatoire",
"sort": "Trier", "sort": "Trier",
"sort-alphabetically": "Alphabétique", "sort-alphabetically": "Alphabétique",

View File

@@ -142,6 +142,7 @@
"save": "Gardar", "save": "Gardar",
"settings": "Axustes", "settings": "Axustes",
"share": "Compartir", "share": "Compartir",
"show-all": "Show All",
"shuffle": "Barallar", "shuffle": "Barallar",
"sort": "Ordenar", "sort": "Ordenar",
"sort-alphabetically": "Alfabético", "sort-alphabetically": "Alfabético",

View File

@@ -142,6 +142,7 @@
"save": "שמירה", "save": "שמירה",
"settings": "הגדרות", "settings": "הגדרות",
"share": "שיתוף", "share": "שיתוף",
"show-all": "Show All",
"shuffle": "אקראי", "shuffle": "אקראי",
"sort": "מיון", "sort": "מיון",
"sort-alphabetically": "א-ת", "sort-alphabetically": "א-ת",

View File

@@ -142,6 +142,7 @@
"save": "Spremi", "save": "Spremi",
"settings": "Postavke", "settings": "Postavke",
"share": "Podijeli", "share": "Podijeli",
"show-all": "Show All",
"shuffle": "Nasumično", "shuffle": "Nasumično",
"sort": "Sortiraj", "sort": "Sortiraj",
"sort-alphabetically": "Abecedno", "sort-alphabetically": "Abecedno",

View File

@@ -142,6 +142,7 @@
"save": "Mentés", "save": "Mentés",
"settings": "Beállítások", "settings": "Beállítások",
"share": "Megosztás", "share": "Megosztás",
"show-all": "Show All",
"shuffle": "Véletlenszerű", "shuffle": "Véletlenszerű",
"sort": "Rendezés", "sort": "Rendezés",
"sort-alphabetically": "Betűrendben", "sort-alphabetically": "Betűrendben",

View File

@@ -142,6 +142,7 @@
"save": "Save", "save": "Save",
"settings": "Settings", "settings": "Settings",
"share": "Share", "share": "Share",
"show-all": "Show All",
"shuffle": "Shuffle", "shuffle": "Shuffle",
"sort": "Sort", "sort": "Sort",
"sort-alphabetically": "Alphabetical", "sort-alphabetically": "Alphabetical",

View File

@@ -142,6 +142,7 @@
"save": "Salva", "save": "Salva",
"settings": "Impostazioni", "settings": "Impostazioni",
"share": "Condividi", "share": "Condividi",
"show-all": "Show All",
"shuffle": "Casuale", "shuffle": "Casuale",
"sort": "Ordina", "sort": "Ordina",
"sort-alphabetically": "Alfabetico", "sort-alphabetically": "Alfabetico",

View File

@@ -142,6 +142,7 @@
"save": "保存", "save": "保存",
"settings": "設定", "settings": "設定",
"share": "共有", "share": "共有",
"show-all": "Show All",
"shuffle": "シャッフル", "shuffle": "シャッフル",
"sort": "並べ換え", "sort": "並べ換え",
"sort-alphabetically": "Alphabetical", "sort-alphabetically": "Alphabetical",

View File

@@ -142,6 +142,7 @@
"save": "저장", "save": "저장",
"settings": "설정", "settings": "설정",
"share": "공유", "share": "공유",
"show-all": "Show All",
"shuffle": "섞기", "shuffle": "섞기",
"sort": "정렬", "sort": "정렬",
"sort-alphabetically": "알파벳순", "sort-alphabetically": "알파벳순",

View File

@@ -142,6 +142,7 @@
"save": "Išsaugoti", "save": "Išsaugoti",
"settings": "Nustatymai", "settings": "Nustatymai",
"share": "Dalintis", "share": "Dalintis",
"show-all": "Show All",
"shuffle": "Maišyti", "shuffle": "Maišyti",
"sort": "Rikiavimas", "sort": "Rikiavimas",
"sort-alphabetically": "Pagal abėcėlę", "sort-alphabetically": "Pagal abėcėlę",

View File

@@ -142,6 +142,7 @@
"save": "Save", "save": "Save",
"settings": "Settings", "settings": "Settings",
"share": "Share", "share": "Share",
"show-all": "Show All",
"shuffle": "Shuffle", "shuffle": "Shuffle",
"sort": "Sort", "sort": "Sort",
"sort-alphabetically": "Alphabetical", "sort-alphabetically": "Alphabetical",

View File

@@ -142,6 +142,7 @@
"save": "Opslaan", "save": "Opslaan",
"settings": "Instellingen", "settings": "Instellingen",
"share": "Delen", "share": "Delen",
"show-all": "Laat alles zien",
"shuffle": "Willekeurig", "shuffle": "Willekeurig",
"sort": "Sorteren", "sort": "Sorteren",
"sort-alphabetically": "Alfabetisch", "sort-alphabetically": "Alfabetisch",

View File

@@ -142,6 +142,7 @@
"save": "Lagre", "save": "Lagre",
"settings": "Innstillinger", "settings": "Innstillinger",
"share": "Del", "share": "Del",
"show-all": "Show All",
"shuffle": "Tilfeldig rekkefølge", "shuffle": "Tilfeldig rekkefølge",
"sort": "Sortér", "sort": "Sortér",
"sort-alphabetically": "Alfabetisk", "sort-alphabetically": "Alfabetisk",

View File

@@ -142,6 +142,7 @@
"save": "Zapisz", "save": "Zapisz",
"settings": "Ustawienia", "settings": "Ustawienia",
"share": "Udostępnij", "share": "Udostępnij",
"show-all": "Show All",
"shuffle": "Pomieszaj", "shuffle": "Pomieszaj",
"sort": "Sortuj", "sort": "Sortuj",
"sort-alphabetically": "Alfabetyczne", "sort-alphabetically": "Alfabetyczne",

View File

@@ -142,6 +142,7 @@
"save": "Salvar", "save": "Salvar",
"settings": "Configurações", "settings": "Configurações",
"share": "Compartilhar", "share": "Compartilhar",
"show-all": "Show All",
"shuffle": "Aleatório", "shuffle": "Aleatório",
"sort": "Ordenar", "sort": "Ordenar",
"sort-alphabetically": "Alfabética", "sort-alphabetically": "Alfabética",

View File

@@ -142,6 +142,7 @@
"save": "Guardar", "save": "Guardar",
"settings": "Definições", "settings": "Definições",
"share": "Partilhar", "share": "Partilhar",
"show-all": "Mostrar todos",
"shuffle": "Baralhar", "shuffle": "Baralhar",
"sort": "Ordenar", "sort": "Ordenar",
"sort-alphabetically": "Ordem alfabética", "sort-alphabetically": "Ordem alfabética",

View File

@@ -142,6 +142,7 @@
"save": "Salvează", "save": "Salvează",
"settings": "Setări", "settings": "Setări",
"share": "Distribuie", "share": "Distribuie",
"show-all": "Show All",
"shuffle": "Redați aleatoriu", "shuffle": "Redați aleatoriu",
"sort": "Sortează", "sort": "Sortează",
"sort-alphabetically": "Alfabetic", "sort-alphabetically": "Alfabetic",

View File

@@ -142,6 +142,7 @@
"save": "Сохранить", "save": "Сохранить",
"settings": "Настройки", "settings": "Настройки",
"share": "Поделиться", "share": "Поделиться",
"show-all": "Show All",
"shuffle": "Перемешать", "shuffle": "Перемешать",
"sort": "Сортировать", "sort": "Сортировать",
"sort-alphabetically": "По алфавиту", "sort-alphabetically": "По алфавиту",

View File

@@ -142,6 +142,7 @@
"save": "Uložiť", "save": "Uložiť",
"settings": "Nastavenia", "settings": "Nastavenia",
"share": "Zdieľať", "share": "Zdieľať",
"show-all": "Show All",
"shuffle": "Náhodný výber", "shuffle": "Náhodný výber",
"sort": "Usporiadať", "sort": "Usporiadať",
"sort-alphabetically": "Abecedne", "sort-alphabetically": "Abecedne",

View File

@@ -142,6 +142,7 @@
"save": "Shrani", "save": "Shrani",
"settings": "Nastavitve", "settings": "Nastavitve",
"share": "Deli", "share": "Deli",
"show-all": "Show All",
"shuffle": "Naključno", "shuffle": "Naključno",
"sort": "Razvrsti", "sort": "Razvrsti",
"sort-alphabetically": "Po abecedi", "sort-alphabetically": "Po abecedi",

View File

@@ -142,6 +142,7 @@
"save": "Сачувај", "save": "Сачувај",
"settings": "Подешавања", "settings": "Подешавања",
"share": "Подели", "share": "Подели",
"show-all": "Show All",
"shuffle": "Помешано", "shuffle": "Помешано",
"sort": "Сортирај", "sort": "Сортирај",
"sort-alphabetically": "Азбучно", "sort-alphabetically": "Азбучно",

View File

@@ -142,6 +142,7 @@
"save": "Spara", "save": "Spara",
"settings": "Inställningar", "settings": "Inställningar",
"share": "Dela", "share": "Dela",
"show-all": "Show All",
"shuffle": "Blanda", "shuffle": "Blanda",
"sort": "Sortering", "sort": "Sortering",
"sort-alphabetically": "Alfabetisk", "sort-alphabetically": "Alfabetisk",

View File

@@ -142,6 +142,7 @@
"save": "Kaydet", "save": "Kaydet",
"settings": "Ayarlar", "settings": "Ayarlar",
"share": "Paylaş", "share": "Paylaş",
"show-all": "Show All",
"shuffle": "Karıştır", "shuffle": "Karıştır",
"sort": "Sırala", "sort": "Sırala",
"sort-alphabetically": "Alfabetik", "sort-alphabetically": "Alfabetik",

View File

@@ -142,6 +142,7 @@
"save": "Зберегти", "save": "Зберегти",
"settings": "Налаштування", "settings": "Налаштування",
"share": "Поділитись", "share": "Поділитись",
"show-all": "Show All",
"shuffle": "Перемішати", "shuffle": "Перемішати",
"sort": "Сортувати", "sort": "Сортувати",
"sort-alphabetically": "За алфавітом", "sort-alphabetically": "За алфавітом",

View File

@@ -142,6 +142,7 @@
"save": "Save", "save": "Save",
"settings": "Settings", "settings": "Settings",
"share": "Share", "share": "Share",
"show-all": "Show All",
"shuffle": "Shuffle", "shuffle": "Shuffle",
"sort": "Sort", "sort": "Sort",
"sort-alphabetically": "Alphabetical", "sort-alphabetically": "Alphabetical",

View File

@@ -142,6 +142,7 @@
"save": "保存", "save": "保存",
"settings": "设定", "settings": "设定",
"share": "分享", "share": "分享",
"show-all": "Show All",
"shuffle": "随机", "shuffle": "随机",
"sort": "排序", "sort": "排序",
"sort-alphabetically": "按字母顺序排序", "sort-alphabetically": "按字母顺序排序",

View File

@@ -142,6 +142,7 @@
"save": "保存", "save": "保存",
"settings": "設定", "settings": "設定",
"share": "分享", "share": "分享",
"show-all": "Show All",
"shuffle": "隨機", "shuffle": "隨機",
"sort": "排序", "sort": "排序",
"sort-alphabetically": "按字母順序", "sort-alphabetically": "按字母順序",

View File

@@ -1,6 +1,6 @@
from datetime import datetime, timedelta from datetime import datetime, timedelta
from pathlib import Path from pathlib import Path
from typing import Annotated, Any from typing import Annotated
from uuid import UUID from uuid import UUID
from pydantic import UUID4, ConfigDict, Field, StringConstraints, field_validator from pydantic import UUID4, ConfigDict, Field, StringConstraints, field_validator
@@ -12,6 +12,7 @@ from mealie.db.models.users import User
from mealie.db.models.users.users import AuthMethod from mealie.db.models.users.users import AuthMethod
from mealie.schema._mealie import MealieModel from mealie.schema._mealie import MealieModel
from mealie.schema.group.group_preferences import ReadGroupPreferences from mealie.schema.group.group_preferences import ReadGroupPreferences
from mealie.schema.group.webhook import CreateWebhook, ReadWebhook
from mealie.schema.recipe import RecipeSummary from mealie.schema.recipe import RecipeSummary
from mealie.schema.response.pagination import PaginationBase from mealie.schema.response.pagination import PaginationBase
@@ -180,12 +181,14 @@ class UpdateGroup(GroupBase):
slug: str slug: str
categories: list[CategoryBase] | None = [] categories: list[CategoryBase] | None = []
webhooks: list[Any] = [] webhooks: list[CreateWebhook] = []
class GroupInDB(UpdateGroup): class GroupInDB(UpdateGroup):
users: list[UserOut] | None = None users: list[UserOut] | None = None
preferences: ReadGroupPreferences | None = None preferences: ReadGroupPreferences | None = None
webhooks: list[ReadWebhook] = []
model_config = ConfigDict(from_attributes=True) model_config = ConfigDict(from_attributes=True)
@staticmethod @staticmethod