From e53a42a2311e5646f96f6af89388f274f4b85001 Mon Sep 17 00:00:00 2001
From: m1k1o <sedivy.miro@gmail.com>
Date: Mon, 6 Apr 2020 11:55:08 +0200
Subject: [PATCH 1/7] language minor bugs

---
 client/src/neko/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/neko/index.ts b/client/src/neko/index.ts
index 571ab1cf..f2fca887 100644
--- a/client/src/neko/index.ts
+++ b/client/src/neko/index.ts
@@ -54,7 +54,7 @@ export class NekoClient extends BaseClient implements EventEmitter<NekoEvents> {
     this.disconnect()
     this.cleanup()
     this.$vue.$swal({
-      title: this.$vue.$t('notifications.logged_out', { name: 'You' }),
+      title: this.$vue.$t('notifications.logged_out', { name: this.$vue.$t('you') }),
       icon: 'info',
       confirmButtonText: this.$vue.$t('ok') as string,
     })
@@ -207,7 +207,7 @@ export class NekoClient extends BaseClient implements EventEmitter<NekoEvents> {
 
     this.$accessor.chat.newMessage({
       id: member.id,
-      content: this.$vue.$t('notifications.controls_released') as string,
+      content: this.$vue.$t('notifications.controls_released', { name: '' }) as string,
       type: 'event',
       created: new Date(),
     })

From 96ea219340d7858c3217823e2c734912ab5131d5 Mon Sep 17 00:00:00 2001
From: m1k1o <sedivy.miro@gmail.com>
Date: Mon, 6 Apr 2020 12:22:36 +0200
Subject: [PATCH 2/7] context added translations for modals

---
 client/src/components/context.vue | 28 ++++++++++++++++------------
 client/src/locale/en-us.ts        | 12 ++++++++++++
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/client/src/components/context.vue b/client/src/components/context.vue
index af4a4476..11cf348f 100644
--- a/client/src/components/context.vue
+++ b/client/src/components/context.vue
@@ -165,11 +165,12 @@
 
     kick(member: Member) {
       this.$swal({
-        title: `Kick ${member.displayname}?`,
-        text: `Are you sure you want to kick ${member.displayname}?`,
+        title: this.$t('context.confirm.kick_title', { name: member.displayname }),
+        text: this.$t('context.confirm.kick_text', { name: member.displayname }),
         icon: 'warning',
         showCancelButton: true,
-        confirmButtonText: 'Yes',
+        confirmButtonText: this.$t('context.confirm.button_yes'),
+        cancelButtonText: this.$t('context.confirm.button_cancel'),
       }).then(({ value }) => {
         if (value) {
           this.$accessor.user.kick(member)
@@ -179,11 +180,12 @@
 
     ban(member: Member) {
       this.$swal({
-        title: `Ban ${member.displayname}?`,
-        text: `Are you sure you want to ban ${member.displayname}? You will need to restart the server to undo this.`,
+        title: this.$t('context.confirm.ban_title', { name: member.displayname }),
+        text: this.$t('context.confirm.ban_text', { name: member.displayname }),
         icon: 'warning',
         showCancelButton: true,
-        confirmButtonText: 'Yes',
+        confirmButtonText: this.$t('context.confirm.button_yes'),
+        cancelButtonText: this.$t('context.confirm.button_cancel'),
       }).then(({ value }) => {
         if (value) {
           this.$accessor.user.ban(member)
@@ -193,11 +195,12 @@
 
     mute(member: Member) {
       this.$swal({
-        title: `Mute ${member.displayname}?`,
-        text: `Are you sure you want to mute ${member.displayname}?`,
+        title: this.$t('context.confirm.mute_title', { name: member.displayname }),
+        text: this.$t('context.confirm.mute_text', { name: member.displayname }),
         icon: 'warning',
         showCancelButton: true,
-        confirmButtonText: 'Yes',
+        confirmButtonText: this.$t('context.confirm.button_yes'),
+        cancelButtonText: this.$t('context.confirm.button_cancel'),
       }).then(({ value }) => {
         if (value) {
           this.$accessor.user.mute(member)
@@ -207,11 +210,12 @@
 
     unmute(member: Member) {
       this.$swal({
-        title: `Unmute ${member.displayname}?`,
-        text: `Are you sure you want to unmute ${member.displayname}?`,
+        title: this.$t('context.confirm.unmute_title', { name: member.displayname }),
+        text: this.$t('context.confirm.unmute_text', { name: member.displayname }),
         icon: 'warning',
         showCancelButton: true,
-        confirmButtonText: 'Yes',
+        confirmButtonText: this.$t('context.confirm.button_yes'),
+        cancelButtonText: this.$t('context.confirm.button_cancel'),
       }).then(({ value }) => {
         if (value) {
           this.$accessor.user.unmute(member)
diff --git a/client/src/locale/en-us.ts b/client/src/locale/en-us.ts
index 8fd05a6d..cc171491 100644
--- a/client/src/locale/en-us.ts
+++ b/client/src/locale/en-us.ts
@@ -25,6 +25,18 @@ export const context = {
   give: 'Give Controls',
   kick: 'Kick',
   ban: 'Ban IP',
+  confirm: {
+    kick_title: 'Kick {name}?',
+    kick_text: 'Are you sure you want to kick {name}?',
+    ban_title: 'Ban {name}?',
+    ban_text: 'Are you sure you want to ban {name}? You will need to restart the server to undo this.',
+    mute_title: 'Mute {name}?',
+    mute_text: 'Are you sure you want to mute {name}?',
+    unmute_title: 'Unmute {name}?',
+    unmute_text: 'Are you sure you want to unmute {name}?',
+    button_yes: 'Yes',
+    button_cancel: 'Cancel',
+  }
 }
 
 export const controls = {

From 180bfc250f868da870c1ca8f9de6bc5c879625cd Mon Sep 17 00:00:00 2001
From: m1k1o <sedivy.miro@gmail.com>
Date: Mon, 6 Apr 2020 12:25:07 +0200
Subject: [PATCH 3/7] send_a_message translate

---
 client/src/components/chat.vue | 2 +-
 client/src/locale/en-us.ts     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/src/components/chat.vue b/client/src/components/chat.vue
index 0b4e8ebb..619909af 100644
--- a/client/src/components/chat.vue
+++ b/client/src/components/chat.vue
@@ -35,7 +35,7 @@
     <div v-if="!muted" class="chat-send">
       <div class="accent" />
       <div class="text-container">
-        <textarea ref="input" placeholder="Send a message" @keydown="onKeyDown" v-model="content" />
+        <textarea ref="input" :placeholder="$t('send_a_message')" @keydown="onKeyDown" v-model="content" />
         <neko-emoji v-if="emoji" @picked="onEmojiPicked" @done="emoji = false" />
         <i class="emoji-menu fas fa-laugh" @click.stop.prevent="onEmoji"></i>
       </div>
diff --git a/client/src/locale/en-us.ts b/client/src/locale/en-us.ts
index cc171491..895ac208 100644
--- a/client/src/locale/en-us.ts
+++ b/client/src/locale/en-us.ts
@@ -5,6 +5,7 @@ export const unsupported = 'this browser does not support webrtc'
 export const admin_loggedin = 'You are logged in as an admin'
 export const you = 'You'
 export const ok = 'ok'
+export const send_a_message = 'Send a message'
 export const connected = 'connected'
 export const disconnected = 'disconnected'
 

From cce6a90a1503cf117080172493703680287bebd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= <sedivy.miro@gmail.com>
Date: Mon, 6 Apr 2020 14:56:20 +0200
Subject: [PATCH 4/7] ts-lint fixes

---
 client/src/components/context.vue | 32 +++++++++++++++----------------
 client/src/locale/en-us.ts        |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/client/src/components/context.vue b/client/src/components/context.vue
index 11cf348f..34e82301 100644
--- a/client/src/components/context.vue
+++ b/client/src/components/context.vue
@@ -165,12 +165,12 @@
 
     kick(member: Member) {
       this.$swal({
-        title: this.$t('context.confirm.kick_title', { name: member.displayname }),
-        text: this.$t('context.confirm.kick_text', { name: member.displayname }),
+        title: this.$t('context.confirm.kick_title', { name: member.displayname }) as string,
+        text: this.$t('context.confirm.kick_text', { name: member.displayname }) as string,
         icon: 'warning',
         showCancelButton: true,
-        confirmButtonText: this.$t('context.confirm.button_yes'),
-        cancelButtonText: this.$t('context.confirm.button_cancel'),
+        confirmButtonText: this.$t('context.confirm.button_yes') as string,
+        cancelButtonText: this.$t('context.confirm.button_cancel') as string,
       }).then(({ value }) => {
         if (value) {
           this.$accessor.user.kick(member)
@@ -180,12 +180,12 @@
 
     ban(member: Member) {
       this.$swal({
-        title: this.$t('context.confirm.ban_title', { name: member.displayname }),
-        text: this.$t('context.confirm.ban_text', { name: member.displayname }),
+        title: this.$t('context.confirm.ban_title', { name: member.displayname }) as string,
+        text: this.$t('context.confirm.ban_text', { name: member.displayname }) as string,
         icon: 'warning',
         showCancelButton: true,
-        confirmButtonText: this.$t('context.confirm.button_yes'),
-        cancelButtonText: this.$t('context.confirm.button_cancel'),
+        confirmButtonText: this.$t('context.confirm.button_yes') as string,
+        cancelButtonText: this.$t('context.confirm.button_cancel') as string,
       }).then(({ value }) => {
         if (value) {
           this.$accessor.user.ban(member)
@@ -195,12 +195,12 @@
 
     mute(member: Member) {
       this.$swal({
-        title: this.$t('context.confirm.mute_title', { name: member.displayname }),
-        text: this.$t('context.confirm.mute_text', { name: member.displayname }),
+        title: this.$t('context.confirm.mute_title', { name: member.displayname }) as string,
+        text: this.$t('context.confirm.mute_text', { name: member.displayname }) as string,
         icon: 'warning',
         showCancelButton: true,
-        confirmButtonText: this.$t('context.confirm.button_yes'),
-        cancelButtonText: this.$t('context.confirm.button_cancel'),
+        confirmButtonText: this.$t('context.confirm.button_yes') as string,
+        cancelButtonText: this.$t('context.confirm.button_cancel') as string,
       }).then(({ value }) => {
         if (value) {
           this.$accessor.user.mute(member)
@@ -210,12 +210,12 @@
 
     unmute(member: Member) {
       this.$swal({
-        title: this.$t('context.confirm.unmute_title', { name: member.displayname }),
-        text: this.$t('context.confirm.unmute_text', { name: member.displayname }),
+        title: this.$t('context.confirm.unmute_title', { name: member.displayname }) as string,
+        text: this.$t('context.confirm.unmute_text', { name: member.displayname }) as string,
         icon: 'warning',
         showCancelButton: true,
-        confirmButtonText: this.$t('context.confirm.button_yes'),
-        cancelButtonText: this.$t('context.confirm.button_cancel'),
+        confirmButtonText: this.$t('context.confirm.button_yes') as string,
+        cancelButtonText: this.$t('context.confirm.button_cancel') as string,
       }).then(({ value }) => {
         if (value) {
           this.$accessor.user.unmute(member)
diff --git a/client/src/locale/en-us.ts b/client/src/locale/en-us.ts
index 895ac208..62ff7df7 100644
--- a/client/src/locale/en-us.ts
+++ b/client/src/locale/en-us.ts
@@ -37,7 +37,7 @@ export const context = {
     unmute_text: 'Are you sure you want to unmute {name}?',
     button_yes: 'Yes',
     button_cancel: 'Cancel',
-  }
+  },
 }
 
 export const controls = {

From 85f2f41176025cb23c8206593486fd206f82a580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= <sedivy.miro@gmail.com>
Date: Mon, 6 Apr 2020 15:29:53 +0200
Subject: [PATCH 5/7] i18n improved

---
 client/src/components/side.vue |  4 ++--
 client/src/locale/en-us.ts     | 18 +++++++++++-------
 client/src/neko/index.ts       | 18 +++++++++---------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/client/src/components/side.vue b/client/src/components/side.vue
index 033ac07e..db1ff814 100644
--- a/client/src/components/side.vue
+++ b/client/src/components/side.vue
@@ -4,11 +4,11 @@
       <ul>
         <li :class="{ active: tab === 'chat' }" @click.stop.prevent="change('chat')">
           <i class="fas fa-comment-alt" />
-          <span>{{ $t('chat') }}</span>
+          <span>{{ $t('side.chat') }}</span>
         </li>
         <li :class="{ active: tab === 'settings' }" @click.stop.prevent="change('settings')">
           <i class="fas fa-sliders-h" />
-          <span>{{ $t('settings') }}</span>
+          <span>{{ $t('side.settings') }}</span>
         </li>
       </ul>
     </div>
diff --git a/client/src/locale/en-us.ts b/client/src/locale/en-us.ts
index 62ff7df7..1dfe6454 100644
--- a/client/src/locale/en-us.ts
+++ b/client/src/locale/en-us.ts
@@ -1,13 +1,13 @@
-export const chat = 'Chat'
-export const settings = 'Settings'
 export const logout = 'logout'
 export const unsupported = 'this browser does not support webrtc'
 export const admin_loggedin = 'You are logged in as an admin'
 export const you = 'You'
-export const ok = 'ok'
 export const send_a_message = 'Send a message'
-export const connected = 'connected'
-export const disconnected = 'disconnected'
+
+export const side = {
+  chat: 'Chat',
+  settings: 'Settings',
+}
 
 export const connect = {
   title: 'Please Login',
@@ -63,11 +63,15 @@ export const setting = {
 }
 
 export const connection = {
-  success: 'Successfully connected',
+  logged_out: 'You have been logged out!',
+  connected: 'Successfully connected',
+  disconnected: 'You have been disconnected',
+  button_confirm: 'Ok',
 }
 
 export const notifications = {
-  logged_out: '{name} logged out!',
+  connected: '{name} connected',
+  disconnected: '{name} disconnected',
   controls_taken: '{name} took the controls',
   controls_taken_force: 'force took the controls',
   controls_taken_steal: 'took the controls from {name}',
diff --git a/client/src/neko/index.ts b/client/src/neko/index.ts
index f2fca887..1db8fdd3 100644
--- a/client/src/neko/index.ts
+++ b/client/src/neko/index.ts
@@ -54,9 +54,9 @@ export class NekoClient extends BaseClient implements EventEmitter<NekoEvents> {
     this.disconnect()
     this.cleanup()
     this.$vue.$swal({
-      title: this.$vue.$t('notifications.logged_out', { name: this.$vue.$t('you') }),
+      title: this.$vue.$t('connection.logged_out', { name: this.$vue.$t('you') }),
       icon: 'info',
-      confirmButtonText: this.$vue.$t('ok') as string,
+      confirmButtonText: this.$vue.$t('connection.button_confirm') as string,
     })
   }
 
@@ -75,7 +75,7 @@ export class NekoClient extends BaseClient implements EventEmitter<NekoEvents> {
     this.$vue.$notify({
       group: 'neko',
       type: 'success',
-      title: this.$vue.$t('connection.success') as string,
+      title: this.$vue.$t('connection.connected') as string,
       duration: 5000,
       speed: 1000,
     })
@@ -86,7 +86,7 @@ export class NekoClient extends BaseClient implements EventEmitter<NekoEvents> {
     this.$vue.$notify({
       group: 'neko',
       type: 'error',
-      title: this.$vue.$t('disconnected') as string,
+      title: this.$vue.$t('connection.disconnected') as string,
       text: reason ? reason.message : undefined,
       duration: 5000,
       speed: 1000,
@@ -111,10 +111,10 @@ export class NekoClient extends BaseClient implements EventEmitter<NekoEvents> {
   protected [EVENT.SYSTEM.DISCONNECT]({ message }: DisconnectPayload) {
     this.onDisconnected(new Error(message))
     this.$vue.$swal({
-      title: this.$vue.$t('disconnected'),
+      title: this.$vue.$t('connection.disconnected'),
       text: message,
       icon: 'error',
-      confirmButtonText: this.$vue.$t('ok') as string,
+      confirmButtonText: this.$vue.$t('connection.button_confirm') as string,
     })
   }
 
@@ -125,7 +125,7 @@ export class NekoClient extends BaseClient implements EventEmitter<NekoEvents> {
     this.$accessor.user.setMembers(members)
     this.$accessor.chat.newMessage({
       id: this.id,
-      content: this.$vue.$t('connected') as string,
+      content: this.$vue.$t('notifications.connected', { name: '' }) as string,
       type: 'event',
       created: new Date(),
     })
@@ -137,7 +137,7 @@ export class NekoClient extends BaseClient implements EventEmitter<NekoEvents> {
     if (member.id !== this.id) {
       this.$accessor.chat.newMessage({
         id: member.id,
-        content: this.$vue.$t('connected') as string,
+        content: this.$vue.$t('notifications.connected', { name: '' }) as string,
         type: 'event',
         created: new Date(),
       })
@@ -152,7 +152,7 @@ export class NekoClient extends BaseClient implements EventEmitter<NekoEvents> {
 
     this.$accessor.chat.newMessage({
       id: member.id,
-      content: this.$vue.$t('disconnected') as string,
+      content: this.$vue.$t('notifications.disconnected', { name: '' }) as string,
       type: 'event',
       created: new Date(),
     })

From 2fa5839b9982681eb4921cedcf735cb787710641 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= <sedivy.miro@gmail.com>
Date: Mon, 6 Apr 2020 15:32:06 +0200
Subject: [PATCH 6/7] connection.logged_out does not have 'you' anymore

---
 client/src/neko/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/neko/index.ts b/client/src/neko/index.ts
index 1db8fdd3..880e7935 100644
--- a/client/src/neko/index.ts
+++ b/client/src/neko/index.ts
@@ -54,7 +54,7 @@ export class NekoClient extends BaseClient implements EventEmitter<NekoEvents> {
     this.disconnect()
     this.cleanup()
     this.$vue.$swal({
-      title: this.$vue.$t('connection.logged_out', { name: this.$vue.$t('you') }),
+      title: this.$vue.$t('connection.logged_out'),
       icon: 'info',
       confirmButtonText: this.$vue.$t('connection.button_confirm') as string,
     })

From 080766481c49f9711e35af1374df7707aea9beb6 Mon Sep 17 00:00:00 2001
From: Ellen Marie Dash <me@duckie.co>
Date: Mon, 6 Apr 2020 13:09:32 -0400
Subject: [PATCH 7/7] Fix _+: keys in Firefox

19466b5 fixes the keys without shift; this fixes them with shift.

Related: https://github.com/nurdism/neko/commit/19466b5625b6e6c2796faa7eeac0e3be1797f7f5
Context: https://github.com/nurdism/neko/issues/51#issuecomment-609877197
---
 client/src/components/video.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/components/video.vue b/client/src/components/video.vue
index 00dd11b7..b56add24 100644
--- a/client/src/components/video.vue
+++ b/client/src/components/video.vue
@@ -466,15 +466,15 @@
     // frick you firefox
     getCode(e: KeyboardEvent): number {
       let key = e.keyCode
-      if (key === 59 && e.key === ';') {
+      if (key === 59 && (e.key === ';' || e.key === ':')) {
         key = 186
       }
 
-      if (key === 61 && e.key === '=') {
+      if (key === 61 && (e.key === '=' || e.key === '+')) {
         key = 187
       }
 
-      if (key === 173 && e.key === '-') {
+      if (key === 173 && (e.key === '-' || e.key === '_')) {
         key = 189
       }