Merge pull request #33819 from nextcloud/fix/user-exists-l10n

Fix translation of user exists error server-side
nextcloud · Sep 16, 2022 · c14ad84 · c14ad84
2 parents 25888a3 + 8a15c62
commit c14ad84
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php
@@ -350,7 +350,7 @@ public function addUser(
 
 		if ($this->userManager->userExists($userid)) {
 			$this->logger->error('Failed addUser attempt: User already exists.', ['app' => 'ocs_api']);
-			throw new OCSException('User already exists', 102);
+			throw new OCSException($this->l10nFactory->get('provisioning_api')->t('User already exists'), 102);
 		}
 
 		if ($groups !== []) {

diff --git a/apps/settings/src/store/users.js b/apps/settings/src/store/users.js
@@ -30,7 +30,6 @@ import api from './api'
 import axios from '@nextcloud/axios'
 import { generateOcsUrl } from '@nextcloud/router'
 import logger from '../logger'
-import { showError } from '@nextcloud/dialogs'
 
 const orderGroups = function(groups, orderBy) {
 	/* const SORT_USERCOUNT = 1;
@@ -553,13 +552,6 @@ const actions = {
 				.then((response) => dispatch('addUserData', userid || response.data.ocs.data.id))
 				.catch((error) => { throw error })
 		}).catch((error) => {
-			const statusCode = error?.response?.data?.ocs?.meta?.statuscode
-
-			if (statusCode === 102) {
-				showError(t('settings', 'User already exists.'))
-				throw error
-			}
-
 			commit('API_FAILURE', { userid, error })
 			throw error
 		})