From 2137c5754106bb2905eda0907a2bce3bea91d05a Mon Sep 17 00:00:00 2001
From: yumeko <yumeko@mainichi.social>
Date: Sat, 22 Jul 2023 11:31:01 +0300
Subject: [PATCH] Add a basic title and description for the
 objectStorageS3ForcePathStyle storage configuration option.

---
 locales/en-US.yml                                  | 3 +++
 locales/ja-JP.yml                                  | 2 ++
 packages/client/src/pages/admin/object-storage.vue | 8 ++++++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index af8541947..8f06d7120 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/<bucket>/' over '<bucket>.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 46a486d91..c7b80e226 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を作る際には、'<bucket>.s3.amazonaws.com'の代わりに's3.amazonaws.com/<bucket>/'のようなスタイルを使用します。"
 serverLogs: "サーバーログ"
 deleteAll: "全て削除"
 showFixedPostForm: "タイムライン上部に投稿フォームを表示する"
diff --git a/packages/client/src/pages/admin/object-storage.vue b/packages/client/src/pages/admin/object-storage.vue
index a438c6944..c90a970c7 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"
 						>
-							<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";