server icon indicating copy to clipboard operation
server copied to clipboard

Rename users to account or person

Open PVince81 opened this issue 3 years ago • 16 comments

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

how to convert:

  • [ ] "user status"
  • [ ] "User documentation"

@jancborchardt ideas ?

PVince81 avatar Sep 21 '22 15:09 PVince81

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

PVince81 avatar Sep 21 '22 17:09 PVince81

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

and in https://github.com/nextcloud/server/pull/34179 replace the rest.

so, let's do this: I'll merge https://github.com/nextcloud/server/pull/34179 into this PR and fix the tests at once

PVince81 avatar Sep 21 '22 18:09 PVince81

I've pushed even more renames here

PVince81 avatar Sep 21 '22 19:09 PVince81

/compile amend /

PVince81 avatar Sep 21 '22 19:09 PVince81

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

PVince81 avatar Sep 22 '22 07:09 PVince81

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".

jancborchardt avatar Oct 11 '22 08:10 jancborchardt

@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 avatar Oct 19 '22 15:10 PVince81

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

PVince81 avatar Oct 19 '22 15:10 PVince81

rebased and recompiled

@jancborchardt would be good if you could review. you should also be able to test this locally

PVince81 avatar Oct 21 '22 13:10 PVince81

@Pytal maybe a review from a native speaker? :)

jancborchardt avatar Jan 26 '23 17:01 jancborchardt

There is no way this will merge :P Either should have happened right away, or now be split in smaller chunks

nickvergessen avatar Jan 27 '23 09:01 nickvergessen

someone should take over if this is still of interest

PVince81 avatar Mar 18 '23 21:03 PVince81

/compile amend /

AndyScherzinger avatar Apr 25 '23 12:04 AndyScherzinger

1) OC\Core\Controller\OCSControllerTest::testGetIdentityProofWithNotExistingUser
440 | Failed asserting that two objects are equal.
441 | --- Expected
442 | +++ Actual
443 | @@ @@
444 | OCP\AppFramework\Http\DataResponse Object (
445 | 'data' => Array (
446 | -        0 => 'User not found'
447 | +        0 => 'Account not found'
448 | )
449 | 'headers' => Array (...)
450 | 'cookies' => Array ()
451 |  
452 | /drone/src/tests/Core/Controller/OCSControllerTest.php:200

skjnldsv avatar Apr 25 '23 14:04 skjnldsv

Just came to my mind @skjnldsv is this PR even merge-able in anyway since all those changes would need to be backported so a single commit will always fail hard and is impossible to manually resolve/redo, no?

AndyScherzinger avatar Apr 26 '23 20:04 AndyScherzinger

a single commit will always fail hard and is impossible to manually resolve/redo, no?

Hard to tell, sometimes it's alright, sometimes not. A manual cherry pick would allow you to use any mergetool and resolve conflicts one by one (while the rest of the changes works)

skjnldsv avatar Apr 27 '23 05:04 skjnldsv

/compile /

AndyScherzinger avatar Jan 18 '24 20:01 AndyScherzinger