Rename Auto linker to Link Formatter

This commit is contained in:
Angelina Filippova 2020-07-24 23:29:12 +03:00
parent 55eb374d36
commit 0c80942777
5 changed files with 17 additions and 17 deletions

View file

@ -358,10 +358,10 @@ export default {
instance: 'Instance', instance: 'Instance',
upload: 'Upload', upload: 'Upload',
mailer: 'Mailer', mailer: 'Mailer',
linkFormatter: 'Link Formatter',
logger: 'Logger', logger: 'Logger',
activityPub: 'ActivityPub', activityPub: 'ActivityPub',
auth: 'Authentication', auth: 'Authentication',
autoLinker: 'Auto Linker',
captcha: 'Captcha', captcha: 'Captcha',
frontend: 'Frontend', frontend: 'Frontend',
http: 'HTTP', http: 'HTTP',

View file

@ -1,7 +1,7 @@
<template> <template>
<div v-if="!loading" :class="isSidebarOpen" class="form-container"> <div v-if="!loading" :class="isSidebarOpen" class="form-container">
<el-form :model="autoLinkerData" :label-position="labelPosition" :label-width="labelWidth"> <el-form :model="linkFormatterData" :label-position="labelPosition" :label-width="labelWidth">
<setting :setting-group="autoLinker" :data="autoLinkerData"/> <setting :setting-group="linkFormatter" :data="linkFormatterData"/>
</el-form> </el-form>
<div class="submit-button-container"> <div class="submit-button-container">
<el-button class="submit-button" type="primary" @click="onSubmit">Submit</el-button> <el-button class="submit-button" type="primary" @click="onSubmit">Submit</el-button>
@ -16,17 +16,17 @@ import Setting from './Setting'
import _ from 'lodash' import _ from 'lodash'
export default { export default {
name: 'AutoLinker', name: 'LinkFormatter',
components: { Setting }, components: { Setting },
computed: { computed: {
...mapGetters([ ...mapGetters([
'settings' 'settings'
]), ]),
autoLinker() { linkFormatter() {
return this.settings.description.find(setting => setting.key === ':opts') return this.settings.description.find(setting => setting.key === 'Pleroma.Formatter')
}, },
autoLinkerData() { linkFormatterData() {
return _.get(this.settings.settings, [':auto_linker', ':opts']) || {} return _.get(this.settings.settings, [':pleroma', 'Pleroma.Formatter']) || {}
}, },
isMobile() { isMobile() {
return this.$store.state.app.device === 'mobile' return this.$store.state.app.device === 'mobile'

View file

@ -1,6 +1,5 @@
export { default as ActivityPub } from './ActivityPub' export { default as ActivityPub } from './ActivityPub'
export { default as Authentication } from './Authentication' export { default as Authentication } from './Authentication'
export { default as AutoLinker } from './AutoLinker'
export { default as Captcha } from './Captcha' export { default as Captcha } from './Captcha'
export { default as Esshd } from './Esshd' export { default as Esshd } from './Esshd'
export { default as Frontend } from './Frontend' export { default as Frontend } from './Frontend'
@ -8,6 +7,7 @@ export { default as Gopher } from './Gopher'
export { default as Http } from './Http' export { default as Http } from './Http'
export { default as Instance } from './Instance' export { default as Instance } from './Instance'
export { default as JobQueue } from './JobQueue' export { default as JobQueue } from './JobQueue'
export { default as LinkFormatter } from './LinkFormatter'
export { default as Logger } from './Logger' export { default as Logger } from './Logger'
export { default as Mailer } from './Mailer' export { default as Mailer } from './Mailer'
export { default as MediaProxy } from './MediaProxy' export { default as MediaProxy } from './MediaProxy'

View file

@ -7,10 +7,6 @@ export const tabs = {
label: 'settings.auth', label: 'settings.auth',
settings: [':auth', ':ldap', ':oauth2', 'Pleroma.Web.Auth.Authenticator'] settings: [':auth', ':ldap', ':oauth2', 'Pleroma.Web.Auth.Authenticator']
}, },
'auto-linker': {
label: 'settings.autoLinker',
settings: [':opts']
},
'esshd': { 'esshd': {
label: 'settings.esshd', label: 'settings.esshd',
settings: [':esshd'] settings: [':esshd']
@ -39,6 +35,10 @@ export const tabs = {
label: 'settings.jobQueue', label: 'settings.jobQueue',
settings: ['Pleroma.ActivityExpiration', 'Oban', ':workers'] settings: ['Pleroma.ActivityExpiration', 'Oban', ':workers']
}, },
'link-formatter': {
label: 'settings.linkFormatter',
settings: ['Pleroma.Formatter']
},
'logger': { 'logger': {
label: 'settings.logger', label: 'settings.logger',
settings: [':console', ':ex_syslogger', ':quack', ':logger'] settings: [':console', ':ex_syslogger', ':quack', ':logger']

View file

@ -69,7 +69,7 @@
<div class="settings-search-input-container"/> <div class="settings-search-input-container"/>
<activity-pub v-if="activeTab === 'activityPub'"/> <activity-pub v-if="activeTab === 'activityPub'"/>
<authentication v-if="activeTab === 'auth'"/> <authentication v-if="activeTab === 'auth'"/>
<auto-linker v-if="activeTab === 'autoLinker'"/> <link-formatter v-if="activeTab === 'linkFormatter'"/>
<esshd v-if="activeTab === 'esshd'"/> <esshd v-if="activeTab === 'esshd'"/>
<captcha v-if="activeTab === 'captcha'"/> <captcha v-if="activeTab === 'captcha'"/>
<frontend v-if="activeTab === 'frontend'"/> <frontend v-if="activeTab === 'frontend'"/>
@ -97,7 +97,6 @@ import { tabs } from './components/tabs'
import { import {
ActivityPub, ActivityPub,
Authentication, Authentication,
AutoLinker,
Captcha, Captcha,
Esshd, Esshd,
Frontend, Frontend,
@ -105,6 +104,7 @@ import {
Http, Http,
Instance, Instance,
JobQueue, JobQueue,
LinkFormatter,
Logger, Logger,
Mailer, Mailer,
MediaProxy, MediaProxy,
@ -122,7 +122,6 @@ export default {
components: { components: {
ActivityPub, ActivityPub,
Authentication, Authentication,
AutoLinker,
Captcha, Captcha,
Esshd, Esshd,
Frontend, Frontend,
@ -130,6 +129,7 @@ export default {
Http, Http,
Instance, Instance,
JobQueue, JobQueue,
LinkFormatter,
Logger, Logger,
Mailer, Mailer,
MediaProxy, MediaProxy,
@ -147,7 +147,7 @@ export default {
options: [ options: [
{ value: 'activityPub', label: i18n.t('settings.activityPub') }, { value: 'activityPub', label: i18n.t('settings.activityPub') },
{ value: 'auth', label: i18n.t('settings.auth') }, { value: 'auth', label: i18n.t('settings.auth') },
{ value: 'autoLinker', label: i18n.t('settings.autoLinker') }, { value: 'linkFormatter', label: i18n.t('settings.linkFormatter') },
{ value: 'esshd', label: i18n.t('settings.esshd') }, { value: 'esshd', label: i18n.t('settings.esshd') },
{ value: 'captcha', label: i18n.t('settings.captcha') }, { value: 'captcha', label: i18n.t('settings.captcha') },
{ value: 'frontend', label: i18n.t('settings.frontend') }, { value: 'frontend', label: i18n.t('settings.frontend') },