From c524a47e6f3ce341861f0a4c03aac45c4c1e6461 Mon Sep 17 00:00:00 2001 From: Oneric Date: Wed, 15 Nov 2023 23:36:19 +0100 Subject: [PATCH] Drop broken "@ symbol as icon" setting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It was merged into pleroma-fe on 2022-02-03 in 76547fe66d1771f5bff732a34b0547f890f4621a and imported into akkoma-fe on 2022-06-08 with the merge commit f6cf509a046507eeb9e52e2a279e82dd7a0f6bf8. However, something went wrong in the merge and while the setting and its infrastructure exist, it is never used anywhere and @ is always displayed as text. Given it existed in this broken state for nearly one and a half years, never worked on akkoma-fe and no bugs were filed about this, it appears nobody cares, so let’s just remove it. --- src/components/mention_link/mention_link.js | 3 --- src/components/settings_modal/tabs/general_tab.vue | 8 -------- src/i18n/ca.json | 1 - src/i18n/de.json | 1 - src/i18n/en.json | 1 - src/i18n/fr.json | 1 - src/i18n/ja_pedantic.json | 1 - src/i18n/nl.json | 1 - src/i18n/uk.json | 1 - src/i18n/zh.json | 1 - src/modules/config.js | 1 - src/modules/instance.js | 1 - 12 files changed, 21 deletions(-) diff --git a/src/components/mention_link/mention_link.js b/src/components/mention_link/mention_link.js index 55eea195..377f8ea5 100644 --- a/src/components/mention_link/mention_link.js +++ b/src/components/mention_link/mention_link.js @@ -93,9 +93,6 @@ const MentionLink = { this.highlightType ] }, - useAtIcon () { - return this.mergedConfig.useAtIcon - }, isRemote () { return this.userName !== this.userNameFull }, diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue index 7dc1c3f1..2754cde0 100644 --- a/src/components/settings_modal/tabs/general_tab.vue +++ b/src/components/settings_modal/tabs/general_tab.vue @@ -483,14 +483,6 @@ -
  • - - {{ $t('settings.use_at_icon') }} - -
  • {{ $t('settings.mention_link_show_avatar') }} diff --git a/src/i18n/ca.json b/src/i18n/ca.json index e2cd094a..47f1eaf0 100644 --- a/src/i18n/ca.json +++ b/src/i18n/ca.json @@ -884,7 +884,6 @@ "upload_a_photo": "Pujar una foto", "useStreamingApi": "Rebre apunts i notificacions en temps real", "useStreamingApiWarning": "És genial emprar-lo. Si es trenca, refresca, suposo?", - "use_at_icon": "Mostra el símbol {'@'} com a icona enlloc de text", "use_contain_fit": "No retallar els adjunts en miniatures", "use_one_click_nsfw": "Obre els adjunts NSFW amb només un clic", "user_mutes": "Usuaris", diff --git a/src/i18n/de.json b/src/i18n/de.json index a4ec886c..d5a7b1c0 100644 --- a/src/i18n/de.json +++ b/src/i18n/de.json @@ -916,7 +916,6 @@ "upload_a_photo": "Lade ein Foto hoch", "useStreamingApi": "Empfange Posts und Benachrichtigungen in Echtzeit", "useStreamingApiWarning": "(Nicht empfohlen, experimentell, bekannt dafür, Posts zu überspringen)", - "use_at_icon": "{'@'}-Symbol als Icon und nicht als Text anzeigen", "use_blurhash": "Blurhash für NSFW-Vorschauen verwenden", "use_contain_fit": "Vorschaubilder nicht zuschneiden", "use_one_click_nsfw": "Heikle Anhänge mit nur einem Klick öffnen", diff --git a/src/i18n/en.json b/src/i18n/en.json index a5e9d9c1..0160b187 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -922,7 +922,6 @@ "upload_a_photo": "Upload a photo", "useStreamingApi": "Receive posts and notifications real-time", "useStreamingApiWarning": "It's cool use it. If it breaks refresh I guess?", - "use_at_icon": "Display {'@'} symbol as an icon instead of text", "use_contain_fit": "Don't crop the attachment in thumbnails", "use_one_click_nsfw": "Open NSFW attachments with just one click", "user_mutes": "Users", diff --git a/src/i18n/fr.json b/src/i18n/fr.json index 252291ea..0344d9ec 100644 --- a/src/i18n/fr.json +++ b/src/i18n/fr.json @@ -920,7 +920,6 @@ "upload_a_photo": "Envoyer une photo", "useStreamingApi": "Recevoir les messages et notifications en temps réel", "useStreamingApiWarning": "(Non recommandé, expérimental, connu pour rater des messages)", - "use_at_icon": "Afficher le symbol {'@'} comme une image", "use_contain_fit": "Ne pas rogner les miniatures des pièces-jointes", "use_one_click_nsfw": "Ouvrir les pièces-jointes sensibles avec un seul clic", "user_mutes": "Comptes", diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json index 5f315172..c685ea1d 100644 --- a/src/i18n/ja_pedantic.json +++ b/src/i18n/ja_pedantic.json @@ -921,7 +921,6 @@ "upload_a_photo": "画像をアップロード", "useStreamingApi": "投稿と通知を、すぐに受け取る", "useStreamingApiWarning": "（実験中で、投稿を取りこぼすかもしれないので、おすすめしません）", - "use_at_icon": "{'@'}マークをアイコンにする", "use_contain_fit": "画像のサムネイルを、切り抜かない", "use_one_click_nsfw": "NSFWなファイルを1クリックで開く", "user_mutes": "ユーザー", diff --git a/src/i18n/nl.json b/src/i18n/nl.json index 15d639c4..75e10500 100644 --- a/src/i18n/nl.json +++ b/src/i18n/nl.json @@ -918,7 +918,6 @@ "upload_a_photo": "Foto uploaden", "useStreamingApi": "Berichten en meldingen in real-time ontvangen", "useStreamingApiWarning": "Iets experimenteels met berichten streamen uwu miss kun je beter uit laten ofzo?", - "use_at_icon": "{'@'} symbool als icoon tonen in plaats van tekst", "use_blurhash": "Waas tonen over NSFW-miniaturen", "use_contain_fit": "Bijlage in miniaturen niet bijsnijden", "use_one_click_nsfw": "Gevoelige bijlagen met slechts één klik openen", diff --git a/src/i18n/uk.json b/src/i18n/uk.json index 08570f9b..13b92e03 100644 --- a/src/i18n/uk.json +++ b/src/i18n/uk.json @@ -922,7 +922,6 @@ "upload_a_photo": "Вивантажити фото", "useStreamingApi": "Отримувати дописи та сповіщення наживо", "useStreamingApiWarning": "Загалом працює. Якщо не зовсім, спробуєте оновити сторінку?", - "use_at_icon": "Значок {'@'} замість символу", "use_blurhash": "Показувати дражливі мініатюри (як розмиті кольори)", "use_contain_fit": "Не обрізати краї мініатюр", "use_one_click_nsfw": "Відкривати NSFW вкладення одним кліком миші", diff --git a/src/i18n/zh.json b/src/i18n/zh.json index 7fec7226..c342bc5b 100644 --- a/src/i18n/zh.json +++ b/src/i18n/zh.json @@ -922,7 +922,6 @@ "upload_a_photo": "上传照片", "useStreamingApi": "实时接收帖文和通知", "useStreamingApiWarning": "十分炫酷推荐使用。要是崩了试试刷新？", - "use_at_icon": "将 {'@'} 符号显示为图标而不是文本", "use_blurhash": "对NSFW的缩略图使用模糊处理", "use_contain_fit": "生成缩略图时不要裁剪附件", "use_one_click_nsfw": "点击一次以打开工作场所不适宜（NSFW）的附件", diff --git a/src/modules/config.js b/src/modules/config.js index ebb27929..39ac1076 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -95,7 +95,6 @@ export const defaultState = { disableStickyHeaders: false, showScrollbars: false, greentext: undefined, // instance default - useAtIcon: undefined, // instance default mentionLinkDisplay: undefined, // instance default mentionLinkShowTooltip: undefined, // instance default mentionLinkShowAvatar: undefined, // instance default diff --git a/src/modules/instance.js b/src/modules/instance.js index 02cbe1f8..0c856352 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -21,7 +21,6 @@ const defaultState = { background: '/static/aurora_borealis.jpg', collapseMessageWithSubject: true, greentext: false, - useAtIcon: false, mentionLinkDisplay: 'short', mentionLinkShowTooltip: true, mentionLinkShowAvatar: false,