From 2c811ce9a7a24762d82e8050cc47025813785dfd Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Mon, 4 Nov 2019 22:30:52 +0900
Subject: [PATCH] refs #982 Add notice in login for users who use proxy server

---
 src/config/locales/de/translation.missing.json    | 4 ++++
 src/config/locales/en/translation.json            | 2 ++
 src/config/locales/fr/translation.missing.json    | 4 ++++
 src/config/locales/it/translation.missing.json    | 4 ++++
 src/config/locales/ja/translation.json            | 2 ++
 src/config/locales/ko/translation.missing.json    | 4 ++++
 src/config/locales/pl/translation.missing.json    | 4 ++++
 src/config/locales/zh_cn/translation.missing.json | 4 ++++
 src/renderer/components/Login/LoginForm.vue       | 8 ++++++++
 9 files changed, 36 insertions(+)

diff --git a/src/config/locales/de/translation.missing.json b/src/config/locales/de/translation.missing.json
index 62bb40cb..8b53dab9 100644
--- a/src/config/locales/de/translation.missing.json
+++ b/src/config/locales/de/translation.missing.json
@@ -79,5 +79,9 @@
     "follow_request_accept_error": "Failed to accept the request",
     "follow_reuqest_reject_error": "failed to reject the request",
     "start_all_streamings_error": "Failed to start streaming of {{domain}}"
+  },
+  "login": {
+    "proxy_info": "If you want to use proxy server, please setup your proxy in",
+    "proxy_here": " here"
   }
 }
diff --git a/src/config/locales/en/translation.json b/src/config/locales/en/translation.json
index 4221d9b3..8749c25f 100644
--- a/src/config/locales/en/translation.json
+++ b/src/config/locales/en/translation.json
@@ -376,6 +376,8 @@
   },
   "login": {
     "domain_name_label": "First, let's log in to a Mastodon instance. Please enter an instance domain name.",
+    "proxy_info": "If you want to use proxy server, please setup your proxy in",
+    "proxy_here": " here",
     "search": "Search",
     "login": "Login"
   },
diff --git a/src/config/locales/fr/translation.missing.json b/src/config/locales/fr/translation.missing.json
index daf9644a..61d35c44 100644
--- a/src/config/locales/fr/translation.missing.json
+++ b/src/config/locales/fr/translation.missing.json
@@ -34,5 +34,9 @@
       },
       "save": "Save"
     }
+  },
+  "login": {
+    "proxy_info": "If you want to use proxy server, please setup your proxy in",
+    "proxy_here": " here"
   }
 }
diff --git a/src/config/locales/it/translation.missing.json b/src/config/locales/it/translation.missing.json
index 8e240a41..662c37c8 100644
--- a/src/config/locales/it/translation.missing.json
+++ b/src/config/locales/it/translation.missing.json
@@ -99,5 +99,9 @@
       "title": "Reblog",
       "body": "{{username}} boosted your status"
     }
+  },
+  "login": {
+    "proxy_info": "If you want to use proxy server, please setup your proxy in",
+    "proxy_here": " here"
   }
 }
diff --git a/src/config/locales/ja/translation.json b/src/config/locales/ja/translation.json
index 5f4f622b..3db742ca 100644
--- a/src/config/locales/ja/translation.json
+++ b/src/config/locales/ja/translation.json
@@ -376,6 +376,8 @@
   },
   "login": {
     "domain_name_label": "ドメイン名を入力してマストドンにログインしてください．",
+    "proxy_info": "もしプロキシを利用する場合は",
+    "proxy_here": "こちら．",
     "search": "検索",
     "login": "ログイン"
   },
diff --git a/src/config/locales/ko/translation.missing.json b/src/config/locales/ko/translation.missing.json
index 28641219..ff9e6715 100644
--- a/src/config/locales/ko/translation.missing.json
+++ b/src/config/locales/ko/translation.missing.json
@@ -117,5 +117,9 @@
       "title": "Reblog",
       "body": "{{username}} boosted your status"
     }
+  },
+  "login": {
+    "proxy_info": "If you want to use proxy server, please setup your proxy in",
+    "proxy_here": " here"
   }
 }
diff --git a/src/config/locales/pl/translation.missing.json b/src/config/locales/pl/translation.missing.json
index bc3d8fcb..719e9334 100644
--- a/src/config/locales/pl/translation.missing.json
+++ b/src/config/locales/pl/translation.missing.json
@@ -138,5 +138,9 @@
       "title": "Reblog",
       "body": "{{username}} boosted your status"
     }
+  },
+  "login": {
+    "proxy_info": "If you want to use proxy server, please setup your proxy in",
+    "proxy_here": " here"
   }
 }
diff --git a/src/config/locales/zh_cn/translation.missing.json b/src/config/locales/zh_cn/translation.missing.json
index daf9644a..61d35c44 100644
--- a/src/config/locales/zh_cn/translation.missing.json
+++ b/src/config/locales/zh_cn/translation.missing.json
@@ -34,5 +34,9 @@
       },
       "save": "Save"
     }
+  },
+  "login": {
+    "proxy_info": "If you want to use proxy server, please setup your proxy in",
+    "proxy_here": " here"
   }
 }
diff --git a/src/renderer/components/Login/LoginForm.vue b/src/renderer/components/Login/LoginForm.vue
index 9b568cfb..5f91e97e 100644
--- a/src/renderer/components/Login/LoginForm.vue
+++ b/src/renderer/components/Login/LoginForm.vue
@@ -11,6 +11,9 @@
     <el-form-item :label="$t('login.domain_name_label')" prop="domainName">
       <el-input v-model="form.domainName" placeholder="mastodon.social" v-shortkey="['enter']" @shortkey.native="handleKey"></el-input>
     </el-form-item>
+    <p class="proxy-info">
+      {{ $t('login.proxy_info') }}<router-link to="/preferences/network">{{ $t('login.proxy_here') }}</router-link>
+    </p>
     <!-- Dummy form to guard submitting with enter -->
     <el-form-item class="hidden">
       <el-input></el-input>
@@ -165,5 +168,10 @@ export default {
   .hidden {
     display: none;
   }
+
+  .proxy-info {
+    color: #dcdfe6;
+    margin-bottom: 24px;
+  }
 }
 </style>