i18n improved

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>

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

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(),
     })