Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <tsteur@users.noreply.github.com>2018-11-25 01:41:19 +0300
committerStefan Giehl <stefan@piwik.org>2018-11-25 01:41:19 +0300
commit4c92e54d35efb15feddab414cc8c21eeb188d653 (patch)
treeb6142b5fd44d7cff0f341155383dce66fc6dee9a /plugins/UsersManager
parentd4ee921d32d3be08e5613186706a613ff965d7bc (diff)
When token_auth is re-generated, remove wording that user will be logged out (#13606)
Diffstat (limited to 'plugins/UsersManager')
-rw-r--r--plugins/UsersManager/lang/en.json4
-rw-r--r--plugins/UsersManager/templates/userSettings.twig1
2 files changed, 1 insertions, 4 deletions
diff --git a/plugins/UsersManager/lang/en.json b/plugins/UsersManager/lang/en.json
index 62944443e4..438ec55fd8 100644
--- a/plugins/UsersManager/lang/en.json
+++ b/plugins/UsersManager/lang/en.json
@@ -80,9 +80,7 @@
"TheLoginScreen": "The login screen",
"ThereAreCurrentlyNRegisteredUsers": "There are currently %s registered users.",
"TokenAuth": "API Authentication Token",
- "TokenRegenerateConfirm": "Changing the API authentication token will invalidate the user's current token. If the user is currently logged in, they may be required to log in again. Do you really want to continue?",
- "TokenRegenerateConfirmSelf": "Changing the API authentication token will invalidate your own token. You may be required to log in again if you proceed. Do you really want to change your authentication token?",
- "TokenRegenerateLogoutWarning": "When you re-generate your token you will be logged out and need to log in again.",
+ "TokenRegenerateConfirmSelf": "Changing the API authentication token will invalidate your own token. If the current token is in use, you need to update all API clients with the newly generated token. Do you really want to change your authentication token?",
"TokenRegenerateTitle": "Regenerate",
"TypeYourPasswordAgain": "Type your new password again.",
"User": "User",
diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig
index 203039f8ad..0b6ef9fb78 100644
--- a/plugins/UsersManager/templates/userSettings.twig
+++ b/plugins/UsersManager/templates/userSettings.twig
@@ -104,7 +104,6 @@
content-title="{{ 'UsersManager_TokenAuth'|translate|e('html_attr') }}">
<pre piwik-select-on-focus id="token_auth_user" piwik-show-sensitive-data="{{ userTokenAuth }}"></pre>
- <p>{{ 'UsersManager_TokenRegenerateLogoutWarning'|translate }}</p>
<button class="btn btn-link"
ng-controller="PersonalSettingsController as personalSettings"
ng-click="personalSettings.regenerateTokenAuth()">{{ 'UsersManager_TokenRegenerateTitle'|translate }}</button>