From 4f435748a7e43bd49cdd8c49982bfc98e02db0b9 Mon Sep 17 00:00:00 2001 From: Mohammad Asim Khan <51525305+wisdomkhan@users.noreply.github.com> Date: Sat, 2 Oct 2021 17:24:46 +0530 Subject: [PATCH 01/15] Added link for Tandoor Translate --- cookbook/templates/base.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cookbook/templates/base.html b/cookbook/templates/base.html index ba600aa4..71e2f94b 100644 --- a/cookbook/templates/base.html +++ b/cookbook/templates/base.html @@ -246,6 +246,8 @@ class="fab fa-markdown fa-fw"> {% trans 'Markdown Guide' %} {% trans 'GitHub' %} + {% trans 'Translate Tandoor' %} {% trans 'API Documentation' %} Date: Mon, 4 Oct 2021 16:18:21 -0500 Subject: [PATCH 02/15] a better fix --- cookbook/helper/recipe_search.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook/helper/recipe_search.py b/cookbook/helper/recipe_search.py index 05f932cf..d63dba0f 100644 --- a/cookbook/helper/recipe_search.py +++ b/cookbook/helper/recipe_search.py @@ -61,7 +61,7 @@ def search_recipes(request, queryset, params): # return queryset.annotate(last_view=Max('viewlog__pk')).annotate(new=Case(When(pk__in=last_viewed_recipes, then=('last_view')), default=Value(0))).filter(new__gt=0).order_by('-new') # queryset that only annotates most recent view (higher pk = lastest view) - queryset = queryset.annotate(last_view=Max('viewlog__pk')).annotate(recent=Coalesce(When(pk__in=last_viewed_recipes, then=('last_view')), Value(0))) + queryset = queryset.annotate(recent=Coalesce(Max('viewlog__pk'), Value(0))) orderby += ['-recent'] # TODO create setting for default ordering - most cooked, rating, From 1fb1becfcf1ea62090ab47975f5f12782ab04720 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Wed, 6 Oct 2021 20:09:54 +0200 Subject: [PATCH 03/15] added translations to book view --- vue/src/components/CookbookToc.vue | 2 +- vue/src/locales/en.json | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/vue/src/components/CookbookToc.vue b/vue/src/components/CookbookToc.vue index 2d052c68..50a4a041 100644 --- a/vue/src/components/CookbookToc.vue +++ b/vue/src/components/CookbookToc.vue @@ -1,7 +1,7 @@