Compare commits

...

6 commits

Author SHA1 Message Date
vib
e75af3b34d Merge branch 'main' into snug.moe 2022-10-08 17:32:44 +03:00
f6a5459f91
Merge PR 'client: refactor super-menu component to composition API' (#186)
Reviewed-on: FoundKeyGang/FoundKey#186
2022-10-07 19:50:56 -04:00
64e3239566
client: refactor super-menu component to composition API 2022-10-07 11:28:49 +02:00
cee402c591 Translated using Weblate (German)
Currently translated at 100.0% (1366 of 1366 strings)

Translated using Weblate (German)

Currently translated at 100.0% (1366 of 1366 strings)

Translated using Weblate (English)

Currently translated at 99.7% (1363 of 1366 strings)

Co-authored-by: Johann <johann@qwertqwefsday.eu>
Translate-URL: http://translate.akkoma.dev/projects/foundkey/foundkey/de/
Translate-URL: http://translate.akkoma.dev/projects/foundkey/foundkey/en/
Translation: Foundkey/foundkey
2022-10-07 07:39:53 +00:00
Weblate
6a3f8aa4f9 Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/foundkey/foundkey/
Translation: Foundkey/foundkey
2022-10-07 07:39:53 +00:00
8311b30b4c
client: fix tolerance for future timestamp 2022-10-07 09:38:44 +02:00
5 changed files with 39 additions and 20 deletions

View file

@ -887,7 +887,9 @@ makeReactionsPublicDescription: "Jeder wird die Liste deiner gesendeten Reaktion
classic: "Classic"
muteThread: "Thread stummschalten"
unmuteThread: "Threadstummschaltung aufheben"
threadMuteNotificationsDesc: "Wähle die Benachrichtigungen, die du aus diesem Thread erhalten möchtest. Globale Benachrichtigungs-Einstellungen werden zusätzlich angewandt. Das Deaktivieren einer Benachrichtigung hat Vorrang."
threadMuteNotificationsDesc: "Wähle die Benachrichtigungen, die du aus diesem Thread\
\ erhalten möchtest. Globale Benachrichtigungs-Einstellungen werden zusätzlich angewandt.\
\ Das Deaktivieren einer Benachrichtigung hat Vorrang."
ffVisibility: "Sichtbarkeit von Gefolgten/Followern"
ffVisibilityDescription: "Konfiguriere wer sehen kann, wem du folgst sowie wer dir\
\ folgt."
@ -1558,3 +1560,7 @@ _services:
_github:
connected: GitHub-Account @{login} wurde mit Foundkey-Account @{userName} verknüpft!
disconnected: GitHub-Verknüpfung wurde entfernt.
documentation: Dokumentation
signinHistoryExpires: Frühere Login-Versuche werden aus Datenschutzgründen nach 60
Tagen automatisch gelöscht.
unlimited: Unbegrenzt

View file

@ -479,7 +479,8 @@ youHaveNoGroups: "You have no groups"
joinOrCreateGroup: "Get invited to a group or create your own."
noHistory: "No history available"
signinHistory: "Login history"
signinHistoryExpires: "Data about past login attempts is automatically deleted after 60 days to comply with privacy regulations."
signinHistoryExpires: "Data about past login attempts is automatically deleted after\
\ 60 days to comply with privacy regulations."
disableAnimatedMfm: "Disable MFM with animation"
doing: "Processing..."
category: "Category"
@ -864,7 +865,8 @@ makeReactionsPublicDescription: "This will make the list of all your past reacti
classic: "Classic"
muteThread: "Mute thread"
unmuteThread: "Unmute thread"
threadMuteNotificationsDesc: "Select the notifications you wish to view from this thread. Global notification settings also apply. Disabling takes precedence."
threadMuteNotificationsDesc: "Select the notifications you wish to view from this\
\ thread. Global notification settings also apply. Disabling takes precedence."
ffVisibility: "Follows/Followers Visibility"
ffVisibilityDescription: "Allows you to configure who can see who you follow and who\
\ follows you."

View file

@ -852,8 +852,6 @@ typeToConfirm: "この操作を行うには {x} と入力してください"
deleteAccount: "アカウント削除"
numberOfPageCache: "ページキャッシュ数"
numberOfPageCacheDescription: "多くすると利便性が向上しますが、負荷とメモリ使用量が増えます。"
document: "ドキュメント"
_emailUnavailable:
used: "既に使用されています"
format: "形式が正しくありません"

View file

@ -58,7 +58,7 @@ const relative = $computed(() => {
}
}
if (ago >= -5) {
if (ago >= -5 * SECOND) {
if (props.format === 'date') {
// this is also the catch-all for the formats with hour/minute/second precision
return i18n.ts.today;

View file

@ -23,21 +23,34 @@
</div>
</template>
<script lang="ts">
import { defineComponent } from 'vue';
<script lang="ts" setup>
type MenuItem = {
text: string;
icon?: string;
danger?: boolean;
active?: boolean;
i?: number;
} & (
{
type: 'a';
href: string;
target?: string;
} | {
type: 'button';
action(MouseEvent): void;
} | {
to: string;
}
);
export default defineComponent({
props: {
def: {
type: Array,
required: true,
},
grid: {
type: Boolean,
required: false,
default: false,
},
},
withDefaults(defineProps<{
def: {
title?: string;
items: MenuItem[];
}[];
grid?: boolean;
}>(), {
grid: false,
});
</script>