Merge branch 'master' of github.com:wg-easy/wg-easy into dev

2 years ago · 0aea529131
5 changed files with 157 additions and 57 deletions
--- a/.env
+++ b/.env
@ -1,5 +1,6 @@
 WG_HOST=🚨YOUR_SERVER_IP
 PASSWORD=🚨YOUR_ADMIN_PASSWORD
+# (Supports: en, ru, tr, no, pl, fr, de, ca, es)
 LANGUAGE=en
 PORT=51821
 WG_DEVICE=eth0
--- a/README.md
+++ b/README.md
@ -65,7 +65,7 @@ These options can be configured by setting environment variables using `-e KEY="

 | Env | Default | Example | Description |
 | - | - | - | - |
-| `LANGUAGE` | `en` | `de` | Web UI language. List of available languages in [i18n.js]() |
+| `LANGUAGE` | `en` | `de` | Web UI language (Supports: en, ru, tr, no, pl, fr, de, ca, es). |
 | `CHECK_UPDATE` | `true` | `false` | Check for a new version and display a notification about its availability |
 | `PORT` | `51821` | `6789` | TCP port for Web UI. |
 | `WEBUI_HOST` | `0.0.0.0` | `localhost` | IP address web UI binds to. |
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -6,7 +6,7 @@ services:
  amnezia-wg-easy:
    env_file:
      - .env
-    build: .
+    image: ghcr.io/spcfox/amnezia-wg-easy
    container_name: amnezia-wg-easy
    volumes:
      - ~/.amnezia-wg-easy:/etc/wireguard
--- a/src/package-lock.json
+++ b/src/package-lock.json
@ -486,9 +486,9 @@
      "dev": true
    },
    "node_modules/@types/semver": {
-      "version": "7.5.6",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz",
-      "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==",
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.7.tgz",
+      "integrity": "sha512-/wdoPq1QqkSj9/QOeKkFquEuPzQbHTWAMPH/PaUMB+JuR31lXhlWXRZ52IpfDYVlDOUBvX09uBrPwxGT1hjNBg==",
      "dev": true
    },
    "node_modules/@typescript-eslint/eslint-plugin": {
@ -1053,14 +1053,15 @@
      }
    },
    "node_modules/call-bind": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.6.tgz",
-      "integrity": "sha512-Mj50FLHtlsoVfRfnHaZvyrooHcrlceNZdL/QBvJJVd9Ta55qCQK0gs4ss2oZDeV9zFCs6ewzYgVE5yfVmfFpVg==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
      "dependencies": {
+        "es-define-property": "^1.0.0",
        "es-errors": "^1.3.0",
        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.3",
-        "set-function-length": "^1.2.0"
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
      },
      "engines": {
        "node": ">= 0.4"
@ -1286,17 +1287,19 @@
      "peer": true
    },
    "node_modules/define-data-property": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.2.tgz",
-      "integrity": "sha512-SRtsSqsDbgpJBbW3pABMCOt6rQyeM8s8RiyeSN8jYG8sYmt/kGJejbydttUsnDs1tadr19tvhT4ShwMyoqAm4g==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
      "dependencies": {
+        "es-define-property": "^1.0.0",
        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.2",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.1"
+        "gopd": "^1.0.1"
      },
      "engines": {
        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
      }
    },
    "node_modules/define-properties": {
@ -1419,50 +1422,52 @@
      }
    },
    "node_modules/es-abstract": {
-      "version": "1.22.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz",
-      "integrity": "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==",
+      "version": "1.22.4",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.4.tgz",
+      "integrity": "sha512-vZYJlk2u6qHYxBOTjAeg7qUxHdNfih64Uu2J8QqWgXZ2cri0ZpJAkzDUK/q593+mvKwlxyaxr6F1Q+3LKoQRgg==",
      "dev": true,
      "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
-        "arraybuffer.prototype.slice": "^1.0.2",
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.5",
-        "es-set-tostringtag": "^2.0.1",
+        "array-buffer-byte-length": "^1.0.1",
+        "arraybuffer.prototype.slice": "^1.0.3",
+        "available-typed-arrays": "^1.0.6",
+        "call-bind": "^1.0.7",
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "es-set-tostringtag": "^2.0.2",
        "es-to-primitive": "^1.2.1",
        "function.prototype.name": "^1.1.6",
-        "get-intrinsic": "^1.2.2",
-        "get-symbol-description": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "get-symbol-description": "^1.0.2",
        "globalthis": "^1.0.3",
        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0",
+        "has-property-descriptors": "^1.0.2",
        "has-proto": "^1.0.1",
        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0",
-        "internal-slot": "^1.0.5",
-        "is-array-buffer": "^3.0.2",
+        "hasown": "^2.0.1",
+        "internal-slot": "^1.0.7",
+        "is-array-buffer": "^3.0.4",
        "is-callable": "^1.2.7",
        "is-negative-zero": "^2.0.2",
        "is-regex": "^1.1.4",
        "is-shared-array-buffer": "^1.0.2",
        "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.12",
+        "is-typed-array": "^1.1.13",
        "is-weakref": "^1.0.2",
        "object-inspect": "^1.13.1",
        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.5.1",
-        "safe-array-concat": "^1.0.1",
-        "safe-regex-test": "^1.0.0",
+        "object.assign": "^4.1.5",
+        "regexp.prototype.flags": "^1.5.2",
+        "safe-array-concat": "^1.1.0",
+        "safe-regex-test": "^1.0.3",
        "string.prototype.trim": "^1.2.8",
        "string.prototype.trimend": "^1.0.7",
        "string.prototype.trimstart": "^1.0.7",
-        "typed-array-buffer": "^1.0.0",
+        "typed-array-buffer": "^1.0.1",
        "typed-array-byte-length": "^1.0.0",
        "typed-array-byte-offset": "^1.0.0",
        "typed-array-length": "^1.0.4",
        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.13"
+        "which-typed-array": "^1.1.14"
      },
      "engines": {
        "node": ">= 0.4"
@ -1477,6 +1482,17 @@
      "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
      "dev": true
    },
+    "node_modules/es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "dependencies": {
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
    "node_modules/es-errors": {
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
@ -2449,13 +2465,14 @@
      }
    },
    "node_modules/get-symbol-description": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.1.tgz",
-      "integrity": "sha512-KmuibvwbWaM4BHcBRYwJfZ1JxyJeBwB8ct9YYu67SvYdbEIlcQ2e56dHxfbobqW38GXo8/zDFqJeGtHiVbWyQw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
+      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
      "dev": true,
      "dependencies": {
        "call-bind": "^1.0.5",
-        "es-errors": "^1.3.0"
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4"
      },
      "engines": {
        "node": ">= 0.4"
@ -2609,11 +2626,11 @@
      }
    },
    "node_modules/has-property-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
-      "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
      "dependencies": {
-        "get-intrinsic": "^1.2.2"
+        "es-define-property": "^1.0.0"
      },
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
@ -2657,9 +2674,9 @@
      }
    },
    "node_modules/hasown": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
-      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz",
+      "integrity": "sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==",
      "dependencies": {
        "function-bind": "^1.1.2"
      },
@ -3676,9 +3693,9 @@
      }
    },
    "node_modules/postcss": {
-      "version": "8.4.34",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.34.tgz",
-      "integrity": "sha512-4eLTO36woPSocqZ1zIrFD2K1v6wH7pY1uBh0JIM2KKfrVtGvPFiAku6aNOP0W1Wr9qwnaCsF0Z+CrVnryB2A8Q==",
+      "version": "8.4.35",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz",
+      "integrity": "sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==",
      "dev": true,
      "funding": [
        {
@ -3972,14 +3989,15 @@
      }
    },
    "node_modules/regexp.prototype.flags": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz",
-      "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==",
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
+      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
      "dev": true,
      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "set-function-name": "^2.0.0"
+        "call-bind": "^1.0.6",
+        "define-properties": "^1.2.1",
+        "es-errors": "^1.3.0",
+        "set-function-name": "^2.0.1"
      },
      "engines": {
        "node": ">= 0.4"
--- a/src/www/js/i18n.js
+++ b/src/www/js/i18n.js
@ -191,4 +191,85 @@ const messages = { // eslint-disable-line no-unused-vars
    madeBy: 'Erstellt von',
    donate: 'Spenden',
  },
+  ca: { // github.com/guillembonet
+    name: 'Nom',
+    password: 'Contrasenya',
+    signIn: 'Iniciar sessió',
+    logout: 'Tanca sessió',
+    updateAvailable: 'Hi ha una actualització disponible!',
+    update: 'Actualitza',
+    clients: 'Clients',
+    new: 'Nou',
+    deleteClient: 'Esborra client',
+    deleteDialog1: 'Estàs segur que vols esborrar aquest client?',
+    deleteDialog2: 'Aquesta acció no es pot desfer.',
+    cancel: 'Cancel·la',
+    create: 'Crea',
+    createdOn: 'Creat el ',
+    lastSeen: 'Última connexió el ',
+    totalDownload: 'Baixada total: ',
+    totalUpload: 'Pujada total: ',
+    newClient: 'Nou client',
+    disableClient: 'Desactiva client',
+    enableClient: 'Activa client',
+    noClients: 'Encara no hi ha cap client.',
+    showQR: 'Mostra codi QR',
+    downloadConfig: 'Descarrega configuració',
+    madeBy: 'Fet per',
+    donate: 'Donatiu',
+  },
+  es: { // github.com/amarqz
+    name: 'Nombre',
+    password: 'Contraseña',
+    signIn: 'Iniciar sesión',
+    logout: 'Cerrar sesión',
+    updateAvailable: '¡Hay una actualización disponible!',
+    update: 'Actualizar',
+    clients: 'Clientes',
+    new: 'Nuevo',
+    deleteClient: 'Eliminar cliente',
+    deleteDialog1: '¿Estás seguro de que quieres borrar este cliente?',
+    deleteDialog2: 'Esta acción no podrá ser revertida.',
+    cancel: 'Cancelar',
+    create: 'Crear',
+    createdOn: 'Creado el ',
+    lastSeen: 'Última conexión el ',
+    totalDownload: 'Total descargado: ',
+    totalUpload: 'Total subido: ',
+    newClient: 'Nuevo cliente',
+    disableClient: 'Desactivar cliente',
+    enableClient: 'Activar cliente',
+    noClients: 'Aún no hay ningún cliente.',
+    showQR: 'Mostrar código QR',
+    downloadConfig: 'Descargar configuración',
+    madeBy: 'Hecho por',
+    donate: 'Donar',
+  },
+  ko: {
+    name: '이름',
+    password: '암호',
+    signIn: '로그안',
+    logout: '로그아웃',
+    updateAvailable: '업데이트가 있습니다!',
+    update: '업데이트',
+    clients: '클라이언트',
+    new: '추가',
+    deleteClient: '클라이언트 삭제',
+    deleteDialog1: '삭제 하시겠습니까?',
+    deleteDialog2: '이 작업은 취소할 수 없습니다.',
+    cancel: '취소',
+    create: '생성',
+    createdOn: '생성일: ',
+    lastSeen: '마지막 사용 날짜: ',
+    totalDownload: '총 다운로드: ',
+    totalUpload: '총 업로드: ',
+    newClient: '새로운 클라이언트',
+    disableClient: '클라이언트 비활성화',
+    enableClient: '클라이언트 활성화',
+    noClients: '아직 클라이언트가 없습니다.',
+    showQR: 'QR 코드 표시',
+    downloadConfig: '구성 다운로드',
+    madeBy: '만든 사람',
+    donate: '기부',
+  },
 };