diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2019-01-23 15:33:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-23 15:33:45 +0300 |
| commit | 238655538e1ca7831e5f988afbf2cba9121c0241 (patch) | |
| tree | 005dfb55dd0a0f0c30e9280c58707001e7d20972 | |
| parent | 5c6a1f70cb9d04a58fc5ac42a04c35fb093cb2b5 (diff) | |
| parent | aafc32ecca5b883bfe760f36d5f52047b25e967a (diff) | |
Merge pull request #13763 from nextcloud/backport/13730/stable14
[stable14] 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 8d79311002e..e69c05b14a1 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -2133,12 +2133,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()); } } } |