From 9e9f970c96344bc8a4c8a6c3482d6e53efeb0236 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 20 Oct 2021 11:38:41 +0100 Subject: [PATCH] System monitor section within admin profile --- translations/ar.json | 3 ++- translations/ca.json | 3 ++- translations/cy.json | 3 ++- translations/de.json | 3 ++- translations/en.json | 3 ++- translations/es.json | 3 ++- translations/fr.json | 3 ++- translations/ga.json | 3 ++- translations/hi.json | 3 ++- translations/it.json | 3 ++- translations/ja.json | 3 ++- translations/ku.json | 3 ++- translations/oc.json | 3 ++- translations/pt.json | 3 ++- translations/ru.json | 3 ++- translations/sw.json | 3 ++- translations/zh.json | 3 ++- webapp_profile.py | 15 +++++++++++++++ 18 files changed, 49 insertions(+), 17 deletions(-) diff --git a/translations/ar.json b/translations/ar.json index 027f0a02f..325f09dc4 100644 --- a/translations/ar.json +++ b/translations/ar.json @@ -487,5 +487,6 @@ "Introduce yourself and specify the date and time when you wish to stay": "عرّف عن نفسك وحدد التاريخ والوقت اللذين ترغب في الإقامة فيهما", "Members": "أعضاء", "Join": "انضم", - "Leave": "يترك" + "Leave": "يترك", + "System Monitor": "مراقب النظام" } diff --git a/translations/ca.json b/translations/ca.json index 7e3920654..8e7b37c08 100644 --- a/translations/ca.json +++ b/translations/ca.json @@ -487,5 +487,6 @@ "Introduce yourself and specify the date and time when you wish to stay": "Presenteu-vos i especifiqueu la data i l’hora en què voleu romandre", "Members": "Membres", "Join": "Uneix-te", - "Leave": "Marxa" + "Leave": "Marxa", + "System Monitor": "Monitor del sistema" } diff --git a/translations/cy.json b/translations/cy.json index 337eea82a..97daf5510 100644 --- a/translations/cy.json +++ b/translations/cy.json @@ -487,5 +487,6 @@ "Introduce yourself and specify the date and time when you wish to stay": "Cyflwynwch eich hun a nodwch y dyddiad a'r amser pan fyddwch yn dymuno aros", "Members": "Aelodau", "Join": "Ymunwch", - "Leave": "Gadewch" + "Leave": "Gadewch", + "System Monitor": "Monitor System" } diff --git a/translations/de.json b/translations/de.json index 9abc39dc1..0667373c2 100644 --- a/translations/de.json +++ b/translations/de.json @@ -487,5 +487,6 @@ "Introduce yourself and specify the date and time when you wish to stay": "Stellen Sie sich vor und geben Sie Datum und Uhrzeit Ihres Aufenthalts an", "Members": "Mitglieder", "Join": "Verbinden", - "Leave": "Verlassen" + "Leave": "Verlassen", + "System Monitor": "Systemmonitor" } diff --git a/translations/en.json b/translations/en.json index eec7f8cc3..d7b71a414 100644 --- a/translations/en.json +++ b/translations/en.json @@ -487,5 +487,6 @@ "Introduce yourself and specify the date and time when you wish to stay": "Introduce yourself and specify the date and time when you wish to stay", "Members": "Members", "Join": "Join", - "Leave": "Leave" + "Leave": "Leave", + "System Monitor": "System Monitor" } diff --git a/translations/es.json b/translations/es.json index 5576bd971..1bd72c84e 100644 --- a/translations/es.json +++ b/translations/es.json @@ -487,5 +487,6 @@ "Introduce yourself and specify the date and time when you wish to stay": "Preséntese y especifique la fecha y hora en que desea quedarse", "Members": "Miembros", "Join": "Entrar", - "Leave": "Dejar" + "Leave": "Dejar", + "System Monitor": "Monitor del sistema" } diff --git a/translations/fr.json b/translations/fr.json index a0b498f4f..16f396e53 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -487,5 +487,6 @@ "Introduce yourself and specify the date and time when you wish to stay": "Présentez-vous et précisez la date et l'heure auxquelles vous souhaitez rester", "Members": "Membres", "Join": "Rejoindre", - "Leave": "Laisser" + "Leave": "Laisser", + "System Monitor": "Moniteur système" } diff --git a/translations/ga.json b/translations/ga.json index 0ca375921..eb0b12af3 100644 --- a/translations/ga.json +++ b/translations/ga.json @@ -487,5 +487,6 @@ "Introduce yourself and specify the date and time when you wish to stay": "Cuir tú féin in aithne agus sonraigh an dáta agus an t-am ar mhaith leat fanacht", "Members": "Baill", "Join": "Bí páirteach", - "Leave": "Fág" + "Leave": "Fág", + "System Monitor": "Monatóir Córais" } diff --git a/translations/hi.json b/translations/hi.json index 6b9af71af..b93a3180d 100644 --- a/translations/hi.json +++ b/translations/hi.json @@ -487,5 +487,6 @@ "Introduce yourself and specify the date and time when you wish to stay": "अपना परिचय दें और वह तारीख और समय निर्दिष्ट करें जब आप रुकना चाहते हैं", "Members": "सदस्यों", "Join": "शामिल हों", - "Leave": "छोड़ना" + "Leave": "छोड़ना", + "System Monitor": "सिस्टम मॉनिटर" } diff --git a/translations/it.json b/translations/it.json index 19c143f5f..4ea931172 100644 --- a/translations/it.json +++ b/translations/it.json @@ -487,5 +487,6 @@ "Introduce yourself and specify the date and time when you wish to stay": "Presentati e specifica la data e l'ora in cui desideri soggiornare", "Members": "Membri", "Join": "Aderire", - "Leave": "Lasciare" + "Leave": "Lasciare", + "System Monitor": "Monitor di sistema" } diff --git a/translations/ja.json b/translations/ja.json index 18a6d237c..d751c83aa 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -487,5 +487,6 @@ "Introduce yourself and specify the date and time when you wish to stay": "自己紹介をし、滞在したい日時を指定してください", "Members": "メンバー", "Join": "加入", - "Leave": "離れる" + "Leave": "離れる", + "System Monitor": "システムモニター" } diff --git a/translations/ku.json b/translations/ku.json index e6f6acb02..bf383bdfe 100644 --- a/translations/ku.json +++ b/translations/ku.json @@ -487,5 +487,6 @@ "Introduce yourself and specify the date and time when you wish to stay": "Xwe bidin nasîn û roj û dema ku hûn dixwazin bimînin bimînin diyar bikin", "Members": "Endam", "Join": "Bihevgirêdan", - "Leave": "Terikandin" + "Leave": "Terikandin", + "System Monitor": "System Monitor" } diff --git a/translations/oc.json b/translations/oc.json index e895eba22..c2e6f0c8f 100644 --- a/translations/oc.json +++ b/translations/oc.json @@ -483,5 +483,6 @@ "Introduce yourself and specify the date and time when you wish to stay": "Introduce yourself and specify the date and time when you wish to stay", "Members": "Members", "Join": "Join", - "Leave": "Leave" + "Leave": "Leave", + "System Monitor": "System Monitor" } diff --git a/translations/pt.json b/translations/pt.json index d59ecdcc3..75444a1b5 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -487,5 +487,6 @@ "Introduce yourself and specify the date and time when you wish to stay": "Apresente-se e especifique a data e hora em que deseja ficar", "Members": "Membros", "Join": "Juntar", - "Leave": "Sair" + "Leave": "Sair", + "System Monitor": "Monitor de Sistema" } diff --git a/translations/ru.json b/translations/ru.json index c9af59f6a..83597b5b0 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -487,5 +487,6 @@ "Introduce yourself and specify the date and time when you wish to stay": "Представьтесь и укажите дату и время, когда вы хотите остаться", "Members": "Члены", "Join": "Присоединиться", - "Leave": "Оставлять" + "Leave": "Оставлять", + "System Monitor": "Системный монитор" } diff --git a/translations/sw.json b/translations/sw.json index 326b271d1..c658897b2 100644 --- a/translations/sw.json +++ b/translations/sw.json @@ -487,5 +487,6 @@ "Introduce yourself and specify the date and time when you wish to stay": "Jitambulishe na taja tarehe na saa unapotaka kukaa", "Members": "Wanachama", "Join": "Jiunge", - "Leave": "Ondoka" + "Leave": "Ondoka", + "System Monitor": "Ufuatiliaji wa Mfumo" } diff --git a/translations/zh.json b/translations/zh.json index 4a08be59f..db16066e8 100644 --- a/translations/zh.json +++ b/translations/zh.json @@ -487,5 +487,6 @@ "Introduce yourself and specify the date and time when you wish to stay": "自我介绍并指定您希望入住的日期和时间", "Members": "会员", "Join": "加入", - "Leave": "离开" + "Leave": "离开", + "System Monitor": "系统监视器" } diff --git a/webapp_profile.py b/webapp_profile.py index a2f04aca2..632f8b07f 100644 --- a/webapp_profile.py +++ b/webapp_profile.py @@ -1415,6 +1415,16 @@ def _htmlEditProfileDangerZone(translate: {}) -> str: return editProfileForm +def _htmlSystemMonitor(translate: {}) -> str: + """Links to performance graphs + """ + systemMonitorStr = beginEditSection(translate['System Monitor']) + systemMonitorStr += '

📊 GET

' + systemMonitorStr += '

📊 POST

' + systemMonitorStr += endEditSection() + return systemMonitorStr + + def _htmlEditProfileSkills(baseDir: str, nickname: str, domain: str, translate: {}) -> str: """skills section of Edit Profile screen @@ -2038,6 +2048,7 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str, roleAssignStr = '' peertubeStr = '' libretranslateStr = '' + systemMonitorStr = '' graphicsStr = '' sharesFederationStr = '' @@ -2063,6 +2074,7 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str, mediaInstanceStr, blogsInstanceStr, newsInstanceStr) + systemMonitorStr = _htmlSystemMonitor(translate) instanceTitle = getConfigParam(baseDir, 'instanceTitle') editProfileForm = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) @@ -2123,6 +2135,9 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str, # automatic translations editProfileForm += libretranslateStr + # system monitor + editProfileForm += systemMonitorStr + # Filtering and blocking section replyIntervalHours = getReplyIntervalHours(baseDir, nickname, domain, defaultReplyIntervalHours)