diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2020-03-21 13:36:41 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2020-03-21 13:36:41 +0900 |
| commit | 6fb7721798657cf842556fb63f116316365efa74 (patch) | |
| tree | 6917342553156b6483b899eafc66ef8f040b8352 /src/client/pages/instance | |
| parent | Update CHANGELOG.md (diff) | |
| parent | 12.22.0 (diff) | |
| download | misskey-6fb7721798657cf842556fb63f116316365efa74.tar.gz misskey-6fb7721798657cf842556fb63f116316365efa74.tar.bz2 misskey-6fb7721798657cf842556fb63f116316365efa74.zip | |
Merge branch 'develop'
Diffstat (limited to 'src/client/pages/instance')
| -rw-r--r-- | src/client/pages/instance/queue.queue.vue | 6 | ||||
| -rw-r--r-- | src/client/pages/instance/settings.vue | 13 |
2 files changed, 9 insertions, 10 deletions
diff --git a/src/client/pages/instance/queue.queue.vue b/src/client/pages/instance/queue.queue.vue index 710f4ec099..7f0fc7d2bc 100644 --- a/src/client/pages/instance/queue.queue.vue +++ b/src/client/pages/instance/queue.queue.vue @@ -11,12 +11,12 @@ <canvas ref="chart"></canvas> </div> <div class="_content" style="max-height: 180px; overflow: auto;"> - <sequential-entrance :delay="15" v-if="jobs.length > 0"> - <div v-for="(job, i) in jobs" :key="job[0]"> + <div v-if="jobs.length > 0"> + <div v-for="job in jobs" :key="job[0]"> <span>{{ job[0] }}</span> <span style="margin-left: 8px; opacity: 0.7;">({{ job[1] | number }} jobs)</span> </div> - </sequential-entrance> + </div> <span v-else style="opacity: 0.5;">{{ $t('noJobs') }}</span> </div> </section> diff --git a/src/client/pages/instance/settings.vue b/src/client/pages/instance/settings.vue index 7572108718..d11f840d8f 100644 --- a/src/client/pages/instance/settings.vue +++ b/src/client/pages/instance/settings.vue @@ -102,21 +102,20 @@ <div class="_content"> <mk-switch v-model="useObjectStorage">{{ $t('useObjectStorage') }}</mk-switch> <template v-if="useObjectStorage"> - <mk-input v-model="objectStorageBaseUrl" :disabled="!useObjectStorage">URL</mk-input> + <mk-input v-model="objectStorageBaseUrl" :disabled="!useObjectStorage">{{ $t('objectStorageBaseUrl') }}<template #desc>{{ $t('objectStorageBaseUrlDesc') }}</template></mk-input> <div class="_inputs"> - <mk-input v-model="objectStorageBucket" :disabled="!useObjectStorage">Bucket</mk-input> - <mk-input v-model="objectStoragePrefix" :disabled="!useObjectStorage">Prefix</mk-input> + <mk-input v-model="objectStorageBucket" :disabled="!useObjectStorage">{{ $t('objectStorageBucket') }}<template #desc>{{ $t('objectStorageBucketDesc') }}</template></mk-input> + <mk-input v-model="objectStoragePrefix" :disabled="!useObjectStorage">{{ $t('objectStoragePrefix') }}<template #desc>{{ $t('objectStoragePrefixDesc') }}</template></mk-input> </div> - <mk-input v-model="objectStorageEndpoint" :disabled="!useObjectStorage">Endpoint</mk-input> + <mk-input v-model="objectStorageEndpoint" :disabled="!useObjectStorage">{{ $t('objectStorageEndpoint') }}<template #desc>{{ $t('objectStorageEndpointDesc') }}</template></mk-input> <div class="_inputs"> - <mk-input v-model="objectStorageRegion" :disabled="!useObjectStorage">Region</mk-input> - <mk-input v-model="objectStoragePort" type="number" :disabled="!useObjectStorage">Port</mk-input> + <mk-input v-model="objectStorageRegion" :disabled="!useObjectStorage">{{ $t('objectStorageRegion') }}<template #desc>{{ $t('objectStorageRegionDesc') }}</template></mk-input> </div> <div class="_inputs"> <mk-input v-model="objectStorageAccessKey" :disabled="!useObjectStorage"><template #icon><fa :icon="faKey"/></template>Access key</mk-input> <mk-input v-model="objectStorageSecretKey" :disabled="!useObjectStorage"><template #icon><fa :icon="faKey"/></template>Secret key</mk-input> </div> - <mk-switch v-model="objectStorageUseSSL" :disabled="!useObjectStorage">SSL</mk-switch> + <mk-switch v-model="objectStorageUseSSL" :disabled="!useObjectStorage">{{ $t('objectStorageUseSSL') }}<template #desc>{{ $t('objectStorageUseSSLDesc') }}</template></mk-switch> </template> </div> <div class="_footer"> |