From 1e8d26ce4d9ae02f43a21ffa0ba81b064cedbaa1 Mon Sep 17 00:00:00 2001 From: Mar0xy Date: Sat, 23 Sep 2023 04:34:15 +0200 Subject: [PATCH] upd: change about-misskey to about-sharkey --- locales/de-DE.yml | 10 +- locales/en-US.yml | 10 +- .../1605585339718-instance-pinned-pages.js | 2 +- .../migration/1678427401214-remove-unused.js | 2 +- .../src/components/MkVisitorDashboard.vue | 2 +- .../{about-misskey.vue => about-sharkey.vue} | 195 ++---------------- packages/frontend/src/pages/about.vue | 4 +- packages/frontend/src/router.ts | 4 +- packages/frontend/src/ui/_common_/common.ts | 2 +- 9 files changed, 33 insertions(+), 198 deletions(-) rename packages/frontend/src/pages/{about-misskey.vue => about-sharkey.vue} (65%) diff --git a/locales/de-DE.yml b/locales/de-DE.yml index 16f210202b..1148729e78 100644 --- a/locales/de-DE.yml +++ b/locales/de-DE.yml @@ -2,7 +2,7 @@ _lang_: "Deutsch" headlineMisskey: "Ein durch Notizen verbundenes Netzwerk" introMisskey: "Willkommen! Misskey ist eine dezentralisierte Open-Source Microblogging-Platform.\nVerfasse „Notizen“ um mitzuteilen, was gerade passiert oder um Ereignisse mit anderen zu teilen. 📡\nMit „Reaktionen“ kannst du außerdem schnell deine Gefühle über Notizen anderer Benutzer zum Ausdruck bringen. 👍\nEine neue Welt wartet auf dich! 🚀" -poweredByMisskeyDescription: "{name} ist einer der durch die Open-Source-Plattform Misskey betriebenen Dienste (meist als \"Misskey-Instanz\" bezeichnet)." +poweredByMisskeyDescription: "{name} ist einer der durch die Open-Source-Plattform Sharkey betriebenen Dienste die auf Misskey basiert ist (meist als \"Misskey-Instanz\" bezeichnet)." monthAndDay: "{day}.{month}." search: "Suchen" notifications: "Benachrichtigungen" @@ -407,7 +407,7 @@ exploreFediverse: "Das Fediverse erkunden" popularTags: "Beliebte Schlagwörter" userList: "Liste" about: "Über" -aboutMisskey: "Über Misskey" +aboutMisskey: "Über Sharkey" administrator: "Administrator" token: "Token" 2fa: "Zwei-Faktor-Authentifizierung" @@ -1550,12 +1550,12 @@ _registry: domain: "Domain" createKey: "Schlüssel erstellen" _aboutMisskey: - about: "Misskey ist Open-Source-Software, welche von syuilo seit 2014 entwickelt wird." + about: "Sharkey ist Open-Source-Software basiert auf Misskey welche von syuilo seit 2014 entwickelt wird." contributors: "Hauptmitwirkende" allContributors: "Alle Mitwirkenden" source: "Quellcode" - translation: "Misskey übersetzen" - donate: "An Misskey spenden" + translation: "Sharkey übersetzen" + donate: "An Sharkey spenden" morePatrons: "Wir schätzen ebenso die Unterstützung vieler anderer hier nicht gelisteter Personen sehr. Danke! 🥰" patrons: "UnterstützerInnen" _displayOfSensitiveMedia: diff --git a/locales/en-US.yml b/locales/en-US.yml index 2d13e777d0..e27b68f806 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -2,7 +2,7 @@ _lang_: "English" headlineMisskey: "A network connected by notes" introMisskey: "Welcome! Misskey is an open source, decentralized microblogging service.\nCreate \"notes\" to share your thoughts with everyone around you. 📡\nWith \"reactions\", you can also quickly express your feelings about everyone's notes. 👍\nLet's explore a new world! 🚀" -poweredByMisskeyDescription: "{name} is one of the services powered by the open source platform Misskey (referred to as a \"Misskey instance\")." +poweredByMisskeyDescription: "{name} is one of the services powered by the open source platform Sharkey which is based on Misskey (referred to as a \"Misskey instance\")." monthAndDay: "{month}/{day}" search: "Search" notifications: "Notifications" @@ -407,7 +407,7 @@ exploreFediverse: "Explore the Fediverse" popularTags: "Popular tags" userList: "Lists" about: "About" -aboutMisskey: "About Misskey" +aboutMisskey: "About Sharkey" administrator: "Administrator" token: "Token" 2fa: "Two-factor authentication" @@ -1550,12 +1550,12 @@ _registry: domain: "Domain" createKey: "Create key" _aboutMisskey: - about: "Misskey is open-source software being developed by syuilo since 2014." + about: "Sharkey is open-source software based on Misskey which has been in developed since 2014 by syuilo." contributors: "Main contributors" allContributors: "All contributors" source: "Source code" - translation: "Translate Misskey" - donate: "Donate to Misskey" + translation: "Translate Sharkey" + donate: "Donate to Sharkey" morePatrons: "We also appreciate the support of many other helpers not listed here. Thank you! 🥰" patrons: "Patrons" _displayOfSensitiveMedia: diff --git a/packages/backend/migration/1605585339718-instance-pinned-pages.js b/packages/backend/migration/1605585339718-instance-pinned-pages.js index e6f3c2a785..767139c9e5 100644 --- a/packages/backend/migration/1605585339718-instance-pinned-pages.js +++ b/packages/backend/migration/1605585339718-instance-pinned-pages.js @@ -8,7 +8,7 @@ export class instancePinnedPages1605585339718 { this.name = 'instancePinnedPages1605585339718'; } async up(queryRunner) { - await queryRunner.query(`ALTER TABLE "meta" ADD "pinnedPages" character varying(512) array NOT NULL DEFAULT '{"/featured", "/channels", "/explore", "/pages", "/about-misskey"}'::varchar[]`); + await queryRunner.query(`ALTER TABLE "meta" ADD "pinnedPages" character varying(512) array NOT NULL DEFAULT '{"/featured", "/channels", "/explore", "/pages", "/about-sharkey"}'::varchar[]`); } async down(queryRunner) { await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "pinnedPages"`); diff --git a/packages/backend/migration/1678427401214-remove-unused.js b/packages/backend/migration/1678427401214-remove-unused.js index 59f42da080..e2947034ea 100644 --- a/packages/backend/migration/1678427401214-remove-unused.js +++ b/packages/backend/migration/1678427401214-remove-unused.js @@ -13,6 +13,6 @@ export class removeUnused1678427401214 { async down(queryRunner) { await queryRunner.query(`ALTER TABLE "meta" ADD "pinnedClipId" character varying(32)`); - await queryRunner.query(`ALTER TABLE "meta" ADD "pinnedPages" character varying(512) array NOT NULL DEFAULT '{/featured,/channels,/explore,/pages,/about-misskey}'`); + await queryRunner.query(`ALTER TABLE "meta" ADD "pinnedPages" character varying(512) array NOT NULL DEFAULT '{/featured,/channels,/explore,/pages,/about-sharkey}'`); } } diff --git a/packages/frontend/src/components/MkVisitorDashboard.vue b/packages/frontend/src/components/MkVisitorDashboard.vue index 7a8d7e6109..4f11a9b964 100644 --- a/packages/frontend/src/components/MkVisitorDashboard.vue +++ b/packages/frontend/src/components/MkVisitorDashboard.vue @@ -102,7 +102,7 @@ function showMenu(ev) { text: i18n.ts.aboutMisskey, icon: 'ti ti-info-circle', action: () => { - os.pageWindow('/about-misskey'); + os.pageWindow('/about-sharkey'); }, }, null, { text: i18n.ts.help, diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-sharkey.vue similarity index 65% rename from packages/frontend/src/pages/about-misskey.vue rename to packages/frontend/src/pages/about-sharkey.vue index bb776cc5a0..4b4e6b7ce0 100644 --- a/packages/frontend/src/pages/about-misskey.vue +++ b/packages/frontend/src/pages/about-sharkey.vue @@ -43,6 +43,20 @@ SPDX-License-Identifier: AGPL-3.0-only +
+ + + @mar0rxy + + + + @insert5starname + +
+ + + +
@@ -69,20 +83,6 @@ SPDX-License-Identifier: AGPL-3.0-only @robflop
- - - - -
-
- - {{ patron.name }} -
-
-
-
{{ patron }}
-
-

{{ i18n.ts._aboutMisskey.morePatrons }}

 @@ -119,171 +119,6 @@ import { definePageMetadata } from '@/scripts/page-metadata.js'; import { claimAchievement, claimedAchievements } from '@/scripts/achievements.js'; import { $i } from '@/account.js'; -const patronsWithIcon = [{ - name: 'カイヤン', - icon: 'https://misskey-hub.net/patrons/a2820716883e408cb87773e377ce7c8d.jpg', -}, { - name: 'だれかさん', - icon: 'https://misskey-hub.net/patrons/f7409b5e5a88477a9b9d740c408de125.jpg', -}, { - name: 'narazaka', - icon: 'https://misskey-hub.net/patrons/e3affff31ffb4877b1196c7360abc3e5.jpg', -}, { - name: 'ひとぅ', - icon: 'https://misskey-hub.net/patrons/8cc0d0a0a6d84c88bca1aedabf6ed5ab.jpg', -}, { - name: 'ぱーこ', - icon: 'https://misskey-hub.net/patrons/79c6602ffade489e8df2fcf2c2bc5d9d.jpg', -}, { - name: 'わっほー☆', - icon: 'https://misskey-hub.net/patrons/d31d5d13924443a082f3da7966318a0a.jpg', -}, { - name: 'mollinaca', - icon: 'https://misskey-hub.net/patrons/ceb36b8f66e549bdadb3b90d5da62314.jpg', -}, { - name: '坂本龍', - icon: 'https://misskey-hub.net/patrons/a631cf8b490145cf8dbbe4e7508cfbc2.jpg', -}, { - name: 'takke', - icon: 'https://misskey-hub.net/patrons/6c3327e626c046f2914fbcd9f7557935.jpg', -}, { - name: 'ぺんぎん', - icon: 'https://misskey-hub.net/patrons/6a652e0534ff4cb1836e7ce4968d76a7.jpg', -}, { - name: 'かみらえっと', - icon: 'https://misskey-hub.net/patrons/be1326bda7d940a482f3758ffd9ffaf6.jpg', -}, { - name: 'へてて', - icon: 'https://misskey-hub.net/patrons/0431eacd7c6843d09de8ea9984307e86.jpg', -}, { - name: 'spinlock', - icon: 'https://misskey-hub.net/patrons/6a1cebc819d540a78bf20e9e3115baa8.jpg', -}, { - name: 'じゅくま', - icon: 'https://misskey-hub.net/patrons/3e56bdac69dd42f7a06e0f12cf2fc895.jpg', -}, { - name: '清遊あみ', - icon: 'https://misskey-hub.net/patrons/de25195b88e940a388388bea2e7637d8.jpg', -}, { - name: 'Nagi8410', - icon: 'https://misskey-hub.net/patrons/31b102ab4fc540ed806b0461575d38be.jpg', -}, { - name: '山岡士郎', - icon: 'https://misskey-hub.net/patrons/84b9056341684266bb1eda3e680d094d.jpg', -}, { - name: 'よもやまたろう', - icon: 'https://misskey-hub.net/patrons/4273c9cce50d445f8f7d0f16113d6d7f.jpg', -}, { - name: '花咲ももか', - icon: 'https://misskey-hub.net/patrons/8c9b2b9128cb4fee99f04bb4f86f2efa.jpg', -}, { - name: 'カガミ', - icon: 'https://misskey-hub.net/patrons/226ea3a4617749548580ec2d9a263e24.jpg', -}, { - name: 'フランギ・シュウ', - icon: 'https://misskey-hub.net/patrons/3016d37e35f3430b90420176c912d304.jpg', -}]; - -const patrons = [ - 'まっちゃとーにゅ', - 'mametsuko', - 'noellabo', - 'AureoleArk', - 'Gargron', - 'Nokotaro Takeda', - 'Suji Yan', - 'oi_yekssim', - 'regtan', - 'Hekovic', - 'nenohi', - 'Gitmo Life Services', - 'naga_rus', - 'Efertone', - 'Melilot', - 'motcha', - 'nanami kan', - 'sevvie Rose', - 'Hayato Ishikawa', - 'Puniko', - 'skehmatics', - 'Quinton Macejkovic', - 'YUKIMOCHI', - 'dansup', - 'mewl hayabusa', - 'Emilis', - 'Fristi', - 'makokunsan', - 'chidori ninokura', - 'Peter G.', - '見当かなみ', - 'natalie', - 'Maronu', - 'Steffen K9', - 'takimura', - 'sikyosyounin', - 'Nesakko', - 'YuzuRyo61', - 'blackskye', - 'sheeta.s', - 'osapon', - 'public_yusuke', - 'CG', - '吴浥', - 't_w', - 'Jerry', - 'nafuchoco', - 'Takumi Sugita', - 'GLaTAN', - 'mkatze', - 'kabo2468y', - 'mydarkstar', - 'Roujo', - 'DignifiedSilence', - 'uroco @99', - 'totokoro', - 'うし', - 'kiritan', - 'weepjp', - 'Liaizon Wakest', - 'Duponin', - 'Blue', - 'Naoki Hirayama', - 'wara', - 'Wataru Manji (manji0)', - 'みなしま', - 'kanoy', - 'xianon', - 'Denshi', - 'Osushimaru', - 'にょんへら', - 'おのだい', - 'Leni', - 'oss', - 'Weeble', - '蝉暮せせせ', - 'ThatOneCalculator', - 'pixeldesu', - 'あめ玉', - '氷月氷華里', - 'Ebise Lutica', - '巣黒るい@リスケモ男の娘VTuber!', - 'ふぇいぽむ', - '依古田イコ', - '戸塚こだま', - 'すー。', - '秋雨/Slime-hatena.jp', - 'けそ', - 'ずも', - 'binvinyl', - '渡志郎', - 'ぷーざ', - '越貝鯛丸', - 'Nick / pprmint.', - 'kino3277', - '美少女JKぐーちゃん', - 'てば', -]; - let thereIsTreasure = $ref($i && !claimedAchievements.includes('foundTreasure')); let easterEggReady = false; @@ -316,7 +151,7 @@ function gravity() { function iLoveMisskey() { os.post({ - initialText: 'I $[jelly ❤] #Misskey', + initialText: 'I $[jelly ❤] #Sharkey', instant: true, }); } diff --git a/packages/frontend/src/pages/about.vue b/packages/frontend/src/pages/about.vue index 02768b0774..1efaeb1d7b 100644 --- a/packages/frontend/src/pages/about.vue +++ b/packages/frontend/src/pages/about.vue @@ -25,12 +25,12 @@ SPDX-License-Identifier: AGPL-3.0-only
- +
- {{ i18n.ts.aboutMisskey }} + {{ i18n.ts.aboutMisskey }}
diff --git a/packages/frontend/src/router.ts b/packages/frontend/src/router.ts index e658477bbc..cb506df22a 100644 --- a/packages/frontend/src/router.ts +++ b/packages/frontend/src/router.ts @@ -200,8 +200,8 @@ export const routes = [{ component: page(() => import('./pages/about.vue')), hash: 'initialTab', }, { - path: '/about-misskey', - component: page(() => import('./pages/about-misskey.vue')), + path: '/about-sharkey', + component: page(() => import('./pages/about-sharkey.vue')), }, { path: '/invite', name: 'invite', diff --git a/packages/frontend/src/ui/_common_/common.ts b/packages/frontend/src/ui/_common_/common.ts index ca4a71a67f..49fe5a8347 100644 --- a/packages/frontend/src/ui/_common_/common.ts +++ b/packages/frontend/src/ui/_common_/common.ts @@ -77,7 +77,7 @@ export function openInstanceMenu(ev: MouseEvent) { }, { type: 'link', text: i18n.ts.aboutMisskey, - to: '/about-misskey', + to: '/about-sharkey', }], ev.currentTarget ?? ev.target, { align: 'left', });