Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UsersManager plugin language reworked #19469

Open
wants to merge 2 commits into
base: 4.x-dev
Choose a base branch
from

Conversation

comradekingu
Copy link
Contributor

Description:

Generally shorter and to the point.
In line with other edits.

Review

"ForAnonymousUsersReportDateToLoadByDefault": "For anonymous users, report date to load by default",
"GiveUserAccess": "Give '%1$s' %2$s access for %3$s.",
"GiveViewAccess": "Give view access for %1$s",
"ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth is expecting an MD5-hashed password (a string of 32 characters). Please call the md5() function on the password before calling this method.",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ummm?

"CreateNewToken": "Create new token",
"AnonymousAccessConfirmation": "You are about to grant the anonymous user the 'view' access to this website. This means your analytics reports and your visitors information will be publicly viewable by anyone even without a login. Are you sure you want to proceed?",
"AnonymousAccessConfirmation": "Grant the anonymous user the 'view' access to this website? This means your analytics reports and your visitor will be publicly viewable by anyone even without a login.",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't it still say something like visitor info or visitor details?

"ConfirmGrantSuperUserAccess": "Grant '%s' superuser access? Warning: The user will have access to all websites and will be able to perform administrative tasks.",
"ConfirmProhibitMySuperUserAccess": "%s, do you really want to remove your own superuser access? You will lose all permissions and access to all websites, and will be logged out of Matomo.",
"ConfirmProhibitOtherUsersSuperUserAccess": "Revoke superuser access from '%s'? The user will lose all permissions and access to all websites. Make sure you grant access to needed websites afterwards if necessary.",
"DeleteConfirm": "Delete the '%s' user?",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The placeholder will be filled with the users login. Not sure if the order needs to be changed in that case.

"ExceptionInvalidPasswordTooLong": "The password length must be less than %1$s characters.",
"ExceptionAnonymousAccessNotPossible": "You can only set %1$s or %2$s access for the 'anonymous' user.",
"ExceptionDeleteDoesNotExist": "The user '%s' doesn't exist, and therefore can't be deleted.",
"ExceptionDeleteOnlyUserWithSuperUserAccess": "Deleting the '%s' user is not possible.",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here

"ExceptionRemoveSuperUserAccessOnlySuperUser": "Revoking superuser access for the user '%s' is not possible.",
"ExceptionSuperUserAccess": "This user has superuser access and already has permission to access and modify all websites in Matomo. You may revoke superuser access for this user and try again.",
"ExceptionUserHasSuperUserAccess": "The user '%s' has superuser access and already has permission to access and modify all websites in Matomo. You may revoke superuser access for this user and try again.",
"ExceptionUserDoesNotExist": "There is no '%s' user.",
Copy link
Member

@sgiehl sgiehl Jul 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here the placeholder is filled with the login as well

"UsersManagementMainDescription": "Create new users or update the existing users. You can then set their permissions above.",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "When users are not logged in and visit Matomo, they should initially see",
"WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "When users are not logged in and visit Matomo, they should initially be met by",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one is displayed in this context:
image

Not sure if the new wording fits there.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be "The dashboard for all websites" and "A dashboard for a specific website", but that mostly remains the same with "see".

"ManageUsersAdminDesc": "Create new users or update the existing users. You can then set their permissions here too. Please note that you are logged in as an administrator. This means you only see and manage users that have access to the specific websites where you have \"admin\" permissions. Only a user with super user access can see and manage all users across all websites.",
"NoAccessWarning": "This user has not been granted access to a website. When they login, they will see an error message. To prevent this, add access to a website below.",
"ManageUsersAdminDesc": "Create new users or update existing ones and their permissions. As you are logged in as an administrator you only browse and manage users that have access to the specific websites where you have \"admin\" permissions. Only a user with superuser access can browse and manage all users across all websites.",
"NoAccessWarning": "This user has not been granted access to a website and will get an error message when logging in. Prevent this by granting access to a website below.",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this maybe better?

Suggested change
"NoAccessWarning": "This user has not been granted access to a website and will get an error message when logging in. Prevent this by granting access to a website below.",
"NoAccessWarning": "This user has not been granted access to any website and will get an error message when logging in. Prevent this by granting access to a website below.",

"PasswordChangeNotificationSubject": "Your Matomo account's password has just been changed",
"PasswordChangedEmail": "Your password has just been changed. The change was initiated from the following device: %1$s (IP address = %2$s).",
"PasswordChangeTerminatesOtherSessions": "When you change your password, any other active session of this account will be logged out.",
"PasswordChangedEmail": "Your password has just been changed. The change was initiated from the following device: %1$s (IP address — %2$s).",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The second placeholder is filled with the ip-adress. So wouldn't it be better to use a : instead of ?

@sgiehl sgiehl added the c: i18n For issues around internationalisation and localisation. label Jul 6, 2022
@sgiehl
Copy link
Member

sgiehl commented Jul 7, 2022

@comradekingu Any reason for including the UserId stuff here? Wasn't that included in another PR already?

@comradekingu
Copy link
Contributor Author

comradekingu commented Jul 7, 2022

@sgiehl Just tired. Will get that fixed.
Edit: Like so?

* WebsiteMeasurable plugin language reworked (matomo-org#19444)

* WebsiteMeasurable plugin language reworked

* comma

* update tests

* VisitTime plugin language reworked (matomo-org#19453)

* VisitTime plugin language reworked

* Spelling: technical

Co-authored-by: Stefan Giehl <stefan@matomo.org>

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* VisitorInterest plugin language reworked (matomo-org#19445)

* VisitorInterest plugin language reworked

* Spelling: their

Co-authored-by: Stefan Giehl <stefan@matomo.org>

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* update tests

Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
@sgiehl
Copy link
Member

sgiehl commented Jul 21, 2022

@comradekingu There had been a couple of changes the the usersmanager language. Not sure if you are able to rebase this PR. Otherwise might maybe be simpler to recreate the PR with your changes.

@github-actions
Copy link
Contributor

github-actions bot commented Aug 5, 2022

If you don't want this PR to be closed automatically in 28 days then you need to assign the label 'Do not close'.

@github-actions github-actions bot added the Stale The label used by the Close Stale Issues action label Aug 5, 2022
@github-actions
Copy link
Contributor

This PR was last updated more than one month ago, maybe it's time to close it. Please check if there is anything we still can do or close this PR. ping @matomo-org/core-reviewers

@github-actions github-actions bot added the Stale for long The label used by the Close Stale Issues action label Sep 17, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
c: i18n For issues around internationalisation and localisation. Stale for long The label used by the Close Stale Issues action Stale The label used by the Close Stale Issues action
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants