diff options
| author | lambda <pleromagit@rogerbraun.net> | 2017-11-09 08:06:35 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2017-11-09 08:06:35 +0000 |
| commit | 991360108033229ae16272a09cc7061b579e1523 (patch) | |
| tree | 41b01003e3a43814c8cf38ddd5e1cbbd09cc47e8 /src | |
| parent | 3059a699ac12e18895cbe56608d1eed87cdb0d56 (diff) | |
| parent | 26416ed15cefa8c448d56233f572e474baa0c8c2 (diff) | |
Merge branch 'feature/timeago-locales' into 'develop'
Revert to English timeago for latin script languages.
See merge request pleroma/pleroma-fe!144
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.js | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/main.js b/src/main.js index a387b444..9e0b9e7c 100644 --- a/src/main.js +++ b/src/main.js @@ -30,15 +30,9 @@ const currentLocale = (window.navigator.language || 'en').split('-')[0] Vue.use(Vuex) Vue.use(VueRouter) Vue.use(VueTimeago, { - locale: currentLocale, + locale: currentLocale === 'ja' ? 'ja' : 'en', locales: { 'en': require('../static/timeago-en.json'), - 'fi': require('../static/timeago-fi.json'), - 'de': require('../static/timeago-de.json'), - 'et': require('../static/timeago-et.json'), - 'hu': require('../static/timeago-hu.json'), - 'it': require('../static/timeago-it.json'), - 'fr': require('../static/timeago-fr.json'), 'ja': require('../static/timeago-ja.json') } }) |