From 40f7ffa99e23a14b28f72a39ec74cd8c02cfa3b2 Mon Sep 17 00:00:00 2001 From: lesion Date: Fri, 2 Aug 2019 13:43:28 +0200 Subject: [PATCH] ego --- locales/en.js | 7 ++- locales/it.js | 6 ++- pages/admin.vue | 29 +++++------- pages/event/_id.vue | 9 ++-- plugins/filters.js | 4 +- server/api/controller/event.js | 3 +- server/api/controller/user.js | 4 +- server/api/index.js | 13 ++++-- server/federation/ego.js | 17 +++++++ server/federation/follows.js | 9 ++-- server/federation/helpers.js | 20 +++++++++ server/federation/index.js | 13 ++++-- server/federation/nodeinfo.js | 4 +- server/federation/webfinger.js | 82 +++++++++++++++++++++++++++++++++- server/index.js | 12 ++--- store/index.js | 2 +- 16 files changed, 183 insertions(+), 51 deletions(-) create mode 100644 server/federation/ego.js diff --git a/locales/en.js b/locales/en.js index 751ed567..2c643922 100644 --- a/locales/en.js +++ b/locales/en.js @@ -48,7 +48,9 @@ export default { enable: 'Enable', disable: 'Disable', me: 'You', - password_updated: 'Password updated!' + password_updated: 'Password updated!', + username: 'Username', + comments: 'Comments' }, login: { @@ -123,7 +125,8 @@ export default { recurrent_2m_ordinal: '|The {n} {days} a month each two|The {n} {days} a month each two', due: 'due', from: 'From', - image_too_big: 'Image too big! Max 4M' + image_too_big: 'Image too big! Max 4M', + interact_with_me_at: 'Interact with me on fediverse at' }, admin: { diff --git a/locales/it.js b/locales/it.js index e21e56c2..0c1ed24d 100644 --- a/locales/it.js +++ b/locales/it.js @@ -49,7 +49,8 @@ export default { disable: 'Disabilita', me: 'Sei te', password_updated: 'Password modificata!', - username: 'Nickname' + username: 'Nickname', + comments: 'Commenti' }, login: { @@ -128,7 +129,8 @@ export default { each_month: 'Ogni mese', due: 'alle', from: 'Dalle', - image_too_big: 'Immagine troppo grande! Massimo 4M' + image_too_big: 'Immagine troppo grande! Massimo 4M', + interact_with_me_at: 'Seguimi nel fediverso su' }, admin: { diff --git a/pages/admin.vue b/pages/admin.vue index 2713a9b1..e943137c 100644 --- a/pages/admin.vue +++ b/pages/admin.vue @@ -60,15 +60,14 @@ el-form-item(v-show='allow_recurrent_event' :label="$t('admin.recurrent_event_visible')") el-switch(v-model='recurrent_event_visible') + el-divider {{$t('admin.federation')}} - el-form(inline @submit.native.prevent='associate_mastondon_instance' label-width='240px') - p {{$t('admin.mastodon_description')}} - el-form-item(:label='$t("admin.mastodon_instance")') - el-input(v-model="mastodon_instance") - el-form-item - el-button(native-type='submit' type='success' :disabled='!mastodon_instance') {{$t('common.associate')}} - el-form-item(:label="$t('admin.allow_comments')") - el-switch(v-model='allow_comments') + el-form(inline label-width='400px') + el-form-item(:label="$t('admin.enable_federation')") + el-switch(v-model='enable_federation') + + //- el-form-item(:label="$t('admin.allow_boost_like')") + //- el-switch(v-model='allow_comments')