diff --git a/daemon.py b/daemon.py index 887b3845e..dd3156728 100644 --- a/daemon.py +++ b/daemon.py @@ -5359,6 +5359,7 @@ class PubServer(BaseHTTPRequestHandler): ssbAddress = None emailAddress = None lockedAccount = False + alsoKnownAs = None movedTo = '' actorJson = getPersonFromCache(baseDir, optionsActor, @@ -5379,6 +5380,8 @@ class PubServer(BaseHTTPRequestHandler): emailAddress = getEmailAddress(actorJson) PGPpubKey = getPGPpubKey(actorJson) PGPfingerprint = getPGPfingerprint(actorJson) + if actorJson.get('alsoKnownAs'): + alsoKnownAs = actorJson['alsoKnownAs'] msg = htmlPersonOptions(self.server.defaultTimeline, self.server.cssCache, self.server.translate, @@ -5398,7 +5401,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.dormantMonths, backToPath, lockedAccount, - movedTo).encode('utf-8') + movedTo, alsoKnownAs).encode('utf-8') msglen = len(msg) self._set_headers('text/html', msglen, cookie, callingDomain) diff --git a/translations/ar.json b/translations/ar.json index 9898c7a69..b9b556ef1 100644 --- a/translations/ar.json +++ b/translations/ar.json @@ -359,5 +359,6 @@ "Word frequencies": "ترددات الكلمات", "New account": "حساب جديد", "Moved to new account address": "انتقل إلى عنوان الحساب الجديد", - "Yet another Epicyon Instance": "مثال آخر Epicyon" + "Yet another Epicyon Instance": "مثال آخر Epicyon", + "Other accounts": "حسابات أخرى" } diff --git a/translations/ca.json b/translations/ca.json index 41379e7b4..a286abdcf 100644 --- a/translations/ca.json +++ b/translations/ca.json @@ -359,5 +359,6 @@ "Word frequencies": "Freqüències de paraules", "New account": "Compte nou", "Moved to new account address": "S'ha mogut a l'adreça del compte nova", - "Yet another Epicyon Instance": "Encara una altra instància Epicyon" + "Yet another Epicyon Instance": "Encara una altra instància Epicyon", + "Other accounts": "Altres comptes" } diff --git a/translations/cy.json b/translations/cy.json index 5e10c41a5..8f98bf4d2 100644 --- a/translations/cy.json +++ b/translations/cy.json @@ -359,5 +359,6 @@ "Word frequencies": "Amleddau geiriau", "New account": "Cyfrif newydd", "Moved to new account address": "Wedi'i symud i gyfeiriad cyfrif newydd", - "Yet another Epicyon Instance": "Digwyddiad Epicyon arall" + "Yet another Epicyon Instance": "Digwyddiad Epicyon arall", + "Other accounts": "Cyfrifon eraill" } diff --git a/translations/de.json b/translations/de.json index 4e3e4b141..4ab19cfd8 100644 --- a/translations/de.json +++ b/translations/de.json @@ -359,5 +359,6 @@ "Word frequencies": "Worthäufigkeiten", "New account": "Neues Konto", "Moved to new account address": "An neue Kontoadresse verschoben", - "Yet another Epicyon Instance": "Noch eine Epicyon-Instanz" + "Yet another Epicyon Instance": "Noch eine Epicyon-Instanz", + "Other accounts": "Andere Konten" } diff --git a/translations/en.json b/translations/en.json index df4c47cde..68e7e7a8b 100644 --- a/translations/en.json +++ b/translations/en.json @@ -359,5 +359,6 @@ "Word frequencies": "Word frequencies", "New account": "New account", "Moved to new account address": "Moved to new account address", - "Yet another Epicyon Instance": "Yet another Epicyon Instance" + "Yet another Epicyon Instance": "Yet another Epicyon Instance", + "Other accounts": "Other accounts" } diff --git a/translations/es.json b/translations/es.json index 5d7b9514c..fbc8c6784 100644 --- a/translations/es.json +++ b/translations/es.json @@ -359,5 +359,6 @@ "Word frequencies": "Frecuencias de palabras", "New account": "Nueva cuenta", "Moved to new account address": "Movido a la nueva dirección de la cuenta", - "Yet another Epicyon Instance": "Otra instancia más de Epicyon" + "Yet another Epicyon Instance": "Otra instancia más de Epicyon", + "Other accounts": "Otras cuentas" } diff --git a/translations/fr.json b/translations/fr.json index e17541ee6..6dd5a7b87 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -359,5 +359,6 @@ "Word frequencies": "Fréquences des mots", "New account": "Nouveau compte", "Moved to new account address": "Déplacé vers une nouvelle adresse de compte", - "Yet another Epicyon Instance": "Encore une autre instance Epicyon" + "Yet another Epicyon Instance": "Encore une autre instance Epicyon", + "Other accounts": "Autres comptes" } diff --git a/translations/ga.json b/translations/ga.json index 551520642..dc4da496e 100644 --- a/translations/ga.json +++ b/translations/ga.json @@ -359,5 +359,6 @@ "Word frequencies": "Minicíochtaí focal", "New account": "Cuntas nua", "Moved to new account address": "Ar athraíodh a ionad go seoladh cuntas nua", - "Yet another Epicyon Instance": "Institiúid Epicyon eile fós" + "Yet another Epicyon Instance": "Institiúid Epicyon eile fós", + "Other accounts": "Cuntais eile" } diff --git a/translations/hi.json b/translations/hi.json index 2329bace6..60cdc8a3c 100644 --- a/translations/hi.json +++ b/translations/hi.json @@ -359,5 +359,6 @@ "Word frequencies": "शब्द आवृत्तियों", "New account": "नया खाता", "Moved to new account address": "नए खाते के पते पर ले जाया गया", - "Yet another Epicyon Instance": "फिर भी एक और एपिकॉन उदाहरण" + "Yet another Epicyon Instance": "फिर भी एक और एपिकॉन उदाहरण", + "Other accounts": "अन्य खाते" } diff --git a/translations/it.json b/translations/it.json index 6dd5d6b08..7d4f2f6c8 100644 --- a/translations/it.json +++ b/translations/it.json @@ -359,5 +359,6 @@ "Word frequencies": "Frequenze di parole", "New account": "Nuovo account", "Moved to new account address": "Spostato al nuovo indirizzo dell'account", - "Yet another Epicyon Instance": "Ancora un'altra istanza di Epicyon" + "Yet another Epicyon Instance": "Ancora un'altra istanza di Epicyon", + "Other accounts": "Altri account" } diff --git a/translations/ja.json b/translations/ja.json index ef9f26ff4..340a00812 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -359,5 +359,6 @@ "Word frequencies": "単語の頻度", "New account": "新しいアカウント", "Moved to new account address": "新しいアカウントアドレスに移動しました", - "Yet another Epicyon Instance": "さらに別のエピキオンインスタンス" + "Yet another Epicyon Instance": "さらに別のエピキオンインスタンス", + "Other accounts": "その他のアカウント" } diff --git a/translations/oc.json b/translations/oc.json index 2ec983864..f5d0c1174 100644 --- a/translations/oc.json +++ b/translations/oc.json @@ -355,5 +355,6 @@ "Word frequencies": "Word frequencies", "New account": "New account", "Moved to new account address": "Moved to new account address", - "Yet another Epicyon Instance": "Yet another Epicyon Instance" + "Yet another Epicyon Instance": "Yet another Epicyon Instance", + "Other accounts": "Other accounts" } diff --git a/translations/pt.json b/translations/pt.json index d11d7195b..c09154982 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -359,5 +359,6 @@ "Word frequencies": "Frequências de palavras", "New account": "Nova conta", "Moved to new account address": "Movido para o novo endereço da conta", - "Yet another Epicyon Instance": "Mais uma instância do Epicyon" + "Yet another Epicyon Instance": "Mais uma instância do Epicyon", + "Other accounts": "Outras contas" } diff --git a/translations/ru.json b/translations/ru.json index 993bd5c50..037195a08 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -359,5 +359,6 @@ "Word frequencies": "Частоты слов", "New account": "Новый аккаунт", "Moved to new account address": "Перемещен на новый адрес учетной записи", - "Yet another Epicyon Instance": "Еще один экземпляр Эпикиона" + "Yet another Epicyon Instance": "Еще один экземпляр Эпикиона", + "Other accounts": "Другие аккаунты" } diff --git a/translations/zh.json b/translations/zh.json index 07b7c3073..b4a95082f 100644 --- a/translations/zh.json +++ b/translations/zh.json @@ -359,5 +359,6 @@ "Word frequencies": "词频", "New account": "新账户", "Moved to new account address": "移至新帐户地址", - "Yet another Epicyon Instance": "另一个Epicyon实例" + "Yet another Epicyon Instance": "另一个Epicyon实例", + "Other accounts": "其他账户" } diff --git a/webapp_person_options.py b/webapp_person_options.py index 807465b95..69153af86 100644 --- a/webapp_person_options.py +++ b/webapp_person_options.py @@ -48,7 +48,8 @@ def htmlPersonOptions(defaultTimeline: str, dormantMonths: int, backToPath: str, lockedAccount: bool, - movedTo: str) -> str: + movedTo: str, + alsoKnownAs: []) -> str: """Show options for a person: view/follow/block/report """ optionsDomain, optionsPort = getDomainFromActor(optionsActor) @@ -143,6 +144,24 @@ def htmlPersonOptions(defaultTimeline: str, '
\n' + elif alsoKnownAs: + optionsStr += \ + ' \n' if emailAddress: optionsStr += \ '' + translate['Email'] + \