Merge pull request #1081 from h3poteto/iss-982

refs #982 Add notice in login for users who use proxy server

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"
   }
 }

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"
   },

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"
   }
 }

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"
   }
 }

src/config/locales/ja/translation.json

@@ -376,6 +376,8 @@
   },
   "login": {
     "domain_name_label": "ドメイン名を入力してマストドンにログインしてください．",
+    "proxy_info": "もしプロキシを利用する場合は",
+    "proxy_here": "こちら．",
     "search": "検索",
     "login": "ログイン"
   },

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"
   }
 }

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"
   }
 }

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"
   }
 }

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>