Merge branch 'enhance/add-s3pathstyle-description' into 'develop'

Add a basic title and description for s3ForcePathStyle

See merge request firefish/firefish!10525
This commit is contained in:
Kainoa Kanter 2023-07-28 18:04:01 +00:00
commit 31b7619813
3 changed files with 11 additions and 2 deletions

View File

@ -566,6 +566,9 @@ objectStorageUseProxy: "Connect over Proxy"
objectStorageUseProxyDesc: "Turn this off if you are not going to use a Proxy for
API connections"
objectStorageSetPublicRead: "Set \"public-read\" on upload"
objectStorageS3ForcePathStyle: "Use path-based endpoint URLs"
objectStorageS3ForcePathStyleDesc: "Turn this on to construct endpoint URLs in the
format of 's3.amazonaws.com/<bucket>/' over '<bucket>.s3.amazonaws.com'."
serverLogs: "Server logs"
deleteAll: "Delete all"
showFixedPostForm: "Display the posting form at the top of the timeline"

View File

@ -517,6 +517,8 @@ objectStorageUseSSLDesc: "API接続にhttpsを使用しない場合はオフに
objectStorageUseProxy: "Proxyを利用する"
objectStorageUseProxyDesc: "API接続にproxyを利用しない場合はオフにしてください"
objectStorageSetPublicRead: "アップロード時に'public-read'を設定する"
objectStorageS3ForcePathStyle: "DNS名ではなくてパスを使用する"
objectStorageS3ForcePathStyleDesc: "EndpointのURLを作る際には、'<bucket>.s3.amazonaws.com'の代わりに's3.amazonaws.com/<bucket>/'のようなスタイルを使用します。"
serverLogs: "サーバーログ"
deleteAll: "全て削除"
showFixedPostForm: "タイムライン上部に投稿フォームを表示する"

View File

@ -134,7 +134,12 @@
v-model="objectStorageS3ForcePathStyle"
class="_formBlock"
>
<template #label>s3ForcePathStyle</template>
<template #label>{{
i18n.ts.objectStorageS3ForcePathStyle
}}</template>
<template #caption>{{
i18n.ts.objectStorageS3ForcePathStyleDesc
}}</template>
</FormSwitch>
</template>
</div>
@ -149,7 +154,6 @@ import FormSwitch from "@/components/form/switch.vue";
import FormInput from "@/components/form/input.vue";
import FormSuspense from "@/components/form/suspense.vue";
import FormSplit from "@/components/form/split.vue";
import FormSection from "@/components/form/section.vue";
import * as os from "@/os";
import { fetchInstance } from "@/instance";
import { i18n } from "@/i18n";