From 98175ab3261ef4eac32b20c2b562895f7a179bb2 Mon Sep 17 00:00:00 2001
From: hunterlong <info@socialeck.com>
Date: Mon, 1 Jun 2020 23:56:19 -0700
Subject: [PATCH 1/3] i18n implementation for frontend, oauth url fixes, added
 language into Core,

---
 .gitattributes                                |  2 +-
 LICENSE                                       |  4 +-
 frontend/config/webpack.config.common.js      |  7 ++-
 frontend/package.json                         |  2 +
 frontend/src/App.vue                          |  4 +-
 .../components/Dashboard/DashboardUsers.vue   |  2 +
 .../components/Index/GroupServiceFailures.vue | 15 ++-----
 .../src/components/Service/ServiceBlock.vue   | 12 -----
 frontend/src/forms/CoreSettings.vue           | 12 +++++
 frontend/src/forms/OAuth.vue                  |  6 +--
 frontend/src/forms/Service.vue                | 14 ++++--
 frontend/src/forms/Setup.vue                  | 44 ++++++++++++-------
 frontend/src/forms/User.vue                   |  5 +--
 frontend/src/languages/english.js             | 33 ++++++++++++++
 frontend/src/languages/french.js              | 19 ++++++++
 frontend/src/languages/german.js              | 19 ++++++++
 frontend/src/languages/index.js               | 15 +++++++
 frontend/src/languages/russian.js             | 19 ++++++++
 frontend/src/languages/spanish.js             | 19 ++++++++
 frontend/src/main.js                          | 19 +++++---
 frontend/src/mixin.js                         | 31 ++++++++-----
 frontend/yarn.lock                            | 20 +++++++++
 handlers/oauth.go                             |  4 --
 handlers/setup.go                             |  3 ++
 types/configs/struct.go                       |  1 +
 types/core/database.go                        |  1 +
 types/core/struct.go                          |  1 +
 utils/configs.go                              |  1 +
 28 files changed, 259 insertions(+), 75 deletions(-)
 create mode 100644 frontend/src/languages/english.js
 create mode 100644 frontend/src/languages/french.js
 create mode 100644 frontend/src/languages/german.js
 create mode 100644 frontend/src/languages/index.js
 create mode 100644 frontend/src/languages/russian.js
 create mode 100644 frontend/src/languages/spanish.js

diff --git a/.gitattributes b/.gitattributes
index 37e6bb8e..cfa572fe 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,4 @@
-*.gohtml linguist-language=golang
+*.gohtml linguist-index=golang
 *.js linguist-detectable=false
 *.yml linguist-detectable=false
 *.json linguist-detectable=false
diff --git a/LICENSE b/LICENSE
index 1125e62e..1c506dda 100644
--- a/LICENSE
+++ b/LICENSE
@@ -117,8 +117,8 @@ form of a work.
 
   A "Standard Interface" means an interface that either is an official
 standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
+interfaces specified for a particular programming index, one that
+is widely used among developers working in that index.
 
   The "System Libraries" of an executable work include anything, other
 than the work as a whole, that (a) is included in the normal form of
diff --git a/frontend/config/webpack.config.common.js b/frontend/config/webpack.config.common.js
index 5a85a3f7..ebc5c82a 100644
--- a/frontend/config/webpack.config.common.js
+++ b/frontend/config/webpack.config.common.js
@@ -22,7 +22,12 @@ const webpackConfig = {
       {
         test: /\.vue$/,
         loader: 'vue-loader',
-        include: [ helpers.root('src') ]
+        include: [ helpers.root('src') ],
+        options: {
+          loaders: {
+            i18n: '@kazupon/vue-i18n-loader'
+          }
+        }
       },
       {
         test: /\.js$/,
diff --git a/frontend/package.json b/frontend/package.json
index 6b366b32..b672688d 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -36,6 +36,7 @@
     "vue-cookies": "^1.7.0",
     "vue-flatpickr-component": "^8.1.5",
     "vue-github-button": "^1.1.2",
+    "vue-i18n": "^8.18.1",
     "vue-moment": "^4.1.0",
     "vue-observe-visibility": "^0.4.6",
     "vue-router": "~3.0",
@@ -51,6 +52,7 @@
     "@babel/plugin-syntax-import-meta": "~7.2",
     "@babel/polyfill": "~7.2",
     "@babel/preset-env": "^7.9.0",
+    "@kazupon/vue-i18n-loader": "^0.5.0",
     "@vue/babel-preset-app": "^4.1.2",
     "@vue/cli-plugin-babel": "^4.1.0",
     "@vue/cli-service": "^4.2.3",
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 323a7651..8a8d0dad 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -6,7 +6,6 @@
 </template>
 
 <script>
-  import Api from './API';
   import Footer from "./components/Index/Footer";
 
   export default {
@@ -28,6 +27,9 @@
   async beforeMount() {
     await this.$store.dispatch('loadCore')
 
+    this.$i18n.locale = this.core.language || "en";
+    // this.$i18n.locale = "ru";
+
       if (!this.core.setup) {
         this.$router.push('/setup')
       }
diff --git a/frontend/src/components/Dashboard/DashboardUsers.vue b/frontend/src/components/Dashboard/DashboardUsers.vue
index bb43a2fe..8ff7d372 100644
--- a/frontend/src/components/Dashboard/DashboardUsers.vue
+++ b/frontend/src/components/Dashboard/DashboardUsers.vue
@@ -67,6 +67,8 @@
       this.edit = v
     },
     editUser(u, mode) {
+      delete(u.password)
+      delete(u.confirm_password)
       this.user = u
       this.edit = !mode
     },
diff --git a/frontend/src/components/Index/GroupServiceFailures.vue b/frontend/src/components/Index/GroupServiceFailures.vue
index 8aff79a5..72ad7bda 100644
--- a/frontend/src/components/Index/GroupServiceFailures.vue
+++ b/frontend/src/components/Index/GroupServiceFailures.vue
@@ -6,11 +6,11 @@
             </div>
         </div>
         <div class="row mt-2">
-            <div class="col-4 text-left font-2 text-muted">30 Days Ago</div>
-            <div class="col-4 text-center font-2" :class="{'text-muted': service.online, 'text-danger': !service.online}">
+            <div class="col-3 text-left font-2 text-muted">30 Days Ago</div>
+            <div class="col-6 text-center font-2" :class="{'text-muted': service.online, 'text-danger': !service.online}">
                {{service_txt}}
             </div>
-            <div class="col-4 text-right font-2 text-muted">Today</div>
+            <div class="col-3 text-right font-2 text-muted">Today</div>
         </div>
     </div>
 </template>
@@ -36,14 +36,7 @@ export default {
   },
   computed: {
     service_txt() {
-      const s = this.service
-      if (!s.online) {
-        if (!this.toUnix(this.parseISO(s.last_success))) {
-          return `Always Offline`
-        }
-        return `Offline for ${this.ago(s.last_success)}`
-      }
-      return `${this.service.online_24_hours}% Uptime`
+      return this.smallText(this.service)
     }
   },
     mounted () {
diff --git a/frontend/src/components/Service/ServiceBlock.vue b/frontend/src/components/Service/ServiceBlock.vue
index 3141d8cd..1ea76bf6 100644
--- a/frontend/src/components/Service/ServiceBlock.vue
+++ b/frontend/src/components/Service/ServiceBlock.vue
@@ -223,18 +223,6 @@ export default {
             this.stats.low_ping.chart = pingData.chart;
             this.stats.low_ping.value = this.humanTime(pingData.low);
         },
-        smallText(s) {
-          const incidents = s.incidents
-            if (s.online) {
-                return `Checked ${this.ago(s.last_success)} ago`
-            } else {
-                const last = s.last_failure
-                if (last) {
-                    return `Offline, last error: ${last} ${this.ago(last.created_at)}`
-                }
-                return `Service has been offline for ${this.ago(s.last_success)}`
-            }
-        },
         visibleChart(isVisible, entry) {
                 if (isVisible && !this.visible) {
                     this.visible = true
diff --git a/frontend/src/forms/CoreSettings.vue b/frontend/src/forms/CoreSettings.vue
index 08d42ebd..fef485d0 100644
--- a/frontend/src/forms/CoreSettings.vue
+++ b/frontend/src/forms/CoreSettings.vue
@@ -31,6 +31,18 @@
             <small class="form-text text-muted">HTML is allowed inside the footer</small>
         </div>
 
+        <div class="form-group">
+            <label>Language</label>
+            <select v-model="core.language" class="form-control">
+                <option value="en">English</option>
+                <option value="es">Spanish</option>
+                <option value="fr">French</option>
+                <option value="ru">Russian</option>
+                <option value="de">German</option>
+            </select>
+            <small class="form-text text-muted">HTML is allowed inside the footer</small>
+        </div>
+
         <div class="form-group row mt-3">
             <label class="col-sm-10 col-form-label">Enable Error Reporting</label>
             <div class="col-sm-2 float-right">
diff --git a/frontend/src/forms/OAuth.vue b/frontend/src/forms/OAuth.vue
index 99e63ccd..ca0c7a5d 100644
--- a/frontend/src/forms/OAuth.vue
+++ b/frontend/src/forms/OAuth.vue
@@ -51,7 +51,7 @@
                     <label for="gh_callback" class="col-sm-4 col-form-label">Callback URL</label>
                     <div class="col-sm-8">
                         <div class="input-group">
-                            <input v-bind:value="`${core.domain}/api/oauth/github`" type="text" class="form-control" id="gh_callback" readonly>
+                            <input v-bind:value="`${core.domain}/oauth/github`" type="text" class="form-control" id="gh_callback" readonly>
                             <div class="input-group-append copy-btn">
                                 <button @click.prevent="copy(`${core.domain}/oauth/github`)" class="btn btn-outline-secondary" type="button">Copy</button>
                             </div>
@@ -90,7 +90,7 @@
                     <label for="google_callback" class="col-sm-4 col-form-label">Callback URL</label>
                     <div class="col-sm-8">
                         <div class="input-group">
-                            <input v-bind:value="`${core.domain}/api/oauth/google`" type="text" class="form-control" id="google_callback" readonly>
+                            <input v-bind:value="`${core.domain}/oauth/google`" type="text" class="form-control" id="google_callback" readonly>
                             <div class="input-group-append copy-btn">
                                 <button @click.prevent="copy(`${core.domain}/oauth/google`)" class="btn btn-outline-secondary" type="button">Copy</button>
                             </div>
@@ -136,7 +136,7 @@
                     <label for="slack_callback" class="col-sm-4 col-form-label">Callback URL</label>
                     <div class="col-sm-8">
                         <div class="input-group">
-                            <input v-bind:value="`${core.domain}/api/oauth/slack`" type="text" class="form-control" id="slack_callback" readonly>
+                            <input v-bind:value="`${core.domain}/oauth/slack`" type="text" class="form-control" id="slack_callback" readonly>
                             <div class="input-group-append copy-btn">
                                 <button @click.prevent="copy(`${core.domain}/oauth/slack`)" class="btn btn-outline-secondary" type="button">Copy</button>
                             </div>
diff --git a/frontend/src/forms/Service.vue b/frontend/src/forms/Service.vue
index c4ef8a48..306f61f4 100644
--- a/frontend/src/forms/Service.vue
+++ b/frontend/src/forms/Service.vue
@@ -54,11 +54,14 @@
 
             <div class="form-group row">
                 <label for="service_interval" class="col-sm-4 col-form-label">Check Interval</label>
-                <div class="col-sm-8">
+                <div class="col-sm-6">
                     <span class="slider-info">{{secondsHumanize(service.check_interval)}}</span>
-                    <input v-model="service.check_interval" type="range" class="slider" id="service_interval" min="1" max="1800" :step="stepVal(service.check_interval)">
+                    <input v-model="service.check_interval" type="range" class="slider" id="service_interval" min="1" max="1800" :step="1">
                     <small id="interval" class="form-text text-muted">Interval to check your service state</small>
                 </div>
+                <div class="col-sm-2">
+                    <input v-model="service.check_interval" type="text" name="check_interval" class="form-control">
+                </div>
             </div>
 
             </div>
@@ -99,11 +102,16 @@
 
         <div class="form-group row">
             <label class="col-sm-4 col-form-label">Request Timeout</label>
-            <div class="col-sm-8">
+            <div class="col-sm-6">
                 <span v-if="service.timeout >= 0" class="slider-info">{{secondsHumanize(service.timeout)}}</span>
                 <input v-model="service.timeout" type="range" id="timeout" name="timeout" class="slider" min="1" max="180">
                 <small class="form-text text-muted">If the endpoint does not respond within this time it will be considered to be offline</small>
             </div>
+
+            <div class="col-sm-2">
+                <input v-model="service.timeout" type="text" name="service_timeout" class="form-control">
+            </div>
+
         </div>
 
         <div v-if="service.type.match(/^(http)$/) && service.method.match(/^(POST|PATCH|DELETE|PUT)$/)" class="form-group row">
diff --git a/frontend/src/forms/Setup.vue b/frontend/src/forms/Setup.vue
index dc1d695f..e72b6e6f 100644
--- a/frontend/src/forms/Setup.vue
+++ b/frontend/src/forms/Setup.vue
@@ -9,7 +9,17 @@
                 <div class="row">
                     <div class="col-6">
                         <div class="form-group">
-                            <label>Database Connection</label>
+                            <label>{{ $t('setup.language') }}</label>
+                            <select @change="changeLanguages" v-model="setup.language" id="language" class="form-control">
+                                <option value="en">English</option>
+                                <option value="es">Spanish</option>
+                                <option value="fr">French</option>
+                                <option value="ru">Russian</option>
+                                <option value="de">German</option>
+                            </select>
+                        </div>
+                        <div class="form-group">
+                            <label>{{ $t('setup.connection') }}</label>
                             <select @change="canSubmit" v-model="setup.db_connection" id="db_connection" class="form-control">
                                 <option value="sqlite">SQLite</option>
                                 <option value="postgres">Postgres</option>
@@ -17,23 +27,23 @@
                             </select>
                         </div>
                         <div v-if="setup.db_connection !== 'sqlite'" class="form-group">
-                            <label>Host</label>
+                            <label>{{ $t('setup.host') }}</label>
                             <input @keyup="canSubmit" v-model="setup.db_host" id="db_host" type="text" class="form-control" placeholder="localhost">
                         </div>
                         <div v-if="setup.db_connection !== 'sqlite'" class="form-group">
-                            <label>Database Port</label>
+                            <label>{{ $t('port') }}</label>
                             <input @keyup="canSubmit" v-model="setup.db_port" id="db_port" type="text" class="form-control" placeholder="localhost">
                         </div>
                         <div v-if="setup.db_connection !== 'sqlite'" class="form-group">
-                            <label>Username</label>
+                            <label>{{ $t('username') }}</label>
                             <input @keyup="canSubmit" v-model="setup.db_user" id="db_user" type="text" class="form-control" placeholder="root">
                         </div>
                         <div v-if="setup.db_connection !== 'sqlite'" class="form-group">
-                            <label for="db_password">Password</label>
+                            <label for="db_password">{{ $t('password') }}</label>
                             <input @keyup="canSubmit" v-model="setup.db_password" id="db_password" type="password" class="form-control" placeholder="password123">
                         </div>
                         <div v-if="setup.db_connection !== 'sqlite'" class="form-group">
-                            <label for="db_database">Database</label>
+                            <label for="db_database">{{ $t('database') }}</label>
                             <input @keyup="canSubmit" v-model="setup.db_database" id="db_database" type="text" class="form-control" placeholder="Database name">
                         </div>
 
@@ -42,50 +52,50 @@
                     <div class="col-6">
 
                         <div class="form-group">
-                            <label>Project Name</label>
+                            <label>{{ $t('setup.project_name') }}</label>
                             <input @keyup="canSubmit" v-model="setup.project" id="project" type="text" class="form-control" placeholder="Great Uptime" required>
                         </div>
 
                         <div class="form-group">
-                            <label>Project Description</label>
+                            <label>{{ $t('setup.project_description') }}</label>
                             <input @keyup="canSubmit" v-model="setup.description" id="description" type="text" class="form-control" placeholder="Great Uptime">
                         </div>
 
                         <div class="form-group">
-                            <label for="domain">Domain URL</label>
+                            <label for="domain">{{ $t('setup.domain') }}</label>
                             <input @keyup="canSubmit" v-model="setup.domain" type="text" class="form-control" id="domain" required>
                         </div>
 
                         <div class="form-group">
-                            <label>Admin Username</label>
+                            <label>{{ $t('setup.username') }}</label>
                             <input @keyup="canSubmit" v-model="setup.username" id="username" type="text" class="form-control" placeholder="admin" required>
                         </div>
 
                         <div class="form-group">
-                            <label>Admin Password</label>
+                            <label>{{ $t('setup.username') }}</label>
                             <input @keyup="canSubmit" v-model="setup.password" id="password" type="password" class="form-control" placeholder="password" required>
                         </div>
 
                         <div class="form-group">
-                            <label>Confirm Admin Password</label>
+                            <label>{{ $t('setup.password_confirm') }}</label>
                             <input @keyup="canSubmit" v-model="setup.confirm_password" id="password_confirm" type="password" class="form-control" placeholder="password" required>
                         </div>
 
                         <div class="form-group">
                             <div class="row">
                                 <div class="col-8">
-                                    <label>Email Address</label>
+                                    <label>{{ $t('email') }}</label>
                                     <input @keyup="canSubmit" v-model="setup.email" id="email" type="text" class="form-control" placeholder="myemail@domain.com">
                                 </div>
                                 <div class="col-4">
-                                    <label class="d-none d-sm-block">Newsletter</label>
+                                    <label class="d-none d-sm-block">{{ $t('setup.newsletter') }}</label>
                                     <span @click="setup.newsletter = !!setup.newsletter" class="switch">
                                       <input v-model="setup.newsletter" type="checkbox" name="using_cdn" class="switch" id="send_newsletter" :checked="setup.newsletter">
                                       <label for="send_newsletter"></label>
                                     </span>
                                 </div>
                             </div>
-                            <small>We will not share your email, emails are only for major updates.</small>
+                            <small>{{ $t('setup.newsletter_note') }}</small>
                         </div>
                     </div>
 
@@ -115,6 +125,7 @@
       loading: false,
       disabled: true,
       setup: {
+        language: "en",
         db_connection: "sqlite",
         db_host: "",
         db_port: "",
@@ -146,6 +157,9 @@
     this.setup.domain = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ":"+window.location.port : "")
   },
   methods: {
+    changeLanguages() {
+      this.$i18n.locale = this.setup.language
+    },
       canSubmit() {
           this.error = null
           const s = this.setup
diff --git a/frontend/src/forms/User.vue b/frontend/src/forms/User.vue
index d58b478f..599b5f7a 100644
--- a/frontend/src/forms/User.vue
+++ b/frontend/src/forms/User.vue
@@ -82,10 +82,7 @@
   },
   watch: {
     in_user() {
-        let u = this.in_user
-        u.password = null
-        u.password_confirm = null
-        this.user = u
+        this.user = this.in_user
     }
   },
   methods: {
diff --git a/frontend/src/languages/english.js b/frontend/src/languages/english.js
new file mode 100644
index 00000000..6a89c661
--- /dev/null
+++ b/frontend/src/languages/english.js
@@ -0,0 +1,33 @@
+const english = {
+  setup: {
+    language: "Language",
+    connection: "Database Connection",
+    host: "Host",
+    database: "Database",
+    project_name: "Project Name",
+    project_description: "Project Description",
+    domain: "Domain URL",
+    username: "Admin Username",
+    password: "Admin Username",
+    password_confirm: "Confirm Admin Username",
+    newsletter: "Newsletter",
+    newsletter_note: "We will not share your email, emails are only for major updates.",
+  },
+  email: "Email Address",
+  port: "Database Port",
+  username: "Username",
+  password: 'password',
+  service: 'service',
+  online: 'online',
+  offline: 'offline',
+  incident: 'incident',
+  group: 'group',
+  message: 'message',
+  logout: 'logout',
+  sample_data: 'Sample Data',
+  today: 'Today',
+  day: 'day',
+  hour: 'hour',
+}
+
+export default english
diff --git a/frontend/src/languages/french.js b/frontend/src/languages/french.js
new file mode 100644
index 00000000..4e899d8f
--- /dev/null
+++ b/frontend/src/languages/french.js
@@ -0,0 +1,19 @@
+const french = {
+  setup: {
+    language: "Langue",
+    database_connection: "Database Connection"
+  },
+  service: 'service',
+  online: 'online',
+  offline: 'offline',
+  incident: 'incident',
+  group: 'group',
+  message: 'message',
+  logout: 'logout',
+  sample_data: 'Sample Data',
+  today: 'Today',
+  day: 'day',
+  hour: 'hour',
+}
+
+export default french
diff --git a/frontend/src/languages/german.js b/frontend/src/languages/german.js
new file mode 100644
index 00000000..47afbb6c
--- /dev/null
+++ b/frontend/src/languages/german.js
@@ -0,0 +1,19 @@
+const german = {
+  setup: {
+    language: "Sprache",
+    database_connection: "Database Connection"
+  },
+  service: 'service',
+  online: 'online',
+  offline: 'offline',
+  incident: 'incident',
+  group: 'group',
+  message: 'message',
+  logout: 'logout',
+  sample_data: 'Sample Data',
+  today: 'Today',
+  day: 'day',
+  hour: 'hour',
+}
+
+export default german
diff --git a/frontend/src/languages/index.js b/frontend/src/languages/index.js
new file mode 100644
index 00000000..905a0919
--- /dev/null
+++ b/frontend/src/languages/index.js
@@ -0,0 +1,15 @@
+import english from "./english"
+import spanish from "./spanish"
+import german from "./german"
+import russian from "./russian";
+import french from "./french";
+
+const language = {
+  en: english,
+  es: spanish,
+  de: german,
+  ru: russian,
+  fr: french,
+}
+
+export default language
diff --git a/frontend/src/languages/russian.js b/frontend/src/languages/russian.js
new file mode 100644
index 00000000..b1a07ffe
--- /dev/null
+++ b/frontend/src/languages/russian.js
@@ -0,0 +1,19 @@
+const russian = {
+  setup: {
+    language: "язык",
+    database_connection: "Database Connection"
+  },
+  service: 'service',
+  online: 'online',
+  offline: 'offline',
+  incident: 'incident',
+  group: 'group',
+  message: 'message',
+  logout: 'logout',
+  sample_data: 'Sample Data',
+  today: 'Today',
+  day: 'day',
+  hour: 'hour',
+}
+
+export default russian
diff --git a/frontend/src/languages/spanish.js b/frontend/src/languages/spanish.js
new file mode 100644
index 00000000..fc7ac5fb
--- /dev/null
+++ b/frontend/src/languages/spanish.js
@@ -0,0 +1,19 @@
+const spanish = {
+  setup: {
+    language: "Idioma",
+    database_connection: "Database Connection"
+  },
+  service: 'service',
+  online: 'online',
+  offline: 'offline',
+  incident: 'incident',
+  group: 'group',
+  message: 'message',
+  logout: 'logout',
+  sample_data: 'Sample Data',
+  today: 'Today',
+  day: 'day',
+  hour: 'hour',
+}
+
+export default spanish
diff --git a/frontend/src/main.js b/frontend/src/main.js
index db97a220..3f235954 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -4,9 +4,13 @@ import VueApexCharts from 'vue-apexcharts'
 import VueObserveVisibility from 'vue-observe-visibility'
 import VueClipboard from 'vue-clipboard2'
 import VueCookies from 'vue-cookies'
-
+import VueI18n from 'vue-i18n'
+import router from './routes'
+import "./mixin"
+import "./icons"
 import App from '@/App.vue'
 import store from './store'
+import language from './languages'
 
 Vue.component('apexchart', VueApexCharts)
 
@@ -14,16 +18,19 @@ Vue.use(VueClipboard);
 Vue.use(VueRouter);
 Vue.use(VueObserveVisibility);
 Vue.use(VueCookies);
+Vue.use(VueI18n);
+
+const i18n = new VueI18n({
+  fallbackLocale: "en",
+  messages: language
+});
+
 Vue.$cookies.config('3d')
 
-import router from './routes'
-import "./mixin"
-import "./icons"
-
-
 Vue.config.productionTip = false
 new Vue({
   router,
   store,
+  i18n,
   render: h => h(App),
 }).$mount('#app')
diff --git a/frontend/src/mixin.js b/frontend/src/mixin.js
index bef65f48..b3b130f1 100644
--- a/frontend/src/mixin.js
+++ b/frontend/src/mixin.js
@@ -20,18 +20,7 @@ export default Vue.mixin({
       return startOfToday()
     },
       secondsHumanize (val) {
-      if (!Number.isInteger(val)) {
-        return "0 seconds"
-      }
-        const t2 = addSeconds(new Date(0), val)
-          if (val >= 60) {
-              let minword = "minute"
-              if (val >= 120) {
-                  minword = "minutes"
-              }
-              return format(t2, "m '"+minword+"' s 'seconds'")
-          }
-        return format(t2, "s 'seconds'")
+        return `${val} seconds`
       },
     utc(val) {
       return new Date.UTC(val)
@@ -57,6 +46,24 @@ export default Vue.mixin({
       parseISO(v) {
         return parseISO(v)
       },
+    isZero(val) {
+      return getUnixTime(parseISO(val)) <= 0
+    },
+    smallText(s) {
+      const incidents = s.incidents
+      if (s.online) {
+        return `Online, checked ${this.ago(s.last_success)} ago`
+      } else {
+        const last = s.last_failure
+        if (last) {
+          return `Offline, last error: ${last} ${this.ago(last.created_at)}`
+        }
+        if (this.isZero(s.last_success)) {
+          return `Service has never been online`
+        }
+        return `Service has been offline for ${this.ago(s.last_success)}`
+      }
+    },
     toUnix(val) {
       return getUnixTime(val)
     },
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 6ef31251..40dcc5a9 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -1371,6 +1371,14 @@
     "@types/yargs" "^15.0.0"
     chalk "^3.0.0"
 
+"@kazupon/vue-i18n-loader@^0.5.0":
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/@kazupon/vue-i18n-loader/-/vue-i18n-loader-0.5.0.tgz#64819fc9dbe21bac523e3436b7e15c32bcd33b92"
+  integrity sha512-Tp2mXKemf9/RBhI9CW14JjR9oKjL2KH7tV6S0eKEjIBuQBAOFNuPJu3ouacmz9hgoXbNp+nusw3MVQmxZWFR9g==
+  dependencies:
+    js-yaml "^3.13.1"
+    json5 "^2.1.1"
+
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
@@ -7063,6 +7071,13 @@ json5@^2.1.0:
   dependencies:
     minimist "^1.2.0"
 
+json5@^2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
+  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
+  dependencies:
+    minimist "^1.2.5"
+
 json5@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.2.tgz#43ef1f0af9835dd624751a6b7fa48874fb2d608e"
@@ -11884,6 +11899,11 @@ vue-hot-reload-api@^2.3.0:
   resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2"
   integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==
 
+vue-i18n@^8.18.1:
+  version "8.18.1"
+  resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.18.1.tgz#2e683ac93a15617bdcd210f99359d6034e8425dd"
+  integrity sha512-K+hFQJksF8Ph23pnhbwSyoQx+4Y1q/rh2o7GiXI/3rLCCrwanUbzudC8+trp0Mb8rn9y83DYF6RXNrMd+VsuCw==
+
 vue-loader@^15.8.3:
   version "15.9.0"
   resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.0.tgz#5d4b0378a4606188fc83e587ed23c94bc3a10998"
diff --git a/handlers/oauth.go b/handlers/oauth.go
index ce9158bf..3fd38bff 100644
--- a/handlers/oauth.go
+++ b/handlers/oauth.go
@@ -29,10 +29,6 @@ type oAuth struct {
 func oauthHandler(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	provider := vars["provider"]
-	code := r.URL.Query().Get("code")
-	fmt.Println("code: ", code)
-	fmt.Println("client: ", core.App.OAuth.SlackClientID)
-	fmt.Println("secret: ", core.App.OAuth.SlackClientSecret)
 
 	var err error
 	var oauth *oAuth
diff --git a/handlers/setup.go b/handlers/setup.go
index 2d2d9ad4..e2c43066 100644
--- a/handlers/setup.go
+++ b/handlers/setup.go
@@ -134,6 +134,9 @@ func processSetupHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func registerNews(email, domain string) error {
+	if email == "" {
+		return nil
+	}
 	v := url.Values{}
 	v.Set("email", email)
 	v.Set("domain", domain)
diff --git a/types/configs/struct.go b/types/configs/struct.go
index 6b0e14a6..cadcf17c 100644
--- a/types/configs/struct.go
+++ b/types/configs/struct.go
@@ -13,6 +13,7 @@ type DbConfig struct {
 	DbData      string `yaml:"database" json:"-"`
 	DbPort      int    `yaml:"port" json:"-"`
 	ApiSecret   string `yaml:"api_secret" json:"-"`
+	Language    string `yaml:"language" json:"language"`
 	Project     string `yaml:"-" json:"-"`
 	Description string `yaml:"-" json:"-"`
 	Domain      string `yaml:"-" json:"-"`
diff --git a/types/core/database.go b/types/core/database.go
index cbd95728..4324e12a 100644
--- a/types/core/database.go
+++ b/types/core/database.go
@@ -50,6 +50,7 @@ func (c *Core) Create() error {
 		ApiSecret:   secret,
 		Version:     App.Version,
 		Domain:      c.Domain,
+		Language:    "en",
 		MigrationId: utils.Now().Unix(),
 	}
 	q := db.Create(&newCore)
diff --git a/types/core/struct.go b/types/core/struct.go
index 6f02e14f..6f52a482 100644
--- a/types/core/struct.go
+++ b/types/core/struct.go
@@ -28,6 +28,7 @@ type Core struct {
 	Footer        null.NullString `gorm:"column:footer" json:"footer"`
 	Domain        string          `gorm:"not null;column:domain" json:"domain"`
 	Version       string          `gorm:"column:version" json:"version"`
+	Language      string          `gorm:"column:language" json:"language"`
 	Setup         bool            `gorm:"-" json:"setup"`
 	MigrationId   int64           `gorm:"column:migration_id" json:"migration_id,omitempty"`
 	UseCdn        null.NullBool   `gorm:"column:use_cdn;default:false" json:"using_cdn,omitempty"`
diff --git a/utils/configs.go b/utils/configs.go
index 7abd3e46..a44c3091 100644
--- a/utils/configs.go
+++ b/utils/configs.go
@@ -56,6 +56,7 @@ func setDefaults() {
 	Params.SetDefault("DESCRIPTION", "This status page has sample data included")
 	Params.SetDefault("REMOVE_AFTER", 2160*time.Hour)
 	Params.SetDefault("CLEANUP_INTERVAL", 1*time.Hour)
+	Params.SetDefault("LANGUAGE", "en")
 
 	dbConn := Params.GetString("DB_CONN")
 	dbInt := Params.GetInt("DB_PORT")

From d463f548addc312e1f87129fb3cb8cbfa502fc6c Mon Sep 17 00:00:00 2001
From: hunterlong <info@socialeck.com>
Date: Tue, 2 Jun 2020 00:05:13 -0700
Subject: [PATCH 2/3] language

---
 .gitattributes                | 2 +-
 LICENSE                       | 4 ++--
 handlers/setup.go             | 1 +
 types/configs/configs_form.go | 3 +++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index cfa572fe..37e6bb8e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,4 @@
-*.gohtml linguist-index=golang
+*.gohtml linguist-language=golang
 *.js linguist-detectable=false
 *.yml linguist-detectable=false
 *.json linguist-detectable=false
diff --git a/LICENSE b/LICENSE
index 1c506dda..1125e62e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -117,8 +117,8 @@ form of a work.
 
   A "Standard Interface" means an interface that either is an official
 standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming index, one that
-is widely used among developers working in that index.
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
 
   The "System Libraries" of an executable work include anything, other
 than the work as a whole, that (a) is included in the normal form of
diff --git a/handlers/setup.go b/handlers/setup.go
index e2c43066..81c2f531 100644
--- a/handlers/setup.go
+++ b/handlers/setup.go
@@ -90,6 +90,7 @@ func processSetupHandler(w http.ResponseWriter, r *http.Request) {
 		CreatedAt:   utils.Now(),
 		UseCdn:      null.NewNullBool(false),
 		Footer:      null.NewNullString(""),
+		Language:    confgs.Language,
 	}
 
 	log.Infoln("Creating new Core")
diff --git a/types/configs/configs_form.go b/types/configs/configs_form.go
index ef0fb4c2..6b6ba782 100644
--- a/types/configs/configs_form.go
+++ b/types/configs/configs_form.go
@@ -23,6 +23,7 @@ func LoadConfigForm(r *http.Request) (*DbConfig, error) {
 	description := g("description")
 	domain := g("domain")
 	email := g("email")
+	language := g("language")
 
 	if project == "" || username == "" || password == "" {
 		err := errors.New("Missing required elements on setup form")
@@ -38,6 +39,7 @@ func LoadConfigForm(r *http.Request) (*DbConfig, error) {
 	p.Set("DB_DATABASE", dbDatabase)
 	p.Set("NAME", project)
 	p.Set("DESCRIPTION", description)
+	p.Set("LANGUAGE", language)
 
 	confg := &DbConfig{
 		DbConn:      dbConn,
@@ -53,6 +55,7 @@ func LoadConfigForm(r *http.Request) (*DbConfig, error) {
 		Password:    password,
 		Email:       email,
 		Location:    utils.Directory,
+		Language:    language,
 	}
 
 	return confg, nil

From 8fd585120afc7d6b00140fbd83b6d18568d66f73 Mon Sep 17 00:00:00 2001
From: hunterlong <info@socialeck.com>
Date: Tue, 2 Jun 2020 00:22:26 -0700
Subject: [PATCH 3/3] language

---
 types/core/database.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/core/database.go b/types/core/database.go
index 4324e12a..a139ef4b 100644
--- a/types/core/database.go
+++ b/types/core/database.go
@@ -50,7 +50,7 @@ func (c *Core) Create() error {
 		ApiSecret:   secret,
 		Version:     App.Version,
 		Domain:      c.Domain,
-		Language:    "en",
+		Language:    c.Language,
 		MigrationId: utils.Now().Unix(),
 	}
 	q := db.Create(&newCore)