mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-09-09 04:31:59 +03:00
merge: Switch source code bits (!435)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/435 Approved-by: Julia Johannesen <julia@insertdomain.name> Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
This commit is contained in:
commit
78975ddcc8
|
@ -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"
|
||||
|
|
16
locales/index.d.ts
vendored
16
locales/index.d.ts
vendored
|
@ -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,9 +7075,13 @@ export interface Locale extends ILocale {
|
|||
*/
|
||||
"translation": string;
|
||||
/**
|
||||
* Sharkeyに寄付
|
||||
* Misskeyに寄付
|
||||
*/
|
||||
"donate": string;
|
||||
/**
|
||||
* Sharkeyに寄付
|
||||
*/
|
||||
"donate_sharkey": string;
|
||||
/**
|
||||
* 他にも多くの方が支援してくれています。ありがとうございます🥰
|
||||
*/
|
||||
|
@ -9049,7 +9057,7 @@ export interface Locale extends ILocale {
|
|||
*/
|
||||
"pollEnded": string;
|
||||
/**
|
||||
* 注記が編集されました
|
||||
* 投稿が編集されました
|
||||
*/
|
||||
"edited": string;
|
||||
/**
|
||||
|
|
|
@ -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: "プロジェクトメンバー"
|
||||
|
|
|
@ -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]],
|
||||
|
|
|
@ -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');
|
||||
}
|
||||
});
|
||||
|
|
|
@ -71,6 +71,7 @@ function close() {
|
|||
width: calc(100% - (var(--margin) * 2));
|
||||
max-width: 500px;
|
||||
display: flex;
|
||||
backdrop-filter: var(--blur, blur(15px));
|
||||
}
|
||||
|
||||
.icon {
|
||||
|
|
|
@ -27,6 +27,39 @@ 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 v-if="instance.repositoryUrl !== 'https://activitypub.software/TransFem-org/Sharkey/'">
|
||||
<div class="_gaps_s">
|
||||
<MkInfo>
|
||||
{{ i18n.tsx._aboutMisskey.thisIsModifiedVersion({ name: instance.name }) }}
|
||||
</MkInfo>
|
||||
<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 }}
|
||||
</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>
|
||||
{{ i18n.ts._aboutMisskey.source }}
|
||||
<template #suffix>Tarball</template>
|
||||
</FormLink>
|
||||
<MkInfo v-if="!instance.repositoryUrl && !instance.providesTarball" warn>
|
||||
{{ i18n.ts.sourceCodeIsNotYetProvided }}
|
||||
</MkInfo>
|
||||
</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>
|
||||
|
@ -41,31 +74,6 @@ SPDX-License-Identifier: AGPL-3.0-only
|
|||
</FormLink>
|
||||
</div>
|
||||
</FormSection>
|
||||
<FormSection v-if="instance.repositoryUrl !== 'https://github.com/misskey-dev/misskey'">
|
||||
<div class="_gaps_s">
|
||||
<MkInfo>
|
||||
{{ i18n.tsx._aboutMisskey.thisIsModifiedVersion({ name: instance.name }) }}
|
||||
</MkInfo>
|
||||
<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>
|
||||
{{ i18n.ts._aboutMisskey.source }}
|
||||
<template #suffix>Tarball</template>
|
||||
</FormLink>
|
||||
<MkInfo v-if="!instance.repositoryUrl && !instance.providesTarball" warn>
|
||||
{{ i18n.ts.sourceCodeIsNotYetProvided }}
|
||||
</MkInfo>
|
||||
</div>
|
||||
</FormSection>
|
||||
<FormSection>
|
||||
<template #label>{{ i18n.ts._aboutMisskey.projectMembers }}</template>
|
||||
<div :class="$style.contributors" style="margin-bottom: 8px;">
|
||||
|
|
Loading…
Reference in a new issue