From 8687b46e1801f6bb282a87494802cd37cc953605 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 19 Jul 2022 10:13:17 -0700 Subject: [PATCH] More Calckey strings --- locales/en-US.yml | 4 ++-- packages/backend/src/boot/master.ts | 2 +- packages/backend/src/server/web/feed.ts | 2 +- packages/backend/src/server/web/index.ts | 18 +++++++++--------- packages/backend/src/server/web/views/bios.pug | 2 +- packages/backend/src/server/web/views/cli.pug | 2 +- .../backend/src/server/web/views/flush.pug | 2 +- .../backend/src/server/web/views/info-card.pug | 2 +- packages/backend/src/services/logger.ts | 2 +- packages/client/src/config.ts | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/locales/en-US.yml b/locales/en-US.yml index b51084534..776ee0d00 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -699,7 +699,7 @@ onlineUsersCount: "{n} users are online" nUsers: "{n} Users" nNotes: "{n} Notes" sendErrorReports: "Send error reports" -sendErrorReportsDescription: "When turned on, detailed error information will be shared with Misskey when a problem occurs, helping to improve the quality of Misskey.\nThis will include information such the version of your OS, what browser you're using, your activity in Misskey, etc." +sendErrorReportsDescription: "When turned on, detailed error information will be shared with Calckey when a problem occurs, helping to improve the quality of Misskey.\nThis will include information such the version of your OS, what browser you're using, your activity in Calckey, etc." myTheme: "My theme" backgroundColor: "Background color" accentColor: "Accent color" @@ -973,7 +973,7 @@ _nsfw: _mfm: cheatSheet: "MFM Cheatsheet" intro: "MFM is a markup language used on Misskey, Calckey, Akkoma, and more that can be used in many places. Here you can view a list of all available MFM syntax." - dummy: "Misskey expands the world of the Fediverse" + dummy: "Calckey expands the world of the Fediverse" mention: "Mention" mentionDescription: "You can specify a user by using an At-Symbol and a username." hashtag: "Hashtag" diff --git a/packages/backend/src/boot/master.ts b/packages/backend/src/boot/master.ts index 80e482168..55f75737d 100644 --- a/packages/backend/src/boot/master.ts +++ b/packages/backend/src/boot/master.ts @@ -27,7 +27,7 @@ const themeColor = chalk.hex('#31748f'); function greet() { if (!envOption.quiet) { - //#region Misskey logo + //#region Calckey logo const v = `v${meta.version}`; console.log(themeColor(' ___ _ _ ')); console.log(themeColor(' / __\\__ _| | ___| | _____ _ _ ')); diff --git a/packages/backend/src/server/web/feed.ts b/packages/backend/src/server/web/feed.ts index 4abe2885c..157ef54ae 100644 --- a/packages/backend/src/server/web/feed.ts +++ b/packages/backend/src/server/web/feed.ts @@ -26,7 +26,7 @@ export default async function(user: User) { id: author.link, title: `${author.name} (@${user.username}@${config.host})`, updated: notes[0].createdAt, - generator: 'Misskey', + generator: 'Calckey', description: `${user.notesCount} Notes, ${profile.ffVisibility === 'public' ? user.followingCount : '?'} Following, ${profile.ffVisibility === 'public' ? user.followersCount : '?'} Followers${profile.description ? ` ยท ${profile.description}` : ''}`, link: author.link, image: await Users.getAvatarUrl(user), diff --git a/packages/backend/src/server/web/index.ts b/packages/backend/src/server/web/index.ts index 0022bb8d1..27ab71a1a 100644 --- a/packages/backend/src/server/web/index.ts +++ b/packages/backend/src/server/web/index.ts @@ -278,7 +278,7 @@ const motd = [ 'Use #hashtags to tag notes and reach more people, especially for #art.', 'If your note gets popular, it might show up on the Featured tap for up to 3 days!', 'Use the 4 buttons at the top (or the top drop-down on mobile) to switch timelines.', - 'The Fediverse is made up of more than just Misskey.', + 'The Fediverse is made up of more than just Calckey.', 'Avatars and banners can be GIFs.', 'When writing a note, type $ to see a list of cool text effects (mfm).', 'Be gay, do crime.', @@ -307,7 +307,7 @@ router.get(['/@:user', '/@:user/:sub'], async (ctx, next) => { user, profile, me, avatarUrl: await Users.getAvatarUrl(user), sub: ctx.params.sub, - instanceName: meta.name || 'Misskey', + instanceName: meta.name || 'Calckey', icon: meta.iconUrl, themeColor: meta.themeColor, privateMode: meta.privateMode, @@ -353,7 +353,7 @@ router.get('/notes/:note', async (ctx, next) => { avatarUrl: await Users.getAvatarUrl(await Users.findOneByOrFail({ id: note.userId })), // TODO: Let locale changeable by instance setting summary: getNoteSummary(_note), - instanceName: meta.name || 'Misskey', + instanceName: meta.name || 'Calckey', icon: meta.iconUrl, privateMode: meta.privateMode, themeColor: meta.themeColor, @@ -390,7 +390,7 @@ router.get('/@:user/pages/:page', async (ctx, next) => { page: _page, profile, avatarUrl: await Users.getAvatarUrl(await Users.findOneByOrFail({ id: page.userId })), - instanceName: meta.name || 'Misskey', + instanceName: meta.name || 'Calckey', icon: meta.iconUrl, themeColor: meta.themeColor, privateMode: meta.privateMode, @@ -423,7 +423,7 @@ router.get('/clips/:clip', async (ctx, next) => { clip: _clip, profile, avatarUrl: await Users.getAvatarUrl(await Users.findOneByOrFail({ id: clip.userId })), - instanceName: meta.name || 'Misskey', + instanceName: meta.name || 'Calckey', privateMode: meta.privateMode, icon: meta.iconUrl, themeColor: meta.themeColor, @@ -449,7 +449,7 @@ router.get('/gallery/:post', async (ctx, next) => { post: _post, profile, avatarUrl: await Users.getAvatarUrl(await Users.findOneByOrFail({ id: post.userId })), - instanceName: meta.name || 'Misskey', + instanceName: meta.name || 'Calckey', icon: meta.iconUrl, themeColor: meta.themeColor, privateMode: meta.privateMode, @@ -474,7 +474,7 @@ router.get('/channels/:channel', async (ctx, next) => { const meta = await fetchMeta(); await ctx.render('channel', { channel: _channel, - instanceName: meta.name || 'Misskey', + instanceName: meta.name || 'Calckey', icon: meta.iconUrl, themeColor: meta.themeColor, privateMode: meta.privateMode, @@ -537,8 +537,8 @@ router.get('(.*)', async ctx => { const meta = await fetchMeta(); await ctx.render('base', { img: meta.bannerUrl, - title: meta.name || 'Misskey', - instanceName: meta.name || 'Misskey', + title: meta.name || 'Calckey', + instanceName: meta.name || 'Calckey', desc: meta.description, icon: meta.iconUrl, themeColor: meta.themeColor, diff --git a/packages/backend/src/server/web/views/bios.pug b/packages/backend/src/server/web/views/bios.pug index b32a2e3d9..408ebb27b 100644 --- a/packages/backend/src/server/web/views/bios.pug +++ b/packages/backend/src/server/web/views/bios.pug @@ -6,7 +6,7 @@ html meta(charset='utf-8') meta(name='application-name' content='Calckey') meta(name='viewport' content='width=device-width, initial-scale=1.0') - title Misskey Repair Tool + title Calckey Repair Tool style include ../bios.css script diff --git a/packages/backend/src/server/web/views/cli.pug b/packages/backend/src/server/web/views/cli.pug index 9e0229bc5..2abd5ae95 100644 --- a/packages/backend/src/server/web/views/cli.pug +++ b/packages/backend/src/server/web/views/cli.pug @@ -6,7 +6,7 @@ html meta(charset='utf-8') meta(name='application-name' content='Calckey') meta(name='viewport' content='width=device-width, initial-scale=1.0') - title Misskey Cli + title Calckey Cli style include ../cli.css script diff --git a/packages/backend/src/server/web/views/flush.pug b/packages/backend/src/server/web/views/flush.pug index 784d17946..abd8fff11 100644 --- a/packages/backend/src/server/web/views/flush.pug +++ b/packages/backend/src/server/web/views/flush.pug @@ -5,7 +5,7 @@ html meta(charset='utf-8') meta(name='application-name' content='Calckey') meta(name='viewport' content='width=device-width, initial-scale=1.0') - title Flush Misskey + title Flush Calckey style. * { font-family: BIZ UDGothic, Roboto, HelveticaNeue, Arial, sans-serif; diff --git a/packages/backend/src/server/web/views/info-card.pug b/packages/backend/src/server/web/views/info-card.pug index 1d62778ce..be52d0c39 100644 --- a/packages/backend/src/server/web/views/info-card.pug +++ b/packages/backend/src/server/web/views/info-card.pug @@ -4,7 +4,7 @@ html head meta(charset='utf-8') - meta(name='application-name' content='Misskey') + meta(name='application-name' content='Calckey') title= meta.name || host style. html, body { diff --git a/packages/backend/src/services/logger.ts b/packages/backend/src/services/logger.ts index 89d6d5720..b57272547 100644 --- a/packages/backend/src/services/logger.ts +++ b/packages/backend/src/services/logger.ts @@ -29,7 +29,7 @@ export default class Logger { if (config.syslog) { this.syslogClient = new SyslogPro.RFC5424({ - applacationName: 'Misskey', + applacationName: 'Calckey', timestamp: true, encludeStructuredData: true, color: true, diff --git a/packages/client/src/config.ts b/packages/client/src/config.ts index f2022b0f0..5e02a9107 100644 --- a/packages/client/src/config.ts +++ b/packages/client/src/config.ts @@ -10,6 +10,6 @@ export const lang = localStorage.getItem('lang'); export const langs = _LANGS_; export const locale = JSON.parse(localStorage.getItem('locale')); export const version = _VERSION_; -export const instanceName = siteName === 'Misskey' ? host : siteName; +export const instanceName = siteName === 'Calckey' ? host : siteName; export const ui = localStorage.getItem('ui'); export const debug = localStorage.getItem('debug') === 'true';