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.

Sign up for GitHub

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

Jump to bottom

Rename users to account or person #34178

Merged
merged 5 commits into from
Feb 13, 2024
Merged

Rename users to account or person #34178

merged 5 commits into from
Feb 13, 2024

Conversation

PVince81
Copy link
Member

@PVince81 PVince81 commented Sep 21, 2022 •
edited by skjnldsv
Loading

Replace translated texts from "user" to either "account" or "people" depending on context

Resolves #32720

@PVince81 PVince81 added the 3. to review Waiting for reviews label Sep 21, 2022
@PVince81 PVince81 added this to the Nextcloud 25 milestone Sep 21, 2022
@PVince81 PVince81 self-assigned this Sep 21, 2022
@PVince81 PVince81 force-pushed the replace-user-to-account-or-person branch from 8d4de1e to 79d887b Compare September 21, 2022 16:36
@PVince81
Copy link
Member Author

I've fixed the unit tests locally, I'll push after I see the acceptance test results... some rely on texts/labels sometimes

@PVince81
Copy link
Member Author

this is getting complicated because the users page is using some core strings so I'd need to replace some of them

and in #34179 replace the rest.

so, let's do this: I'll merge #34179 into this PR and fix the tests at once

@PVince81 PVince81 mentioned this pull request Sep 21, 2022
Closed
1 task
@PVince81 PVince81 force-pushed the replace-user-to-account-or-person branch from 79d887b to 3136a35 Compare September 21, 2022 19:17
@PVince81
Copy link
Member Author

I've pushed even more renames here

@PVince81
Copy link
Member Author

/compile amend /

@nextcloud-command nextcloud-command force-pushed the replace-user-to-account-or-person branch from 3136a35 to 82ace7d Compare September 21, 2022 19:24
@PVince81 PVince81 force-pushed the replace-user-to-account-or-person branch 2 times, most recently from 42e100f to 83fc72a Compare September 21, 2022 21:46
@PVince81 PVince81 added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Sep 22, 2022
@PVince81
Copy link
Member Author

as it's a bit late considering the string freeze and also the fact that other apps need adjusting as well, let's not merge this for 25.0.0 but 25.0.1 could do

this would give us time also to properly review all the strings that were replaced and see how they look like in context

@blizzz blizzz mentioned this pull request Sep 22, 2022
Merged
2 tasks
@blizzz blizzz modified the milestones: Nextcloud 25, Nextcloud 26 Sep 22, 2022
@jancborchardt
Copy link
Member

how to convert:

  • "user status"
  • "User documentation"

Where is "user status" used in these cases? Cause just "Status" might be enough? "the status feature", "set your status", "people can set their status" etc.

For "user documentation" → "Usage documentation". German equivalent would be "Benutzerhandbuch" → "Benutzungshandbuch".

@PVince81
Copy link
Member Author

@jancborchardt I rechecked and it seems the only place where "User status" is visible is for admins as it's the name of the app that can be disabled. And it appears in few debug messages, but that's all. Should we leave it as is ?

@PVince81 PVince81 force-pushed the replace-user-to-account-or-person branch from 83fc72a to 8b50e5e Compare October 19, 2022 15:39
@PVince81
Copy link
Member Author

Rebased and renamed "User documentation" to "Usage documentation"

@PVince81 PVince81 added 3. to review Waiting for reviews enhancement and removed 2. developing Work in progress labels Oct 19, 2022
@blizzz blizzz modified the milestones: Nextcloud 28, Nextcloud 29 Nov 23, 2023
@AndyScherzinger AndyScherzinger force-pushed the replace-user-to-account-or-person branch from b7cf9e6 to 5a2ca05 Compare January 18, 2024 20:01
ArtificialOwl
ArtificialOwl reviewed Jan 18, 2024
View reviewed changes
apps/files/lib/Activity/Provider.php Outdated
@@ -163,7 +163,7 @@ public function parseShortVersion(IEvent $event, IEvent $previousEvent = null) {

if (!isset($parsedParameters['user'])) {
// External user via public link share
$subject = str_replace('{user}', $this->activityLang->t('"remote user"'), $subject);
$subject = str_replace('{user}', $this->activityLang->t('"remote person"'), $subject);
Copy link
Member

Choose a reason for hiding this comment

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

why not 'remote account' ?

Copy link
Member

Choose a reason for hiding this comment

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

@jancborchardt for feedback

apps/files_sharing/appinfo/info.xml Outdated Show resolved Hide resolved
@AndyScherzinger

This comment was marked as resolved.

Sign in to view
@skjnldsv skjnldsv self-assigned this Jan 24, 2024
@skjnldsv skjnldsv force-pushed the replace-user-to-account-or-person branch from 2858f49 to 693e2cf Compare January 24, 2024 10:48
@skjnldsv skjnldsv force-pushed the replace-user-to-account-or-person branch 4 times, most recently from aa2c934 to 42d99d1 Compare February 13, 2024 16:44
@skjnldsv skjnldsv force-pushed the replace-user-to-account-or-person branch from 42d99d1 to a00b92f Compare February 13, 2024 19:45
@skjnldsv skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Feb 13, 2024
@skjnldsv skjnldsv enabled auto-merge February 13, 2024 19:45
PVince81 and others added 5 commits February 13, 2024 21:06
@PVince81 @skjnldsv
feat: rename users to account or person
839ddaa 
Replace translated text in most locations

Signed-off-by: Vincent Petry <[email protected]>
@skjnldsv
fix: openapi
9593f4d 
Signed-off-by: John Molakvoæ <[email protected]>
@skjnldsv
fix: phpunit
4a509df 
Signed-off-by: John Molakvoæ <[email protected]>
@skjnldsv
fix: cypress
b1a47f7 
Signed-off-by: John Molakvoæ <[email protected]>
@skjnldsv
fix: replace Account name by Login
524ed97 
Signed-off-by: John Molakvoæ <[email protected]>
@skjnldsv skjnldsv force-pushed the replace-user-to-account-or-person branch from a00b92f to 524ed97 Compare February 13, 2024 20:08
@skjnldsv skjnldsv disabled auto-merge February 13, 2024 20:27
@skjnldsv skjnldsv merged commit 6f1d9eb into master Feb 13, 2024
155 checks passed
@skjnldsv skjnldsv deleted the replace-user-to-account-or-person branch February 13, 2024 20:28
@blizzz blizzz mentioned this pull request Mar 5, 2024
Merged
@joshtrichards joshtrichards mentioned this pull request May 10, 2024
Merged
4 tasks
@Pytal Pytal mentioned this pull request May 17, 2024
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@come-nc come-nc come-nc left review comments

@jancborchardt jancborchardt jancborchardt approved these changes

@skjnldsv skjnldsv skjnldsv approved these changes

@ChristophWurst ChristophWurst ChristophWurst approved these changes

@AndyScherzinger AndyScherzinger AndyScherzinger approved these changes

@ArtificialOwl ArtificialOwl ArtificialOwl approved these changes

@CarlSchwan CarlSchwan Awaiting requested review from CarlSchwan

@nickvergessen nickvergessen Awaiting requested review from nickvergessen nickvergessen is a code owner

@artonge artonge Awaiting requested review from artonge artonge is a code owner

@Pytal Pytal Awaiting requested review from Pytal Pytal is a code owner

@julien-nc julien-nc Awaiting requested review from julien-nc julien-nc is a code owner

@marcelklehr marcelklehr Awaiting requested review from marcelklehr marcelklehr is a code owner

@icewind1991 icewind1991 Awaiting requested review from icewind1991 icewind1991 is a code owner

@datenangebot datenangebot Awaiting requested review from datenangebot

@miaulalala miaulalala Awaiting requested review from miaulalala

@GretaD GretaD Awaiting requested review from GretaD

@hamza221 hamza221 Awaiting requested review from hamza221

@st3iny st3iny Awaiting requested review from st3iny

Assignees

@skjnldsv skjnldsv

@sorbaugh sorbaugh

Labels
4. to release Ready to be released and/or waiting for tests to finish enhancement
Projects
None yet
Milestone
Nextcloud 29
Development

Successfully merging this pull request may close these issues.

Gender-neutral language
10 participants
@PVince81 @jancborchardt @nickvergessen @AndyScherzinger @skjnldsv @ArtificialOwl @ChristophWurst @come-nc @blizzz @sorbaugh