Add Server Information to About Dialog and to Global Messages (#425)

Add Server Information to About Dialog and to Global Messages

2 files changed, 11 insertions, 3 deletions

diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js
index 77b91fa1c..41bda2f67 100644
--- a/src/components/auth/AuthLayout.js
+++ b/src/components/auth/AuthLayout.js
@@ -21,6 +21,8 @@ import AppUpdateInfoBar from '../AppUpdateInfoBar';
 import { GITHUB_FERDIUM_URL } from '../../config';
 import Icon from '../ui/icon';
 
+import { serverName } from '../../api/apiBase';
+
 class AuthLayout extends Component {
   static propTypes = {
     children: oneOrManyChildElements.isRequired,
@@ -53,6 +55,10 @@ class AuthLayout extends Component {
 
     const { intl } = this.props;
 
+    let serverNameParse = serverName();
+    serverNameParse =
+      serverNameParse === 'Custom' ? 'your Custom Server' : serverNameParse;
+
     return (
       <>
         {isWindows && !isFullScreen && (
@@ -85,7 +91,7 @@ class AuthLayout extends Component {
               onClick={retryHealthCheck}
             >
               <Icon icon={mdiFlash} />
-              {intl.formatMessage(globalMessages.APIUnhealthy)}
+              {intl.formatMessage(globalMessages.APIUnhealthy, { serverNameParse })}
             </InfoBar>
           )}
           <div className="auth__layout">
diff --git a/src/components/auth/Welcome.js b/src/components/auth/Welcome.js
index 830501ac3..c9d592a88 100644
--- a/src/components/auth/Welcome.js
+++ b/src/components/auth/Welcome.js
@@ -21,7 +21,7 @@ const messages = defineMessages({
   },
   changeServerMessage: {
     id: 'login.changeServerMessage',
-    defaultMessage: 'You are using {serverNameParse}, do you want to switch?'
+    defaultMessage: 'You are using {serverNameParse} Server, do you want to switch?'
   },
   changeServer: {
     id: 'login.changeServer',
@@ -53,7 +53,9 @@ class Welcome extends Component {
     recipes = shuffleArray(recipes);
     recipes.length = 8 * 2;
 
-    const serverNameParse = serverName();
+    let serverNameParse = serverName();
+    serverNameParse =
+      serverNameParse === 'Custom' ? 'a Custom' : serverNameParse;
 
     return (
       <div className="welcome">