diff --git a/locales/de-DE.yml b/locales/de-DE.yml index 16f210202b255b7360325908a2fce5abbe2ddb92..1148729e786ecebe90dcad5ca738a0820246cd5c 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 <b>Misskey</b> betriebenen Dienste (meist als \"Misskey-Instanz\" bezeichnet)." +poweredByMisskeyDescription: "{name} ist einer der durch die Open-Source-Plattform <b>Sharkey</b> 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 2d13e777d013f0ebc0a1d187f5c979312f79db78..e27b68f8066101f6b26daf1198e7c65fd506320f 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 <b>Misskey</b> (referred to as a \"Misskey instance\")." +poweredByMisskeyDescription: "{name} is one of the services powered by the open source platform <b>Sharkey</b> 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 e6f3c2a78560ea724410ebe5539d65c25ea9b8bb..767139c9e558e9a393b14e818a378345c8db916d 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 59f42da0809a34cc92715f3ab503cc5857a114c6..e2947034ea24eb40895bd1845e09229dc7009742 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 7a8d7e610998218df2d046f2349cb34f52a97d45..4f11a9b96428ebf464a9990ee175d9969ecffac6 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 bb776cc5a0152f76dca50baf07e4d1dc89ed7e3f..4b4e6b7ce0f10aeffb51ea3248c3c348963cb5b6 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 </FormSection> <FormSection> <template #label>{{ i18n.ts._aboutMisskey.contributors }}</template> + <div :class="$style.contributors"> + <a href="https://github.com/mar0xy" target="_blank" :class="$style.contributor"> + <img src="https://avatars.githubusercontent.com/u/8841466?v=4" :class="$style.contributorAvatar"> + <span :class="$style.contributorUsername">@mar0rxy</span> + </a> + <a href="https://github.com/insert5starname" target="_blank" :class="$style.contributor"> + <img src="https://avatars.githubusercontent.com/u/123300075?v=4" :class="$style.contributorAvatar"> + <span :class="$style.contributorUsername">@insert5starname</span> + </a> + </div> + <template #caption><MkLink url="https://github.com/transfem-org/sharkey/graphs/contributors">{{ i18n.ts._aboutMisskey.allContributors }}</MkLink></template> + </FormSection> + <FormSection> + <template #label>Misskey Contributors</template> <div :class="$style.contributors"> <a href="https://github.com/syuilo" target="_blank" :class="$style.contributor"> <img src="https://avatars.githubusercontent.com/u/4439005?v=4" :class="$style.contributorAvatar"> @@ -69,20 +83,6 @@ SPDX-License-Identifier: AGPL-3.0-only <span :class="$style.contributorUsername">@robflop</span> </a> </div> - <template #caption><MkLink url="https://github.com/misskey-dev/misskey/graphs/contributors">{{ i18n.ts._aboutMisskey.allContributors }}</MkLink></template> - </FormSection> - <FormSection> - <template #label><Mfm text="$[jelly â¤]"/> {{ i18n.ts._aboutMisskey.patrons }}</template> - <div :class="$style.patronsWithIcon"> - <div v-for="patron in patronsWithIcon" :class="$style.patronWithIcon"> - <img :src="patron.icon" :class="$style.patronIcon"> - <span :class="$style.patronName">{{ patron.name }}</span> - </div> - </div> - <div style="margin-top: 16px; display: grid; grid-template-columns: repeat(auto-fill, minmax(180px, 1fr)); grid-gap: 12px;"> - <div v-for="patron in patrons" :key="patron">{{ patron }}</div> - </div> - <p>{{ i18n.ts._aboutMisskey.morePatrons }}</p> </FormSection> <FormSection> <template #label>Special thanks</template> @@ -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 02768b07740645ae34cf3a8aef370ee02ea951b6..1efaeb1d7b9bb5edb2a8c0ce1377496131192671 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 <FormSection> <div class="_gaps_m"> <MkKeyValue :copy="version"> - <template #key>Misskey</template> + <template #key>Sharkey</template> <template #value>{{ version }}</template> </MkKeyValue> <div v-html="i18n.t('poweredByMisskeyDescription', { name: instance.name ?? host })"> </div> - <FormLink to="/about-misskey">{{ i18n.ts.aboutMisskey }}</FormLink> + <FormLink to="/about-sharkey">{{ i18n.ts.aboutMisskey }}</FormLink> </div> </FormSection> diff --git a/packages/frontend/src/router.ts b/packages/frontend/src/router.ts index e658477bbc74141a201fd1bdcc3654daec8264b0..cb506df22a584408c4aae43b3a923f368ba9ff61 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 ca4a71a67f0fd4078856d4ea45a3bdc207a792a6..49fe5a8347919cbc4c758cafbb8aa6cec11d0d27 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', });