diff options
| author | Shpuld Shpludson <shp@cock.li> | 2021-01-29 08:38:15 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2021-01-29 08:38:15 +0000 |
| commit | de66267a07eb018cc0309ff6f9dd896d53ba3ff4 (patch) | |
| tree | fdf46bb349e8b14a008e24bfe9e4b3ffa7ececac /src/components/timeago/timeago.vue | |
| parent | 6e4a0d408c50746ed179623f92d04723def68c7d (diff) | |
| parent | 60a8a89f5b7526af44c9682e151dd92c979b1412 (diff) | |
Merge branch 'fix/use-current-app-locale' into 'develop'
Use app locale with toLocaleString/toLocaleDateString
See merge request pleroma/pleroma-fe!1301
Diffstat (limited to 'src/components/timeago/timeago.vue')
| -rw-r--r-- | src/components/timeago/timeago.vue | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/components/timeago/timeago.vue b/src/components/timeago/timeago.vue index 6df0524d..55a2dd94 100644 --- a/src/components/timeago/timeago.vue +++ b/src/components/timeago/timeago.vue @@ -9,6 +9,7 @@ <script> import * as DateUtils from 'src/services/date_utils/date_utils.js' +import localeService from 'src/services/locale/locale.service.js' export default { name: 'Timeago', @@ -21,9 +22,10 @@ export default { }, computed: { localeDateString () { + const browserLocale = localeService.internalToBrowserLocale(this.$i18n.locale) return typeof this.time === 'string' - ? new Date(Date.parse(this.time)).toLocaleString() - : this.time.toLocaleString() + ? new Date(Date.parse(this.time)).toLocaleString(browserLocale) + : this.time.toLocaleString(browserLocale) } }, created () { |