mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13762 from nextcloud/backport/13730/stable15 

[stable15] Respect user locale in natural sort comparator
This commit is contained in:
Morris Jobke 2019-01-23 13:31:37 +01:00 committed by GitHub
parent 703bb18fc9 90e9877dd0
commit 51cd99d089
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/js/js.js
View File

@ -2078,12 +2078,9 @@ OC.Util = {
if (aNum == aa[x] && bNum == bb[x]) {
return aNum - bNum;
} else {
// Forcing 'en' locale to match the server-side locale which is
// always 'en'.
//
// Note: This setting isn't supported by all browsers but for the ones
// Note: This locale setting isn't supported by all browsers but for the ones
// that do there will be more consistency between client-server sorting
return aa[x].localeCompare(bb[x], 'en');
return aa[x].localeCompare(bb[x], OC.getLanguage());
}
}
}