From c934d7ecd3068d9a191fa67ffc5639dc9afbea54 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Tue, 25 Jul 2023 21:37:12 +0200 Subject: [PATCH] wip: english translation --- frontend/src/App.vue | 3 +- frontend/src/components/Confirmation.vue | 59 ++-- .../src/components/InterfaceViewModal.vue | 4 +- frontend/src/components/Modal.vue | 2 +- frontend/src/components/PeerViewModal.vue | 45 ++- frontend/src/components/UserEditModal.vue | 60 ++-- frontend/src/components/UserViewModal.vue | 37 +-- frontend/src/helpers/models.js | 9 +- frontend/src/lang/index.js | 4 +- frontend/src/lang/translations/en.json | 313 +++++++++++++----- frontend/src/lang/translations/es.json | 3 - frontend/src/views/AboutView.vue | 15 - frontend/src/views/HomeView.vue | 42 +-- frontend/src/views/InterfaceView.vue | 115 ++++--- frontend/src/views/LoginView.vue | 14 +- frontend/src/views/ProfileView.vue | 28 +- frontend/src/views/UserView.vue | 43 +-- 17 files changed, 459 insertions(+), 337 deletions(-) delete mode 100644 frontend/src/lang/translations/es.json delete mode 100644 frontend/src/views/AboutView.vue diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 9b51d7e..dfe1641 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -109,13 +109,12 @@ const currentYear = ref(new Date().getFullYear())
Copyright © {{ companyName }} {{ currentYear }} - version {{ wgVersion }}
-
+
English Deutsch - Español
diff --git a/frontend/src/components/Confirmation.vue b/frontend/src/components/Confirmation.vue index 3c567a7..d5a5318 100644 --- a/frontend/src/components/Confirmation.vue +++ b/frontend/src/components/Confirmation.vue @@ -1,31 +1,8 @@ - - - - \ No newline at end of file + + + + + diff --git a/frontend/src/components/InterfaceViewModal.vue b/frontend/src/components/InterfaceViewModal.vue index 378e0ed..b71c400 100644 --- a/frontend/src/components/InterfaceViewModal.vue +++ b/frontend/src/components/InterfaceViewModal.vue @@ -28,7 +28,7 @@ const title = computed(() => { return "" // otherwise interfaces.GetSelected will die... } - return t("interfaces.interface.show") + ": " + selectedInterface.value.Identifier + return t("modals.interface-view.headline") + " " + selectedInterface.value.Identifier }) // functions @@ -54,7 +54,7 @@ function close() { diff --git a/frontend/src/components/Modal.vue b/frontend/src/components/Modal.vue index 17cbd61..7409b57 100644 --- a/frontend/src/components/Modal.vue +++ b/frontend/src/components/Modal.vue @@ -2,7 +2,7 @@
-
+
{{ title }}
diff --git a/frontend/src/components/PeerViewModal.vue b/frontend/src/components/PeerViewModal.vue index a6f1fe5..d06f24b 100644 --- a/frontend/src/components/PeerViewModal.vue +++ b/frontend/src/components/PeerViewModal.vue @@ -63,16 +63,14 @@ const title = computed(() => { return "" // otherwise interfaces.GetSelected will die... } if (selectedInterface.value.Mode === "server") { - return t("interfaces.peer.view") + ": " + selectedPeer.value.DisplayName + return t("modals.peer-view.headline-peer") + " " + selectedPeer.value.DisplayName } else { - return t("interfaces.endpoint.view") + ": " + selectedPeer.value.DisplayName + return t("modals.peer-view.headline-endpoint") + " " + selectedPeer.value.DisplayName } }) watch(() => props.visible, async (newValue, oldValue) => { if (oldValue === false && newValue === true) { // if modal is shown - console.log(selectedInterface.value) - console.log(selectedPeer.value) await peers.LoadPeerConfig(selectedPeer.value.Identifier) configString.value = peers.configuration } @@ -121,21 +119,20 @@ function email() {

-

Details

    -
  • Identifier: {{ selectedPeer.PublicKey }}
    • -
  • IP Addresses: {{ ip }}
    • -
  • Linked User: {{ selectedPeer.UserIdentifier }}
    • -
  • Notes: {{ selectedPeer.Notes }}
    • -
  • Expires At: {{ selectedPeer.ExpiresAt }}
    • -
  • Disabled Reason: {{ selectedPeer.DisabledReason }}
    • +
  • {{ $t('modals.peer-view.identifier') }}: {{ selectedPeer.PublicKey }}
    • +
  • {{ $t('modals.peer-view.ip') }}: {{ ip }}
    • +
  • {{ $t('modals.peer-view.user') }}: {{ selectedPeer.UserIdentifier }}
    • +
  • {{ $t('modals.peer-view.notes') }}: {{ selectedPeer.Notes }}
    • +
  • {{ $t('modals.peer-view.expiry-status') }}: {{ selectedPeer.ExpiresAt }}
    • +
  • {{ $t('modals.peer-view.disabled-status') }}: {{ selectedPeer.DisabledReason }}
@@ -148,21 +145,21 @@ function email() {

-

Traffic

-

{{ selectedStats.BytesReceived }} Bytes / {{ selectedStats.BytesTransmitted }} Bytes

-

Connection Stats

+

{{ $t('modals.peer-view.traffic') }}

+

{{ selectedStats.BytesReceived }} Bytes / {{ selectedStats.BytesTransmitted }} Bytes

+

{{ $t('modals.peer-view.connection-status') }}

    -
  • Pingable: {{ selectedStats.IsPingable }}
    • -
  • Last Handshake: {{ selectedStats.LastHandshake }}
    • -
  • Connected Since: {{ selectedStats.LastSessionStart }}
    • -
  • Endpoint: {{ selectedStats.EndpointAddress }}
    • +
  • {{ $t('modals.peer-view.pingable') }}: {{ selectedStats.IsPingable }}
    • +
  • {{ $t('modals.peer-view.handshake') }}: {{ selectedStats.LastHandshake }}
    • +
  • {{ $t('modals.peer-view.connected-since') }}: {{ selectedStats.LastSessionStart }}
    • +
  • {{ $t('modals.peer-view.endpoint') }}: {{ selectedStats.EndpointAddress }}
@@ -172,7 +169,7 @@ function email() {

@@ -185,10 +182,10 @@ function email() { diff --git a/frontend/src/components/UserEditModal.vue b/frontend/src/components/UserEditModal.vue index 3106295..cf2ac0c 100644 --- a/frontend/src/components/UserEditModal.vue +++ b/frontend/src/components/UserEditModal.vue @@ -26,9 +26,9 @@ const title = computed(() => { return "" // otherwise interfaces.GetSelected will die... } if (selectedUser.value) { - return t("users.edit") + ": " + selectedUser.value.Identifier + return t("modals.user-edit.headline-edit") + " " + selectedUser.value.Identifier } - return t("users.new") + return t("modals.user-edit.headline-new") }) const formData = ref(freshUser()) @@ -97,78 +97,78 @@ async function del() { diff --git a/frontend/src/components/UserViewModal.vue b/frontend/src/components/UserViewModal.vue index 492ace1..c2edbb7 100644 --- a/frontend/src/components/UserViewModal.vue +++ b/frontend/src/components/UserViewModal.vue @@ -3,7 +3,6 @@ import Modal from "./Modal.vue"; import {userStore} from "../stores/users"; import {computed, ref, watch} from "vue"; import { useI18n } from 'vue-i18n'; -import { notify } from "@kyvg/vue3-notification"; const { t } = useI18n() @@ -29,7 +28,7 @@ const title = computed(() => { if (!props.visible) { return "" // otherwise interfaces.GetSelected will die... } - return t("users.view") + ": " + selectedUser.value.Identifier + return t("modals.user-view.headline") + " " + selectedUser.value.Identifier }) const userPeers = computed(() => { @@ -56,52 +55,52 @@ function close() { diff --git a/frontend/src/helpers/models.js b/frontend/src/helpers/models.js index 92fc9a1..3dfa4d6 100644 --- a/frontend/src/helpers/models.js +++ b/frontend/src/helpers/models.js @@ -39,7 +39,10 @@ export function freshInterface() { PeerDefPreUp: "", PeerDefPostUp: "", PeerDefPreDown: "", - PeerDefPostDown: "" + PeerDefPostDown: "", + + TotalPeers: 0, + EnabledPeers: 0 } } @@ -141,7 +144,9 @@ export function freshUser() { Disabled: false, DisabledReason: "", Locked: false, - LockedReason: "" + LockedReason: "", + + PeerCount: 0 } } diff --git a/frontend/src/lang/index.js b/frontend/src/lang/index.js index 24c2bc9..1b6460a 100644 --- a/frontend/src/lang/index.js +++ b/frontend/src/lang/index.js @@ -1,7 +1,6 @@ // src/lang/index.js import de from './translations/de.json'; import en from './translations/en.json'; -import es from './translations/es.json'; import {createI18n} from "vue-i18n"; function getStoredLanguage() { @@ -21,8 +20,7 @@ const i18n = createI18n({ fallbackLocale: "en", // set fallback locale messages: { "de": de, - "en": en, - "es": es + "en": en } }); diff --git a/frontend/src/lang/translations/en.json b/frontend/src/lang/translations/en.json index 9266d1c..48ae478 100644 --- a/frontend/src/lang/translations/en.json +++ b/frontend/src/lang/translations/en.json @@ -1,137 +1,278 @@ { - "hello": "Hello World!", + "general": { + "pagination": { + "size": "Number of Elements", + "all": "All (slow)" + }, + "search": { + "placeholder": "Search...", + "button": "Search" + }, + "select-all": "Select all", + "yes": "Yes", + "no": "No", + "cancel": "Cancel", + "close": "Close", + "save": "Save", + "delete": "Delete" + }, + "login": { + "headline": "Please sign in", + "username": { + "label": "Username", + "placeholder": "Please enter your username" + }, + "password": { + "label": "Password", + "placeholder": "Please enter your password" + }, + "button": "Sign in" + }, "menu": { "home": "Home", "interfaces": "Interfaces", "users": "Users", - "firstname": "Firstname", - "lastname": "Lastname", - "login": "Login", "lang": "Toggle Language", "profile": "My Profile", + "login": "Login", "logout": "Logout" }, "home": { - "h1": "WireGuard® VPN Portal", - "info": "More Information", + "headline": "WireGuard® VPN Portal", + "info-headline": "More Information", "abstract": "WireGuard® is an extremely simple yet fast and modern VPN that utilizes state-of-the-art cryptography. It aims to be faster, simpler, leaner, and more useful than IPsec, while avoiding the massive headache. It intends to be considerably more performant than OpenVPN.", "installation": { - "instruct": "Installation instructions for client software can be found on the official WireGuard website.", - "h1": "WireGuard Installation", - "h2": "Installation", + "box-header": "WireGuard Installation", + "headline": "Installation", + "content": "Installation instructions for client software can be found on the official WireGuard website.", "btn": "Open Instructions" }, "about-wg": { - "instruct": "WireGuard® is an extremely simple yet fast and modern VPN that utilizes state-of-the-art cryptography.", - "h1": "About WireGuard", - "h2": "About", - "btn": "More" + "box-header": "About WireGuard", + "headline": "About", + "content": "WireGuard® is an extremely simple yet fast and modern VPN that utilizes state-of-the-art cryptography.", + "button": "More" }, "about-portal": { - "instruct": "WireGuard Portal is a simple, web based configuration portal for WireGuard.", - "h1": "About WireGuard Portal", - "h2": "WireGuard Portal", - "btn": "More" + "box-header": "About WireGuard Portal", + "headline": "WireGuard Portal", + "content": "WireGuard Portal is a simple, web based configuration portal for WireGuard.", + "button": "More" }, "profiles": { - "h1": "VPN Profiles", + "headline": "VPN Profiles", "abstract": "You can access and download your personal VPN configurations via your Userprofile.", - "instruct": "To find all your configured profiles click on the button below.", - "btn": "Open my profile" + "content": "To find all your configured profiles click on the button below.", + "button": "Open my profile" }, "admin": { - "h1": "Administration Area", + "headline": "Administration Area", "abstract": "In the administration area you can manage WireGuard peers and the server interface as well as users that are allowed to log in to the WireGuard Portal.", - "instruct": "To find all your configured profiles click on the button below.", - "btn-1": "Open Server Administration", - "btn-2": "Open User Administration" + "content": "To find all your configured profiles click on the button below.", + "button-admin": "Open Server Administration", + "button-user": "Open User Administration" } }, "interfaces": { - "h1": "Interface Administration", - "h2": "Current VPN Peers", - "h2-client": "Current Endpoints", - "tableHeadings": { + "headline": "Interface Administration", + "headline-peers": "Current VPN Peers", + "headline-endpoints": "Current Endpoints", + "no-interface": { + "default-selection": "No Interface available", + "headline": "No interfaces found...", + "abstract": "Click the plus button above to create a new WireGuard interface." + }, + "no-peer": { + "headline": "No peers available", + "abstract": "Currently, there are no peers available for the selected WireGuard interface." + }, + "table-heading": { "name": "Name", "user": "User", "ip": "IP's", "endpoint": "Endpoint", - "stats": "Status" + "status": "Status" }, - "noInterface": { - "h1": "No interfaces found...", - "message": "Click the plus button above to create a new WireGuard interface." - }, - "notAvailable": "No Interface available", - "statusBox": { - "h1": "Interface status for", + "interface": { + "headline": "Interface status for", "mode": "mode", "key": "Public Key", "endpoint": "Public Endpoint", "port": "Listening Port", "peers": "Enabled Peers", - "totalPeers": "Total Peers", + "total-peers": "Total Peers", + "endpoints": "Enabled Endpoints", + "total-endpoints": "Total Endpoints", "ip": "IP Address", - "allowedIP": "Default allowed IPs", - "dnsServers": "DNS Servers", - "mtu": "Default MTU", - "interval": "Default Keepalive Interval" + "default-allowed-ip": "Default allowed IPs", + "dns": "DNS Servers", + "mtu": "MTU", + "default-keep-alive": "Default Keepalive Interval", + "button-show-config": "Show configuration", + "button-download-config": "Download configuration", + "button-store-config": "Store configuration for wg-quick", + "button-edit": "Edit interface" }, - "noPeerSelect": { - "h4": "No peers for the selected interface...", - "message": "Click the plus button above to create a new WireGuard interface." - }, - "peer": { - "new": "Create new peer", - "edit": "Edit peer" - }, - "interface": { - "new": "Create new interface", - "edit": "Edit interface" - }, - "endpoint": { - "new": "Create new endpoint", - "edit": "Edit endpoint" - } + "button-add-interface": "Add Interface", + "button-add-peer": "Add Peer", + "button-add-peers": "Add Multiple Peers", + "button-show-peer": "Show Peer", + "button-edit-peer": "Edit Peer", + "peer-disabled": "Peer is disabled, reason:", + "peer-expiring": "Peer is expiring at", + "peer-connected": "Connected", + "peer-not-connected": "Not Connected", + "peer-handshake": "Last handshake:" }, - "login": { - "please": "Please sign in", - "username": "Username", - "userMessage": "Please enter your username", - "pass": "Password", - "passMessage": "Please enter your password", - "btn": "Sign in" - }, - "user": { - "h1": "User Administration", - "id": "ID", - "email": "eMail", - "firstname": "Firstname", - "lastname": "Lastname", - "source": "Source", - "peers": "Peers", - "admin": "Admin", - "addUser": "Add User", - "addMulti": "Add Multiple Users" + "users": { + "headline": "User Administration", + "table-heading": { + "id": "ID", + "email": "E-Mail", + "firstname": "Firstname", + "lastname": "Lastname", + "source": "Source", + "peers": "Peers", + "admin": "Admin" + }, + "no-user": { + "headline": "No users available", + "abstract": "Currently, there are no users registered with WireGuard Portal." + }, + "button-add-user": "Add User", + "button-show-user": "Show User", + "button-edit-user": "Edit User", + "user-disabled": "User is disabled, reason:", + "user-locked": "Account is locked, reason:", + "admin": "User has administrator privileges", + "no-admin": "User has no administrator privileges" }, "profile": { - "h2-clients": "My VPN Peers", - "tableHeadings": { + "headline": "My VPN Peers", + "table-heading": { "name": "Name", "ip": "IP's", "stats": "Status", "interface": "Server Interface" - } + }, + "no-peer": { + "headline": "No peers available", + "abstract": "Currently, there are no peers associated with your user profile." + }, + "peer-connected": "Connected", + "button-add-peer": "Add Peer", + "button-show-peer": "Show Peer", + "button-edit-peer": "Edit Peer" }, "modals": { - "peeredit": { + "user-view": { + "headline": "User Account:", + "tab-user": "Information", + "tab-peers": "Peers", + "headline-info": "User Information:", + "headline-notes": "Notes:", + "email": "E-Mail", + "firstname": "Firstname", + "lastname": "Lastname", + "phone": "Phone number", + "department": "Department", + "disabled": "Account Disabled", + "locked": "Account Locked", + "no-peers": "User has no associated peers.", + "peers": { + "name": "Name", + "interface": "Interface", + "ip": "IP's" + } + }, + "user-edit": { + "headline-edit": "Edit user:", + "headline-new": "New user", + "header-general": "General", + "header-personal": "User Information", + "header-notes": "Notes", + "header-state": "State", + "identifier": { + "label": "Identifier", + "placeholder": "The unique user identifier" + }, + "source": { + "label": "Source", + "placeholder": "The user source" + }, + "password": { + "label": "Password", + "placeholder": "A super secret password", + "description": "Leave this field blank to keep current password." + }, + "email": { + "label": "Email", + "placeholder": "The email address" + }, + "phone": { + "label": "Phone", + "placeholder": "The phone number" + }, + "department": { + "label": "Department", + "placeholder": "The department" + }, + "firstname": { + "label": "Firstname", + "placeholder": "Firstname" + }, + "lastname": { + "label": "Lastname", + "placeholder": "Lastname" + }, + "notes": { + "label": "Notes", + "placeholder": "" + }, + "disabled": { + "label": "Disabled (no WireGuard connection and no login possible)" + }, + "locked": { + "label": "Locked (no login possible, WireGuard connections still work)" + }, + "admin": { + "label": "Is Admin" + } + }, + "interface-view": { + "headline": "Config for Interface:" + }, + "interface-edit": { + "privatekey": "Private Key" + }, + "peer-view": { + "headline-peer": "Peer:", + "headline-endpoint": "Endpoint:", + "section-info": "Peer Information", + "section-status": "Current Status", + "section-config": "Configuration", + "identifier": "Identifier", + "ip": "IP Addresses", + "user": "Associated User", + "notes": "Notes", + "expiry-status": "Expires At", + "disabled-status": "Disabled At", + "traffic": "Traffic", + "connection-status": "Connection Stats", + "upload": "Uploaded Bytes (from Server to Peer)", + "download": "Downloaded Bytes (from Peer to Server)", + "pingable": "Is Pingable", + "handshake": "Last Handshake", + "connected-since": "Connected since", + "endpoint": "Endpoint", + "button-download": "Download configuration", + "button-email": "Send configuration via E-Mail" + }, + "peer-edit": { + "privatekey": "Private Key" + }, + "peer-multi-create": { "privatekey": "Private Key" - } - }, - "general": { - "pagination": { - "size": "Number of Elements", - "all": "All (slow)" } } } diff --git a/frontend/src/lang/translations/es.json b/frontend/src/lang/translations/es.json deleted file mode 100644 index 52a94ef..0000000 --- a/frontend/src/lang/translations/es.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "hello": "Hola mundo!" -} diff --git a/frontend/src/views/AboutView.vue b/frontend/src/views/AboutView.vue deleted file mode 100644 index 756ad2a..0000000 --- a/frontend/src/views/AboutView.vue +++ /dev/null @@ -1,15 +0,0 @@ - - - diff --git a/frontend/src/views/HomeView.vue b/frontend/src/views/HomeView.vue index f3d6eef..b0dafe8 100644 --- a/frontend/src/views/HomeView.vue +++ b/frontend/src/views/HomeView.vue @@ -7,65 +7,65 @@