Skip to content

Commit

Permalink
Merge branch 'master' into 1.5.X
Browse files Browse the repository at this point in the history
  • Loading branch information
louislam committed Oct 13, 2024
2 parents 19beb02 + df95d7c commit 020faa4
Show file tree
Hide file tree
Showing 21 changed files with 349 additions and 31 deletions.
2 changes: 2 additions & 0 deletions backend/agent-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ export class AgentManager {
if (bean) {
await R.trash(bean);
let endpoint = bean.endpoint;
this.disconnect(endpoint);
this.sendAgentList();
delete this.agentSocketList[endpoint];
} else {
throw new Error("Agent not found");
Expand Down
15 changes: 13 additions & 2 deletions frontend/src/lang/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"restartPolicyAlways": "دائماً",
"restartPolicyOnFailure": "عند الفشل",
"restartPolicyNo": "لا",
"environmentVariable": "متغير البيئة | متغيرات البيئة",
"environmentVariable": "متغير | متغيرات",
"restartPolicy": "سياسة إعادة التشغيل",
"containerName": "اسم الحاوية",
"port": "منفذ | منافذ",
Expand Down Expand Up @@ -98,5 +98,16 @@
"url": "رابط | روابط",
"extra": "إضافات",
"reverseProxyMsg1": "هل تستدخم خادم عكسي؟",
"connecting...": "جاري الاتصال بخادم المقبس…"
"connecting...": "جاري الاتصال بخادم المقبس…",
"newUpdate": "تحديث جديد",
"currentEndpoint": "السياق: الوكيل الحالي",
"dockgeURL": "رابط Dockge (مثلا http://127.0.0.1:5001)",
"agentOnline": "متصل",
"agentOffline": "غير متصل",
"connecting": "جاري الإتصال",
"connect": "ارتبط",
"dockgeAgent": "سيرفر Dockge",
"removeAgent": "حذف الوكيل",
"removeAgentMsg": "هل انت متأكد من حذف هذا الوكيل؟",
"LongSyntaxNotSupported": "كتابة النصوص المدعومة غير المدعومة هنا. الرجاء استخدام محرر YAML."
}
116 changes: 116 additions & 0 deletions frontend/src/lang/be.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
{
"active": "акт.",
"LongSyntaxNotSupported": "Доўгі сінтаксіс тут не падтрымліваецца. Выкарыстоўвайце рэдактар YAML.",
"removeAgentMsg": "Вы ўпэўнены, што хочаце выдаліць гэтага агента?",
"languageName": "Беларуская",
"Create your admin account": "Стварыце ўліковы запіс адміністратара",
"authIncorrectCreds": "Няправільны лагін ці пароль.",
"PasswordsDoNotMatch": "Паролі не супадаюць.",
"Repeat Password": "Паўтарыце пароль",
"Create": "Стварыць",
"signedInDisp": "Аўтарызаваны як {0}",
"signedInDispDisabled": "Аўтарызацыя выключана.",
"home": "Галоўная",
"console": "Кансоль",
"registry": "Рэестр (Registry)",
"compose": "Compose",
"addFirstStackMsg": "Стварыце свой першы стэк!",
"stackName": "Назва стэка",
"deployStack": "Разгарнуць",
"deleteStack": "Выдаліць",
"stopStack": "Спыніць",
"restartStack": "Перазапусціць",
"updateStack": "Абнавіць",
"startStack": "Запусціць",
"downStack": "Спыніць і дэактываваць",
"editStack": "Рэдагаваць",
"discardStack": "Скасаваць",
"saveStackDraft": "Захаваць",
"notAvailableShort": "Н/Д",
"deleteStackMsg": "Вы ўпэўнены, што хочаце выдаліць гэты стэк?",
"stackNotManagedByDockgeMsg": "Дадзены стэк не кіруецца Dockge.",
"primaryHostname": "Імя хоста",
"general": "Агульныя",
"container": "Кантэйнер | Кантэйнеры",
"scanFolder": "Сканаваць папку стэкаў",
"dockerImage": "Вобраз",
"restartPolicyUnlessStopped": "Пакуль не будзе спынены",
"restartPolicyAlways": "Заўсёды",
"restartPolicyOnFailure": "Пры падзенні",
"restartPolicyNo": "Ніколі",
"environmentVariable": "Зменная асяроддзя | Зменныя асяроддзя",
"restartPolicy": "Палітыка рэстарту",
"containerName": "Імя кантэйнера",
"port": "Порт | Порты",
"volume": "Сховішча | Сховішчы",
"network": "Сетка | Сеткі",
"dependsOn": "Залежнасць кантэйнера | Залежнасці кантэйнера",
"addListItem": "Дадаць {0}",
"deleteContainer": "Выдаліць",
"addContainer": "Дадаць кантэйнер",
"addNetwork": "Дадаць сетку",
"disableauth.message1": "Вы ўпэўнены, што хочаце <strong>адключыць аўтэнтыфікацыю</strong>?",
"Show update if available": "Паказаць абнаўленне, калі яно даступна",
"Also check beta release": "Атрымліваць бэта-версіі",
"disableauth.message2": "Гэта прызначана для сцэнарыяў, <strong>калі вы збіраецеся выкарыстоўваць староннюю аўтэнтыфікацыю</strong> перад Dockge, напрыклад, Cloudflare Access, Authelia або іншыя механізмы аўтэнтыфікацыі.",
"passwordNotMatchMsg": "Паўторны пароль не супадае.",
"autoGet": "Аўта",
"add": "Дадаць",
"Edit": "Змяніць",
"applyToYAML": "Ужыць да YAML",
"createExternalNetwork": "Стварыць",
"addInternalNetwork": "Дадаць",
"Save": "Захаваць",
"Language": "Мова",
"Current User": "Бягучы карыстальнік",
"Change Password": "Змяніць пароль",
"Current Password": "Бягучы пароль",
"New Password": "Новы пароль",
"Repeat New Password": "Паўтарыце новы пароль",
"Update Password": "Абнавіць пароль",
"Advanced": "Пашыраныя",
"Please use this option carefully!": "Выкарыстоўвайце гэтую опцыю асцярожна!",
"Enable Auth": "Уключыць аўтэнтыфікацыю",
"Disable Auth": "Адключыць аўтэнтыфікацыю",
"I understand, please disable": "Я разумею, адключыце",
"Leave": "Пакінуць",
"Frontend Version": "Версія знешняга інтэрфейсу",
"Check Update On GitHub": "Праверыць абнаўленні на GitHub",
"Remember me": "Запомніць мяне",
"Login": "Лагін",
"Username": "Імя карыстальніка",
"Password": "Пароль",
"Settings": "Налады",
"Logout": "Выйсці",
"Lowercase only": "Толькі ніжні рэгістр",
"Convert to Compose": "Пераўтварыць у Compose",
"Docker Run": "Docker Run",
"exited": "спын.",
"inactive": "неакт.",
"Appearance": "Знешні выгляд",
"Security": "Бяспека",
"About": "Аб праграме",
"Allowed commands:": "Дазволеныя каманды:",
"Internal Networks": "Унутраныя сеткі",
"External Networks": "Знешнія сеткі",
"No External Networks": "Няма знешніх сетак",
"reverseProxyMsg1": "Выкарыстоўваеце зваротны проксі?",
"reverseProxyMsg2": "Праверце, як наладзіць яго для WebSocket",
"Cannot connect to the socket server.": "Не ўдалося падключыцца да сокет-сервера.",
"reconnecting...": "Перападключэнне…",
"connecting...": "Падключэнне да сокет-сервера…",
"url": "URL-адрас | URL-адрасы",
"extra": "Дадаткова",
"newUpdate": "Даступна абнаўленне",
"dockgeAgent": "Агент Dockge | Агенты Dockge",
"currentEndpoint": "Бягучы",
"dockgeURL": "URL-адрас Dockge (напрыклад: http://127.0.0.1:5001)",
"agentOnline": "У сетцы",
"agentOffline": "Не ў сетцы",
"connecting": "Падключэнне",
"connect": "Падключыць",
"addAgent": "Дадаць Агента",
"agentAddedSuccessfully": "Агент паспяхова дададзены.",
"agentRemovedSuccessfully": "Агент паспяхова выдалены.",
"removeAgent": "Выдаліць агента"
}
3 changes: 2 additions & 1 deletion frontend/src/lang/ca.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,5 +111,6 @@
"Please use this option carefully!": "Si us plau, utilitzeu aquesta opció amb cura!",
"Enable Auth": "Habilitar autenticació",
"I understand, please disable": "Ho entenc, si us plau deshabilita",
"Password": "Contrasenya"
"Password": "Contrasenya",
"LongSyntaxNotSupported": "La sintaxi llarga no està suportada aquí. Si us plau, fes servir l'editor YAML."
}
3 changes: 2 additions & 1 deletion frontend/src/lang/da.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,5 +111,6 @@
"agentAddedSuccessfully": "Agent succesfuld tilføjet.",
"agentRemovedSuccessfully": "Agent succesfuld fjernet.",
"removeAgent": "Fjern agent",
"removeAgentMsg": "Er du sikker på at du vil fjerne denne agent?"
"removeAgentMsg": "Er du sikker på at du vil fjerne denne agent?",
"LongSyntaxNotSupported": "Langt syntaks er ikke understøttet her. Forsøg venligst med YAML-editoren."
}
2 changes: 1 addition & 1 deletion frontend/src/lang/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"Cannot connect to the socket server.": "Keine Verbindung zum Socket Server.",
"reverseProxyMsg1": "Wird ein Reverse Proxy genutzt?",
"reconnecting...": "Erneuter Verbindungsaufbau…",
"downStack": "Stopp & Inaktiv",
"downStack": "Stoppen & Deaktivieren",
"extra": "Extra",
"url": "URL / URLs",
"reverseProxyMsg2": "Lerne wie dieser für WebSockets zu konfigurieren ist.",
Expand Down
7 changes: 4 additions & 3 deletions frontend/src/lang/es.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"languageName": "Español",
"languageName": "Inglés",
"Create your admin account": "Crea tu cuenta de administrador",
"authIncorrectCreds": "Nombre de usuario o contraseña incorrectos.",
"PasswordsDoNotMatch": "Las contraseñas no coinciden.",
Expand Down Expand Up @@ -98,7 +98,7 @@
"Cannot connect to the socket server.": "No se puede conectar al servidor del socket.",
"reconnecting...": "Reconectando…",
"connecting...": "Conectando al servidor del socket…",
"url": "URL | URLs",
"url": "Dirección URL | Direcciones URLs",
"extra": "Addicional",
"currentEndpoint": "Corriente",
"dockgeURL": "URL de Dockge (ej. http://127.0.0.1:5001)",
Expand All @@ -111,5 +111,6 @@
"removeAgentMsg": "Estás seguro que deseas remover este agente?",
"dockgeAgent": "Agentes Dockge",
"connecting": "Conectando",
"agentRemovedSuccessfully": "Agente removido satisfactoriamente."
"agentRemovedSuccessfully": "Agente removido satisfactoriamente.",
"LongSyntaxNotSupported": "Aquí no hay soporte para la sintaxis larga. Por favor use el editor de YAML."
}
116 changes: 116 additions & 0 deletions frontend/src/lang/ga.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
{
"Create your admin account": "Cruthaigh do chuntas riaracháin",
"authIncorrectCreds": "Ainm úsáideora nó pasfhocal mícheart.",
"PasswordsDoNotMatch": "Níl na pasfhocail comhthráthacha.",
"Repeat Password": "Athscríobh an Pasfhocal",
"Create": "Cruthaigh",
"signedInDisp": "Sínithe isteach mar {0}",
"languageName": "Gaeilge",
"console": "Consól",
"registry": "Clárlann",
"compose": "Scríobh",
"stackName": "Ainm an Staca",
"deployStack": "Deighil",
"deleteStack": "Scrios",
"stopStack": "Stad",
"restartStack": "Atosaigh",
"updateStack": "Nuashonraigh",
"startStack": "Tosaigh",
"downStack": "Stad & Neamhghníomhach",
"editStack": "Cuir in Eagar",
"discardStack": "Caith amach",
"saveStackDraft": "Sábháil",
"deleteStackMsg": "An bhfuil tú cinnte go bhfuil tú ag iarraidh an staca seo a scriosadh?",
"primaryHostname": "Príomhainm óstáin",
"general": "Ginearálta",
"container": "Coimeádán | Coimeádáin",
"scanFolder": "Scanáil Fillteáin na dStacanna",
"dockerImage": "Íomha",
"restartPolicyUnlessStopped": "Mura Stadfar",
"restartPolicyAlways": "I gcónaí",
"restartPolicyOnFailure": "Ar theip",
"restartPolicyNo": "Níl",
"environmentVariable": "Athróg Timpeallacht | Athróga Timpeallacht",
"restartPolicy": "Polasaí Atosaigh",
"port": "Port | Portanna",
"volume": "Toirt | Toirteanna",
"network": "Líonra | Líonraí",
"dependsOn": "Spleáchas Coimeádán | Spleáchais Coimeádán",
"addListItem": "Cuir {0}",
"deleteContainer": "Scrios",
"addContainer": "Cuir Coimeádán leis",
"addNetwork": "Cuir Líonra leis",
"add": "Cuir",
"Edit": "Cuir in eagar",
"applyToYAML": "Déan iarratas ar YAML",
"createExternalNetwork": "Cruthaigh",
"disableauth.message1": "An bhfuil tú cinnte gur mhaith leat <strong>fíordheimhniú a dhíchumasú</strong>?",
"passwordNotMatchMsg": "Ní hionann an pasfhocal athfhillteach.",
"autoGet": "Faigh Uathoibríoch",
"addInternalNetwork": "Cuir",
"Save": "Sábháil",
"Language": "Teanga",
"Current User": "Úsáideoir Reatha",
"New Password": "Pasfhocal Nua",
"Current Password": "Pasfhocal Reatha",
"Change Password": "Athraigh do Phasfhocal",
"Repeat New Password": "Déan Pasfhocal Nua arís",
"Update Password": "Nuashonraigh Pasfhocal",
"Advanced": "Ardleibhéal",
"Please use this option carefully!": "Bain úsáid as an rogha seo go cúramach, le do thoil!",
"Enable Auth": "Cumasaigh Auth",
"Disable Auth": "Auth dhíchumasú",
"I understand, please disable": "Tuigim, le do thoil, múch",
"Leave": "Fág",
"Frontend Version": "Leagan Frontend",
"Check Update On GitHub": "Seiceáil an Nuashonrú ar GitHub",
"Show update if available": "Taispeáin an Nuashonrú más ar fáil",
"Also check beta release": "Seiceáil an scaoileadh beta freisin",
"Remember me": "Cuimhnigh orm",
"Login": "Logáil isteach",
"Username": "Ainm úsáideora",
"Password": "Pasfhocal",
"Logout": "Logáil Amach",
"Lowercase only": "Cás íochtair amháin",
"Convert to Compose": "Tiontaigh go Compóidh",
"Docker Run": "Docker Rith",
"exited": "scoir",
"inactive": "neamhghníomhach",
"Appearance": "Dealramh",
"Security": "Slándáil",
"About": "Maidir le",
"Allowed commands:": "Orduithe ceadaithe:",
"Internal Networks": "Líonraí Inmheánacha",
"External Networks": "Líonraí Seachtracha",
"No External Networks": "Gan Líonraí Seachtracha",
"reverseProxyMsg1": "Ag Úsáid Seachfhreastalaí Réabhlóideach?",
"reverseProxyMsg2": "Seiceáil conas é a shocraigh don WebSocket",
"Cannot connect to the socket server.": "Ní féidir ceangal a dhéanamh leis an freastalaí soicéad.",
"reconnecting...": "Ag athcheangal…",
"connecting...": "Ag nascadh leis an freastalaí soicéad…",
"url": "URL | URLanna",
"extra": "Breise",
"newUpdate": "Nuashonrú Nua",
"dockgeAgent": "Aighne Dockge | Aighnithe Dockge",
"currentEndpoint": "Reatha",
"dockgeURL": "Dockge URL (e.g. http://127.0.0.1:5001)",
"agentOnline": "Ar Líne",
"agentOffline": "As Líne",
"connecting": "Ag Nascadh",
"connect": "Ceangail",
"addAgent": "Cuir Aighne",
"agentAddedSuccessfully": "Aighne curtha leis go rathúil.",
"agentRemovedSuccessfully": "Aighne bhaint as go rathúil.",
"removeAgent": "Bain Aighne",
"removeAgentMsg": "An bhfuil tú cinnte gur mhaith leat an t-aighne seo a bhaint?",
"LongSyntaxNotSupported": "Ní thacaítear leis an níochán fada anseo. Úsáid an Eagarthóir YAML, le do thoil.",
"signedInDispDisabled": "Auth Díchumasaithe.",
"home": "Abhaile",
"addFirstStackMsg": "Scríobh do chéad stac!",
"notAvailableShort": "Níl ar Fáil",
"stackNotManagedByDockgeMsg": "Ní bhainistítear an staca seo ag Dockge.",
"containerName": "Ainm na gCoimeádán",
"disableauth.message2": "Tá sé deartha do chúinsí <strong>ina bhfuil sé beartaithe agat tríú páirtí athbhreithniú a chur i bhfeidhm</strong> os comhair Dockge cosúil le Rochtain Cloudflare, Authelia nó múnlaí deimhniú eile.",
"Settings": "Socruithe",
"active": "gníomhach"
}
3 changes: 2 additions & 1 deletion frontend/src/lang/hu.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,5 +111,6 @@
"Cannot connect to the socket server.": "A Socket csatlakozás nem elérhető.",
"connecting...": "Csatlakozás a socket szerver-hez…",
"url": "URL | URL-ek",
"dockgeURL": "Dockge URL (pl. http://127.0.0.1:5001)"
"dockgeURL": "Dockge URL (pl. http://127.0.0.1:5001)",
"LongSyntaxNotSupported": "A hosszú szintaxis itt nem támogatott. Használja a YAML szerkesztőt."
}
3 changes: 2 additions & 1 deletion frontend/src/lang/id.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,5 +111,6 @@
"currentEndpoint": "Sekarang",
"agentOnline": "Terhubung",
"agentOffline": "Terputus",
"removeAgentMsg": "Apakah anda yakin untuk menghapus agen ini?"
"removeAgentMsg": "Apakah anda yakin untuk menghapus agen ini?",
"LongSyntaxNotSupported": "Sintaks yang panjang tidak didukung di sini. Silakan gunakan editor YAML."
}
7 changes: 4 additions & 3 deletions frontend/src/lang/it-IT.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,10 @@
"reverseProxyMsg1": "Stai usando Reverse Proxy?",
"reverseProxyMsg2": "Verifica come configurarlo per il WebSocket",
"Cannot connect to the socket server.": "impossibile collegarsi al socket server",
"connecting...": "Connessione al server socket…",
"connecting...": "connettendosi al socket server",
"extra": "Extra",
"reconnecting...": "Riconnessione…",
"url": "Indirizzo | Indirizzi",
"url": "URL | URLs",
"newUpdate": "Nuovo aggiornamento",
"dockgeAgent": "Agente Dockge | Agenti Dockge",
"currentEndpoint": "Corrente",
Expand All @@ -111,5 +111,6 @@
"removeAgent": "Rimuovi Agente",
"removeAgentMsg": "Sei sicuro di voler rimuovere questo agente?",
"addAgent": "Aggungi Agente",
"agentAddedSuccessfully": "Agente aggiunto correttamente."
"agentAddedSuccessfully": "Agente aggiunto correttamente.",
"LongSyntaxNotSupported": "La sintassi lunga non è supportata qui. Utilizzare l'editor YAML."
}
34 changes: 34 additions & 0 deletions frontend/src/lang/nb_NO.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"Create your admin account": "Lag din administrator konto",
"authIncorrectCreds": "Brukernavn eller passord stemmer ikke.",
"PasswordsDoNotMatch": "Passord stemmer ikke.",
"Repeat Password": "Gjenta passord",
"Create": "Lag",
"signedInDisp": "Logg in som {0}",
"signedInDispDisabled": "Auth deaktivert.",
"home": "Hjem",
"console": "Konsoll",
"registry": "Register",
"compose": "Skriv",
"addFirstStackMsg": "Lag din første stack!",
"stackName": "Navn på stack",
"deployStack": "Utplassere",
"deleteStack": "Slett",
"stopStack": "Stoppe",
"restartStack": "Omstart",
"updateStack": "Oppdater",
"downStack": "Stop & Inaktiver",
"editStack": "Rediger",
"discardStack": "Kast",
"saveStackDraft": "Lagre",
"notAvailableShort": "N/A",
"deleteStackMsg": "Er du sikker på at du vil slette denne stacken?",
"stackNotManagedByDockgeMsg": "Denne stacken er ikke styrt av Dockge.",
"primaryHostname": "Primært vertsnavn",
"general": "Generell",
"container": "Container | Containers",
"scanFolder": "Skann Stacks mappe",
"dockerImage": "Bilde",
"languageName": "Engelsk",
"startStack": "Start"
}
Loading

0 comments on commit 020faa4

Please sign in to comment.