summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2024-02-20 20:01:31 +0000
committerAmelia Yukii <amelia.yukii@shourai.de>2024-02-20 20:01:31 +0000
commitc9940b7359e72a3cd806b174e4a2a651f56d0e7a (patch)
tree5b593f3be6d3808eac4ea52ab9ae68b403cbbafd
parentmerge: Note Edited notification type (!432) (diff)
downloadsharkey-c9940b7359e72a3cd806b174e4a2a651f56d0e7a.tar.gz
sharkey-c9940b7359e72a3cd806b174e4a2a651f56d0e7a.tar.bz2
sharkey-c9940b7359e72a3cd806b174e4a2a651f56d0e7a.zip
Switch source code bits
-rw-r--r--locales/en-US.yml13
-rw-r--r--locales/index.d.ts16
-rw-r--r--locales/ja-JP.yml8
-rw-r--r--packages/backend/src/server/api/openapi/gen-spec.ts4
-rw-r--r--packages/frontend/src/boot/main-boot.ts2
-rw-r--r--packages/frontend/src/components/MkSourceCodeAvailablePopup.vue1
-rw-r--r--packages/frontend/src/pages/about-sharkey.vue50
7 files changed, 62 insertions, 32 deletions
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 67791c98ae..64033d6a2b 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1026,6 +1026,7 @@ remindMeLater: "Maybe later"
didYouLikeMisskey: "Have you taken a liking to Sharkey?"
pleaseDonate: "{host} uses the free software, Sharkey. We would highly appreciate your donations so development of Sharkey can continue!"
pleaseDonateInstance: "You can also support {host} directly by donating to your instance administration."
+correspondingSourceIsAvailable: "The corresponding source code is available from {anchor}."
roles: "Roles"
role: "Role"
noRole: "Role not found"
@@ -1214,6 +1215,12 @@ confirmShowRepliesAll: "This operation is irreversible. Would you really like to
confirmHideRepliesAll: "This operation is irreversible. Would you really like to hide replies to others from everyone you follow in your timeline?"
externalServices: "External Services"
sourceCode: "Source code"
+sourceCodeIsNotYetProvided: "The source code is not yet available. Please contact your administrator to fix this issue."
+repositoryUrl: "Repository URL"
+repositoryUrlDescription: "If there is a repository where the source code is publicly available, enter its URL. If you are using Sharkey as-is (without any changes to the source code), enter https://activitypub.software/TransFem-org/Sharkey/."
+repositoryUrlOrTarballRequired: "If you don't have a public repository, you'll need to provide a tarball instead. See .config/example.yml for details."
+feedback: "Feedback"
+feedbackUrl: "Feedback URL"
impressum: "Impressum"
impressumUrl: "Impressum URL"
impressumDescription: "In some countries, like germany, the inclusion of operator contact information (an Impressum) is legally required for commercial websites."
@@ -1808,8 +1815,12 @@ _aboutMisskey:
contributors: "Main contributors"
allContributors: "All contributors"
source: "Source code"
+ original: "Misskey original"
+ original_sharkey: "Sharkey original"
+ thisIsModifiedVersion: "{name} uses a modified version of the original Sharkey"
translation: "Translate Sharkey"
- donate: "Donate to Sharkey"
+ donate: "Donate to Misskey"
+ donate_sharkey: "Donate to Sharkey"
morePatrons: "We also appreciate the support of many other helpers not listed here. Thank you! 🥰"
patrons: "Patrons"
projectMembers: "Project members"
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 30ead15e13..f816feb108 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -7059,11 +7059,15 @@ export interface Locale extends ILocale {
*/
"source": string;
/**
- * オリジナル
+ * Misskey オリジナル
*/
"original": string;
/**
- * {name}はオリジナルのMisskeyを改変したバージョンを使用しています。
+ * Sharkey オリジナル
+ */
+ "original_sharkey": string;
+ /**
+ * {name}はオリジナルのSharkeyを改変したバージョンを使用しています。
*/
"thisIsModifiedVersion": ParameterizedString<"name">;
/**
@@ -7071,10 +7075,14 @@ export interface Locale extends ILocale {
*/
"translation": string;
/**
- * Sharkeyに寄付
+ * Misskeyに寄付
*/
"donate": string;
/**
+ * Sharkeyに寄付
+ */
+ "donate_sharkey": string;
+ /**
* 他にも多くの方が支援してくれています。ありがとうございます🥰
*/
"morePatrons": string;
@@ -9049,7 +9057,7 @@ export interface Locale extends ILocale {
*/
"pollEnded": string;
/**
- * 注記が編集されました
+ * 投稿が編集されました
*/
"edited": string;
/**
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index db3ea6c653..439210f45e 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1839,10 +1839,12 @@ _aboutMisskey:
contributors: "主なコントリビューター"
allContributors: "全てのコントリビューター"
source: "ソースコード"
- original: "オリジナル"
- thisIsModifiedVersion: "{name}はオリジナルのMisskeyを改変したバージョンを使用しています。"
+ original: "Misskey オリジナル"
+ original_sharkey: "Sharkey オリジナル"
+ thisIsModifiedVersion: "{name}はオリジナルのSharkeyを改変したバージョンを使用しています。"
translation: "Sharkeyを翻訳"
- donate: "Sharkeyに寄付"
+ donate: "Misskeyに寄付"
+ donate_sharkey: "Sharkeyに寄付"
morePatrons: "他にも多くの方が支援してくれています。ありがとうございます🥰"
patrons: "支援者"
projectMembers: "プロジェクトメンバー"
diff --git a/packages/backend/src/server/api/openapi/gen-spec.ts b/packages/backend/src/server/api/openapi/gen-spec.ts
index 7679a9b464..b5f91ff542 100644
--- a/packages/backend/src/server/api/openapi/gen-spec.ts
+++ b/packages/backend/src/server/api/openapi/gen-spec.ts
@@ -20,7 +20,7 @@ export function genOpenapiSpec(config: Config, includeSelfRef = false) {
externalDocs: {
description: 'Repository',
- url: 'https://github.com/misskey-dev/misskey',
+ url: 'https://activitypub.software/TransFem-org/Sharkey',
},
servers: [{
@@ -98,7 +98,7 @@ export function genOpenapiSpec(config: Config, includeSelfRef = false) {
description: desc,
externalDocs: {
description: 'Source code',
- url: `https://github.com/misskey-dev/misskey/blob/develop/packages/backend/src/server/api/endpoints/${endpoint.name}.ts`,
+ url: `https://activitypub.software/TransFem-org/Sharkey/-/tree/develop/packages/backend/src/server/api/endpoints/${endpoint.name}.ts`,
},
...(endpoint.meta.tags ? {
tags: [endpoint.meta.tags[0]],
diff --git a/packages/frontend/src/boot/main-boot.ts b/packages/frontend/src/boot/main-boot.ts
index 324bc40146..66d9bf0680 100644
--- a/packages/frontend/src/boot/main-boot.ts
+++ b/packages/frontend/src/boot/main-boot.ts
@@ -235,7 +235,7 @@ export async function mainBoot() {
fetchInstance().then(() => {
const modifiedVersionMustProminentlyOfferInAgplV3Section13Read = miLocalStorage.getItem('modifiedVersionMustProminentlyOfferInAgplV3Section13Read');
- if (modifiedVersionMustProminentlyOfferInAgplV3Section13Read !== 'true' && instance.repositoryUrl !== 'https://github.com/misskey-dev/misskey') {
+ if (modifiedVersionMustProminentlyOfferInAgplV3Section13Read !== 'true' && instance.repositoryUrl !== 'https://activitypub.software/TransFem-org/Sharkey/') {
popup(defineAsyncComponent(() => import('@/components/MkSourceCodeAvailablePopup.vue')), {}, {}, 'closed');
}
});
diff --git a/packages/frontend/src/components/MkSourceCodeAvailablePopup.vue b/packages/frontend/src/components/MkSourceCodeAvailablePopup.vue
index dcab80e758..cd884f0b19 100644
--- a/packages/frontend/src/components/MkSourceCodeAvailablePopup.vue
+++ b/packages/frontend/src/components/MkSourceCodeAvailablePopup.vue
@@ -71,6 +71,7 @@ function close() {
width: calc(100% - (var(--margin) * 2));
max-width: 500px;
display: flex;
+ backdrop-filter: var(--blur, blur(15px));
}
.icon {
diff --git a/packages/frontend/src/pages/about-sharkey.vue b/packages/frontend/src/pages/about-sharkey.vue
index d3efb23033..954db9025a 100644
--- a/packages/frontend/src/pages/about-sharkey.vue
+++ b/packages/frontend/src/pages/about-sharkey.vue
@@ -27,21 +27,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<div v-if="$i != null" style="text-align: center;">
<MkButton primary rounded inline @click="iLoveMisskey">I <Mfm text="$[jelly ❤]"/> #Sharkey</MkButton>
</div>
- <FormSection>
- <div class="_gaps_s">
- <FormLink to="https://github.com/misskey-dev/misskey" external>
- <template #icon><i class="ph-code ph-bold ph-lg"></i></template>
- {{ i18n.ts._aboutMisskey.source }} ({{ i18n.ts._aboutMisskey.original }})
- <template #suffix>GitHub</template>
- </FormLink>
- <FormLink to="https://www.patreon.com/syuilo" external>
- <template #icon><i class="ph-piggy-bank ph-bold ph-lg"></i></template>
- {{ i18n.ts._aboutMisskey.donate }}
- <template #suffix>Patreon</template>
- </FormLink>
- </div>
- </FormSection>
- <FormSection v-if="instance.repositoryUrl !== 'https://github.com/misskey-dev/misskey'">
+ <FormSection v-if="instance.repositoryUrl !== 'https://activitypub.software/TransFem-org/Sharkey/'">
<div class="_gaps_s">
<MkInfo>
{{ i18n.tsx._aboutMisskey.thisIsModifiedVersion({ name: instance.name }) }}
@@ -49,12 +35,6 @@ SPDX-License-Identifier: AGPL-3.0-only
<FormLink v-if="instance.repositoryUrl" :to="instance.repositoryUrl" external>
<template #icon><i class="ph-code ph-bold ph-lg"></i></template>
{{ i18n.ts._aboutMisskey.source }}
- <template #suffix>GitLab</template>
- </FormLink>
- <FormLink to="https://ko-fi.com/transfem" external>
- <template #icon><i class="ph-piggy-bank ph-bold ph-lg"></i></template>
- {{ i18n.ts._aboutMisskey.donate }}
- <template #suffix>Ko-Fi</template>
</FormLink>
<FormLink v-if="instance.providesTarball" :to="`/tarball/sharkey-${version}.tar.gz`" external>
<template #icon><i class="ph-download ph-bold ph-lg"></i></template>
@@ -67,6 +47,34 @@ SPDX-License-Identifier: AGPL-3.0-only
</div>
</FormSection>
<FormSection>
+ <div class="_gaps_s">
+ <FormLink to="https://activitypub.software/TransFem-org/Sharkey/" external>
+ <template #icon><i class="ph-code ph-bold ph-lg"></i></template>
+ {{ i18n.ts._aboutMisskey.source }} ({{ i18n.ts._aboutMisskey.original_sharkey }})
+ <template #suffix>GitLab</template>
+ </FormLink>
+ <FormLink to="https://ko-fi.com/transfem" external>
+ <template #icon><i class="ph-piggy-bank ph-bold ph-lg"></i></template>
+ {{ i18n.ts._aboutMisskey.donate_sharkey }}
+ <template #suffix>Ko-Fi</template>
+ </FormLink>
+ </div>
+ </FormSection>
+ <FormSection>
+ <div class="_gaps_s">
+ <FormLink to="https://github.com/misskey-dev/misskey" external>
+ <template #icon><i class="ph-code ph-bold ph-lg"></i></template>
+ {{ i18n.ts._aboutMisskey.source }} ({{ i18n.ts._aboutMisskey.original }})
+ <template #suffix>GitHub</template>
+ </FormLink>
+ <FormLink to="https://www.patreon.com/syuilo" external>
+ <template #icon><i class="ph-piggy-bank ph-bold ph-lg"></i></template>
+ {{ i18n.ts._aboutMisskey.donate }}
+ <template #suffix>Patreon</template>
+ </FormLink>
+ </div>
+ </FormSection>
+ <FormSection>
<template #label>{{ i18n.ts._aboutMisskey.projectMembers }}</template>
<div :class="$style.contributors" style="margin-bottom: 8px;">
<a href="https://activitypub.software/Marie" target="_blank" :class="$style.contributor">