Compare commits

...

84 Commits
2.2.1 ... 2.2.7

Author SHA1 Message Date
vabene1111
8572f338ad fixed ingredient insert focus error 2025-09-25 21:03:35 +02:00
vabene1111
920ec8e74b fixed missing pg extensions 2025-09-25 20:56:53 +02:00
vabene1111
2328bf2342 fixed mealie edgecases 2025-09-25 20:48:20 +02:00
vabene1111
85620a1431 Merge branch 'master' into develop 2025-09-25 12:33:43 +02:00
vabene1111
0037858885 fixed step editor layout 2025-09-25 12:33:39 +02:00
vabene1111
9df3ff0028 Merge branch 'develop' 2025-09-25 07:39:38 +02:00
vabene1111
0a43272126 fixed property editor page updateing with 0 values 2025-09-25 07:39:30 +02:00
vabene1111
ff96eb194f auto grow comment textarea 2025-09-25 07:37:40 +02:00
vabene1111
6b69c4184b fixed ingredients wihtout unit in steps overview 2025-09-25 07:31:45 +02:00
vabene1111
e90e21181c fixed sizing of ingredient input in recipe editor 2025-09-25 07:28:01 +02:00
vabene1111
5237228673 added patreon link 2025-09-24 19:54:36 +02:00
vabene1111
ecb3172085 increased storage token length 2025-09-24 19:24:33 +02:00
vabene1111
b4f4e9fd2b Merge branch 'develop' 2025-09-24 19:11:01 +02:00
vabene1111
6d0f3b99c8 deactivate for now 2025-09-24 18:56:45 +02:00
vabene1111
cdb94ae628 more nginx testing 2025-09-24 18:49:29 +02:00
vabene1111
0d589444fd fixed order 2025-09-24 18:34:53 +02:00
vabene1111
95fa420c3a updated nginx confi 2025-09-24 18:31:02 +02:00
vabene1111
dd4dc1083f add duplicate to recipe 2025-09-24 18:24:58 +02:00
vabene1111
04f889b742 fixed search updated at filter 2025-09-24 17:36:37 +02:00
vabene1111
67d374c071 always clear staticfiles directory on collect 2025-09-24 17:33:49 +02:00
vabene1111
8d749e351d django vite manifest path 2025-09-24 15:22:01 +02:00
vabene1111
417ffcab5d improved recipe editor layout 2025-09-24 07:46:15 +02:00
vabene1111
0c0012aab8 WIP recipe editor improvements 2025-09-23 07:58:38 +02:00
vabene1111
e562883da3 return steps in importer 2025-09-23 07:41:11 +02:00
vabene1111
a81bc335cc added AI properties import 2025-09-22 21:59:34 +02:00
vabene1111
ebee1ccd4b Merge branch 'develop' of https://github.com/TandoorRecipes/recipes into develop 2025-09-22 21:08:59 +02:00
vabene1111
b1104b4581 import button in shared recipes 2025-09-22 21:08:55 +02:00
vabene1111
f5e952d88c Merge pull request #4060 from Nailik/patch-1
Synology documentation update Tandoor 2
2025-09-22 20:29:54 +02:00
vabene1111
968fcc3936 fixed docs 2025-09-22 20:28:36 +02:00
vabene1111
73d3d87217 fixed open data import 2025-09-22 20:21:59 +02:00
vabene1111
9050f648f9 added special symbols and updated translations 2025-09-22 20:17:55 +02:00
vabene1111
a4a9e104b5 invite link button on UserSpace model Liste page 2025-09-22 20:02:56 +02:00
Nailik
3ed85ea0c4 Update synology.md 2025-09-22 14:16:53 +02:00
Nailik
da8ceb7abe Update synology.md 2025-09-22 14:06:25 +02:00
Nailik
5ff3a6bb2e Update synology.md 2025-09-22 14:02:42 +02:00
Vincenzo Reale
3ed750b330 Translated using Weblate (Italian)
Currently translated at 100.0% (488 of 488 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/
2025-09-22 10:09:35 +00:00
TC Kuo
0315911802 Translated using Weblate (Chinese (Traditional Han script))
Currently translated at 92.0% (795 of 864 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/zh_Hant/
2025-09-22 10:02:22 +00:00
TC Kuo
1fe96f2b3d Translated using Weblate (Chinese (Simplified Han script))
Currently translated at 65.7% (568 of 864 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/zh_Hans/
2025-09-22 10:02:22 +00:00
TC Kuo
11761c0b15 Translated using Weblate (Ukrainian)
Currently translated at 35.9% (311 of 864 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/uk/
2025-09-22 10:02:22 +00:00
TC Kuo
a7b0a1ab30 Translated using Weblate (Turkish)
Currently translated at 65.7% (568 of 864 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/tr/
2025-09-22 10:02:22 +00:00
TC Kuo
e4fcae3b00 Translated using Weblate (Swedish)
Currently translated at 70.0% (605 of 864 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/sv/
2025-09-22 10:02:22 +00:00
TC Kuo
b0401639f1 Translated using Weblate (Slovenian)
Currently translated at 92.0% (795 of 864 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/sl/
2025-09-22 10:02:22 +00:00
TC Kuo
5f8770f502 Translated using Weblate (Russian)
Currently translated at 91.6% (792 of 864 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/ru/
2025-09-22 10:02:22 +00:00
TC Kuo
aaa627d3b6 Translated using Weblate (Romanian)
Currently translated at 55.3% (478 of 864 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/ro/
2025-09-22 10:02:22 +00:00
TC Kuo
e77734f696 Translated using Weblate (Portuguese (Brazil))
Currently translated at 75.9% (656 of 864 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pt_BR/
2025-09-22 10:02:22 +00:00
TC Kuo
73df6bb961 Translated using Weblate (Polish)
Currently translated at 68.7% (594 of 864 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pl/
2025-09-22 10:02:22 +00:00
Justin Straver
7d187b638e Translated using Weblate (Dutch)
Currently translated at 92.2% (797 of 864 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/nl/
2025-09-22 10:02:22 +00:00
TC Kuo
68bb750f8c Translated using Weblate (Dutch)
Currently translated at 92.2% (797 of 864 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/nl/
2025-09-22 10:02:22 +00:00
TC Kuo
1e35035540 Translated using Weblate (Norwegian Bokmål)
Currently translated at 46.4% (401 of 864 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/nb_NO/
2025-09-22 10:02:22 +00:00
Vincenzo Reale
561ba2f1da Translated using Weblate (Italian)
Currently translated at 100.0% (864 of 864 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
2025-09-22 10:02:22 +00:00
TC Kuo
bd600301f9 Translated using Weblate (Italian)
Currently translated at 100.0% (864 of 864 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
2025-09-22 10:02:22 +00:00
TC Kuo
cf5483a4d9 Translated using Weblate (Indonesian)
Currently translated at 16.5% (143 of 864 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/id/
2025-09-22 10:02:22 +00:00
TC Kuo
ba417c49dd Translated using Weblate (Hungarian)
Currently translated at 53.7% (464 of 864 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/hu/
2025-09-22 10:02:22 +00:00
TC Kuo
0259b1dc08 Translated using Weblate (Croatian)
Currently translated at 65.7% (568 of 864 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/hr/
2025-09-22 10:02:22 +00:00
TC Kuo
34553dadd7 Translated using Weblate (Hebrew)
Currently translated at 65.7% (568 of 864 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/he/
2025-09-22 10:02:22 +00:00
TC Kuo
535b88c8db Translated using Weblate (French)
Currently translated at 89.2% (771 of 864 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
2025-09-22 10:02:22 +00:00
TC Kuo
71eb8818b5 Translated using Weblate (Finnish)
Currently translated at 59.6% (515 of 864 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fi/
2025-09-22 10:02:21 +00:00
TC Kuo
0dc94a817f Translated using Weblate (Spanish)
Currently translated at 88.0% (761 of 864 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/es/
2025-09-22 10:02:21 +00:00
TC Kuo
4df862c7f3 Translated using Weblate (Greek)
Currently translated at 65.7% (568 of 864 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/el/
2025-09-22 10:02:21 +00:00
TC Kuo
69f013c980 Translated using Weblate (Danish)
Currently translated at 65.7% (568 of 864 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/da/
2025-09-22 10:02:21 +00:00
TC Kuo
23c420dda8 Translated using Weblate (Czech)
Currently translated at 64.6% (559 of 864 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/cs/
2025-09-22 10:02:21 +00:00
TC Kuo
63daf1e958 Translated using Weblate (Catalan)
Currently translated at 65.7% (568 of 864 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/ca/
2025-09-22 10:02:21 +00:00
Vincenzo Reale
52b44eacdd Translated using Weblate (Italian)
Currently translated at 100.0% (488 of 488 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/
2025-09-22 10:02:21 +00:00
vabene1111
fa7cc12b99 added AI step sorter 2025-09-22 08:21:26 +02:00
vabene1111
64d2108ef6 locales 2025-09-21 13:16:16 +02:00
vabene1111
dccfdcc11c Merge branch 'develop' of http://translate.tandoor.dev/git/tandoor/recipes-backend into develop
# Conflicts:
#	vue3/src/locales/pt.json
2025-09-21 12:47:20 +02:00
vabene1111
974e72631d improved modeldeletepage, hide when not needed 2025-09-21 10:23:04 +02:00
vabene1111
70f31b8553 fxied api food test: foods can be deleted even when part of a recipe 2025-09-21 10:22:54 +02:00
vabene1111
3cb980c0e7 model delete page done 2025-09-21 09:01:07 +02:00
vabene1111
b8a403b7c1 playing with delete confirm view 2025-09-20 19:04:51 +02:00
vabene1111
b037d90220 proper function for delete relation views 2025-09-20 12:24:25 +02:00
vabene1111
ad32e457fa basics of delete collector logic 2025-09-20 12:05:29 +02:00
vabene1111
8e2726caeb improved step sorting 2025-09-20 10:53:44 +02:00
vabene1111
e693737c57 fixed AI ordering and VNumberInput decimal seperator 2025-09-20 10:42:39 +02:00
vabene1111
9f239c06d3 fixed unglobal of AI provider 2025-09-20 10:12:31 +02:00
vabene1111
0f551c5f88 improved german translation for keyword 2025-09-20 10:03:29 +02:00
vabene1111
eb224a769d Merge branch 'develop' 2025-09-19 17:02:10 +02:00
vabene1111
4515eba9d7 fixed ai provider admin and prevent accidental update 2025-09-19 17:02:01 +02:00
vabene1111
30b37bf0b6 fixed ai credit system 2025-09-19 16:49:30 +02:00
vabene1111
f17207e56e protect endpoint WIP 2025-09-19 16:22:20 +02:00
vabene1111
2cba0e18af Merge branch 'develop' 2025-09-19 16:20:56 +02:00
vabene1111
ec6e81316a fixed unwanted redirect to start page 2025-09-19 16:20:48 +02:00
Whalysonramos
a35c92439c Translated using Weblate (Portuguese)
Currently translated at 43.9% (350 of 797 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pt/
2025-08-20 19:54:18 +00:00
Whalysonramos
eed09a7891 Translated using Weblate (Portuguese)
Currently translated at 43.7% (349 of 797 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pt/
2025-08-20 19:54:17 +00:00
205 changed files with 38474 additions and 38171 deletions

View File

@@ -30,9 +30,11 @@
![Preview](docs/preview.png)
## Core Features
- 🥗 **Manage your recipes** - Manage your ever growing recipe collection
- 📆 **Plan** - multiple meals for each day
- 🛒 **Shopping lists** - via the meal plan or straight from recipes
- 🪄 **use AI** to recognize images, sort recipe steps, find nutrition facts and more
- 📚 **Cookbooks** - collect recipes into books
- 👪 **Share and collaborate** on recipes with friends and family
@@ -62,12 +64,13 @@ a public page.
Documentation can be found [here](https://docs.tandoor.dev/).
## Support our work
## ❤️ Support our work ❤️
Tandoor is developed by volunteers in their free time just because its fun. That said earning
some money with the project allows us to spend more time on it and thus make improvements we otherwise couldn't.
Because of that there are several ways you can support us
- **GitHub Sponsors** You can sponsor contributors of this project on GitHub: [vabene1111](https://github.com/sponsors/vabene1111)
- **Patron** You can sponsor contributors of this project on Patron: [vabene111](https://www.patreon.com/cw/vabene1111)
- **Host at Hetzner** We have been very happy customers of Hetzner for multiple years for all of our projects. If you want to get into self-hosting or are tired of the expensive big providers, their cloud servers are a great place to get started. When you sign up via our [referral link](https://hetzner.cloud/?ref=ISdlrLmr9kGj) you will get 20€ worth of cloud credits and we get a small kickback too.
- **Let us host for you** We are offering a [hosted version](https://app.tandoor.dev) where all profits support us and the development of tandoor (currently only available in germany).

17
boot.sh
View File

@@ -22,6 +22,14 @@ display_warning() {
echo -e "$1"
}
# prepare nginx config
envsubst '$MEDIA_ROOT $STATIC_ROOT $TANDOOR_PORT' < /opt/recipes/http.d/Recipes.conf.template > /opt/recipes/http.d/Recipes.conf
# start nginx early to display error pages
echo "Starting nginx"
nginx
echo "Checking configuration..."
# SECRET_KEY (or a valid file at SECRET_KEY_FILE) must be set in .env file
@@ -93,7 +101,7 @@ fi
echo "Collecting static files, this may take a while..."
python manage.py collectstatic --noinput
python manage.py collectstatic --noinput --clear
echo "Done"
@@ -101,13 +109,6 @@ chmod -R 755 ${MEDIA_ROOT:-/opt/recipes/mediafiles}
ipv6_disable=$(cat /sys/module/ipv6/parameters/disable)
# prepare nginx config
envsubst '$MEDIA_ROOT $STATIC_ROOT $TANDOOR_PORT' < /opt/recipes/http.d/Recipes.conf.template > /opt/recipes/http.d/Recipes.conf
# start nginx
echo "Starting nginx"
nginx
echo "Starting gunicorn"
# Check if IPv6 is enabled, only then run gunicorn with ipv6 support
if [ "$ipv6_disable" -eq 0 ]; then

View File

@@ -91,8 +91,8 @@ admin.site.register(SearchPreference, SearchPreferenceAdmin)
class AiProviderAdmin(admin.ModelAdmin):
list_display = ('name', 'space', 'model',)
search_fields = ('name', 'space', 'model',)
list_display = ('name', 'space', 'model_name',)
search_fields = ('name', 'space', 'model_name',)
admin.site.register(AiProvider, AiProviderAdmin)

View File

@@ -33,12 +33,14 @@ class AiCallbackHandler(CustomLogger):
space = None
user = None
ai_provider = None
function = None
def __init__(self, space, user, ai_provider):
def __init__(self, space, user, ai_provider, function):
super().__init__()
self.space = space
self.user = user
self.ai_provider = ai_provider
self.function = function
def log_pre_api_call(self, model, messages, kwargs):
pass
@@ -62,7 +64,7 @@ class AiCallbackHandler(CustomLogger):
remaining_balance = self.space.ai_credits_balance - Decimal(str(credit_cost))
if remaining_balance < 0:
remaining_balance = 0
if settings.HOSTED:
if settings.HOSTED and self.space.ai_credits_monthly == 0:
self.space.ai_enabled = False
self.space.ai_credits_balance = remaining_balance
@@ -77,7 +79,7 @@ class AiCallbackHandler(CustomLogger):
end_time=end_time,
input_tokens=response_obj['usage']['prompt_tokens'],
output_tokens=response_obj['usage']['completion_tokens'],
function=AiLog.F_FILE_IMPORT,
function=self.function,
credit_cost=credit_cost,
credits_from_balance=credits_from_balance,
)

View File

@@ -51,10 +51,10 @@ class OpenDataImporter:
for field in field_list:
if isinstance(getattr(obj, field), float) or isinstance(getattr(obj, field), Decimal):
if abs(float(getattr(obj, field)) - float(existing_obj[field])) > 0.001: # convert both to float and check if basically equal
print(f'comparing FLOAT {obj} failed because field {field} is not equal ({getattr(obj, field)} != {existing_obj[field]})')
#print(f'comparing FLOAT {obj} failed because field {field} is not equal ({getattr(obj, field)} != {existing_obj[field]})')
return False
elif getattr(obj, field) != existing_obj[field]:
print(f'comparing {obj} failed because field {field} is not equal ({getattr(obj, field)} != {existing_obj[field]})')
#print(f'comparing {obj} failed because field {field} is not equal ({getattr(obj, field)} != {existing_obj[field]})')
return False
return True
@@ -342,7 +342,7 @@ class OpenDataImporter:
'name': self.data[datatype][k]['name'],
'plural_name': self.data[datatype][k]['plural_name'] if self.data[datatype][k]['plural_name'] != '' else None,
'supermarket_category_id': self.slug_id_cache['category'][self.data[datatype][k]['store_category']] if self.data[datatype][k]['store_category'] in self.slug_id_cache['category'] else None,
'fdc_id': re.sub(r'\D', '', self.data[datatype][k]['fdc_id']) if self.data[datatype][k]['fdc_id'] != '' else None,
'fdc_id': re.sub(r'\D', '', str(self.data[datatype][k]['fdc_id'])) if self.data[datatype][k]['fdc_id'] != '' else None,
'open_data_slug': k,
'properties_food_unit_id': None,
'space_id': self.request.space.id,

View File

@@ -288,7 +288,7 @@ class RecipeSearch():
def _updated_on_filter(self):
if self._updatedon:
self._queryset = self._queryset.filter(updated_at__date__date=self._updatedon)
self._queryset = self._queryset.filter(updated_at__date=self._updatedon)
elif self._updatedon_lte:
self._queryset = self._queryset.filter(updated_at__date__lte=self._updatedon_lte)
elif self._updatedon_gte:

View File

@@ -155,7 +155,7 @@ def get_from_scraper(scrape, request):
# assign steps
try:
for i in parse_instructions(scrape.instructions()):
for i in parse_instructions(scrape.instructions_list()):
recipe_json['steps'].append({
'instruction': i,
'ingredients': [],
@@ -177,11 +177,11 @@ def get_from_scraper(scrape, request):
for x in scrape.ingredients():
if x.strip() != '':
try:
amount, unit, ingredient, note = ingredient_parser.parse(x)
amount, unit, food, note = ingredient_parser.parse(x)
ingredient = {
'amount': amount,
'food': {
'name': ingredient,
'name': food,
},
'unit': None,
'note': note,
@@ -315,14 +315,29 @@ def clean_instruction_string(instruction):
# handle unsupported, special UTF8 character in Thermomix-specific instructions,
# that happen in nearly every recipe on Cookidoo, Zaubertopf Club, Rezeptwelt
# and in Thermomix-specific recipes on many other sites
return normalized_string \
.replace("", _('reverse rotation')) \
.replace("", _('careful rotation')) \
.replace("", _('knead')) \
.replace("", _('thicken')) \
.replace("", _('warm up')) \
.replace("", _('ferment')) \
.replace("", _("sous-vide"))
normalized_string = normalized_string \
.replace(u"\uE003", _('reverse rotation')) \
.replace(u"\uE002", _('careful rotation')) \
.replace(u"\uE001", _('knead')) \
.replace(u"\uE031", _('thicken')) \
.replace(u"\uE019", _('warm up')) \
.replace(u"\uE02E", _('ferment')) \
.replace(u"\uE018", _('slow cook')) \
.replace(u"\uE033", _('egg boiler')) \
.replace(u"\uE016", _('kettle')) \
.replace(u"\uE01E", _('blend')) \
.replace(u"\uE011", _('pre-clean')) \
.replace(u"\uE026", _('high temperature')) \
.replace(u"\uE00D", _('rice cooker')) \
.replace(u"\uE00C", _('caramelize')) \
.replace(u"\uE038", _('peeler')) \
.replace(u"\uE037", _('slicer')) \
.replace(u"\uE036", _('grater')) \
.replace(u"\uE04C", _('spiralizer')) \
.replace(u"\uE02D", _("sous-vide"))
return normalized_string
def parse_instructions(instructions):

View File

@@ -138,6 +138,16 @@ class Mealie1(Integration):
if s['recipe_id'] not in first_step_of_recipe_dict:
first_step_of_recipe_dict[s['recipe_id']] = step.pk
# it is possible for a recipe to not have steps but have ingredients, in that case create an empty step to add them to later
for r in recipes_dict.keys():
if r not in first_step_of_recipe_dict:
step = Step.objects.create(instruction='',
order=0,
name='',
space=self.request.space)
steps_relation.append(Recipe.steps.through(recipe_id=recipes_dict[r], step_id=step.pk))
first_step_of_recipe_dict[r] = step.pk
for n in mealie_database['notes']:
if n['recipe_id'] in recipes_dict:
step = Step.objects.create(instruction=n['text'],
@@ -169,7 +179,7 @@ class Mealie1(Integration):
unit_id=units_dict[i['unit_id']] if i['unit_id'] in units_dict else None,
original_text=i['original_text'],
order=i['position'],
amount=i['quantity'],
amount=i['quantity'] if i['quantity'] else 0,
note=i['note'],
space=self.request.space,
)

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -16,7 +16,7 @@ import uuid
from django.conf import settings
from django.db import migrations, models
from cookbook.models import SearchFields
from django.contrib.postgres.operations import TrigramExtension, UnaccentExtension
def allSearchFields():
return list(SearchFields.objects.values_list('id', flat=True))
@@ -141,6 +141,8 @@ class Migration(migrations.Migration):
]
operations = [
TrigramExtension(),
UnaccentExtension(),
migrations.RunPython(create_default_groups),
migrations.CreateModel(
name='AiProvider',

View File

@@ -0,0 +1,26 @@
# Generated by Django 5.2.6 on 2025-09-24 17:20
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('cookbook', '0228_space_space_setup_completed'),
]
operations = [
migrations.AlterModelOptions(
name='ailog',
options={'ordering': ('-created_at',)},
),
migrations.AlterModelOptions(
name='aiprovider',
options={'ordering': ('id',)},
),
migrations.AlterField(
model_name='storage',
name='token',
field=models.CharField(blank=True, max_length=4098, null=True),
),
]

View File

@@ -0,0 +1,15 @@
# Generated by Django 5.2.6 on 2025-09-25 18:56
from django.db import migrations
from django.contrib.postgres.operations import TrigramExtension, UnaccentExtension
class Migration(migrations.Migration):
dependencies = [
('cookbook', '0229_alter_ailog_options_alter_aiprovider_options_and_more'),
]
operations = [
TrigramExtension(),
UnaccentExtension(),
]

View File

@@ -417,9 +417,17 @@ class AiProvider(models.Model):
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
def __str__(self):
return self.name
class Meta:
ordering = ('id',)
class AiLog(models.Model, PermissionModelMixin):
F_FILE_IMPORT = 'FILE_IMPORT'
F_STEP_SORT = 'STEP_SORT'
F_FOOD_PROPERTIES = 'FOOD_PROPERTIES'
ai_provider = models.ForeignKey(AiProvider, on_delete=models.SET_NULL, null=True)
function = models.CharField(max_length=64)
@@ -437,6 +445,12 @@ class AiLog(models.Model, PermissionModelMixin):
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
def __str__(self):
return f"{self.function} {self.ai_provider.name} {self.created_at}"
class Meta:
ordering = ('-created_at',)
class ConnectorConfig(models.Model, PermissionModelMixin):
HOMEASSISTANT = 'HomeAssistant'
@@ -578,7 +592,7 @@ class Storage(models.Model, PermissionModelMixin):
)
username = models.CharField(max_length=128, blank=True, null=True)
password = models.CharField(max_length=128, blank=True, null=True)
token = models.CharField(max_length=512, blank=True, null=True)
token = models.CharField(max_length=4098, blank=True, null=True)
url = models.URLField(blank=True, null=True)
path = models.CharField(blank=True, default='', max_length=256)
created_by = models.ForeignKey(User, on_delete=models.PROTECT)
@@ -793,14 +807,7 @@ class Food(ExportModelOperationsMixin('food'), TreeModel, PermissionModelMixin):
self.delete()
return target
def delete(self):
if self.ingredient_set.all().exclude(step=None).count() > 0:
raise ProtectedError(self.name + _(" is part of a recipe step and cannot be deleted"), self.ingredient_set.all().exclude(step=None))
else:
return super().delete()
# MP_Tree move uses raw SQL to execute move, override behavior to force a save triggering post_save signal
def move(self, *args, **kwargs):
super().move(*args, **kwargs)
# treebeard bypasses ORM, need to explicity save to trigger post save signals retrieve the object again to avoid writing previous state back to disk

View File

@@ -151,19 +151,22 @@ class CustomOnHandField(serializers.Field):
return instance
def to_representation(self, obj):
if not self.context["request"].user.is_authenticated:
try:
if not self.context["request"].user.is_authenticated:
return []
shared_users = []
if c := caches['default'].get(f'shopping_shared_users_{self.context["request"].space.id}_{self.context["request"].user.id}', None):
shared_users = c
else:
try:
shared_users = [x.id for x in list(self.context['request'].user.get_shopping_share())] + [self.context['request'].user.id]
caches['default'].set(f'shopping_shared_users_{self.context["request"].space.id}_{self.context["request"].user.id}', shared_users, timeout=5 * 60)
# TODO ugly hack that improves API performance significantly, should be done properly
except AttributeError: # Anonymous users (using share links) don't have shared users
pass
return obj.onhand_users.filter(id__in=shared_users).exists()
except AttributeError:
return []
shared_users = []
if c := caches['default'].get(f'shopping_shared_users_{self.context["request"].space.id}_{self.context["request"].user.id}', None):
shared_users = c
else:
try:
shared_users = [x.id for x in list(self.context['request'].user.get_shopping_share())] + [self.context['request'].user.id]
caches['default'].set(f'shopping_shared_users_{self.context["request"].space.id}_{self.context["request"].user.id}', shared_users, timeout=5 * 60)
# TODO ugly hack that improves API performance significantly, should be done properly
except AttributeError: # Anonymous users (using share links) don't have shared users
pass
return obj.onhand_users.filter(id__in=shared_users).exists()
def to_internal_value(self, data):
return data
@@ -335,17 +338,26 @@ class AiProviderSerializer(serializers.ModelSerializer):
return super().create(validated_data)
def update(self, instance, validated_data):
validated_data = self.handle_global_space_logic(validated_data)
validated_data = self.handle_global_space_logic(validated_data, instance=instance)
return super().update(instance, validated_data)
def handle_global_space_logic(self, validated_data):
def handle_global_space_logic(self, validated_data, instance=None):
"""
allow superusers to create AI providers without a space but make sure everyone else only uses their own space
"""
if ('space' not in validated_data or not validated_data['space']) and self.context['request'].user.is_superuser:
validated_data['space'] = None
if self.context['request'].user.is_superuser:
if ('space' not in validated_data or not validated_data['space']):
validated_data['space'] = None
else:
validated_data['space'] = self.context['request'].space
else:
validated_data['space'] = self.context['request'].space
if instance:
validated_data['space'] = instance.space
else:
validated_data['space'] = self.context['request'].space
if 'log_credit_cost' in validated_data and not self.context['request'].user.is_superuser:
del validated_data['log_credit_cost']
return validated_data
@@ -834,28 +846,31 @@ class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedR
@extend_schema_field(bool)
def get_substitute_onhand(self, obj):
if not self.context["request"].user.is_authenticated:
try:
if not self.context["request"].user.is_authenticated:
return []
shared_users = []
if c := caches['default'].get(
f'shopping_shared_users_{self.context["request"].space.id}_{self.context["request"].user.id}', None):
shared_users = c
else:
try:
shared_users = [x.id for x in list(self.context['request'].user.get_shopping_share())] + [
self.context['request'].user.id]
caches['default'].set(
f'shopping_shared_users_{self.context["request"].space.id}_{self.context["request"].user.id}',
shared_users, timeout=5 * 60)
# TODO ugly hack that improves API performance significantly, should be done properly
except AttributeError: # Anonymous users (using share links) don't have shared users
pass
filter = Q(id__in=obj.substitute.all())
if obj.substitute_siblings:
filter |= Q(path__startswith=obj.path[:Food.steplen * (obj.depth - 1)], depth=obj.depth)
if obj.substitute_children:
filter |= Q(path__startswith=obj.path, depth__gt=obj.depth)
return Food.objects.filter(filter).filter(onhand_users__id__in=shared_users).exists()
except AttributeError:
return []
shared_users = []
if c := caches['default'].get(
f'shopping_shared_users_{self.context["request"].space.id}_{self.context["request"].user.id}', None):
shared_users = c
else:
try:
shared_users = [x.id for x in list(self.context['request'].user.get_shopping_share())] + [
self.context['request'].user.id]
caches['default'].set(
f'shopping_shared_users_{self.context["request"].space.id}_{self.context["request"].user.id}',
shared_users, timeout=5 * 60)
# TODO ugly hack that improves API performance significantly, should be done properly
except AttributeError: # Anonymous users (using share links) don't have shared users
pass
filter = Q(id__in=obj.substitute.all())
if obj.substitute_siblings:
filter |= Q(path__startswith=obj.path[:Food.steplen * (obj.depth - 1)], depth=obj.depth)
if obj.substitute_children:
filter |= Q(path__startswith=obj.path, depth__gt=obj.depth)
return Food.objects.filter(filter).filter(onhand_users__id__in=shared_users).exists()
def create(self, validated_data):
name = validated_data['name'].strip()
@@ -1709,6 +1724,11 @@ class FdcQuerySerializer(serializers.Serializer):
foods = FdcQueryFoodsSerializer(many=True)
class GenericModelReferenceSerializer(serializers.Serializer):
id = serializers.IntegerField()
model = serializers.CharField()
name = serializers.CharField()
# Export/Import Serializers
class KeywordExportSerializer(KeywordSerializer):

View File

@@ -236,42 +236,6 @@ def test_delete(u1_s1, u1_s2, obj_1, obj_tree_1):
assert Food.find_problems() == ([], [], [], [], [])
def test_integrity(u1_s1, recipe_1_s1):
with scopes_disabled():
assert Food.objects.count() == 10
assert Ingredient.objects.count() == 10
f_1 = Food.objects.first()
# deleting food will fail because food is part of recipe
r = u1_s1.delete(
reverse(
DETAIL_URL,
args={f_1.id}
)
)
assert r.status_code == 403
with scopes_disabled():
i_1 = f_1.ingredient_set.first()
# remove Ingredient that references Food from recipe step
i_1.step_set.first().ingredients.remove(i_1)
assert Food.objects.count() == 10
assert Ingredient.objects.count() == 10
# deleting food will succeed because its not part of recipe and delete will cascade to Ingredient
r = u1_s1.delete(
reverse(
DETAIL_URL,
args={f_1.id}
)
)
assert r.status_code == 204
with scopes_disabled():
assert Food.objects.count() == 9
assert Ingredient.objects.count() == 9
def test_move(u1_s1, obj_tree_1, obj_2, obj_3, space_1):
with scope(space=space_1):
# for some reason the 'path' attribute changes between the factory and the test when using both obj_tree and obj

View File

@@ -104,6 +104,7 @@ urlpatterns = [
path('api/sync_all/', api.sync_all, name='api_sync'),
path('api/recipe-from-source/', api.RecipeUrlImportView.as_view(), name='api_recipe_from_source'),
path('api/ai-import/', api.AiImportView.as_view(), name='api_ai_import'),
path('api/ai-step-sort/', api.AiStepSortView.as_view(), name='api_ai_step_sort'),
path('api/import-open-data/', api.ImportOpenData.as_view(), name='api_import_open_data'),
path('api/ingredient-from-string/', api.ingredient_from_string, name='api_ingredient_from_string'),
path('api/fdc-search/', api.FdcSearchView.as_view(), name='api_fdc_search'),

View File

@@ -9,6 +9,7 @@ import threading
import traceback
import uuid
from collections import OrderedDict
from functools import wraps
from json import JSONDecodeError
from urllib.parse import unquote
from zipfile import ZipFile
@@ -19,12 +20,15 @@ import redis
import requests
from PIL import UnidentifiedImageError
from django.contrib import messages
from django.contrib.admin.utils import get_deleted_objects, NestedObjects
from django.contrib.auth.models import Group, User
from django.contrib.postgres.search import TrigramSimilarity
from django.core.cache import caches
from django.core.exceptions import FieldError, ValidationError
from django.core.files import File
from django.db.models import Case, Count, Exists, OuterRef, ProtectedError, Q, Subquery, Value, When
from django.db import DEFAULT_DB_ALIAS
from django.db.models import Case, Count, Exists, OuterRef, ProtectedError, Q, Subquery, Value, When, QuerySet
from django.db.models.deletion import Collector
from django.db.models.fields.related import ForeignObjectRel
from django.db.models.functions import Coalesce, Lower
from django.db.models.signals import post_save
@@ -110,7 +114,7 @@ from cookbook.serializer import (AccessTokenSerializer, AutomationSerializer, Au
LocalizationSerializer, ServerSettingsSerializer, RecipeFromSourceResponseSerializer, ShoppingListEntryBulkCreateSerializer, FdcQuerySerializer,
AiImportSerializer, ImportOpenDataSerializer, ImportOpenDataMetaDataSerializer, ImportOpenDataResponseSerializer, ExportRequestSerializer,
RecipeImportSerializer, ConnectorConfigSerializer, SearchPreferenceSerializer, SearchFieldsSerializer, RecipeBatchUpdateSerializer,
AiProviderSerializer, AiLogSerializer, FoodBatchUpdateSerializer
AiProviderSerializer, AiLogSerializer, FoodBatchUpdateSerializer, GenericModelReferenceSerializer
)
from cookbook.version_info import TANDOOR_VERSION
from cookbook.views.import_export import get_integration
@@ -511,6 +515,143 @@ class TreeMixin(MergeMixin, FuzzyFilterMixin):
return Response(content, status=status.HTTP_400_BAD_REQUEST)
def paginate(func):
"""
pagination decorator for custom ViewSet actions
"""
@wraps(func)
def inner(self, *args, **kwargs):
queryset = func(self, *args, **kwargs)
assert isinstance(queryset, (list, QuerySet))
page = self.paginate_queryset(queryset)
if page is not None:
serializer = self.get_serializer(page, many=True)
return self.get_paginated_response(serializer.data)
serializer = self.get_serializer(queryset, many=True)
return Response(serializer.data)
return inner
class DeleteRelationMixing:
"""
mixin to add custom API function for model delete dependency checking
"""
@staticmethod
def collect(obj):
# collector.nested() nested seems to not include protecting but does include cascading
# collector.protected: objects that raise Protected or Restricted error when deleting unit
# collector.field_updates: fields that get updated when deleting the unit
# collector.model_objs: collects the objects that should be deleted together with the selected unit
collector = NestedObjects(using=DEFAULT_DB_ALIAS)
collector.collect([obj])
return collector
@extend_schema(responses=GenericModelReferenceSerializer(many=True), parameters=[
OpenApiParameter(name='cache', description='If results can be cached or not', type=bool, default=True),
])
@decorators.action(detail=True, methods=['GET'], serializer_class=GenericModelReferenceSerializer)
@paginate
def protecting(self, request, pk):
"""
get a paginated list of objects that are protecting the selected object form being deleted
"""
obj = self.queryset.filter(pk=pk, space=request.space).first()
if obj:
CACHE_KEY = f'DELETE_COLLECTOR_{request.space.pk}_PROTECTING_{obj.__class__.__name__}_{obj.pk}'
cache = self.request.query_params.get('cache', "true") == "true"
if caches['default'].has_key(CACHE_KEY) and cache:
return caches['default'].get(CACHE_KEY)
collector = self.collect(obj)
protected_objects = []
for o in collector.protected:
protected_objects.append({
'id': o.pk,
'model': o.__class__.__name__,
'name': str(o),
})
caches['default'].set(CACHE_KEY, protected_objects, 60)
return protected_objects
else:
return []
@extend_schema(responses=GenericModelReferenceSerializer(many=True), parameters=[
OpenApiParameter(name='cache', description='If results can be cached or not', type=bool, default=True),
])
@decorators.action(detail=True, methods=['GET'], serializer_class=GenericModelReferenceSerializer)
@paginate
def cascading(self, request, pk):
"""
get a paginated list of objects that will be cascaded (deleted) when deleting the selected object
"""
obj = self.queryset.filter(pk=pk, space=request.space).first()
if obj:
CACHE_KEY = f'DELETE_COLLECTOR_{request.space.pk}_CASCADING_{obj.__class__.__name__}_{obj.pk}'
cache = self.request.query_params.get('cache', "true") == "true"
if caches['default'].has_key(CACHE_KEY) and cache:
return caches['default'].get(CACHE_KEY)
collector = self.collect(obj)
cascading_objects = []
for model, objs in collector.model_objs.items():
for o in objs:
if o.pk != pk and o.__class__.__name__ != obj.__class__.__name__:
cascading_objects.append({
'id': o.pk,
'model': o.__class__.__name__,
'name': str(o),
})
caches['default'].set(CACHE_KEY, cascading_objects, 60)
return cascading_objects
else:
return []
@extend_schema(responses=GenericModelReferenceSerializer(many=True), parameters=[
OpenApiParameter(name='cache', description='If results can be cached or not', type=bool, default=True),
])
@decorators.action(detail=True, methods=['GET'], serializer_class=GenericModelReferenceSerializer)
@paginate
def nulling(self, request, pk):
"""
get a paginated list of objects where the selected object will be removed whe its deleted
"""
obj = self.queryset.filter(pk=pk, space=request.space).first()
if obj:
CACHE_KEY = f'DELETE_COLLECTOR_{request.space.pk}_NULLING_{obj.__class__.__name__}_{obj.pk}'
cache = self.request.query_params.get('cache', "true") == "true"
if caches['default'].has_key(CACHE_KEY) and cache:
return caches['default'].get(CACHE_KEY)
collector = self.collect(obj)
nulling_objects = []
# field_updates is a dict of relations that will be updated and querysets of items affected
for key, value in collector.field_updates.items():
# iterate over each queryset for relation
for qs in value:
# itereate over each object in queryset of relation
for o in qs:
nulling_objects.append(
{
'id': o.pk,
'model': o.__class__.__name__,
'name': str(o),
}
)
caches['default'].set(CACHE_KEY, nulling_objects, 60)
return nulling_objects
else:
return []
@extend_schema_view(list=extend_schema(parameters=[
OpenApiParameter(name='filter_list', description='User IDs, repeat for multiple', type=str, many=True),
]))
@@ -633,7 +774,7 @@ class SearchPreferenceViewSet(LoggingMixin, viewsets.ModelViewSet):
return self.queryset.filter(user=self.request.user)
class AiProviderViewSet(LoggingMixin, viewsets.ModelViewSet):
class AiProviderViewSet(LoggingMixin, viewsets.ModelViewSet, DeleteRelationMixing):
queryset = AiProvider.objects
serializer_class = AiProviderSerializer
permission_classes = [CustomAiProviderPermission & CustomTokenHasReadWriteScope]
@@ -656,7 +797,7 @@ class AiLogViewSet(LoggingMixin, viewsets.ModelViewSet):
return self.queryset.filter(space=self.request.space)
class StorageViewSet(LoggingMixin, viewsets.ModelViewSet):
class StorageViewSet(LoggingMixin, viewsets.ModelViewSet, DeleteRelationMixing):
# TODO handle delete protect error and adjust test
queryset = Storage.objects
serializer_class = StorageSerializer
@@ -667,7 +808,7 @@ class StorageViewSet(LoggingMixin, viewsets.ModelViewSet):
return self.queryset.filter(space=self.request.space)
class SyncViewSet(LoggingMixin, viewsets.ModelViewSet):
class SyncViewSet(LoggingMixin, viewsets.ModelViewSet, DeleteRelationMixing):
queryset = Sync.objects
serializer_class = SyncSerializer
permission_classes = [CustomIsAdmin & CustomTokenHasReadWriteScope]
@@ -728,7 +869,7 @@ class RecipeImportViewSet(LoggingMixin, viewsets.ModelViewSet):
return Response({'msg': 'ok'}, status=status.HTTP_200_OK)
class ConnectorConfigViewSet(LoggingMixin, viewsets.ModelViewSet):
class ConnectorConfigViewSet(LoggingMixin, viewsets.ModelViewSet, DeleteRelationMixing):
queryset = ConnectorConfig.objects
serializer_class = ConnectorConfigSerializer
permission_classes = [CustomIsAdmin & CustomTokenHasReadWriteScope]
@@ -738,7 +879,7 @@ class ConnectorConfigViewSet(LoggingMixin, viewsets.ModelViewSet):
return self.queryset.filter(space=self.request.space)
class SupermarketViewSet(LoggingMixin, StandardFilterModelViewSet):
class SupermarketViewSet(LoggingMixin, StandardFilterModelViewSet, DeleteRelationMixing):
queryset = Supermarket.objects
serializer_class = SupermarketSerializer
permission_classes = [CustomIsUser & CustomTokenHasReadWriteScope]
@@ -750,7 +891,7 @@ class SupermarketViewSet(LoggingMixin, StandardFilterModelViewSet):
# TODO does supermarket category have settings to support fuzzy filtering and/or merge?
class SupermarketCategoryViewSet(LoggingMixin, FuzzyFilterMixin, MergeMixin):
class SupermarketCategoryViewSet(LoggingMixin, FuzzyFilterMixin, MergeMixin, DeleteRelationMixing):
queryset = SupermarketCategory.objects
model = SupermarketCategory
serializer_class = SupermarketCategorySerializer
@@ -773,7 +914,7 @@ class SupermarketCategoryRelationViewSet(LoggingMixin, StandardFilterModelViewSe
return super().get_queryset()
class KeywordViewSet(LoggingMixin, TreeMixin):
class KeywordViewSet(LoggingMixin, TreeMixin, DeleteRelationMixing):
queryset = Keyword.objects
model = Keyword
serializer_class = KeywordSerializer
@@ -781,7 +922,7 @@ class KeywordViewSet(LoggingMixin, TreeMixin):
pagination_class = DefaultPagination
class UnitViewSet(LoggingMixin, MergeMixin, FuzzyFilterMixin):
class UnitViewSet(LoggingMixin, MergeMixin, FuzzyFilterMixin, DeleteRelationMixing):
queryset = Unit.objects
model = Unit
serializer_class = UnitSerializer
@@ -801,7 +942,7 @@ class FoodInheritFieldViewSet(LoggingMixin, viewsets.ReadOnlyModelViewSet):
return super().get_queryset()
class FoodViewSet(LoggingMixin, TreeMixin):
class FoodViewSet(LoggingMixin, TreeMixin, DeleteRelationMixing):
queryset = Food.objects
model = Food
serializer_class = FoodSerializer
@@ -947,6 +1088,82 @@ class FoodViewSet(LoggingMixin, TreeMixin):
return JsonResponse({'msg': 'there was an error parsing the FDC data, please check the server logs'},
status=500, json_dumps_params={'indent': 4})
@extend_schema(
parameters=[
OpenApiParameter(name='provider', description='ID of the AI provider that should be used for this AI request', type=int),
]
)
@decorators.action(detail=True, methods=['POST'], )
def aiproperties(self, request, pk):
serializer = RecipeSerializer(data=request.data, partial=True, context={'request': request})
if serializer.is_valid():
if not request.query_params.get('provider', None) or not re.match(r'^(\d)+$', request.query_params.get('provider', None)):
response = {
'error': True,
'msg': _('You must select an AI provider to perform your request.'),
}
return Response(response, status=status.HTTP_400_BAD_REQUEST)
if not can_perform_ai_request(request.space):
response = {
'error': True,
'msg': _("You don't have any credits remaining to use AI or AI features are not enabled for your space."),
}
return Response(response, status=status.HTTP_400_BAD_REQUEST)
ai_provider = AiProvider.objects.filter(pk=request.query_params.get('provider')).filter(Q(space=request.space) | Q(space__isnull=True)).first()
litellm.callbacks = [AiCallbackHandler(request.space, request.user, ai_provider, AiLog.F_FOOD_PROPERTIES)]
property_type_list = list(PropertyType.objects.filter(space=request.space).values('id', 'name', 'description', 'unit', 'category', 'fdc_id'))
messages = [
{
"role": "user",
"content": [
{
"type": "text",
"text": "Given the following food and the following different types of properties please update the food so that the properties attribute contains a list with all property types in the following format [{property_amount: <the property value>, property_type: {id: <the ID of the property type>, name: <the name of the property type>}}]."
"The property values should be in the unit given in the property type and for the amount specified in the properties_food_amount attribute of the food, which is given in the properties_food_unit."
"property_amount is a decimal number. Please try to keep a percision of two decimal places if given in your source data."
"Do not make up any data. If there is no data available for the given property type that is ok, just return null as a property_amount for that property type. Do not change anything else!"
"Most property types are likely going to be nutritional values. Please do not make up any values, only return values you can find in the sources available to you."
"Only return values if you are sure they are meant for the food given. Under no circumstance are you allowed to change any other value of the given food or change the structure in any way or form."
},
{
"type": "text",
"text": json.dumps(request.data)
},
{
"type": "text",
"text": json.dumps(property_type_list)
},
]
},
]
try:
ai_request = {
'api_key': ai_provider.api_key,
'model': ai_provider.model_name,
'response_format': {"type": "json_object"},
'messages': messages,
}
if ai_provider.url:
ai_request['api_base'] = ai_provider.url
ai_response = completion(**ai_request)
response_text = ai_response.choices[0].message.content
return Response(json.loads(response_text), status=status.HTTP_200_OK)
except BadRequestError as err:
pass
response = {
'error': True,
'msg': 'The AI could not process your request. \n\n' + err.message,
}
return Response(response, status=status.HTTP_400_BAD_REQUEST)
def destroy(self, *args, **kwargs):
try:
return (super().destroy(self, *args, **kwargs))
@@ -1049,7 +1266,7 @@ class FoodViewSet(LoggingMixin, TreeMixin):
OpenApiParameter(name='order_direction', description='Order ascending or descending', type=str,
enum=['asc', 'desc']),
]))
class RecipeBookViewSet(LoggingMixin, StandardFilterModelViewSet):
class RecipeBookViewSet(LoggingMixin, StandardFilterModelViewSet, DeleteRelationMixing):
queryset = RecipeBook.objects
serializer_class = RecipeBookSerializer
permission_classes = [(CustomIsOwner | CustomIsShared) & CustomTokenHasReadWriteScope]
@@ -1203,7 +1420,7 @@ class AutoPlanViewSet(LoggingMixin, mixins.CreateModelMixin, viewsets.GenericVie
return Response(serializer.errors, 400)
class MealTypeViewSet(LoggingMixin, viewsets.ModelViewSet):
class MealTypeViewSet(LoggingMixin, viewsets.ModelViewSet, DeleteRelationMixing):
"""
returns list of meal types created by the
requesting user ordered by the order field.
@@ -1353,7 +1570,7 @@ class RecipePagination(PageNumberPagination):
OpenApiParameter(name='filter', description=_('ID of a custom filter. Returns all recipes matched by that filter.'), type=int),
OpenApiParameter(name='makenow', description=_('Filter recipes that can be made with OnHand food. [''true''/''<b>false</b>'']'), type=bool),
]))
class RecipeViewSet(LoggingMixin, viewsets.ModelViewSet):
class RecipeViewSet(LoggingMixin, viewsets.ModelViewSet, DeleteRelationMixing):
queryset = Recipe.objects
serializer_class = RecipeSerializer
# TODO split read and write permission for meal plan guest
@@ -1635,7 +1852,7 @@ class UnitConversionViewSet(LoggingMixin, viewsets.ModelViewSet):
enum=[m[0] for m in PropertyType.CHOICES])
]
))
class PropertyTypeViewSet(LoggingMixin, viewsets.ModelViewSet):
class PropertyTypeViewSet(LoggingMixin, viewsets.ModelViewSet, DeleteRelationMixing):
queryset = PropertyType.objects
serializer_class = PropertyTypeSerializer
permission_classes = [CustomIsUser & CustomTokenHasReadWriteScope]
@@ -1866,7 +2083,7 @@ class BookmarkletImportViewSet(LoggingMixin, viewsets.ModelViewSet):
return self.queryset.filter(space=self.request.space).all()
class UserFileViewSet(LoggingMixin, StandardFilterModelViewSet):
class UserFileViewSet(LoggingMixin, StandardFilterModelViewSet, DeleteRelationMixing):
queryset = UserFile.objects
serializer_class = UserFileSerializer
permission_classes = [CustomIsUser & CustomTokenHasReadWriteScope]
@@ -2155,7 +2372,7 @@ class AiImportView(APIView):
ai_provider = AiProvider.objects.filter(pk=serializer.validated_data['ai_provider_id']).filter(Q(space=request.space) | Q(space__isnull=True)).first()
litellm.callbacks = [AiCallbackHandler(request.space, request.user, ai_provider)]
litellm.callbacks = [AiCallbackHandler(request.space, request.user, ai_provider, AiLog.F_FILE_IMPORT)]
messages = []
uploaded_file = serializer.validated_data['file']
@@ -2272,6 +2489,80 @@ class AiImportView(APIView):
return Response(RecipeFromSourceResponseSerializer(context={'request': request}).to_representation(response), status=status.HTTP_400_BAD_REQUEST)
class AiStepSortView(APIView):
throttle_classes = [AiEndpointThrottle]
permission_classes = [CustomIsUser & CustomTokenHasReadWriteScope]
@extend_schema(request=RecipeSerializer(many=False), responses=RecipeSerializer(many=False),
parameters=[
OpenApiParameter(name='provider', description='ID of the AI provider that should be used for this AI request', type=int),
])
def post(self, request, *args, **kwargs):
"""
given an image or PDF file convert its content to a structured recipe using AI and the scraping system
"""
serializer = RecipeSerializer(data=request.data, partial=True, context={'request': request})
if serializer.is_valid():
if not request.query_params.get('provider', None) or not re.match(r'^(\d)+$', request.query_params.get('provider', None)):
response = {
'error': True,
'msg': _('You must select an AI provider to perform your request.'),
}
return Response(response, status=status.HTTP_400_BAD_REQUEST)
if not can_perform_ai_request(request.space):
response = {
'error': True,
'msg': _("You don't have any credits remaining to use AI or AI features are not enabled for your space."),
}
return Response(response, status=status.HTTP_400_BAD_REQUEST)
ai_provider = AiProvider.objects.filter(pk=request.query_params.get('provider')).filter(Q(space=request.space) | Q(space__isnull=True)).first()
litellm.callbacks = [AiCallbackHandler(request.space, request.user, ai_provider, AiLog.F_STEP_SORT)]
messages = [
{
"role": "user",
"content": [
{
"type": "text",
"text": "You are given data for a recipe formatted as json. You cannot under any circumstance change the value of any of the fields. You are only allowed to split the instructions into multiple steps and to sort the ingredients to their appropriate step. Your goal is to properly structure the recipe by splitting large instructions into multiple coherent steps and putting the ingredients that belong to this step into the ingredients list. Generally an ingredient of a cooking recipe should occur in the first step where its needed. Please sort the ingredients to the appropriate steps without changing any of the actual field values. Return the recipe in the same format you were given as json. Do not change any field value like strings or numbers, or change the sorting, also do not change the language."
},
{
"type": "text",
"text": json.dumps(request.data)
},
]
},
]
try:
ai_request = {
'api_key': ai_provider.api_key,
'model': ai_provider.model_name,
'response_format': {"type": "json_object"},
'messages': messages,
}
if ai_provider.url:
ai_request['api_base'] = ai_provider.url
ai_response = completion(**ai_request)
response_text = ai_response.choices[0].message.content
# TODO validate by loading/dumping using serializer ?
return Response(json.loads(response_text), status=status.HTTP_200_OK)
except BadRequestError as err:
response = {
'error': True,
'msg': 'The AI could not process your request. \n\n' + err.message,
}
return Response(response, status=status.HTTP_400_BAD_REQUEST)
class AppImportView(APIView):
parser_classes = [MultiPartParser]
throttle_classes = [RecipeImportThrottle]

View File

@@ -212,6 +212,6 @@ location /static/ {
Tandoor 1 includes gunicorn, a python WSGI server that handles python code well but is not meant to serve mediafiles. Thus, it has always been recommended to set up a nginx webserver
(not just a reverse proxy) in front of Tandoor to handle mediafiles. The gunicorn server by default is exposed on port 8080.
Tandoor 2 now occasionally bundles nginx inside the container and exposes port 80 where mediafiles are handled by nginx and all the other requests are (mostly) passed to gunicorn.
Tandoor 2 now bundles nginx inside the container and exposes port 80 where mediafiles are handled by nginx and all the other requests are (mostly) passed to gunicorn.
A [GitHub Issue](https://github.com/TandoorRecipes/recipes/issues/3851) has been created to allow for discussions and FAQ's on this issue while this change is fresh. It will later be updated in the docs here if necessary.

View File

@@ -1,9 +1,6 @@
!!! info "Community Contributed"
This guide was contributed by the community and is neither officially supported, nor updated or tested. Since I cannot test it myself, feedback and improvements are always very welcome.
!!! danger "Tandoor 2 Compatibility"
This guide has not been verified/tested for Tandoor 2, which now integrates a nginx service inside the default docker container and exposes its service on port 80 instead of 8080.
## **Instructions**
Basic guide to setup `vabenee1111/recipes` docker container on Synology NAS.
@@ -12,7 +9,7 @@ Basic guide to setup `vabenee1111/recipes` docker container on Synology NAS.
- Login to Synology DSM through your browser
- Install `Container Manager` through package center
- Install `Text Editor` through package center (needed to edit `.env` if you don't edit it locally first)
- If you do not already have a `docker` folder in your File Station, create one at the root of your volume.
- If you do not already have a shared `docker` folder in your File Station, create one at the root of your volume.
- inside of your `volume1/docker` folder, create a `recipes` folder.
- Within, create the necessary folder structure. You will need these folders:
@@ -44,9 +41,13 @@ volume1/docker/
### 4. Edit docker-compose.yml
- Paste the `docker-compose.yml` into the `source` textbox.
- This file tells docker how to setup recipes. Docker will create three containers for recipes to work, recipes, nginx and postgresql. They are all required and need to store and share data through the folders you created before.
- Under the `nginx_recipes` section, look for `ports` that lists `80:80` as the default. This line specifies which external synology port will point to which internal docker port. Chose a free port to use and replace the first number with it. You will open recipes by browsing to http://your.synology.ip:chosen.port, e.g. http://192.168.1.1:2000
- If you want to use port 2000 you would edit the `ports` to `2000:80`
- This file tells docker how to setup recipes. Docker will create two containers for recipes to work, `web_recipes` and `db_recipes`. They are all required and need to store and share data through the folders you created before.
- Under the `web_recipes` section, you can add `ports` . This line specifies which external synology port will point to which internal docker port. Chose a free port to use and replace the first number with it. You will open recipes by browsing to http://your.synology.ip:chosen.port, e.g. http://192.168.1.1:2000
- If you want to use port 2000 you would edit the `ports` to `2000:8080`
```
ports:
- "2000:8080"
```
### 5. Finishing up
- Click `Next`.
@@ -59,25 +60,27 @@ volume1/docker/
Container recipes-db_recipes-1 Started
Container recipes-web_recipes-1 Starting
Container recipes-web_recipes-1 Started
Container recipes-nginx_recipes-1 Starting
Container recipes-nginx_recipes-1 Started
Exit Code: 0
```
- If you get an error, review the error and fix. A common reason it might fail is because you did not create the folders specified in the directory tree in step 1.
- If you notice that `web_recipes` cannot connect to the database there is probably a misconfiguration in you Firewall, see next section.
- Browse to 192.168.1.1:2000 or whatever your IP and port are
### 6. Firewall
!!!info "Depreciated?" This section may be depreciated and may no longer needed. The container may be able to be used without any firewall rules enabled. Further datapoints needed before section or this warning is removed.
You need to set up firewall rules in order for the recipes_web container to be able to connect to the recipes_db container.
You need to set up firewall rules in order for the `recipes_web` container to be able to connect to the `recipes_db` container.
- Control Panel -> Security -> Firewall -> Edit Rules -> Create
- Ports: All
- if you only want to allow the database port 5432, you'll need to create 2 rules to allow ingoing and outgoing port (and eventually also specify ip more restrictive)
- Source IP: Specific IP -> Select -> Subnet
- insert docker network ip (can be found in the docker application, network tab)
- Example: IP address: 172.18.0.0 and Subnet mask/Prefix length: 255.255.255.0
- Action: Allow
- Save and make sure it's above the deny rules
- If you want to skip the SSL Setup via Reverse Proxy you'll also need to allow access to the port you used to expose the container (e.g. 2000 in this example).
- Ports: 2000
- Source: depends on how broad the access should be
- Action: Allow
### 7. Additional SSL Setup
Easiest way is to do it via Reverse Proxy.
@@ -102,7 +105,7 @@ Easiest way is to do it via Reverse Proxy.
- Action: Allow
- Save and make sure it's above the deny rules
### 8. Depreciated Guides
### 8. Deprecated Guides
The following are older guides that may be useful if you are running older versions of DSM.
@@ -111,4 +114,4 @@ The following are older guides that may be useful if you are running older versi
- There is also this
([word](https://github.com/vabene1111/recipes/files/6708738/Tandoor.on.a.Synology.Disk.Station.docx),
[pdf](https://github.com/vabene1111/recipes/files/6901601/Tandoor.on.a.Synology.Disk.Station.pdf)) awesome and very detailed guide provided by @DiversityBug.
[pdf](https://github.com/vabene1111/recipes/files/6901601/Tandoor.on.a.Synology.Disk.Station.pdf)) awesome and very detailed guide provided by @DiversityBug.

View File

@@ -20,11 +20,13 @@ server {
location / {
proxy_set_header Host $http_host;
proxy_pass http://localhost:${TANDOOR_PORT};
error_page 502 /errors/http502.html;
# disabled for now because it redirects to the error page and not back, also not showing html
#error_page 502 /errors/http502.html;
}
location /errors/ {
alias /etc/nginx/conf.d/errorpages/;
alias /etc/nginx/http.d/errorpages/;
internal;
}
}

View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-01 15:04+0200\n"
"POT-Creation-Date: 2025-09-22 20:15+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -69,70 +69,110 @@ msgstr ""
msgid "end"
msgstr ""
#: .\recipes\settings.py:478
#: .\recipes\plugins\enterprise_plugin\templates\enterprise_social_public_view.html:15
msgid "Tandoor Recipe Manager"
msgstr ""
#: .\recipes\settings.py:571
msgid "Armenian "
msgstr ""
#: .\recipes\settings.py:479
#: .\recipes\settings.py:572
msgid "Bulgarian"
msgstr ""
#: .\recipes\settings.py:480
#: .\recipes\settings.py:573
msgid "Catalan"
msgstr ""
#: .\recipes\settings.py:481
#: .\recipes\settings.py:574
msgid "Czech"
msgstr ""
#: .\recipes\settings.py:482
#: .\recipes\settings.py:575
msgid "Croatian"
msgstr ""
#: .\recipes\settings.py:576
msgid "Danish"
msgstr ""
#: .\recipes\settings.py:483
#: .\recipes\settings.py:577
msgid "Dutch"
msgstr ""
#: .\recipes\settings.py:484
#: .\recipes\settings.py:578
msgid "English"
msgstr ""
#: .\recipes\settings.py:485
#: .\recipes\settings.py:579
msgid "French"
msgstr ""
#: .\recipes\settings.py:486
#: .\recipes\settings.py:580
msgid "Finnish"
msgstr ""
#: .\recipes\settings.py:581
msgid "German"
msgstr ""
#: .\recipes\settings.py:487
#: .\recipes\settings.py:582
msgid "Greek"
msgstr ""
#: .\recipes\settings.py:583
msgid "Hebrew"
msgstr ""
#: .\recipes\settings.py:584
msgid "Hungarian"
msgstr ""
#: .\recipes\settings.py:488
#: .\recipes\settings.py:585
msgid "Italian"
msgstr ""
#: .\recipes\settings.py:489
#: .\recipes\settings.py:586
msgid "Latvian"
msgstr ""
#: .\recipes\settings.py:490
msgid "Norwegian "
#: .\recipes\settings.py:587
msgid "Norwegian"
msgstr ""
#: .\recipes\settings.py:491
#: .\recipes\settings.py:589
msgid "Polish"
msgstr ""
#: .\recipes\settings.py:492
#: .\recipes\settings.py:590
msgid "Portuguese"
msgstr ""
#: .\recipes\settings.py:591
msgid "Russian"
msgstr ""
#: .\recipes\settings.py:493
#: .\recipes\settings.py:592
msgid "Romanian"
msgstr ""
#: .\recipes\settings.py:593
msgid "Spanish"
msgstr ""
#: .\recipes\settings.py:494
#: .\recipes\settings.py:594
msgid "Slovenian"
msgstr ""
#: .\recipes\settings.py:595
msgid "Swedish"
msgstr ""
#: .\recipes\settings.py:596
msgid "Turkish"
msgstr ""
#: .\recipes\settings.py:597
msgid "Ukranian"
msgstr ""

View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-01 15:04+0200\n"
"POT-Creation-Date: 2025-09-22 20:15+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -68,70 +68,110 @@ msgstr ""
msgid "end"
msgstr ""
#: .\recipes\settings.py:478
#: .\recipes\plugins\enterprise_plugin\templates\enterprise_social_public_view.html:15
msgid "Tandoor Recipe Manager"
msgstr ""
#: .\recipes\settings.py:571
msgid "Armenian "
msgstr ""
#: .\recipes\settings.py:479
#: .\recipes\settings.py:572
msgid "Bulgarian"
msgstr ""
#: .\recipes\settings.py:480
#: .\recipes\settings.py:573
msgid "Catalan"
msgstr ""
#: .\recipes\settings.py:481
#: .\recipes\settings.py:574
msgid "Czech"
msgstr ""
#: .\recipes\settings.py:482
#: .\recipes\settings.py:575
msgid "Croatian"
msgstr ""
#: .\recipes\settings.py:576
msgid "Danish"
msgstr ""
#: .\recipes\settings.py:483
#: .\recipes\settings.py:577
msgid "Dutch"
msgstr ""
#: .\recipes\settings.py:484
#: .\recipes\settings.py:578
msgid "English"
msgstr ""
#: .\recipes\settings.py:485
#: .\recipes\settings.py:579
msgid "French"
msgstr ""
#: .\recipes\settings.py:486
#: .\recipes\settings.py:580
msgid "Finnish"
msgstr ""
#: .\recipes\settings.py:581
msgid "German"
msgstr ""
#: .\recipes\settings.py:487
#: .\recipes\settings.py:582
msgid "Greek"
msgstr ""
#: .\recipes\settings.py:583
msgid "Hebrew"
msgstr ""
#: .\recipes\settings.py:584
msgid "Hungarian"
msgstr ""
#: .\recipes\settings.py:488
#: .\recipes\settings.py:585
msgid "Italian"
msgstr ""
#: .\recipes\settings.py:489
#: .\recipes\settings.py:586
msgid "Latvian"
msgstr ""
#: .\recipes\settings.py:490
msgid "Norwegian "
#: .\recipes\settings.py:587
msgid "Norwegian"
msgstr ""
#: .\recipes\settings.py:491
#: .\recipes\settings.py:589
msgid "Polish"
msgstr ""
#: .\recipes\settings.py:492
#: .\recipes\settings.py:590
msgid "Portuguese"
msgstr ""
#: .\recipes\settings.py:591
msgid "Russian"
msgstr ""
#: .\recipes\settings.py:493
#: .\recipes\settings.py:592
msgid "Romanian"
msgstr ""
#: .\recipes\settings.py:593
msgid "Spanish"
msgstr ""
#: .\recipes\settings.py:494
#: .\recipes\settings.py:594
msgid "Slovenian"
msgstr ""
#: .\recipes\settings.py:595
msgid "Swedish"
msgstr ""
#: .\recipes\settings.py:596
msgid "Turkish"
msgstr ""
#: .\recipes\settings.py:597
msgid "Ukranian"
msgstr ""

View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-01 15:04+0200\n"
"POT-Creation-Date: 2025-09-22 20:15+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -68,70 +68,110 @@ msgstr ""
msgid "end"
msgstr ""
#: .\recipes\settings.py:478
#: .\recipes\plugins\enterprise_plugin\templates\enterprise_social_public_view.html:15
msgid "Tandoor Recipe Manager"
msgstr ""
#: .\recipes\settings.py:571
msgid "Armenian "
msgstr ""
#: .\recipes\settings.py:479
#: .\recipes\settings.py:572
msgid "Bulgarian"
msgstr ""
#: .\recipes\settings.py:480
#: .\recipes\settings.py:573
msgid "Catalan"
msgstr ""
#: .\recipes\settings.py:481
#: .\recipes\settings.py:574
msgid "Czech"
msgstr ""
#: .\recipes\settings.py:482
#: .\recipes\settings.py:575
msgid "Croatian"
msgstr ""
#: .\recipes\settings.py:576
msgid "Danish"
msgstr ""
#: .\recipes\settings.py:483
#: .\recipes\settings.py:577
msgid "Dutch"
msgstr ""
#: .\recipes\settings.py:484
#: .\recipes\settings.py:578
msgid "English"
msgstr ""
#: .\recipes\settings.py:485
#: .\recipes\settings.py:579
msgid "French"
msgstr ""
#: .\recipes\settings.py:486
#: .\recipes\settings.py:580
msgid "Finnish"
msgstr ""
#: .\recipes\settings.py:581
msgid "German"
msgstr ""
#: .\recipes\settings.py:487
#: .\recipes\settings.py:582
msgid "Greek"
msgstr ""
#: .\recipes\settings.py:583
msgid "Hebrew"
msgstr ""
#: .\recipes\settings.py:584
msgid "Hungarian"
msgstr ""
#: .\recipes\settings.py:488
#: .\recipes\settings.py:585
msgid "Italian"
msgstr ""
#: .\recipes\settings.py:489
#: .\recipes\settings.py:586
msgid "Latvian"
msgstr ""
#: .\recipes\settings.py:490
msgid "Norwegian "
#: .\recipes\settings.py:587
msgid "Norwegian"
msgstr ""
#: .\recipes\settings.py:491
#: .\recipes\settings.py:589
msgid "Polish"
msgstr ""
#: .\recipes\settings.py:492
#: .\recipes\settings.py:590
msgid "Portuguese"
msgstr ""
#: .\recipes\settings.py:591
msgid "Russian"
msgstr ""
#: .\recipes\settings.py:493
#: .\recipes\settings.py:592
msgid "Romanian"
msgstr ""
#: .\recipes\settings.py:593
msgid "Spanish"
msgstr ""
#: .\recipes\settings.py:494
#: .\recipes\settings.py:594
msgid "Slovenian"
msgstr ""
#: .\recipes\settings.py:595
msgid "Swedish"
msgstr ""
#: .\recipes\settings.py:596
msgid "Turkish"
msgstr ""
#: .\recipes\settings.py:597
msgid "Ukranian"
msgstr ""

View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-01 15:04+0200\n"
"POT-Creation-Date: 2025-09-22 20:15+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -69,70 +69,110 @@ msgstr ""
msgid "end"
msgstr ""
#: .\recipes\settings.py:478
#: .\recipes\plugins\enterprise_plugin\templates\enterprise_social_public_view.html:15
msgid "Tandoor Recipe Manager"
msgstr ""
#: .\recipes\settings.py:571
msgid "Armenian "
msgstr ""
#: .\recipes\settings.py:479
#: .\recipes\settings.py:572
msgid "Bulgarian"
msgstr ""
#: .\recipes\settings.py:480
#: .\recipes\settings.py:573
msgid "Catalan"
msgstr ""
#: .\recipes\settings.py:481
#: .\recipes\settings.py:574
msgid "Czech"
msgstr ""
#: .\recipes\settings.py:482
#: .\recipes\settings.py:575
msgid "Croatian"
msgstr ""
#: .\recipes\settings.py:576
msgid "Danish"
msgstr ""
#: .\recipes\settings.py:483
#: .\recipes\settings.py:577
msgid "Dutch"
msgstr ""
#: .\recipes\settings.py:484
#: .\recipes\settings.py:578
msgid "English"
msgstr ""
#: .\recipes\settings.py:485
#: .\recipes\settings.py:579
msgid "French"
msgstr ""
#: .\recipes\settings.py:486
#: .\recipes\settings.py:580
msgid "Finnish"
msgstr ""
#: .\recipes\settings.py:581
msgid "German"
msgstr ""
#: .\recipes\settings.py:487
#: .\recipes\settings.py:582
msgid "Greek"
msgstr ""
#: .\recipes\settings.py:583
msgid "Hebrew"
msgstr ""
#: .\recipes\settings.py:584
msgid "Hungarian"
msgstr ""
#: .\recipes\settings.py:488
#: .\recipes\settings.py:585
msgid "Italian"
msgstr ""
#: .\recipes\settings.py:489
#: .\recipes\settings.py:586
msgid "Latvian"
msgstr ""
#: .\recipes\settings.py:490
msgid "Norwegian "
#: .\recipes\settings.py:587
msgid "Norwegian"
msgstr ""
#: .\recipes\settings.py:491
#: .\recipes\settings.py:589
msgid "Polish"
msgstr ""
#: .\recipes\settings.py:492
#: .\recipes\settings.py:590
msgid "Portuguese"
msgstr ""
#: .\recipes\settings.py:591
msgid "Russian"
msgstr ""
#: .\recipes\settings.py:493
#: .\recipes\settings.py:592
msgid "Romanian"
msgstr ""
#: .\recipes\settings.py:593
msgid "Spanish"
msgstr ""
#: .\recipes\settings.py:494
#: .\recipes\settings.py:594
msgid "Slovenian"
msgstr ""
#: .\recipes\settings.py:595
msgid "Swedish"
msgstr ""
#: .\recipes\settings.py:596
msgid "Turkish"
msgstr ""
#: .\recipes\settings.py:597
msgid "Ukranian"
msgstr ""

View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-01 15:04+0200\n"
"POT-Creation-Date: 2025-09-22 20:15+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -68,70 +68,110 @@ msgstr ""
msgid "end"
msgstr ""
#: .\recipes\settings.py:478
#: .\recipes\plugins\enterprise_plugin\templates\enterprise_social_public_view.html:15
msgid "Tandoor Recipe Manager"
msgstr ""
#: .\recipes\settings.py:571
msgid "Armenian "
msgstr ""
#: .\recipes\settings.py:479
#: .\recipes\settings.py:572
msgid "Bulgarian"
msgstr ""
#: .\recipes\settings.py:480
#: .\recipes\settings.py:573
msgid "Catalan"
msgstr ""
#: .\recipes\settings.py:481
#: .\recipes\settings.py:574
msgid "Czech"
msgstr ""
#: .\recipes\settings.py:482
#: .\recipes\settings.py:575
msgid "Croatian"
msgstr ""
#: .\recipes\settings.py:576
msgid "Danish"
msgstr ""
#: .\recipes\settings.py:483
#: .\recipes\settings.py:577
msgid "Dutch"
msgstr ""
#: .\recipes\settings.py:484
#: .\recipes\settings.py:578
msgid "English"
msgstr ""
#: .\recipes\settings.py:485
#: .\recipes\settings.py:579
msgid "French"
msgstr ""
#: .\recipes\settings.py:486
#: .\recipes\settings.py:580
msgid "Finnish"
msgstr ""
#: .\recipes\settings.py:581
msgid "German"
msgstr ""
#: .\recipes\settings.py:487
#: .\recipes\settings.py:582
msgid "Greek"
msgstr ""
#: .\recipes\settings.py:583
msgid "Hebrew"
msgstr ""
#: .\recipes\settings.py:584
msgid "Hungarian"
msgstr ""
#: .\recipes\settings.py:488
#: .\recipes\settings.py:585
msgid "Italian"
msgstr ""
#: .\recipes\settings.py:489
#: .\recipes\settings.py:586
msgid "Latvian"
msgstr ""
#: .\recipes\settings.py:490
msgid "Norwegian "
#: .\recipes\settings.py:587
msgid "Norwegian"
msgstr ""
#: .\recipes\settings.py:491
#: .\recipes\settings.py:589
msgid "Polish"
msgstr ""
#: .\recipes\settings.py:492
#: .\recipes\settings.py:590
msgid "Portuguese"
msgstr ""
#: .\recipes\settings.py:591
msgid "Russian"
msgstr ""
#: .\recipes\settings.py:493
#: .\recipes\settings.py:592
msgid "Romanian"
msgstr ""
#: .\recipes\settings.py:593
msgid "Spanish"
msgstr ""
#: .\recipes\settings.py:494
#: .\recipes\settings.py:594
msgid "Slovenian"
msgstr ""
#: .\recipes\settings.py:595
msgid "Swedish"
msgstr ""
#: .\recipes\settings.py:596
msgid "Turkish"
msgstr ""
#: .\recipes\settings.py:597
msgid "Ukranian"
msgstr ""

View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-01 15:04+0200\n"
"POT-Creation-Date: 2025-09-22 20:15+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -68,72 +68,112 @@ msgstr ""
msgid "end"
msgstr ""
#: .\recipes\settings.py:478
#: .\recipes\plugins\enterprise_plugin\templates\enterprise_social_public_view.html:15
msgid "Tandoor Recipe Manager"
msgstr ""
#: .\recipes\settings.py:571
msgid "Armenian "
msgstr ""
#: .\recipes\settings.py:479
#: .\recipes\settings.py:572
msgid "Bulgarian"
msgstr ""
#: .\recipes\settings.py:480
#: .\recipes\settings.py:573
msgid "Catalan"
msgstr ""
#: .\recipes\settings.py:481
#: .\recipes\settings.py:574
msgid "Czech"
msgstr ""
#: .\recipes\settings.py:482
#: .\recipes\settings.py:575
msgid "Croatian"
msgstr ""
#: .\recipes\settings.py:576
msgid "Danish"
msgstr ""
#: .\recipes\settings.py:483
#: .\recipes\settings.py:577
msgid "Dutch"
msgstr ""
#: .\recipes\settings.py:484
#: .\recipes\settings.py:578
msgid "English"
msgstr "Englisch"
#: .\recipes\settings.py:485
#: .\recipes\settings.py:579
msgid "French"
msgstr ""
#: .\recipes\settings.py:486
#: .\recipes\settings.py:580
msgid "Finnish"
msgstr ""
#: .\recipes\settings.py:581
msgid "German"
msgstr "Deutsch"
#: .\recipes\settings.py:487
#: .\recipes\settings.py:582
msgid "Greek"
msgstr ""
#: .\recipes\settings.py:583
msgid "Hebrew"
msgstr ""
#: .\recipes\settings.py:584
msgid "Hungarian"
msgstr ""
#: .\recipes\settings.py:488
#: .\recipes\settings.py:585
msgid "Italian"
msgstr ""
#: .\recipes\settings.py:489
#: .\recipes\settings.py:586
msgid "Latvian"
msgstr ""
#: .\recipes\settings.py:490
msgid "Norwegian "
#: .\recipes\settings.py:587
msgid "Norwegian"
msgstr ""
#: .\recipes\settings.py:491
#: .\recipes\settings.py:589
#, fuzzy
#| msgid "English"
msgid "Polish"
msgstr "Englisch"
#: .\recipes\settings.py:492
#: .\recipes\settings.py:590
msgid "Portuguese"
msgstr ""
#: .\recipes\settings.py:591
msgid "Russian"
msgstr ""
#: .\recipes\settings.py:493
#: .\recipes\settings.py:592
msgid "Romanian"
msgstr ""
#: .\recipes\settings.py:593
msgid "Spanish"
msgstr ""
#: .\recipes\settings.py:494
#: .\recipes\settings.py:594
msgid "Slovenian"
msgstr ""
#: .\recipes\settings.py:595
msgid "Swedish"
msgstr ""
#: .\recipes\settings.py:596
msgid "Turkish"
msgstr ""
#: .\recipes\settings.py:597
msgid "Ukranian"
msgstr ""

View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-01 15:04+0200\n"
"POT-Creation-Date: 2025-09-22 20:15+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -68,70 +68,110 @@ msgstr ""
msgid "end"
msgstr ""
#: .\recipes\settings.py:478
#: .\recipes\plugins\enterprise_plugin\templates\enterprise_social_public_view.html:15
msgid "Tandoor Recipe Manager"
msgstr ""
#: .\recipes\settings.py:571
msgid "Armenian "
msgstr ""
#: .\recipes\settings.py:479
#: .\recipes\settings.py:572
msgid "Bulgarian"
msgstr ""
#: .\recipes\settings.py:480
#: .\recipes\settings.py:573
msgid "Catalan"
msgstr ""
#: .\recipes\settings.py:481
#: .\recipes\settings.py:574
msgid "Czech"
msgstr ""
#: .\recipes\settings.py:482
#: .\recipes\settings.py:575
msgid "Croatian"
msgstr ""
#: .\recipes\settings.py:576
msgid "Danish"
msgstr ""
#: .\recipes\settings.py:483
#: .\recipes\settings.py:577
msgid "Dutch"
msgstr ""
#: .\recipes\settings.py:484
#: .\recipes\settings.py:578
msgid "English"
msgstr ""
#: .\recipes\settings.py:485
#: .\recipes\settings.py:579
msgid "French"
msgstr ""
#: .\recipes\settings.py:486
#: .\recipes\settings.py:580
msgid "Finnish"
msgstr ""
#: .\recipes\settings.py:581
msgid "German"
msgstr ""
#: .\recipes\settings.py:487
#: .\recipes\settings.py:582
msgid "Greek"
msgstr ""
#: .\recipes\settings.py:583
msgid "Hebrew"
msgstr ""
#: .\recipes\settings.py:584
msgid "Hungarian"
msgstr ""
#: .\recipes\settings.py:488
#: .\recipes\settings.py:585
msgid "Italian"
msgstr ""
#: .\recipes\settings.py:489
#: .\recipes\settings.py:586
msgid "Latvian"
msgstr ""
#: .\recipes\settings.py:490
msgid "Norwegian "
#: .\recipes\settings.py:587
msgid "Norwegian"
msgstr ""
#: .\recipes\settings.py:491
#: .\recipes\settings.py:589
msgid "Polish"
msgstr ""
#: .\recipes\settings.py:492
#: .\recipes\settings.py:590
msgid "Portuguese"
msgstr ""
#: .\recipes\settings.py:591
msgid "Russian"
msgstr ""
#: .\recipes\settings.py:493
#: .\recipes\settings.py:592
msgid "Romanian"
msgstr ""
#: .\recipes\settings.py:593
msgid "Spanish"
msgstr ""
#: .\recipes\settings.py:494
#: .\recipes\settings.py:594
msgid "Slovenian"
msgstr ""
#: .\recipes\settings.py:595
msgid "Swedish"
msgstr ""
#: .\recipes\settings.py:596
msgid "Turkish"
msgstr ""
#: .\recipes\settings.py:597
msgid "Ukranian"
msgstr ""

View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-01 15:04+0200\n"
"POT-Creation-Date: 2025-09-22 20:15+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -68,70 +68,110 @@ msgstr ""
msgid "end"
msgstr ""
#: .\recipes\settings.py:478
#: .\recipes\plugins\enterprise_plugin\templates\enterprise_social_public_view.html:15
msgid "Tandoor Recipe Manager"
msgstr ""
#: .\recipes\settings.py:571
msgid "Armenian "
msgstr ""
#: .\recipes\settings.py:479
#: .\recipes\settings.py:572
msgid "Bulgarian"
msgstr ""
#: .\recipes\settings.py:480
#: .\recipes\settings.py:573
msgid "Catalan"
msgstr ""
#: .\recipes\settings.py:481
#: .\recipes\settings.py:574
msgid "Czech"
msgstr ""
#: .\recipes\settings.py:482
#: .\recipes\settings.py:575
msgid "Croatian"
msgstr ""
#: .\recipes\settings.py:576
msgid "Danish"
msgstr ""
#: .\recipes\settings.py:483
#: .\recipes\settings.py:577
msgid "Dutch"
msgstr ""
#: .\recipes\settings.py:484
#: .\recipes\settings.py:578
msgid "English"
msgstr ""
#: .\recipes\settings.py:485
#: .\recipes\settings.py:579
msgid "French"
msgstr ""
#: .\recipes\settings.py:486
#: .\recipes\settings.py:580
msgid "Finnish"
msgstr ""
#: .\recipes\settings.py:581
msgid "German"
msgstr ""
#: .\recipes\settings.py:487
#: .\recipes\settings.py:582
msgid "Greek"
msgstr ""
#: .\recipes\settings.py:583
msgid "Hebrew"
msgstr ""
#: .\recipes\settings.py:584
msgid "Hungarian"
msgstr ""
#: .\recipes\settings.py:488
#: .\recipes\settings.py:585
msgid "Italian"
msgstr ""
#: .\recipes\settings.py:489
#: .\recipes\settings.py:586
msgid "Latvian"
msgstr ""
#: .\recipes\settings.py:490
msgid "Norwegian "
#: .\recipes\settings.py:587
msgid "Norwegian"
msgstr ""
#: .\recipes\settings.py:491
#: .\recipes\settings.py:589
msgid "Polish"
msgstr ""
#: .\recipes\settings.py:492
#: .\recipes\settings.py:590
msgid "Portuguese"
msgstr ""
#: .\recipes\settings.py:591
msgid "Russian"
msgstr ""
#: .\recipes\settings.py:493
#: .\recipes\settings.py:592
msgid "Romanian"
msgstr ""
#: .\recipes\settings.py:593
msgid "Spanish"
msgstr ""
#: .\recipes\settings.py:494
#: .\recipes\settings.py:594
msgid "Slovenian"
msgstr ""
#: .\recipes\settings.py:595
msgid "Swedish"
msgstr ""
#: .\recipes\settings.py:596
msgid "Turkish"
msgstr ""
#: .\recipes\settings.py:597
msgid "Ukranian"
msgstr ""

View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-01 15:04+0200\n"
"POT-Creation-Date: 2025-09-22 20:15+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -68,70 +68,110 @@ msgstr ""
msgid "end"
msgstr ""
#: .\recipes\settings.py:478
#: .\recipes\plugins\enterprise_plugin\templates\enterprise_social_public_view.html:15
msgid "Tandoor Recipe Manager"
msgstr ""
#: .\recipes\settings.py:571
msgid "Armenian "
msgstr ""
#: .\recipes\settings.py:479
#: .\recipes\settings.py:572
msgid "Bulgarian"
msgstr ""
#: .\recipes\settings.py:480
#: .\recipes\settings.py:573
msgid "Catalan"
msgstr ""
#: .\recipes\settings.py:481
#: .\recipes\settings.py:574
msgid "Czech"
msgstr ""
#: .\recipes\settings.py:482
#: .\recipes\settings.py:575
msgid "Croatian"
msgstr ""
#: .\recipes\settings.py:576
msgid "Danish"
msgstr ""
#: .\recipes\settings.py:483
#: .\recipes\settings.py:577
msgid "Dutch"
msgstr ""
#: .\recipes\settings.py:484
#: .\recipes\settings.py:578
msgid "English"
msgstr ""
#: .\recipes\settings.py:485
#: .\recipes\settings.py:579
msgid "French"
msgstr ""
#: .\recipes\settings.py:486
#: .\recipes\settings.py:580
msgid "Finnish"
msgstr ""
#: .\recipes\settings.py:581
msgid "German"
msgstr ""
#: .\recipes\settings.py:487
#: .\recipes\settings.py:582
msgid "Greek"
msgstr ""
#: .\recipes\settings.py:583
msgid "Hebrew"
msgstr ""
#: .\recipes\settings.py:584
msgid "Hungarian"
msgstr ""
#: .\recipes\settings.py:488
#: .\recipes\settings.py:585
msgid "Italian"
msgstr ""
#: .\recipes\settings.py:489
#: .\recipes\settings.py:586
msgid "Latvian"
msgstr ""
#: .\recipes\settings.py:490
msgid "Norwegian "
#: .\recipes\settings.py:587
msgid "Norwegian"
msgstr ""
#: .\recipes\settings.py:491
#: .\recipes\settings.py:589
msgid "Polish"
msgstr ""
#: .\recipes\settings.py:492
#: .\recipes\settings.py:590
msgid "Portuguese"
msgstr ""
#: .\recipes\settings.py:591
msgid "Russian"
msgstr ""
#: .\recipes\settings.py:493
#: .\recipes\settings.py:592
msgid "Romanian"
msgstr ""
#: .\recipes\settings.py:593
msgid "Spanish"
msgstr ""
#: .\recipes\settings.py:494
#: .\recipes\settings.py:594
msgid "Slovenian"
msgstr ""
#: .\recipes\settings.py:595
msgid "Swedish"
msgstr ""
#: .\recipes\settings.py:596
msgid "Turkish"
msgstr ""
#: .\recipes\settings.py:597
msgid "Ukranian"
msgstr ""

View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-01 15:04+0200\n"
"POT-Creation-Date: 2025-09-22 20:15+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -68,70 +68,110 @@ msgstr ""
msgid "end"
msgstr ""
#: .\recipes\settings.py:478
#: .\recipes\plugins\enterprise_plugin\templates\enterprise_social_public_view.html:15
msgid "Tandoor Recipe Manager"
msgstr ""
#: .\recipes\settings.py:571
msgid "Armenian "
msgstr ""
#: .\recipes\settings.py:479
#: .\recipes\settings.py:572
msgid "Bulgarian"
msgstr ""
#: .\recipes\settings.py:480
#: .\recipes\settings.py:573
msgid "Catalan"
msgstr ""
#: .\recipes\settings.py:481
#: .\recipes\settings.py:574
msgid "Czech"
msgstr ""
#: .\recipes\settings.py:482
#: .\recipes\settings.py:575
msgid "Croatian"
msgstr ""
#: .\recipes\settings.py:576
msgid "Danish"
msgstr ""
#: .\recipes\settings.py:483
#: .\recipes\settings.py:577
msgid "Dutch"
msgstr ""
#: .\recipes\settings.py:484
#: .\recipes\settings.py:578
msgid "English"
msgstr ""
#: .\recipes\settings.py:485
#: .\recipes\settings.py:579
msgid "French"
msgstr ""
#: .\recipes\settings.py:486
#: .\recipes\settings.py:580
msgid "Finnish"
msgstr ""
#: .\recipes\settings.py:581
msgid "German"
msgstr ""
#: .\recipes\settings.py:487
#: .\recipes\settings.py:582
msgid "Greek"
msgstr ""
#: .\recipes\settings.py:583
msgid "Hebrew"
msgstr ""
#: .\recipes\settings.py:584
msgid "Hungarian"
msgstr ""
#: .\recipes\settings.py:488
#: .\recipes\settings.py:585
msgid "Italian"
msgstr ""
#: .\recipes\settings.py:489
#: .\recipes\settings.py:586
msgid "Latvian"
msgstr ""
#: .\recipes\settings.py:490
msgid "Norwegian "
#: .\recipes\settings.py:587
msgid "Norwegian"
msgstr ""
#: .\recipes\settings.py:491
#: .\recipes\settings.py:589
msgid "Polish"
msgstr ""
#: .\recipes\settings.py:492
#: .\recipes\settings.py:590
msgid "Portuguese"
msgstr ""
#: .\recipes\settings.py:591
msgid "Russian"
msgstr ""
#: .\recipes\settings.py:493
#: .\recipes\settings.py:592
msgid "Romanian"
msgstr ""
#: .\recipes\settings.py:593
msgid "Spanish"
msgstr ""
#: .\recipes\settings.py:494
#: .\recipes\settings.py:594
msgid "Slovenian"
msgstr ""
#: .\recipes\settings.py:595
msgid "Swedish"
msgstr ""
#: .\recipes\settings.py:596
msgid "Turkish"
msgstr ""
#: .\recipes\settings.py:597
msgid "Ukranian"
msgstr ""

View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-01 15:04+0200\n"
"POT-Creation-Date: 2025-09-22 20:15+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -68,70 +68,110 @@ msgstr ""
msgid "end"
msgstr ""
#: .\recipes\settings.py:478
#: .\recipes\plugins\enterprise_plugin\templates\enterprise_social_public_view.html:15
msgid "Tandoor Recipe Manager"
msgstr ""
#: .\recipes\settings.py:571
msgid "Armenian "
msgstr ""
#: .\recipes\settings.py:479
#: .\recipes\settings.py:572
msgid "Bulgarian"
msgstr ""
#: .\recipes\settings.py:480
#: .\recipes\settings.py:573
msgid "Catalan"
msgstr ""
#: .\recipes\settings.py:481
#: .\recipes\settings.py:574
msgid "Czech"
msgstr ""
#: .\recipes\settings.py:482
#: .\recipes\settings.py:575
msgid "Croatian"
msgstr ""
#: .\recipes\settings.py:576
msgid "Danish"
msgstr ""
#: .\recipes\settings.py:483
#: .\recipes\settings.py:577
msgid "Dutch"
msgstr ""
#: .\recipes\settings.py:484
#: .\recipes\settings.py:578
msgid "English"
msgstr ""
#: .\recipes\settings.py:485
#: .\recipes\settings.py:579
msgid "French"
msgstr ""
#: .\recipes\settings.py:486
#: .\recipes\settings.py:580
msgid "Finnish"
msgstr ""
#: .\recipes\settings.py:581
msgid "German"
msgstr ""
#: .\recipes\settings.py:487
#: .\recipes\settings.py:582
msgid "Greek"
msgstr ""
#: .\recipes\settings.py:583
msgid "Hebrew"
msgstr ""
#: .\recipes\settings.py:584
msgid "Hungarian"
msgstr ""
#: .\recipes\settings.py:488
#: .\recipes\settings.py:585
msgid "Italian"
msgstr ""
#: .\recipes\settings.py:489
#: .\recipes\settings.py:586
msgid "Latvian"
msgstr ""
#: .\recipes\settings.py:490
msgid "Norwegian "
#: .\recipes\settings.py:587
msgid "Norwegian"
msgstr ""
#: .\recipes\settings.py:491
#: .\recipes\settings.py:589
msgid "Polish"
msgstr ""
#: .\recipes\settings.py:492
#: .\recipes\settings.py:590
msgid "Portuguese"
msgstr ""
#: .\recipes\settings.py:591
msgid "Russian"
msgstr ""
#: .\recipes\settings.py:493
#: .\recipes\settings.py:592
msgid "Romanian"
msgstr ""
#: .\recipes\settings.py:593
msgid "Spanish"
msgstr ""
#: .\recipes\settings.py:494
#: .\recipes\settings.py:594
msgid "Slovenian"
msgstr ""
#: .\recipes\settings.py:595
msgid "Swedish"
msgstr ""
#: .\recipes\settings.py:596
msgid "Turkish"
msgstr ""
#: .\recipes\settings.py:597
msgid "Ukranian"
msgstr ""

View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-01 15:04+0200\n"
"POT-Creation-Date: 2025-09-22 20:15+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -69,70 +69,110 @@ msgstr ""
msgid "end"
msgstr ""
#: .\recipes\settings.py:478
#: .\recipes\plugins\enterprise_plugin\templates\enterprise_social_public_view.html:15
msgid "Tandoor Recipe Manager"
msgstr ""
#: .\recipes\settings.py:571
msgid "Armenian "
msgstr ""
#: .\recipes\settings.py:479
#: .\recipes\settings.py:572
msgid "Bulgarian"
msgstr ""
#: .\recipes\settings.py:480
#: .\recipes\settings.py:573
msgid "Catalan"
msgstr ""
#: .\recipes\settings.py:481
#: .\recipes\settings.py:574
msgid "Czech"
msgstr ""
#: .\recipes\settings.py:482
#: .\recipes\settings.py:575
msgid "Croatian"
msgstr ""
#: .\recipes\settings.py:576
msgid "Danish"
msgstr ""
#: .\recipes\settings.py:483
#: .\recipes\settings.py:577
msgid "Dutch"
msgstr ""
#: .\recipes\settings.py:484
#: .\recipes\settings.py:578
msgid "English"
msgstr ""
#: .\recipes\settings.py:485
#: .\recipes\settings.py:579
msgid "French"
msgstr ""
#: .\recipes\settings.py:486
#: .\recipes\settings.py:580
msgid "Finnish"
msgstr ""
#: .\recipes\settings.py:581
msgid "German"
msgstr ""
#: .\recipes\settings.py:487
#: .\recipes\settings.py:582
msgid "Greek"
msgstr ""
#: .\recipes\settings.py:583
msgid "Hebrew"
msgstr ""
#: .\recipes\settings.py:584
msgid "Hungarian"
msgstr ""
#: .\recipes\settings.py:488
#: .\recipes\settings.py:585
msgid "Italian"
msgstr ""
#: .\recipes\settings.py:489
#: .\recipes\settings.py:586
msgid "Latvian"
msgstr ""
#: .\recipes\settings.py:490
msgid "Norwegian "
#: .\recipes\settings.py:587
msgid "Norwegian"
msgstr ""
#: .\recipes\settings.py:491
#: .\recipes\settings.py:589
msgid "Polish"
msgstr ""
#: .\recipes\settings.py:492
#: .\recipes\settings.py:590
msgid "Portuguese"
msgstr ""
#: .\recipes\settings.py:591
msgid "Russian"
msgstr ""
#: .\recipes\settings.py:493
#: .\recipes\settings.py:592
msgid "Romanian"
msgstr ""
#: .\recipes\settings.py:593
msgid "Spanish"
msgstr ""
#: .\recipes\settings.py:494
#: .\recipes\settings.py:594
msgid "Slovenian"
msgstr ""
#: .\recipes\settings.py:595
msgid "Swedish"
msgstr ""
#: .\recipes\settings.py:596
msgid "Turkish"
msgstr ""
#: .\recipes\settings.py:597
msgid "Ukranian"
msgstr ""

Binary file not shown.

View File

@@ -0,0 +1,177 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-09-22 20:15+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
#: .\recipes\plugins\enterprise_plugin\helper\permission_helper.py:58
msgid ""
"You do not have the required permissions to view this page! You need to have "
"the following modules licensed: "
msgstr ""
#: .\recipes\plugins\enterprise_plugin\helper\permission_helper.py:76
msgid "You are not logged in and therefore cannot view this page!"
msgstr ""
#: .\recipes\plugins\enterprise_plugin\helper\permission_helper.py:79
msgid "You do not have the required modules to view this page!"
msgstr ""
#: .\recipes\plugins\enterprise_plugin\helper\permission_helper.py:90
msgid "You do not have the required module to view this page!"
msgstr ""
#: .\recipes\plugins\enterprise_plugin\models.py:32
msgid "Recipe"
msgstr ""
#: .\recipes\plugins\enterprise_plugin\models.py:32
msgid "Recipe Keyword"
msgstr ""
#: .\recipes\plugins\enterprise_plugin\models.py:32
msgid "Meal Plan"
msgstr ""
#: .\recipes\plugins\enterprise_plugin\models.py:32
msgid "Shopping"
msgstr ""
#: .\recipes\plugins\enterprise_plugin\models.py:32
msgid "Book"
msgstr ""
#: .\recipes\plugins\enterprise_plugin\models.py:37
msgid "start"
msgstr ""
#: .\recipes\plugins\enterprise_plugin\models.py:37
msgid "center"
msgstr ""
#: .\recipes\plugins\enterprise_plugin\models.py:37
msgid "end"
msgstr ""
#: .\recipes\plugins\enterprise_plugin\templates\enterprise_social_public_view.html:15
msgid "Tandoor Recipe Manager"
msgstr ""
#: .\recipes\settings.py:571
msgid "Armenian "
msgstr ""
#: .\recipes\settings.py:572
msgid "Bulgarian"
msgstr ""
#: .\recipes\settings.py:573
msgid "Catalan"
msgstr ""
#: .\recipes\settings.py:574
msgid "Czech"
msgstr ""
#: .\recipes\settings.py:575
msgid "Croatian"
msgstr ""
#: .\recipes\settings.py:576
msgid "Danish"
msgstr ""
#: .\recipes\settings.py:577
msgid "Dutch"
msgstr ""
#: .\recipes\settings.py:578
msgid "English"
msgstr ""
#: .\recipes\settings.py:579
msgid "French"
msgstr ""
#: .\recipes\settings.py:580
msgid "Finnish"
msgstr ""
#: .\recipes\settings.py:581
msgid "German"
msgstr ""
#: .\recipes\settings.py:582
msgid "Greek"
msgstr ""
#: .\recipes\settings.py:583
msgid "Hebrew"
msgstr ""
#: .\recipes\settings.py:584
msgid "Hungarian"
msgstr ""
#: .\recipes\settings.py:585
msgid "Italian"
msgstr ""
#: .\recipes\settings.py:586
msgid "Latvian"
msgstr ""
#: .\recipes\settings.py:587
msgid "Norwegian"
msgstr ""
#: .\recipes\settings.py:589
msgid "Polish"
msgstr ""
#: .\recipes\settings.py:590
msgid "Portuguese"
msgstr ""
#: .\recipes\settings.py:591
msgid "Russian"
msgstr ""
#: .\recipes\settings.py:592
msgid "Romanian"
msgstr ""
#: .\recipes\settings.py:593
msgid "Spanish"
msgstr ""
#: .\recipes\settings.py:594
msgid "Slovenian"
msgstr ""
#: .\recipes\settings.py:595
msgid "Swedish"
msgstr ""
#: .\recipes\settings.py:596
msgid "Turkish"
msgstr ""
#: .\recipes\settings.py:597
msgid "Ukranian"
msgstr ""

View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-01 15:04+0200\n"
"POT-Creation-Date: 2025-09-22 20:15+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -67,70 +67,110 @@ msgstr ""
msgid "end"
msgstr ""
#: .\recipes\settings.py:478
#: .\recipes\plugins\enterprise_plugin\templates\enterprise_social_public_view.html:15
msgid "Tandoor Recipe Manager"
msgstr ""
#: .\recipes\settings.py:571
msgid "Armenian "
msgstr ""
#: .\recipes\settings.py:479
#: .\recipes\settings.py:572
msgid "Bulgarian"
msgstr ""
#: .\recipes\settings.py:480
#: .\recipes\settings.py:573
msgid "Catalan"
msgstr ""
#: .\recipes\settings.py:481
#: .\recipes\settings.py:574
msgid "Czech"
msgstr ""
#: .\recipes\settings.py:482
#: .\recipes\settings.py:575
msgid "Croatian"
msgstr ""
#: .\recipes\settings.py:576
msgid "Danish"
msgstr ""
#: .\recipes\settings.py:483
#: .\recipes\settings.py:577
msgid "Dutch"
msgstr ""
#: .\recipes\settings.py:484
#: .\recipes\settings.py:578
msgid "English"
msgstr ""
#: .\recipes\settings.py:485
#: .\recipes\settings.py:579
msgid "French"
msgstr ""
#: .\recipes\settings.py:486
#: .\recipes\settings.py:580
msgid "Finnish"
msgstr ""
#: .\recipes\settings.py:581
msgid "German"
msgstr ""
#: .\recipes\settings.py:487
#: .\recipes\settings.py:582
msgid "Greek"
msgstr ""
#: .\recipes\settings.py:583
msgid "Hebrew"
msgstr ""
#: .\recipes\settings.py:584
msgid "Hungarian"
msgstr ""
#: .\recipes\settings.py:488
#: .\recipes\settings.py:585
msgid "Italian"
msgstr ""
#: .\recipes\settings.py:489
#: .\recipes\settings.py:586
msgid "Latvian"
msgstr ""
#: .\recipes\settings.py:490
msgid "Norwegian "
#: .\recipes\settings.py:587
msgid "Norwegian"
msgstr ""
#: .\recipes\settings.py:491
#: .\recipes\settings.py:589
msgid "Polish"
msgstr ""
#: .\recipes\settings.py:492
#: .\recipes\settings.py:590
msgid "Portuguese"
msgstr ""
#: .\recipes\settings.py:591
msgid "Russian"
msgstr ""
#: .\recipes\settings.py:493
#: .\recipes\settings.py:592
msgid "Romanian"
msgstr ""
#: .\recipes\settings.py:593
msgid "Spanish"
msgstr ""
#: .\recipes\settings.py:494
#: .\recipes\settings.py:594
msgid "Slovenian"
msgstr ""
#: .\recipes\settings.py:595
msgid "Swedish"
msgstr ""
#: .\recipes\settings.py:596
msgid "Turkish"
msgstr ""
#: .\recipes\settings.py:597
msgid "Ukranian"
msgstr ""

View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-01 15:04+0200\n"
"POT-Creation-Date: 2025-09-22 20:15+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -68,70 +68,110 @@ msgstr ""
msgid "end"
msgstr ""
#: .\recipes\settings.py:478
#: .\recipes\plugins\enterprise_plugin\templates\enterprise_social_public_view.html:15
msgid "Tandoor Recipe Manager"
msgstr ""
#: .\recipes\settings.py:571
msgid "Armenian "
msgstr ""
#: .\recipes\settings.py:479
#: .\recipes\settings.py:572
msgid "Bulgarian"
msgstr ""
#: .\recipes\settings.py:480
#: .\recipes\settings.py:573
msgid "Catalan"
msgstr ""
#: .\recipes\settings.py:481
#: .\recipes\settings.py:574
msgid "Czech"
msgstr ""
#: .\recipes\settings.py:482
#: .\recipes\settings.py:575
msgid "Croatian"
msgstr ""
#: .\recipes\settings.py:576
msgid "Danish"
msgstr ""
#: .\recipes\settings.py:483
#: .\recipes\settings.py:577
msgid "Dutch"
msgstr ""
#: .\recipes\settings.py:484
#: .\recipes\settings.py:578
msgid "English"
msgstr ""
#: .\recipes\settings.py:485
#: .\recipes\settings.py:579
msgid "French"
msgstr ""
#: .\recipes\settings.py:486
#: .\recipes\settings.py:580
msgid "Finnish"
msgstr ""
#: .\recipes\settings.py:581
msgid "German"
msgstr ""
#: .\recipes\settings.py:487
#: .\recipes\settings.py:582
msgid "Greek"
msgstr ""
#: .\recipes\settings.py:583
msgid "Hebrew"
msgstr ""
#: .\recipes\settings.py:584
msgid "Hungarian"
msgstr ""
#: .\recipes\settings.py:488
#: .\recipes\settings.py:585
msgid "Italian"
msgstr ""
#: .\recipes\settings.py:489
#: .\recipes\settings.py:586
msgid "Latvian"
msgstr ""
#: .\recipes\settings.py:490
msgid "Norwegian "
#: .\recipes\settings.py:587
msgid "Norwegian"
msgstr ""
#: .\recipes\settings.py:491
#: .\recipes\settings.py:589
msgid "Polish"
msgstr ""
#: .\recipes\settings.py:492
#: .\recipes\settings.py:590
msgid "Portuguese"
msgstr ""
#: .\recipes\settings.py:591
msgid "Russian"
msgstr ""
#: .\recipes\settings.py:493
#: .\recipes\settings.py:592
msgid "Romanian"
msgstr ""
#: .\recipes\settings.py:593
msgid "Spanish"
msgstr ""
#: .\recipes\settings.py:494
#: .\recipes\settings.py:594
msgid "Slovenian"
msgstr ""
#: .\recipes\settings.py:595
msgid "Swedish"
msgstr ""
#: .\recipes\settings.py:596
msgid "Turkish"
msgstr ""
#: .\recipes\settings.py:597
msgid "Ukranian"
msgstr ""

View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-01 15:04+0200\n"
"POT-Creation-Date: 2025-09-22 20:15+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -68,70 +68,110 @@ msgstr ""
msgid "end"
msgstr ""
#: .\recipes\settings.py:478
#: .\recipes\plugins\enterprise_plugin\templates\enterprise_social_public_view.html:15
msgid "Tandoor Recipe Manager"
msgstr ""
#: .\recipes\settings.py:571
msgid "Armenian "
msgstr ""
#: .\recipes\settings.py:479
#: .\recipes\settings.py:572
msgid "Bulgarian"
msgstr ""
#: .\recipes\settings.py:480
#: .\recipes\settings.py:573
msgid "Catalan"
msgstr ""
#: .\recipes\settings.py:481
#: .\recipes\settings.py:574
msgid "Czech"
msgstr ""
#: .\recipes\settings.py:482
#: .\recipes\settings.py:575
msgid "Croatian"
msgstr ""
#: .\recipes\settings.py:576
msgid "Danish"
msgstr ""
#: .\recipes\settings.py:483
#: .\recipes\settings.py:577
msgid "Dutch"
msgstr ""
#: .\recipes\settings.py:484
#: .\recipes\settings.py:578
msgid "English"
msgstr ""
#: .\recipes\settings.py:485
#: .\recipes\settings.py:579
msgid "French"
msgstr ""
#: .\recipes\settings.py:486
#: .\recipes\settings.py:580
msgid "Finnish"
msgstr ""
#: .\recipes\settings.py:581
msgid "German"
msgstr ""
#: .\recipes\settings.py:487
#: .\recipes\settings.py:582
msgid "Greek"
msgstr ""
#: .\recipes\settings.py:583
msgid "Hebrew"
msgstr ""
#: .\recipes\settings.py:584
msgid "Hungarian"
msgstr ""
#: .\recipes\settings.py:488
#: .\recipes\settings.py:585
msgid "Italian"
msgstr ""
#: .\recipes\settings.py:489
#: .\recipes\settings.py:586
msgid "Latvian"
msgstr ""
#: .\recipes\settings.py:490
msgid "Norwegian "
#: .\recipes\settings.py:587
msgid "Norwegian"
msgstr ""
#: .\recipes\settings.py:491
#: .\recipes\settings.py:589
msgid "Polish"
msgstr ""
#: .\recipes\settings.py:492
#: .\recipes\settings.py:590
msgid "Portuguese"
msgstr ""
#: .\recipes\settings.py:591
msgid "Russian"
msgstr ""
#: .\recipes\settings.py:493
#: .\recipes\settings.py:592
msgid "Romanian"
msgstr ""
#: .\recipes\settings.py:593
msgid "Spanish"
msgstr ""
#: .\recipes\settings.py:494
#: .\recipes\settings.py:594
msgid "Slovenian"
msgstr ""
#: .\recipes\settings.py:595
msgid "Swedish"
msgstr ""
#: .\recipes\settings.py:596
msgid "Turkish"
msgstr ""
#: .\recipes\settings.py:597
msgid "Ukranian"
msgstr ""

Some files were not shown because too many files have changed in this diff Show More