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

Fix translation of user exists error server-side #33819

Merged
merged 1 commit into from
Sep 16, 2022
Merged

Conversation

Pytal
Copy link
Member

@Pytal Pytal commented Sep 1, 2022

Revert special 102 status code handling on the frontend from #33222 and translate the string server-side instead as the 102 status code does not always mean that the user already exists i.e.

throw new OCSException('Subadmin group does not exist', 102);

102 in addUser()

throw new OCSException('Invalid quota value ' . $value, 102);

102 thrown in editUser() called by addUser()

@Pytal Pytal added this to the Nextcloud 25 milestone Sep 1, 2022
@Pytal Pytal requested review from nickvergessen, come-nc and a team September 1, 2022 19:15
@Pytal Pytal self-assigned this Sep 1, 2022
@Pytal Pytal requested review from PVince81 and juliusknorr and removed request for a team September 1, 2022 19:15
@Pytal
Copy link
Member Author

Pytal commented Sep 1, 2022

/backport to stable24

@blizzz blizzz mentioned this pull request Sep 1, 2022
This was referenced Sep 6, 2022
@Pytal Pytal added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Sep 9, 2022
@skjnldsv skjnldsv mentioned this pull request Sep 15, 2022
@Pytal
Copy link
Member Author

Pytal commented Sep 15, 2022

Rebased

@PVince81 PVince81 merged commit c14ad84 into master Sep 16, 2022
@PVince81 PVince81 deleted the fix/user-exists-l10n branch September 16, 2022 12:58
Pytal added a commit that referenced this pull request Sep 16, 2022
Pytal added a commit that referenced this pull request Sep 19, 2022
Signed-off-by: Christopher Ng <[email protected]>
(cherry picked from commit 4de19e9)
s8321414 pushed a commit to MODAODF/odfweb that referenced this pull request May 4, 2023
Signed-off-by: Christopher Ng <[email protected]>
(cherry picked from commit 4de19e9f851e2d1948d2af4dfcd70a5b22ae53cb)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants