diff options
| author | Roger Braun <roger@rogerbraun.net> | 2018-10-26 16:13:05 +0200 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2018-10-26 16:13:05 +0200 |
| commit | fbe30b49221d09bd3d6f28ad6edff4a2752642c8 (patch) | |
| tree | afe448855eb65070a5d8c27d67ae84ef0108b9d5 | |
| parent | 0aa5fe9d0de46b3e5f01860692f0d87132b6f9a4 (diff) | |
| parent | 2f11ec296ec9540c164f88341663d4000b943c82 (diff) | |
Merge remote-tracking branch 'origin/develop' into oauth
| -rw-r--r-- | src/boot/after_store.js | 8 | ||||
| -rw-r--r-- | static/timeago-oc.json | 10 |
2 files changed, 15 insertions, 3 deletions
diff --git a/src/boot/after_store.js b/src/boot/after_store.js index ca255b5d..58361578 100644 --- a/src/boot/after_store.js +++ b/src/boot/after_store.js @@ -159,9 +159,11 @@ const afterStoreSetup = ({store, i18n}) => { .then((res) => res.json()) .then((data) => { const metadata = data.metadata - store.dispatch('setInstanceOption', { name: 'mediaProxyAvailable', value: data.metadata.mediaProxy }) - store.dispatch('setInstanceOption', { name: 'chatAvailable', value: data.metadata.chat }) - store.dispatch('setInstanceOption', { name: 'gopherAvailable', value: data.metadata.gopher }) + + const features = metadata.features + store.dispatch('setInstanceOption', { name: 'mediaProxyAvailable', value: features.includes('media_proxy') }) + store.dispatch('setInstanceOption', { name: 'chatAvailable', value: features.includes('chat') }) + store.dispatch('setInstanceOption', { name: 'gopherAvailable', value: features.includes('gopher') }) const suggestions = metadata.suggestions store.dispatch('setInstanceOption', { name: 'suggestionsEnabled', value: suggestions.enabled }) diff --git a/static/timeago-oc.json b/static/timeago-oc.json new file mode 100644 index 00000000..7e439871 --- /dev/null +++ b/static/timeago-oc.json @@ -0,0 +1,10 @@ +[ + "ara meteis", + ["fa %s s", "fa %s s"], + ["fa %s min", "fa %s min"], + ["fa %s h", "fa %s h"], + ["fa %s dia", "fa %s jorns"], + ["fa %s setm.", "fa %s setm."], + ["fa %s mes", "fa %s meses"], + ["fa %s any", "fa %s ans"] +] |