Merge branch 'fuzzy_search' of github.com:smilerz/recipes into fuzzy_search

cookbook/forms.py

@@ -358,8 +358,8 @@ class InviteLinkForm(forms.ModelForm):
 
     def clean(self):
         space = self.cleaned_data['space']
-        if space.max_users != 0 and (UserPreference.objects.filter(space=space).count() + InviteLink.objects.filter(
-                space=space).filter(valid_until__gte=datetime.today()).count()) >= space.max_users:
+        if space.max_users != 0 and (UserPreference.objects.filter(space=space).count() +
+                                     InviteLink.objects.filter(valid_until__gte=datetime.today(), used_by=None, space=space).count()) >= space.max_users:
             raise ValidationError(_('Maximum number of users for this space reached.'))
 
     def clean_email(self):

cookbook/locale/it/LC_MESSAGES/django.po

@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-07 17:31+0100\n"
-"PO-Revision-Date: 2021-11-12 20:06+0000\n"
+"PO-Revision-Date: 2022-01-17 07:56+0000\n"
 "Last-Translator: Oliver Cervera <olivercervera@yahoo.it>\n"
 "Language-Team: Italian <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/it/>\n"
@@ -260,10 +260,6 @@ msgid "Email address already taken!"
 msgstr "Questo indirizzo email è già in uso!"
 
 #: .\cookbook\forms.py:367
-#, fuzzy
-#| msgid ""
-#| "An email address is not required but if present the invite link will be "
-#| "send to the user."
 msgid ""
 "An email address is not required but if present the invite link will be sent "
 "to the user."
@@ -840,6 +836,10 @@ msgid ""
 "                    Please request a <a href=\"%(passwd_reset_url)s\">new "
 "password reset</a>."
 msgstr ""
+"Il link per il reset della password non è corretto, probabilmente perché è "
+"stato già utilizzato.\n"
+"                    Puoi richiedere un  <a href=\"%(passwd_reset_url)s\""
+">nuovo reset della password</a>."
 
 #: .\cookbook\templates\account\password_reset_from_key.html:33
 msgid "change password"
@@ -932,10 +932,8 @@ msgid "Supermarket Category"
 msgstr "Categoria Supermercato"
 
 #: .\cookbook\templates\base.html:175 .\cookbook\views\lists.py:195
-#, fuzzy
-#| msgid "Information"
 msgid "Automations"
-msgstr "Informazioni"
+msgstr "Automazioni"
 
 #: .\cookbook\templates\base.html:189 .\cookbook\views\lists.py:215
 msgid "Files"
@@ -1842,6 +1840,9 @@ msgid ""
 "return more results than needed to make sure you find what you are looking "
 "for."
 msgstr ""
+"Cerca quello che ti serve anche se la ricerca o la ricetta contengono "
+"errori. Potrebbe mostrare più risultati di quelli necessari per mostrarti "
+"quello che stai cercando."
 
 #: .\cookbook\templates\settings.html:175
 msgid "This is the default behavior"
@@ -1864,7 +1865,7 @@ msgstr ""
 
 #: .\cookbook\templates\settings.html:183
 msgid "Perfect for large Databases"
-msgstr ""
+msgstr "Perfetto per database grandi"
 
 #: .\cookbook\templates\setup.html:6 .\cookbook\templates\system.html:5
 msgid "Cookbook Setup"

cookbook/locale/zh_CN/LC_MESSAGES/django.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-08 16:27+0100\n"
-"PO-Revision-Date: 2021-08-20 19:28+0000\n"
-"Last-Translator: Danny Tsui <dannytszho@gmail.com>\n"
+"PO-Revision-Date: 2022-01-16 07:06+0000\n"
+"Last-Translator: 糖多 <1365143958@qq.com>\n"
 "Language-Team: Chinese (Simplified) <http://translate.tandoor.dev/projects/"
 "tandoor/recipes-backend/zh_Hans/>\n"
 "Language: zh_CN\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.7.2\n"
+"X-Generator: Weblate 4.8\n"
 
 #: .\cookbook\filters.py:23 .\cookbook\templates\base.html:125
 #: .\cookbook\templates\forms\ingredients.html:34
@@ -1173,12 +1173,12 @@ msgstr ""
 
 #: .\cookbook\templates\include\log_cooking.html:19
 msgid "Rating"
-msgstr ""
+msgstr "评分"
 
 #: .\cookbook\templates\include\log_cooking.html:27
 #: .\cookbook\templates\include\recipe_open_modal.html:18
 msgid "Close"
-msgstr ""
+msgstr "关闭"
 
 #: .\cookbook\templates\include\recipe_open_modal.html:32
 msgid "Open Recipe"