diff --git a/src/components/Announcement/index.vue b/src/components/Announcement/index.vue
index 200b73b0e..057e2b1bc 100644
--- a/src/components/Announcement/index.vue
+++ b/src/components/Announcement/index.vue
@@ -3,12 +3,15 @@
v-if="enabled && !isViewed()"
type="success"
:center="false"
- :title="this.$t('common.Announcement') + ': ' + announcement.subject"
+ :title="title"
@close="onClose"
>
{{ announcement.content }}
- 查看更多
+
+ {{ $t('common.ViewMore') }}
+
+
@@ -33,6 +36,9 @@ export default {
},
enabled() {
return this.publicSettings.ANNOUNCEMENT_ENABLED
+ },
+ title() {
+ return this.$t('common.Announcement') + ': ' + this.announcement.subject
}
},
methods: {
diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 92c68c262..66eaa0648 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -233,6 +233,7 @@
"ReLogin": "重新登录"
},
"common": {
+ "ViewMore": "查看更多",
"Announcement": "公告",
"Logging": "日志记录",
"Database": "数据库记录",
@@ -779,6 +780,7 @@
}
},
"setting": {
+ "Feature": "功能",
"AlibabaCloud": "阿里云",
"TencentCloud": "腾讯云",
"Radius": "Radius",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 80efd36fd..fb8bdb1ba 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -231,6 +231,7 @@
"ReLogin": "Re-Login"
},
"common": {
+ "ViewMore": "View more",
"Announcement": "Announcement",
"Logging": "Logging",
"Database": "Database",
@@ -762,6 +763,7 @@
}
},
"setting": {
+ "Feature": "Feature",
"SMSProvider": "SMS provider",
"SMS": "SMS setting",
"AlibabaCloud": "Alibaba cloud",
diff --git a/src/views/settings/Basic/announcement.vue b/src/views/settings/Basic/announcement.vue
index d350c18c5..755705c40 100644
--- a/src/views/settings/Basic/announcement.vue
+++ b/src/views/settings/Basic/announcement.vue
@@ -33,7 +33,7 @@ export default {
},
data() {
return {
- title: '公告',
+ title: this.$t('common.Announcement'),
visible: false,
config: {
fields: [
@@ -45,6 +45,11 @@ export default {
'SUBJECT', 'CONTENT', 'LINK'
],
fieldsMeta: {
+ CONTENT: {
+ el: {
+ rows: 5
+ }
+ }
}
}
},
diff --git a/src/views/settings/Basic/index.vue b/src/views/settings/Basic/index.vue
index 076fbc10d..0213a1b74 100644
--- a/src/views/settings/Basic/index.vue
+++ b/src/views/settings/Basic/index.vue
@@ -36,7 +36,7 @@ export default {
]
],
[
- '功能', [
+ this.$t('setting.Feature'), [
'TICKETS_ENABLED', 'ANNOUNCEMENT_ENABLED'
]
]