diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2019-01-23 12:19:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-23 12:19:01 +0100 |
| commit | d59de22525a44ad413e1a57c3e4f6d91434d53a9 (patch) | |
| tree | 91f5370ee8967f3eabf79e0b437ceda514cebb01 | |
| parent | f2b118a2561952663a9040e2909ff9d20ea60ffc (diff) | |
| parent | f0265cccf219068499ddd210ea573b29e47954ea (diff) | |
| download | nextcloud-server-d59de22525a44ad413e1a57c3e4f6d91434d53a9.tar.gz nextcloud-server-d59de22525a44ad413e1a57c3e4f6d91434d53a9.zip | |
Merge pull request #13730 from nextcloud/fix/naturalsort-locale
Respect user locale in natural sort comparator
| -rw-r--r-- | core/js/js.js | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/core/js/js.js b/core/js/js.js index e306e2a7369..fd6dcfcff6a 100644 --- a/core/js/js.js +++ b/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()); } } } |