Browse Source
Merge pull request #13730 from nextcloud/fix/naturalsort-locale
Respect user locale in natural sort comparator
pull/13652/head
Morris Jobke
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
5 deletions
-
core/js/js.js
|
|
|
@ -2082,12 +2082,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()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
