Skip to content

Rename users to account or person - #34178

Merged
skjnldsv merged 5 commits into
masterfrom
replace-user-to-account-or-person
Feb 13, 2024
Merged

Rename users to account or person#34178
skjnldsv merged 5 commits into
masterfrom
replace-user-to-account-or-person

Conversation

@PVince81

@PVince81PVince81 commented Sep 21, 2022

Copy link
Copy Markdown
Member

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

Resolves#32720

@PVince81PVince81 added the 3. to review Waiting for reviews label Sep 21, 2022
@PVince81PVince81 added this to the Nextcloud 25 milestone Sep 21, 2022
@PVince81PVince81 self-assigned this Sep 21, 2022
@PVince81
PVince81force-pushed the replace-user-to-account-or-person branch from 8d4de1e to 79d887bCompareSeptember 21, 2022 16:36
@PVince81

Copy link
Copy Markdown
MemberAuthor

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
Copy Markdown
MemberAuthor

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
PVince81force-pushed the replace-user-to-account-or-person branch from 79d887b to 3136a35CompareSeptember 21, 2022 19:17
@PVince81

Copy link
Copy Markdown
MemberAuthor

I've pushed even more renames here

@PVince81

Copy link
Copy Markdown
MemberAuthor

/compile amend /

@nextcloud-command
nextcloud-commandforce-pushed the replace-user-to-account-or-person branch from 3136a35 to 82ace7dCompareSeptember 21, 2022 19:24
@PVince81
PVince81force-pushed the replace-user-to-account-or-person branch 2 times, most recently from 42e100f to 83fc72aCompareSeptember 21, 2022 21:46
@PVince81PVince81 added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Sep 22, 2022
@PVince81

Copy link
Copy Markdown
MemberAuthor

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

@blizzzblizzz mentioned this pull request Sep 22, 2022
2 tasks
@blizzzblizzz modified the milestones: Nextcloud 25, Nextcloud 26Sep 22, 2022
@jancborchardt

Copy link
Copy Markdown
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
Copy Markdown
MemberAuthor

@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
PVince81force-pushed the replace-user-to-account-or-person branch from 83fc72a to 8b50e5eCompareOctober 19, 2022 15:39
@PVince81

Copy link
Copy Markdown
MemberAuthor

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

@PVince81PVince81 added 3. to review Waiting for reviews enhancement and removed 2. developing Work in progress labels Oct 19, 2022
This was referenced Nov 10, 2023
@blizzzblizzz mentioned this pull request Nov 20, 2023
5 tasks
@blizzzblizzz modified the milestones: Nextcloud 28, Nextcloud 29Nov 23, 2023
@AndyScherzinger
AndyScherzingerforce-pushed the replace-user-to-account-or-person branch from b7cf9e6 to 5a2ca05CompareJanuary 18, 2024 20:01
Comment threadapps/files/lib/Activity/Provider.php Outdated
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
Copy Markdown
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
Copy Markdown
Member

Choose a reason for hiding this comment

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

@jancborchardt for feedback

Comment threadapps/files_sharing/appinfo/info.xml Outdated
@AndyScherzinger

This comment was marked as resolved.

@skjnldsvskjnldsv self-assigned this Jan 24, 2024
@skjnldsv
skjnldsvforce-pushed the replace-user-to-account-or-person branch from 2858f49 to 693e2cfCompareJanuary 24, 2024 10:48
@skjnldsv
skjnldsvforce-pushed the replace-user-to-account-or-person branch 4 times, most recently from aa2c934 to 42d99d1CompareFebruary 13, 2024 16:44
@skjnldsv
skjnldsvforce-pushed the replace-user-to-account-or-person branch from 42d99d1 to a00b92fCompareFebruary 13, 2024 19:45
@skjnldsvskjnldsv 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
PVince81and others added 5 commits February 13, 2024 21:06
Replace translated text in most locations
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
@skjnldsv
skjnldsvforce-pushed the replace-user-to-account-or-person branch from a00b92f to 524ed97CompareFebruary 13, 2024 20:08
@blizzzblizzz mentioned this pull request Mar 5, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finishenhancement

Projects

None yet

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