diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-03-07 16:03:06 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-03-07 16:03:06 +0000 |
| commit | bf1fa52e5e8c95d5887e887132782f10197bbc49 (patch) | |
| tree | dc56f0b8a6b7565a5a8843305364062111bea7fb /src/components/settings/settings.vue | |
| parent | c44f0a9bde08c50598207494b121ae4bdf1f0fb1 (diff) | |
| parent | 292cdfb24b2d42d38728e8ff9ab16e2ad9e66410 (diff) | |
Merge branch 'fix/post-content-type' into 'develop'
#327: Load post status content type from instance config
Closes #327
See merge request pleroma/pleroma-fe!641
Diffstat (limited to 'src/components/settings/settings.vue')
| -rw-r--r-- | src/components/settings/settings.vue | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue index 5041b3a3..d2346747 100644 --- a/src/components/settings/settings.vue +++ b/src/components/settings/settings.vue @@ -105,17 +105,9 @@ {{$t('settings.post_status_content_type')}} <label for="postContentType" class="select"> <select id="postContentType" v-model="postContentTypeLocal"> - <option value="text/plain"> - {{$t('settings.status_content_type_plain')}} - {{postContentTypeDefault == 'text/plain' ? $t('settings.instance_default_simple') : ''}} - </option> - <option value="text/html"> - HTML - {{postContentTypeDefault == 'text/html' ? $t('settings.instance_default_simple') : ''}} - </option> - <option value="text/markdown"> - Markdown - {{postContentTypeDefault == 'text/markdown' ? $t('settings.instance_default_simple') : ''}} + <option v-for="postFormat in postFormats" :key="postFormat" :value="postFormat"> + {{$t(`post_status.content_type["${postFormat}"]`)}} + {{postContentTypeDefault === postFormat ? $t('settings.instance_default_simple') : ''}} </option> </select> <i class="icon-down-open"/> |