From cb6a5fa41d6a30f5ac3343abb04b6ecb919b4872 Mon Sep 17 00:00:00 2001 From: sunportainer <93502624+sunportainer@users.noreply.github.com> Date: Mon, 13 Jun 2022 14:53:51 +0800 Subject: [PATCH] fix(typo):UI and logs EE-3282 (#7063) * fix logs and UI typos --- api/internal/registryutils/ecr_reg_token.go | 2 +- .../create/createApplication.html | 4 ++-- .../access-datatable/accessDatatable.html | 2 +- .../kubernetes-app-git-form.controller.js | 2 +- ...rnetes-redeploy-app-git-form.controller.js | 2 +- .../ldap-settings-custom.html | 2 +- .../ldap-settings-openldap.html | 23 ++++++++++--------- app/portainer/views/settings/settings.html | 2 +- app/portainer/views/stacks/edit/stack.html | 4 ++-- 9 files changed, 22 insertions(+), 21 deletions(-) diff --git a/api/internal/registryutils/ecr_reg_token.go b/api/internal/registryutils/ecr_reg_token.go index 0bfd8a616..c597c3d73 100644 --- a/api/internal/registryutils/ecr_reg_token.go +++ b/api/internal/registryutils/ecr_reg_token.go @@ -37,7 +37,7 @@ func parseRegToken(registry *portainer.Registry) (username, password string, err func EnsureRegTokenValid(dataStore dataservices.DataStore, registry *portainer.Registry) (err error) { if registry.Type == portainer.EcrRegistry { if isRegTokenValid(registry) { - log.Println("[DEBUG] [registry, GetEcrAccessToken] [message: curretn ECR token is still valid]") + log.Println("[DEBUG] [registry, GetEcrAccessToken] [message: current ECR token is still valid]") } else { err = doGetRegToken(dataStore, registry) if err != nil { diff --git a/app/kubernetes/views/applications/create/createApplication.html b/app/kubernetes/views/applications/create/createApplication.html index 93061df24..4f4c9d324 100644 --- a/app/kubernetes/views/applications/create/createApplication.html +++ b/app/kubernetes/views/applications/create/createApplication.html @@ -300,8 +300,8 @@
- Portainer will automatically expose all the keys of a configuration as environment variables. This behavior can be overriden to filesystem mounts for each key - via the override button. + Portainer will automatically expose all the keys of a configuration as environment variables. This behavior can be overridden to filesystem mounts for each + key via the override button.
diff --git a/app/portainer/components/access-datatable/accessDatatable.html b/app/portainer/components/access-datatable/accessDatatable.html index 419845b60..50ae49717 100644 --- a/app/portainer/components/access-datatable/accessDatatable.html +++ b/app/portainer/components/access-datatable/accessDatatable.html @@ -3,7 +3,7 @@
- Access tagged as inherited are inherited from the group access. They cannot be removed or modified at the environment level but they can be overriden. + Access tagged as inherited are inherited from the group access. They cannot be removed or modified at the environment level but they can be overridden.
Access tagged as override are overriding the group access for the related users/teams.
diff --git a/app/portainer/components/forms/kubernetes-app-git-form/kubernetes-app-git-form.controller.js b/app/portainer/components/forms/kubernetes-app-git-form/kubernetes-app-git-form.controller.js index b31f914bc..adc81e5b9 100644 --- a/app/portainer/components/forms/kubernetes-app-git-form/kubernetes-app-git-form.controller.js +++ b/app/portainer/components/forms/kubernetes-app-git-form/kubernetes-app-git-form.controller.js @@ -41,7 +41,7 @@ class KubernetesAppGitFormController { try { const confirmed = await this.ModalService.confirmAsync({ title: 'Are you sure?', - message: 'Any changes to this application will be overriden by the definition in git and may cause a service interruption. Do you wish to continue?', + message: 'Any changes to this application will be overridden by the definition in git and may cause a service interruption. Do you wish to continue?', buttons: { confirm: { label: 'Update', diff --git a/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.controller.js b/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.controller.js index d6caf7cc7..34f2f1fce 100644 --- a/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.controller.js +++ b/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.controller.js @@ -82,7 +82,7 @@ class KubernetesRedeployAppGitFormController { try { const confirmed = await this.ModalService.confirmAsync({ title: 'Are you sure?', - message: 'Any changes to this application will be overriden by the definition in git and may cause a service interruption. Do you wish to continue?', + message: 'Any changes to this application will be overridden by the definition in git and may cause a service interruption. Do you wish to continue?', buttons: { confirm: { label: 'Update', diff --git a/app/portainer/settings/authentication/ldap/ldap-settings-custom/ldap-settings-custom.html b/app/portainer/settings/authentication/ldap/ldap-settings-custom/ldap-settings-custom.html index a4cc08472..1b7cbdc2b 100644 --- a/app/portainer/settings/authentication/ldap/ldap-settings-custom/ldap-settings-custom.html +++ b/app/portainer/settings/authentication/ldap/ldap-settings-custom/ldap-settings-custom.html @@ -61,7 +61,7 @@
- +
diff --git a/app/portainer/settings/authentication/ldap/ldap-settings-openldap/ldap-settings-openldap.html b/app/portainer/settings/authentication/ldap/ldap-settings-openldap/ldap-settings-openldap.html index 9f144ba7d..0490f811f 100644 --- a/app/portainer/settings/authentication/ldap/ldap-settings-openldap/ldap-settings-openldap.html +++ b/app/portainer/settings/authentication/ldap/ldap-settings-openldap/ldap-settings-openldap.html @@ -1,5 +1,5 @@ - +
Information
@@ -61,12 +61,13 @@
- -
-