aboutsummaryrefslogtreecommitdiff
path: root/src/web
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2018-03-31 14:55:04 +0200
committerGitHub <noreply@github.com>2018-03-31 14:55:04 +0200
commit1873ed81705399658ce7628f1148327a5c595909 (patch)
tree7abea01f509a5efc136dfddbf260f60d80268186 /src/web
parentRenew certificate. (diff)
parentCorrect spelling mistakes. (diff)
downloadnewspipe-1873ed81705399658ce7628f1148327a5c595909.tar.gz
newspipe-1873ed81705399658ce7628f1148327a5c595909.tar.bz2
newspipe-1873ed81705399658ce7628f1148327a5c595909.zip
Merge pull request #37 from EdwardBetts/spelling
Correct spelling mistakes.
Diffstat (limited to 'src/web')
-rw-r--r--src/web/controllers/abstract.py2
-rw-r--r--src/web/translations/fr/LC_MESSAGES/messages.po4
-rw-r--r--src/web/translations/messages.pot2
-rw-r--r--src/web/views/admin.py2
-rw-r--r--src/web/views/api/v2/common.py6
-rw-r--r--src/web/views/api/v3/common.py2
6 files changed, 9 insertions, 9 deletions
diff --git a/src/web/controllers/abstract.py b/src/web/controllers/abstract.py
index 47cc365f..764ff305 100644
--- a/src/web/controllers/abstract.py
+++ b/src/web/controllers/abstract.py
@@ -63,7 +63,7 @@ class AbstractController:
def _get(self, **filters):
""" Will add the current user id if that one is not none (in which case
the decision has been made in the code that the query shouldn't be user
- dependant) and the user is not an admin and the filters doesn't already
+ dependent) and the user is not an admin and the filters doesn't already
contains a filter for that user.
"""
if self._user_id_key is not None and self.user_id \
diff --git a/src/web/translations/fr/LC_MESSAGES/messages.po b/src/web/translations/fr/LC_MESSAGES/messages.po
index 0c194346..3c1bafff 100644
--- a/src/web/translations/fr/LC_MESSAGES/messages.po
+++ b/src/web/translations/fr/LC_MESSAGES/messages.po
@@ -870,7 +870,7 @@ msgstr "Utilisateur %(nick)s supprimé avec succès."
#: ../views/admin.py:96
#, python-format
-msgid "An error occured while trying to delete a user: %(error)s"
+msgid "An error occurred while trying to delete a user: %(error)s"
msgstr ""
"Une erreur est apparue lors de la suppression de l'utilisateur: %(error)s"
@@ -1306,7 +1306,7 @@ msgstr "Interdit."
#~ msgid "Indexing database..."
#~ msgstr "Indexation la base de données..."
-#~ msgid "An error occured"
+#~ msgid "An error occurred"
#~ msgstr "Une erreur est survenue."
#~ msgid "Option not available on Heroku."
diff --git a/src/web/translations/messages.pot b/src/web/translations/messages.pot
index b3de9487..20a2dcc2 100644
--- a/src/web/translations/messages.pot
+++ b/src/web/translations/messages.pot
@@ -839,7 +839,7 @@ msgstr ""
#: ../views/admin.py:96
#, python-format
-msgid "An error occured while trying to delete a user: %(error)s"
+msgid "An error occurred while trying to delete a user: %(error)s"
msgstr ""
#: ../views/admin.py:114
diff --git a/src/web/views/admin.py b/src/web/views/admin.py
index 4de4009a..c9aa0977 100644
--- a/src/web/views/admin.py
+++ b/src/web/views/admin.py
@@ -93,7 +93,7 @@ def delete_user(user_id=None):
nick=user.nickname), 'success')
except Exception as error:
flash(
- gettext('An error occured while trying to delete a user: %(error)s',
+ gettext('An error occurred while trying to delete a user: %(error)s',
error=error), 'danger')
return redirect(url_for('admin.dashboard'))
diff --git a/src/web/views/api/v2/common.py b/src/web/views/api/v2/common.py
index 04b19d78..8a53d7e6 100644
--- a/src/web/views/api/v2/common.py
+++ b/src/web/views/api/v2/common.py
@@ -45,7 +45,7 @@ def authenticate(func):
if not ucontr.check_password(user, request.authorization.password):
raise Forbidden("Couldn't authenticate your user")
if not user.is_active:
- raise Forbidden("User is desactivated")
+ raise Forbidden("User is deactivated")
login_user_bundle(user)
if current_user.is_authenticated:
return func(*args, **kwargs)
@@ -116,7 +116,7 @@ class PyAggResourceNew(PyAggAbstractResource):
class PyAggResourceExisting(PyAggAbstractResource):
def get(self, obj_id=None):
- """Retreive a single object"""
+ """Retrieve a single object"""
return self.controller.get(id=obj_id)
def put(self, obj_id=None):
@@ -216,7 +216,7 @@ class PyAggResourceMulti(PyAggAbstractResource):
except Exception as error:
status = 206
results.append(error)
- # if no operation succeded, it's not partial anymore, returning err 500
+ # if no operation succeeded, it's not partial anymore, returning err 500
if status == 206 and results.count('ok') == 0:
status = 500
return results, status
diff --git a/src/web/views/api/v3/common.py b/src/web/views/api/v3/common.py
index eb354482..b2a5ea3f 100644
--- a/src/web/views/api/v3/common.py
+++ b/src/web/views/api/v3/common.py
@@ -47,7 +47,7 @@ def auth_func(*args, **kw):
raise ProcessingException("Couldn't authenticate your user",
code=401)
if not user.is_active:
- raise ProcessingException("User is desactivated", code=401)
+ raise ProcessingException("User is deactivated", code=401)
login_user_bundle(user)
if not current_user.is_authenticated:
raise ProcessingException(description='Not authenticated!', code=401)
bgstack15