aboutsummaryrefslogtreecommitdiff
path: root/src/web/views
diff options
context:
space:
mode:
Diffstat (limited to 'src/web/views')
-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
3 files changed, 5 insertions, 5 deletions
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