mirror of
https://gitlab.com/bramw/baserow.git
synced 2025-04-17 18:32:35 +00:00
Remove incorrect usage of he when no gender is needed.
This commit is contained in:
parent
eb4d82ee10
commit
0df81f149d
23 changed files with 37 additions and 37 deletions
backend/src/baserow
api/workspaces
compat/api/groups
contrib/database
core
ws
enterprise/backend/tests/baserow_enterprise_tests/api
premium/backend/src/baserow_premium/admin/dashboard
web-frontend/modules
core
database
|
@ -3,6 +3,6 @@ from rest_framework.status import HTTP_400_BAD_REQUEST
|
|||
ERROR_GROUP_USER_IS_LAST_ADMIN = (
|
||||
"ERROR_GROUP_USER_IS_LAST_ADMIN",
|
||||
HTTP_400_BAD_REQUEST,
|
||||
"The related user is the last admin in the group. He must delete the group or "
|
||||
"The related user is the last admin in the group. They must delete the group or "
|
||||
"give someone else admin permissions.",
|
||||
)
|
||||
|
|
|
@ -225,9 +225,9 @@ class WorkspaceLeaveView(APIView):
|
|||
description=(
|
||||
"Makes the authenticated user leave the workspace related to the provided "
|
||||
"`workspace_id` if the user is in that workspace. If the user is the last admin "
|
||||
"in the workspace, he will not be able to leave it. There must always be one "
|
||||
"in the workspace, they will not be able to leave it. There must always be one "
|
||||
"admin in the workspace, otherwise it will be left without control. If that "
|
||||
"is the case, he must either delete the workspace or give another member admin "
|
||||
"is the case, they must either delete the workspace or give another member admin "
|
||||
"permissions first."
|
||||
),
|
||||
request=None,
|
||||
|
|
|
@ -194,9 +194,9 @@ class GroupLeaveCompatView(WorkspaceLeaveView):
|
|||
description=(
|
||||
f"{DEPRECATION_PREFIXES['leave_group']} Makes the authenticated user leave "
|
||||
"the group related to the provided `group_id` if the user is in that "
|
||||
"group. If the user is the last admin in the group, he will not be able to "
|
||||
"group. If the user is the last admin in the group, they will not be able to "
|
||||
"leave it. There must always be one admin in the group, otherwise it will "
|
||||
"be left without control. If that is the case, he must either delete the "
|
||||
"be left without control. If that is the case, they must either delete the "
|
||||
"group or give another member admin permissions first."
|
||||
),
|
||||
request=None,
|
||||
|
|
|
@ -2788,7 +2788,7 @@ class SingleSelectFieldType(SelectOptionBaseFieldType):
|
|||
self, field, field_name, order_direction
|
||||
) -> OptionallyAnnotatedOrderBy:
|
||||
"""
|
||||
If the user wants to sort the results he expects them to be ordered
|
||||
If the user wants to sort the results they expect them to be ordered
|
||||
alphabetically based on the select option value and not in the id which is
|
||||
stored in the table. This method generates a Case expression which maps the id
|
||||
to the correct position.
|
||||
|
@ -3165,7 +3165,7 @@ class MultipleSelectFieldType(SelectOptionBaseFieldType):
|
|||
|
||||
def get_order(self, field, field_name, order_direction):
|
||||
"""
|
||||
If the user wants to sort the results he expects them to be ordered
|
||||
If the user wants to sort the results they expect them to be ordered
|
||||
alphabetically based on the select option value and not in the id which is
|
||||
stored in the table. This method generates a Case expression which maps the id
|
||||
to the correct position.
|
||||
|
@ -4518,7 +4518,7 @@ class MultipleCollaboratorsFieldType(FieldType):
|
|||
|
||||
def get_order(self, field, field_name, order_direction):
|
||||
"""
|
||||
If the user wants to sort the results he expects them to be ordered
|
||||
If the user wants to sort the results they expect them to be ordered
|
||||
alphabetically based on the user's name and not in the id which is
|
||||
stored in the table. This method generates a Case expression which maps
|
||||
the id to the correct position.
|
||||
|
|
|
@ -64,7 +64,7 @@ class FieldType(
|
|||
This abstract class represents a custom field type that can be added to the
|
||||
field type registry. It must be extended so customisation can be done. Each field
|
||||
type will have its own model that must extend the Field model, this is needed so
|
||||
that the user can set custom settings per field instance he has created.
|
||||
that the user can set custom settings per field instance they have created.
|
||||
|
||||
Example:
|
||||
from baserow.contrib.database.fields.models import Field
|
||||
|
|
|
@ -69,7 +69,7 @@ class ViewType(
|
|||
This abstract class represents a custom view type that can be added to the
|
||||
view type registry. It must be extended so customisation can be done. Each view type
|
||||
will have his own model that must extend the View model, this is needed so that the
|
||||
user can set custom settings per view instance he has created.
|
||||
user can set custom settings per view instance they have created.
|
||||
|
||||
The added API urls will be available under the namespace 'api:database:views'.
|
||||
So if a url with name 'example' is returned by the method it will available under
|
||||
|
|
|
@ -22,8 +22,8 @@ class TablePageType(PageType):
|
|||
|
||||
def can_add(self, user, web_socket_id, table_id, **kwargs):
|
||||
"""
|
||||
The user should only have access to this page if the table exists and if he
|
||||
has access to the table.
|
||||
The user should only have access to this page if the table exists and if they
|
||||
have access to the table.
|
||||
"""
|
||||
|
||||
if not table_id:
|
||||
|
|
|
@ -9,7 +9,7 @@ class PermissionException(Exception):
|
|||
|
||||
class IsNotAdminError(PermissionException):
|
||||
"""
|
||||
Raised when the user tries to perform an action that is not allowed because he
|
||||
Raised when the user tries to perform an action that is not allowed because they
|
||||
does not have admin permissions.
|
||||
"""
|
||||
|
||||
|
@ -79,8 +79,8 @@ class WorkspaceUserAlreadyExists(Exception):
|
|||
class WorkspaceUserIsLastAdmin(Exception):
|
||||
"""
|
||||
Raised when the last admin of the workspace tries to leave it. This will leave the
|
||||
workspace in a state where no one has control over it. He either needs to delete the
|
||||
workspace or make someone else admin.
|
||||
workspace in a state where no one has control over it. They either need to delete
|
||||
the workspace or make someone else admin.
|
||||
"""
|
||||
|
||||
|
||||
|
|
|
@ -44,7 +44,7 @@ class RuntimeFormulaFunction(abc.ABC, Instance):
|
|||
@property
|
||||
def num_args(self):
|
||||
"""
|
||||
Should define the number of arguments expected byt he execute function.
|
||||
Should define the number of arguments expected when they execute function.
|
||||
|
||||
:return: The number of arguments that are expected
|
||||
"""
|
||||
|
|
|
@ -589,9 +589,9 @@ class CoreHandler(metaclass=baserow_trace_methods(tracer)):
|
|||
except WorkspaceUser.DoesNotExist:
|
||||
raise UserNotInWorkspace(user, self)
|
||||
|
||||
# If the current user is an admin and he is the last admin left, he is not
|
||||
# allowed to leave the workspace otherwise no one will have control over it. He
|
||||
# needs to give someone else admin permissions first or he must
|
||||
# If the current user is an admin and they are the last admin left, they are not
|
||||
# allowed to leave the workspace otherwise no one will have control over it.
|
||||
# They need to give someone else admin permissions first or they must
|
||||
# leave the workspace.
|
||||
if (
|
||||
workspace_user.permissions == WORKSPACE_USER_PERMISSION_ADMIN
|
||||
|
@ -985,8 +985,8 @@ class CoreHandler(metaclass=baserow_trace_methods(tracer)):
|
|||
:param email: The email address of the person that is invited to the workspace.
|
||||
Can be an existing or not existing user.
|
||||
:type email: str
|
||||
:param permissions: The workspace permissions that the user will get once he has
|
||||
accepted the invitation.
|
||||
:param permissions: The workspace permissions that the user will get once they
|
||||
have accepted the invitation.
|
||||
:type permissions: str
|
||||
:param base_url: The base url of the frontend, where the user can accept his
|
||||
invitation. The signed invitation id is appended to the URL (base_url +
|
||||
|
|
|
@ -213,7 +213,7 @@ class ApplicationType(
|
|||
This abstract class represents a custom application that can be added to the
|
||||
application registry. It must be extended so customisation can be done. Each
|
||||
application will have his own model that must extend the Application model, this is
|
||||
needed so that the user can set custom settings per application instance he has
|
||||
needed so that the user can set custom settings per application instance they have
|
||||
created.
|
||||
|
||||
The added API urls will be available under the namespace 'api'. So if a url
|
||||
|
|
|
@ -409,7 +409,7 @@ class UserHandler(metaclass=baserow_trace_methods(tracer)):
|
|||
This action sends an email to the user to explain the process.
|
||||
|
||||
:param user: The user to flag as `to_be_deleted`.
|
||||
:raises UserIsLastAdmin: When the user cannot be deleted as he is the last
|
||||
:raises UserIsLastAdmin: When the user cannot be deleted as they are the last
|
||||
admin.
|
||||
"""
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@ class CoreConsumer(AsyncJsonWebsocketConsumer):
|
|||
"""
|
||||
Subscribes the connection to a page abstraction. Based on the provided the page
|
||||
type we can figure out to which page the connection wants to subscribe to. This
|
||||
is for example used when the users visits a page that he might want to
|
||||
is for example used when the users visits a page that they might want to
|
||||
receive real time updates for.
|
||||
|
||||
:param content: The provided payload by the user. This should contain the page
|
||||
|
@ -78,7 +78,7 @@ class CoreConsumer(AsyncJsonWebsocketConsumer):
|
|||
|
||||
async def discard_current_page(self, send_confirmation=True):
|
||||
"""
|
||||
If the user has subscribed to another page then he will be unsubscribed from
|
||||
If the user has subscribed to another page then they will be unsubscribed from
|
||||
the last page.
|
||||
"""
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ from baserow.ws.tasks import broadcast_to_channel_group
|
|||
class PageType(Instance):
|
||||
"""
|
||||
The page registry holds the pages where the users can subscribe/add himself to.
|
||||
When added he will receive real time updates related to that page.
|
||||
When added they will receive real time updates related to that page.
|
||||
|
||||
A user can subscribe by sending a message to the server containing the type as
|
||||
page name and the additional parameters. Example:
|
||||
|
|
|
@ -806,7 +806,7 @@ def test_admin_cannot_delete_last_provider(
|
|||
admin, token = enterprise_data_fixture.create_enterprise_admin_user_and_token()
|
||||
last_provider = enterprise_data_fixture.create_oauth_provider(type="github")
|
||||
|
||||
# but not he last one
|
||||
# but they are not the last one
|
||||
last_provider_url = reverse(
|
||||
"api:enterprise:admin:auth_provider:item",
|
||||
kwargs={"auth_provider_id": last_provider.id},
|
||||
|
@ -846,7 +846,7 @@ def test_admin_cannot_disable_last_provider(
|
|||
HTTP_AUTHORIZATION=f"JWT {token}",
|
||||
)
|
||||
|
||||
# but not he last one
|
||||
# but they are not the last one
|
||||
password_provider_url = reverse(
|
||||
"api:enterprise:admin:auth_provider:item",
|
||||
kwargs={"auth_provider_id": password_provider.id},
|
||||
|
|
|
@ -381,7 +381,7 @@ def test_oauth2_callback_login_success(
|
|||
):
|
||||
"""
|
||||
When a user already have an account associated with the specific provider,
|
||||
he can log in.
|
||||
they can log in.
|
||||
"""
|
||||
|
||||
user, token = data_fixture.create_user_and_token(
|
||||
|
|
|
@ -156,7 +156,7 @@ class AdminDashboardHandler:
|
|||
def get_active_user_count_per_day(self, delta, now=None):
|
||||
"""
|
||||
Returns the active user count for each day in the provided range. Someone is
|
||||
classified as an active user if he has signed in during the provided date
|
||||
classified as an active user if they have signed in during the provided date
|
||||
range. The range is calculated based by subtracting the delta from the row
|
||||
until now. (now - delta until now).
|
||||
|
||||
|
|
|
@ -2,8 +2,8 @@ import { Registerable } from '@baserow/modules/core/registry'
|
|||
|
||||
/**
|
||||
* An admin type is visible in the sidebar under the admin menu item. All
|
||||
* registered admin types are visible in the sidebar to admins and he clicks
|
||||
* on one he is redirected to the route related to the admin type.
|
||||
* registered admin types are visible in the sidebar to admins and they clicks
|
||||
* on one they are redirected to the route related to the admin type.
|
||||
*/
|
||||
export class AdminType extends Registerable {
|
||||
/**
|
||||
|
|
|
@ -131,7 +131,7 @@ export default {
|
|||
this.open &&
|
||||
// If the prop allows it to be closed by clicking outside.
|
||||
this.hideOnClickOutside &&
|
||||
// If the click was not on the opener because he can trigger the toggle
|
||||
// If the click was not on the opener because they can trigger the toggle
|
||||
// method.
|
||||
!isElement(this.opener, target) &&
|
||||
// If the click was not inside one of the context children of this context
|
||||
|
|
|
@ -199,7 +199,7 @@ export default {
|
|||
if (
|
||||
// Check if the context menu is still open
|
||||
this.open &&
|
||||
// If the click was not on the opener because he can trigger the toggle
|
||||
// If the click was not on the opener because they can trigger the toggle
|
||||
// method.
|
||||
!isElement(this.opener, target)
|
||||
) {
|
||||
|
|
|
@ -136,7 +136,7 @@ export default {
|
|||
const firstViewType = app.$registry.get('view', firstView.type)
|
||||
// If the view is deactivated, it's not possible to open the view because it will
|
||||
// put the user in an unrecoverable state. Therefore, it's better to not select a
|
||||
// view, so that the user can choose which he wants to select in the top left
|
||||
// view, so that the user can choose which they want to select in the top left
|
||||
// corner.
|
||||
if (!firstViewType.isDeactivated(data.database.workspace.id)) {
|
||||
viewId = firstView.id
|
||||
|
|
|
@ -200,7 +200,7 @@ export const actions = {
|
|||
},
|
||||
/**
|
||||
* When selecting the table we will have to fetch all the views and fields that
|
||||
* belong to the table we want to select. While the user is waiting he will see a
|
||||
* belong to the table we want to select. While the user is waiting they will see a
|
||||
* loading icon in the related database and after that the table is selected.
|
||||
*/
|
||||
async select({ commit, dispatch, getters }, { database, table }) {
|
||||
|
|
|
@ -63,7 +63,7 @@ export class ViewFilterType extends Registerable {
|
|||
/**
|
||||
* Should return a component that is responsible for the filter's value. For example
|
||||
* for the equal filter a text field will be added where the user can enter whatever
|
||||
* he wants to filter on.
|
||||
* they want to filter on.
|
||||
*/
|
||||
getInputComponent() {
|
||||
return null
|
||||
|
|
Loading…
Add table
Reference in a new issue