Browse Source

Merge pull request #13730 from nextcloud/fix/naturalsort-locale

Respect user locale in natural sort comparator
tags/v16.0.0alpha1
Morris Jobke 5 years ago
parent
commit
d59de22525
No account linked to committer's email address
1 changed files with 2 additions and 5 deletions
  1. 2
    5
      core/js/js.js

+ 2
- 5
core/js/js.js View File

@@ -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());
}
}
}

Loading…
Cancel
Save