fixed some english translations
This commit is contained in:
parent
0aec23fcdd
commit
592bd4f11e
@ -37,7 +37,7 @@ class UserPreferenceForm(forms.ModelForm):
|
||||
'nav_color': _('Color of the top navigation bar. Not all colors work with all themes, just try them out!'),
|
||||
'default_unit': _('Default Unit to be used when inserting a new ingredient into a recipe.'),
|
||||
'use_fractions': _('Enables support for fractions in ingredient amounts (e.g. convert decimals to fractions automatically)'),
|
||||
'plan_share': _('Default user to share newly created meal plan entries with.'),
|
||||
'plan_share': _('Users with whom newly created meal plan/shopping list entries should be shared by default.'),
|
||||
'show_recent': _('Show recently viewed recipes on search page.'),
|
||||
'ingredient_decimals': _('Number of decimals to round ingredients.'),
|
||||
'comments': _('If you want to be able to create and see comments underneath recipes.'),
|
||||
|
@ -141,7 +141,7 @@ class OwnerRequiredMixin(object):
|
||||
return HttpResponseRedirect(reverse_lazy('login'))
|
||||
else:
|
||||
if not is_object_owner(request.user, self.get_object()):
|
||||
messages.add_message(request, messages.ERROR, _('You cannot interact with this object as its not owned by you!'))
|
||||
messages.add_message(request, messages.ERROR, _('You cannot interact with this object as it is not owned by you!'))
|
||||
return HttpResponseRedirect(reverse('index'))
|
||||
|
||||
return super(OwnerRequiredMixin, self).dispatch(request, *args, **kwargs)
|
||||
@ -155,7 +155,7 @@ class CustomIsOwner(permissions.BasePermission):
|
||||
verifies user has ownership over object
|
||||
(either user or created_by or user is request user)
|
||||
"""
|
||||
message = _('You cannot interact with this object as its not owned by you!')
|
||||
message = _('You cannot interact with this object as it is not owned by you!')
|
||||
|
||||
def has_permission(self, request, view):
|
||||
return request.user.is_authenticated
|
||||
@ -169,7 +169,7 @@ class CustomIsShared(permissions.BasePermission): # TODO function duplicate/too
|
||||
Custom permission class for django rest framework views
|
||||
verifies user is shared for the object he is trying to access
|
||||
"""
|
||||
message = _('You cannot interact with this object as its not owned by you!')
|
||||
message = _('You cannot interact with this object as it is not owned by you!')
|
||||
|
||||
def has_permission(self, request, view):
|
||||
return request.user.is_authenticated
|
||||
|
@ -158,7 +158,7 @@ def find_recipe_json(ld_json, url):
|
||||
else:
|
||||
ld_json['recipeInstructions'] = ''
|
||||
|
||||
ld_json['recipeInstructions'] += '\n\n' + _('Imported from ') + url
|
||||
ld_json['recipeInstructions'] += '\n\n' + _('Imported from') + ' ' + url
|
||||
|
||||
if 'image' in ld_json:
|
||||
# check if list of images is returned, take first if so
|
||||
|
@ -238,7 +238,7 @@ msgstr "No heu iniciat la sessió i, per tant, no podeu veure aquesta pàgina."
|
||||
|
||||
#: .\cookbook\helper\permission_helper.py:127
|
||||
#: .\cookbook\helper\permission_helper.py:141 .\cookbook\views\delete.py:132
|
||||
msgid "You cannot interact with this object as its not owned by you!"
|
||||
msgid "You cannot interact with this object as it is not owned by you!"
|
||||
msgstr ""
|
||||
"No podeu interactuar amb aquest objecte ja que no és propietat vostra!"
|
||||
|
||||
@ -430,7 +430,7 @@ msgid "Admin"
|
||||
msgstr "Admin"
|
||||
|
||||
#: .\cookbook\templates\base.html:142
|
||||
msgid "Markdown Help"
|
||||
msgid "Markdown Guide"
|
||||
msgstr "Ajuda de Markdown"
|
||||
|
||||
#: .\cookbook\templates\base.html:144
|
||||
@ -840,7 +840,7 @@ msgstr "Segur que vols combinar aquests dos Ingredients?"
|
||||
|
||||
#: .\cookbook\templates\generic\delete_template.html:18
|
||||
#, python-format
|
||||
msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
|
||||
msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b>?"
|
||||
msgstr "Segur que vols esborrar el %(title)s:<b>%(object)s</b>"
|
||||
|
||||
#: .\cookbook\templates\generic\delete_template.html:21
|
||||
|
@ -238,7 +238,7 @@ msgstr "Du bist nicht angemeldet, daher kannst du diese Seite nicht sehen!"
|
||||
#: .\cookbook\helper\permission_helper.py:144
|
||||
#: .\cookbook\helper\permission_helper.py:158
|
||||
#: .\cookbook\helper\permission_helper.py:172 .\cookbook\views\delete.py:132
|
||||
msgid "You cannot interact with this object as its not owned by you!"
|
||||
msgid "You cannot interact with this object as it is not owned by you!"
|
||||
msgstr ""
|
||||
"Du kannst mit diesem Objekt nicht interagieren, da es dir nicht gehört!"
|
||||
|
||||
@ -430,7 +430,7 @@ msgid "Admin"
|
||||
msgstr "Admin"
|
||||
|
||||
#: .\cookbook\templates\base.html:142
|
||||
msgid "Markdown Help"
|
||||
msgid "Markdown Guide"
|
||||
msgstr "Markdown-Hilfe"
|
||||
|
||||
#: .\cookbook\templates\base.html:144
|
||||
@ -881,7 +881,7 @@ msgstr "Bist du sicher diese beiden Zutaten zusammengeführt werden sollen ?"
|
||||
|
||||
#: .\cookbook\templates\generic\delete_template.html:18
|
||||
#, python-format
|
||||
msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
|
||||
msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b>?"
|
||||
msgstr "Bist du sicher das %(title)s: <b>%(object)s</b> gelöscht werden soll "
|
||||
|
||||
#: .\cookbook\templates\generic\delete_template.html:21
|
||||
|
@ -214,7 +214,7 @@ msgstr ""
|
||||
#: .\cookbook\helper\permission_helper.py:144
|
||||
#: .\cookbook\helper\permission_helper.py:158
|
||||
#: .\cookbook\helper\permission_helper.py:172 .\cookbook\views\delete.py:132
|
||||
msgid "You cannot interact with this object as its not owned by you!"
|
||||
msgid "You cannot interact with this object as it is not owned by you!"
|
||||
msgstr ""
|
||||
|
||||
#: .\cookbook\helper\recipe_url_import.py:36
|
||||
@ -402,7 +402,7 @@ msgid "Admin"
|
||||
msgstr ""
|
||||
|
||||
#: .\cookbook\templates\base.html:142
|
||||
msgid "Markdown Help"
|
||||
msgid "Markdown Guide"
|
||||
msgstr ""
|
||||
|
||||
#: .\cookbook\templates\base.html:144
|
||||
@ -844,7 +844,7 @@ msgstr ""
|
||||
|
||||
#: .\cookbook\templates\generic\delete_template.html:18
|
||||
#, python-format
|
||||
msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
|
||||
msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b>?"
|
||||
msgstr ""
|
||||
|
||||
#: .\cookbook\templates\generic\delete_template.html:21
|
||||
|
BIN
cookbook/locale/es/LC_MESSAGES/django.mo
Normal file
BIN
cookbook/locale/es/LC_MESSAGES/django.mo
Normal file
Binary file not shown.
@ -252,7 +252,7 @@ msgstr "¡No ha iniciado sesión y por lo tanto no puede ver esta página!"
|
||||
#: .\cookbook\helper\permission_helper.py:144
|
||||
#: .\cookbook\helper\permission_helper.py:158
|
||||
#: .\cookbook\helper\permission_helper.py:172 .\cookbook\views\delete.py:132
|
||||
msgid "You cannot interact with this object as its not owned by you!"
|
||||
msgid "You cannot interact with this object as it is not owned by you!"
|
||||
msgstr "¡No puede interactuar con este objeto ya que no es de su propiedad!"
|
||||
|
||||
#: .\cookbook\helper\recipe_url_import.py:36
|
||||
@ -444,7 +444,7 @@ msgid "Admin"
|
||||
msgstr "Administrador"
|
||||
|
||||
#: .\cookbook\templates\base.html:142
|
||||
msgid "Markdown Help"
|
||||
msgid "Markdown Guide"
|
||||
msgstr "Ayuda de Markdown"
|
||||
|
||||
#: .\cookbook\templates\base.html:144
|
||||
@ -895,7 +895,7 @@ msgstr "¿Estás seguro de que quieres combinar estos dos ingredientes?"
|
||||
|
||||
#: .\cookbook\templates\generic\delete_template.html:18
|
||||
#, python-format
|
||||
msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
|
||||
msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b>?"
|
||||
msgstr "¿Estás seguro de que quieres borrar el %(title)s: <b>%(object)s</b>?"
|
||||
|
||||
#: .\cookbook\templates\generic\delete_template.html:21
|
||||
|
@ -249,7 +249,7 @@ msgstr "Vous n'êtes pas connecté et ne pouvez donc pas afficher cette page !"
|
||||
#: .\cookbook\helper\permission_helper.py:144
|
||||
#: .\cookbook\helper\permission_helper.py:158
|
||||
#: .\cookbook\helper\permission_helper.py:172 .\cookbook\views\delete.py:132
|
||||
msgid "You cannot interact with this object as its not owned by you!"
|
||||
msgid "You cannot interact with this object as it is not owned by you!"
|
||||
msgstr ""
|
||||
"Vous ne pouvez pas interagir avec cet objet car vous ne le possédez pas!"
|
||||
|
||||
@ -440,7 +440,7 @@ msgid "Admin"
|
||||
msgstr "Admin"
|
||||
|
||||
#: .\cookbook\templates\base.html:142
|
||||
msgid "Markdown Help"
|
||||
msgid "Markdown Guide"
|
||||
msgstr "Aide Markdown"
|
||||
|
||||
#: .\cookbook\templates\base.html:144
|
||||
@ -888,7 +888,7 @@ msgstr "Êtes-vous certain de vouloir fusionner ces deux ingrédients ?"
|
||||
|
||||
#: .\cookbook\templates\generic\delete_template.html:18
|
||||
#, python-format
|
||||
msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
|
||||
msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b>?"
|
||||
msgstr "Êtes-vous certain de vouloir supprimer %(title)s : <b>%(object)s</b>"
|
||||
|
||||
#: .\cookbook\templates\generic\delete_template.html:21
|
||||
|
BIN
cookbook/locale/it/LC_MESSAGES/django.mo
Normal file
BIN
cookbook/locale/it/LC_MESSAGES/django.mo
Normal file
Binary file not shown.
@ -248,7 +248,7 @@ msgstr "Non sei loggato e quindi non puoi visualizzare questa pagina!"
|
||||
#: .\cookbook\helper\permission_helper.py:144
|
||||
#: .\cookbook\helper\permission_helper.py:158
|
||||
#: .\cookbook\helper\permission_helper.py:172 .\cookbook\views\delete.py:132
|
||||
msgid "You cannot interact with this object as its not owned by you!"
|
||||
msgid "You cannot interact with this object as it is not owned by you!"
|
||||
msgstr "Non puoi interagire con questo oggetto perché non è di tua proprietà!"
|
||||
|
||||
#: .\cookbook\helper\recipe_url_import.py:36
|
||||
@ -440,7 +440,7 @@ msgid "Admin"
|
||||
msgstr "Amministratore"
|
||||
|
||||
#: .\cookbook\templates\base.html:142
|
||||
msgid "Markdown Help"
|
||||
msgid "Markdown Guide"
|
||||
msgstr "Aiuto Markdown"
|
||||
|
||||
#: .\cookbook\templates\base.html:144
|
||||
@ -889,7 +889,7 @@ msgstr "Sei sicuro di volere unire questi due ingredienti?"
|
||||
|
||||
#: .\cookbook\templates\generic\delete_template.html:18
|
||||
#, python-format
|
||||
msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
|
||||
msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b>?"
|
||||
msgstr "Sei sicuro di volere eliminare %(title)s: <b>%(object)s</b>"
|
||||
|
||||
#: .\cookbook\templates\generic\delete_template.html:21
|
||||
|
@ -237,7 +237,7 @@ msgstr "Je bent niet ingelogd en kan deze pagina daarom niet bekijken!"
|
||||
#: .\cookbook\helper\permission_helper.py:144
|
||||
#: .\cookbook\helper\permission_helper.py:158
|
||||
#: .\cookbook\helper\permission_helper.py:172 .\cookbook\views\delete.py:132
|
||||
msgid "You cannot interact with this object as its not owned by you!"
|
||||
msgid "You cannot interact with this object as it is not owned by you!"
|
||||
msgstr "Je kunt dit object niet bewerken omdat je de eigenaar niet bent!"
|
||||
|
||||
#: .\cookbook\helper\recipe_url_import.py:36
|
||||
@ -429,7 +429,7 @@ msgid "Admin"
|
||||
msgstr "Admin"
|
||||
|
||||
#: .\cookbook\templates\base.html:142
|
||||
msgid "Markdown Help"
|
||||
msgid "Markdown Guide"
|
||||
msgstr "Markdown hulp"
|
||||
|
||||
#: .\cookbook\templates\base.html:144
|
||||
@ -882,7 +882,7 @@ msgstr "Weet je zeker dat je deze twee ingrediënten wil samenvoegen?"
|
||||
|
||||
#: .\cookbook\templates\generic\delete_template.html:18
|
||||
#, python-format
|
||||
msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
|
||||
msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b>?"
|
||||
msgstr "Weet je zeker dat je %(title)s: <b>%(object)s</b> wil verwijderen?"
|
||||
|
||||
#: .\cookbook\templates\generic\delete_template.html:21
|
||||
|
@ -214,7 +214,7 @@ msgstr ""
|
||||
#: .\cookbook\helper\permission_helper.py:144
|
||||
#: .\cookbook\helper\permission_helper.py:158
|
||||
#: .\cookbook\helper\permission_helper.py:172 .\cookbook\views\delete.py:132
|
||||
msgid "You cannot interact with this object as its not owned by you!"
|
||||
msgid "You cannot interact with this object as it is not owned by you!"
|
||||
msgstr ""
|
||||
|
||||
#: .\cookbook\helper\recipe_url_import.py:36
|
||||
@ -402,7 +402,7 @@ msgid "Admin"
|
||||
msgstr ""
|
||||
|
||||
#: .\cookbook\templates\base.html:142
|
||||
msgid "Markdown Help"
|
||||
msgid "Markdown Guide"
|
||||
msgstr ""
|
||||
|
||||
#: .\cookbook\templates\base.html:144
|
||||
@ -844,7 +844,7 @@ msgstr ""
|
||||
|
||||
#: .\cookbook\templates\generic\delete_template.html:18
|
||||
#, python-format
|
||||
msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
|
||||
msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b>?"
|
||||
msgstr ""
|
||||
|
||||
#: .\cookbook\templates\generic\delete_template.html:21
|
||||
|
@ -214,7 +214,7 @@ msgstr ""
|
||||
#: .\cookbook\helper\permission_helper.py:144
|
||||
#: .\cookbook\helper\permission_helper.py:158
|
||||
#: .\cookbook\helper\permission_helper.py:172 .\cookbook\views\delete.py:132
|
||||
msgid "You cannot interact with this object as its not owned by you!"
|
||||
msgid "You cannot interact with this object as it is not owned by you!"
|
||||
msgstr ""
|
||||
|
||||
#: .\cookbook\helper\recipe_url_import.py:36
|
||||
@ -402,7 +402,7 @@ msgid "Admin"
|
||||
msgstr ""
|
||||
|
||||
#: .\cookbook\templates\base.html:142
|
||||
msgid "Markdown Help"
|
||||
msgid "Markdown Guide"
|
||||
msgstr ""
|
||||
|
||||
#: .\cookbook\templates\base.html:144
|
||||
@ -844,7 +844,7 @@ msgstr ""
|
||||
|
||||
#: .\cookbook\templates\generic\delete_template.html:18
|
||||
#, python-format
|
||||
msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
|
||||
msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b>?"
|
||||
msgstr ""
|
||||
|
||||
#: .\cookbook\templates\generic\delete_template.html:21
|
||||
|
@ -214,7 +214,7 @@ msgstr ""
|
||||
#: .\cookbook\helper\permission_helper.py:144
|
||||
#: .\cookbook\helper\permission_helper.py:158
|
||||
#: .\cookbook\helper\permission_helper.py:172 .\cookbook\views\delete.py:132
|
||||
msgid "You cannot interact with this object as its not owned by you!"
|
||||
msgid "You cannot interact with this object as it is not owned by you!"
|
||||
msgstr ""
|
||||
|
||||
#: .\cookbook\helper\recipe_url_import.py:36
|
||||
@ -402,7 +402,7 @@ msgid "Admin"
|
||||
msgstr ""
|
||||
|
||||
#: .\cookbook\templates\base.html:142
|
||||
msgid "Markdown Help"
|
||||
msgid "Markdown Guide"
|
||||
msgstr ""
|
||||
|
||||
#: .\cookbook\templates\base.html:144
|
||||
@ -844,7 +844,7 @@ msgstr ""
|
||||
|
||||
#: .\cookbook\templates\generic\delete_template.html:18
|
||||
#, python-format
|
||||
msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
|
||||
msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b>?"
|
||||
msgstr ""
|
||||
|
||||
#: .\cookbook\templates\generic\delete_template.html:21
|
||||
|
@ -84,7 +84,7 @@
|
||||
<li class="nav-item dropdown {% if request.resolver_match.url_name in 'list_keyword,data_batch_edit' %}active{% endif %}">
|
||||
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown"
|
||||
aria-haspopup="true" aria-expanded="false">
|
||||
<i class="fas fa-tags"></i> {% trans 'Tags' %}
|
||||
<i class="fas fa-tags"></i> {% trans 'Keywords' %}
|
||||
</a>
|
||||
<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
|
||||
<a class="dropdown-item" href="{% url 'list_keyword' %}"><i
|
||||
@ -139,7 +139,7 @@
|
||||
{% endif %}
|
||||
<div class="dropdown-divider"></div>
|
||||
<a class="dropdown-item" href="{% url 'docs_markdown' %}"><i
|
||||
class="fab fa-markdown fa-fw"></i> {% trans 'Markdown Help' %}</a>
|
||||
class="fab fa-markdown fa-fw"></i> {% trans 'Markdown Guide' %}</a>
|
||||
<a class="dropdown-item" href="https://github.com/vabene1111/recipes"><i
|
||||
class="fab fa-github fa-fw"></i> {% trans 'GitHub' %}</a>
|
||||
<a class="dropdown-item" href="{% url 'docs_api' %}"><i
|
||||
|
@ -11,9 +11,9 @@
|
||||
<div class="card border-info">
|
||||
<div class="card-body text-info">
|
||||
<p class="card-text">
|
||||
{% trans 'On this Page you can manage all storage folder locations that should be monitored and synced' %}
|
||||
{% trans 'On this Page you can manage all storage folder locations that should be monitored and synced.' %}
|
||||
<br/>
|
||||
{% trans 'The path must be in the following format' %} <code>/Folder/RecipesFolder</code>
|
||||
{% trans 'The path must be in the following format' %}: <code>/Folder/RecipesFolder</code>
|
||||
</p>
|
||||
<form method="POST" class="post-form">{% csrf_token %}
|
||||
{{ form|crispy }}
|
||||
|
@ -129,7 +129,7 @@ class RecipeBookEntryDelete(GroupRequiredMixin, DeleteView):
|
||||
def dispatch(self, request, *args, **kwargs):
|
||||
obj = self.get_object()
|
||||
if not (obj.book.created_by == request.user or request.user.is_superuser):
|
||||
messages.add_message(request, messages.ERROR, _('You cannot interact with this object as its not owned by you!'))
|
||||
messages.add_message(request, messages.ERROR, _('You cannot interact with this object as it is not owned by you!'))
|
||||
return HttpResponseRedirect(reverse('index'))
|
||||
return super(RecipeBookEntryDelete, self).dispatch(request, *args, **kwargs)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user