diff --git a/locales/en-US.yml b/locales/en-US.yml index c3cac3fa5a..3768cf8f6d 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -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//' over '.s3.amazonaws.com'." serverLogs: "Server logs" deleteAll: "Delete all" showFixedPostForm: "Display the posting form at the top of the timeline" diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index af2e12bfdb..dedd0bd8c3 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -517,6 +517,8 @@ objectStorageUseSSLDesc: "API接続にhttpsを使用しない場合はオフに objectStorageUseProxy: "Proxyを利用する" objectStorageUseProxyDesc: "API接続にproxyを利用しない場合はオフにしてください" objectStorageSetPublicRead: "アップロード時に'public-read'を設定する" +objectStorageS3ForcePathStyle: "DNS名ではなくてパスを使用する" +objectStorageS3ForcePathStyleDesc: "EndpointのURLを作る際には、'.s3.amazonaws.com'の代わりに's3.amazonaws.com//'のようなスタイルを使用します。" serverLogs: "サーバーログ" deleteAll: "全て削除" showFixedPostForm: "タイムライン上部に投稿フォームを表示する" diff --git a/packages/client/src/pages/admin/object-storage.vue b/packages/client/src/pages/admin/object-storage.vue index a438c69447..c90a970c79 100644 --- a/packages/client/src/pages/admin/object-storage.vue +++ b/packages/client/src/pages/admin/object-storage.vue @@ -134,7 +134,12 @@ v-model="objectStorageS3ForcePathStyle" class="_formBlock" > - + + @@ -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";