From c020561a72952e3720ebdb2ad220c4bb274c3e1c Mon Sep 17 00:00:00 2001
From: Christopher Ng <chrng8@gmail.com>
Date: Thu, 8 Feb 2024 15:45:58 -0800
Subject: [PATCH] fix(settings): Fix incorrect user quota on page reload in
 non-English locales

Signed-off-by: Christopher Ng <chrng8@gmail.com>
---
 apps/settings/src/components/UserList.vue         | 5 ++---
 apps/settings/src/components/UserList/UserRow.vue | 7 +++----
 apps/settings/src/store/users.js                  | 3 +--
 core/js/tests/specs/coreSpec.js                   | 2 +-
 core/src/OC/util.js                               | 6 +++++-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/apps/settings/src/components/UserList.vue b/apps/settings/src/components/UserList.vue
index f9553445e13..9a97aff085f 100644
--- a/apps/settings/src/components/UserList.vue
+++ b/apps/settings/src/components/UserList.vue
@@ -262,7 +262,6 @@ import Vue from 'vue'
 import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect.js'
-import { formatFileSize, parseFileSize } from '@nextcloud/files'
 
 import userRow from './UserList/UserRow.vue'
 
@@ -487,10 +486,10 @@ export default {
 		 */
 		validateQuota(quota) {
 			// only used for new presets sent through @Tag
-			const validQuota = parseFileSize(quota, true)
+			const validQuota = OC.Util.computerFileSize(quota)
 			if (validQuota !== null && validQuota >= 0) {
 				// unify format output
-				quota = formatFileSize(parseFileSize(quota, true))
+				quota = OC.Util.humanFileSize(OC.Util.computerFileSize(quota))
 				this.newUser.quota = { id: quota, label: quota }
 				return this.newUser.quota
 			}
diff --git a/apps/settings/src/components/UserList/UserRow.vue b/apps/settings/src/components/UserList/UserRow.vue
index 2e507107b73..aff5d7dd37e 100644
--- a/apps/settings/src/components/UserList/UserRow.vue
+++ b/apps/settings/src/components/UserList/UserRow.vue
@@ -268,7 +268,6 @@
 
 <script>
 import ClickOutside from 'vue-click-outside'
-import { formatFileSize, parseFileSize } from '@nextcloud/files'
 
 import {
 	NcPopoverMenu,
@@ -689,7 +688,7 @@ export default {
 				await this.$store.dispatch('setUserData', {
 					userid: this.user.id,
 					key: 'quota',
-					value: '' + parseFileSize(quota, true),
+					value: String(OC.Util.computerFileSize(quota)),
 				})
 			} catch (error) {
 				console.error(error)
@@ -707,10 +706,10 @@ export default {
 		 */
 		validateQuota(quota) {
 			// only used for new presets sent through @Tag
-			const validQuota = parseFileSize(quota, true)
+			const validQuota = OC.Util.computerFileSize(quota)
 			if (validQuota !== null && validQuota >= 0) {
 				// unify format output
-				return this.setUserQuota(formatFileSize(parseFileSize(quota, true)))
+				return this.setUserQuota(OC.Util.humanFileSize(OC.Util.computerFileSize(quota)))
 			}
 			// if no valid do not change
 			return false
diff --git a/apps/settings/src/store/users.js b/apps/settings/src/store/users.js
index 08177499d10..96e66044a0c 100644
--- a/apps/settings/src/store/users.js
+++ b/apps/settings/src/store/users.js
@@ -31,7 +31,6 @@ import api from './api.js'
 import axios from '@nextcloud/axios'
 import { generateOcsUrl } from '@nextcloud/router'
 import logger from '../logger.js'
-import { parseFileSize } from '@nextcloud/files'
 
 const orderGroups = function(groups, orderBy) {
 	/* const SORT_USERCOUNT = 1;
@@ -212,7 +211,7 @@ const mutations = {
 	},
 	setUserData(state, { userid, key, value }) {
 		if (key === 'quota') {
-			const humanValue = parseFileSize(value, true)
+			const humanValue = OC.Util.computerFileSize(value)
 			state.users.find(user => user.id === userid)[key][key] = humanValue !== null ? humanValue : value
 		} else {
 			state.users.find(user => user.id === userid)[key] = value
diff --git a/core/js/tests/specs/coreSpec.js b/core/js/tests/specs/coreSpec.js
index bc8789f0eec..5e64642afa6 100644
--- a/core/js/tests/specs/coreSpec.js
+++ b/core/js/tests/specs/coreSpec.js
@@ -337,7 +337,7 @@ describe('Core base tests', function() {
 					['-1234 B', null],
 					['B', null],
 					['40/0', null],
-					['40,30 kb', null],
+					['40,30 kb', 41267],
 					[' 122.1 MB ', 128031130],
 					['122.1 MB ', 128031130],
 					[' 122.1 MB ', 128031130],
diff --git a/core/src/OC/util.js b/core/src/OC/util.js
index 9c3e5ffe9b5..28eb2c05528 100644
--- a/core/src/OC/util.js
+++ b/core/src/OC/util.js
@@ -26,6 +26,7 @@ import moment from 'moment'
 import History from './util-history.js'
 import OC from './index.js'
 import { formatFileSize as humanFileSize } from '@nextcloud/files'
+import { getCanonicalLocale } from '@nextcloud/l10n'
 
 /**
  * @param {any} t -
@@ -85,7 +86,10 @@ export default {
 			return null
 		}
 
-		const s = string.toLowerCase().trim()
+		const s = string
+			.toLocaleLowerCase(getCanonicalLocale())
+			.replaceAll(',', '.')
+			.trim()
 		let bytes = null
 
 		const bytesArray = {