diff --git a/src/components/Menu/Row.tsx b/src/components/Menu/Row.tsx index 98c48d14..56919332 100644 --- a/src/components/Menu/Row.tsx +++ b/src/components/Menu/Row.tsx @@ -5,7 +5,7 @@ import { StyleConstants } from '@utils/styles/constants' import { useTheme } from '@utils/styles/ThemeManager' import { ColorDefinitions } from '@utils/styles/themes' import React, { useMemo } from 'react' -import { StyleSheet, Text, View } from 'react-native' +import { View } from 'react-native' import { Flow } from 'react-native-animated-spinkit' import { State, Switch, TapGestureHandler } from 'react-native-gesture-handler' @@ -61,7 +61,7 @@ const MenuRow: React.FC = ({ return ( = ({ }} > - - + + {iconFront && ( )} {badge ? ( @@ -99,7 +111,7 @@ const MenuRow: React.FC = ({ }} /> ) : null} - + = ({ {content || switchValue !== undefined || iconBack ? ( - + {content ? ( typeof content === 'string' ? ( = ({ name={iconBack} size={StyleConstants.Font.Size.L} color={colors[iconBackColor]} - style={[styles.iconBack, { opacity: loading ? 0 : 1 }]} + style={{ marginLeft: 8, opacity: loading ? 0 : 1 }} /> ) : null} {loading && loadingSpinkit} @@ -159,42 +179,4 @@ const MenuRow: React.FC = ({ ) } -const styles = StyleSheet.create({ - base: { - minHeight: 50 - }, - core: { - flex: 1, - flexDirection: 'row', - paddingTop: StyleConstants.Spacing.S - }, - front: { - flex: 2, - flexDirection: 'row', - alignItems: 'center' - }, - back: { - flex: 1, - flexDirection: 'row', - justifyContent: 'flex-end', - alignItems: 'center', - marginLeft: StyleConstants.Spacing.M - }, - iconFront: { - marginRight: StyleConstants.Spacing.S - }, - main: { - flex: 1 - }, - description: { - ...StyleConstants.FontStyle.S - }, - content: { - ...StyleConstants.FontStyle.M - }, - iconBack: { - marginLeft: 8 - } -}) - export default MenuRow diff --git a/src/i18n/de/components/contextMenu.json b/src/i18n/de/components/contextMenu.json index 3738d471..b5b5f216 100644 --- a/src/i18n/de/components/contextMenu.json +++ b/src/i18n/de/components/contextMenu.json @@ -1,12 +1,14 @@ { "accessibilityHint": "Funktionen für diesen Tröt - wie z. B. Autor und Originaltröt", "account": { - "title": "", + "title": "Benutzeraktionen", "mute": { - "action": "Profil stummschalten" + "action_false": "Profil stummschalten", + "action_true": "" }, "block": { - "action": "Nutzer blockieren" + "action_false": "Nutzer blockieren", + "action_true": "" }, "reports": { "action": "User melden" @@ -59,12 +61,12 @@ } }, "mute": { - "action-muted_false": "", - "action-muted_true": "" + "action_false": "", + "action_true": "" }, "pin": { - "action-pinned_false": "", - "action-pinned_true": "" + "action_false": "", + "action_true": "" } } } \ No newline at end of file diff --git a/src/i18n/de/components/timeline.json b/src/i18n/de/components/timeline.json index 993af2ff..17e7ad6d 100644 --- a/src/i18n/de/components/timeline.json +++ b/src/i18n/de/components/timeline.json @@ -139,7 +139,7 @@ }, "expiration": { "expired": "Abstimmung abgelaufen", - "until": "Läuft in <0 /> ab" + "until": "Läuft <0 /> ab" } } } diff --git a/src/i18n/it/components/contextMenu.json b/src/i18n/it/components/contextMenu.json index 9a138494..3f5dff19 100644 --- a/src/i18n/it/components/contextMenu.json +++ b/src/i18n/it/components/contextMenu.json @@ -3,10 +3,12 @@ "account": { "title": "", "mute": { - "action": "Muta utente" + "action_false": "Muta utente", + "action_true": "" }, "block": { - "action": "Blocca utente" + "action_false": "Blocca utente", + "action_true": "" }, "reports": { "action": "Segnala utente" @@ -59,12 +61,12 @@ } }, "mute": { - "action-muted_false": "", - "action-muted_true": "" + "action_false": "", + "action_true": "" }, "pin": { - "action-pinned_false": "", - "action-pinned_true": "" + "action_false": "", + "action_true": "" } } } \ No newline at end of file diff --git a/src/i18n/it/components/timeline.json b/src/i18n/it/components/timeline.json index 7efa9234..d1b29919 100644 --- a/src/i18n/it/components/timeline.json +++ b/src/i18n/it/components/timeline.json @@ -139,7 +139,7 @@ }, "expiration": { "expired": "Voto scaduto", - "until": "Scade in <0 />" + "until": "Scade <0 />" } } } diff --git a/src/i18n/ko/components/contextMenu.json b/src/i18n/ko/components/contextMenu.json index b1f3ba27..4b25d130 100644 --- a/src/i18n/ko/components/contextMenu.json +++ b/src/i18n/ko/components/contextMenu.json @@ -3,10 +3,12 @@ "account": { "title": "", "mute": { - "action": "사용자 음소거" + "action_false": "사용자 음소거", + "action_true": "" }, "block": { - "action": "사용자 차단" + "action_false": "사용자 차단", + "action_true": "" }, "reports": { "action": "사용자 신고" @@ -59,12 +61,12 @@ } }, "mute": { - "action-muted_false": "", - "action-muted_true": "" + "action_false": "", + "action_true": "" }, "pin": { - "action-pinned_false": "", - "action-pinned_true": "" + "action_false": "", + "action_true": "" } } } \ No newline at end of file diff --git a/src/i18n/pt_BR/components/contextMenu.json b/src/i18n/pt_BR/components/contextMenu.json index f7ee3d83..fb858fa9 100644 --- a/src/i18n/pt_BR/components/contextMenu.json +++ b/src/i18n/pt_BR/components/contextMenu.json @@ -3,10 +3,12 @@ "account": { "title": "Ações do Usuário", "mute": { - "action": "Silenciar usuário" + "action_false": "Silenciar usuário", + "action_true": "Desativar o silêncio do usuário" }, "block": { - "action": "Bloquear usuário" + "action_false": "Bloquear usuário", + "action_true": "Desbloquear usuário" }, "reports": { "action": "Denunciar usuário" @@ -59,12 +61,12 @@ } }, "mute": { - "action-muted_false": "Silenciar este toot e respostas", - "action-muted_true": "Desbloquear este toot e respostas" + "action_false": "Silenciar este toot e respostas", + "action_true": "Desbloquear este toot e respostas" }, "pin": { - "action-pinned_false": "Toot fixado", - "action-pinned_true": "Desafixar toot" + "action_false": "Toot fixado", + "action_true": "Desafixar toot" } } } \ No newline at end of file diff --git a/src/i18n/pt_BR/components/timeline.json b/src/i18n/pt_BR/components/timeline.json index cc998cc9..7550e747 100644 --- a/src/i18n/pt_BR/components/timeline.json +++ b/src/i18n/pt_BR/components/timeline.json @@ -139,7 +139,7 @@ }, "expiration": { "expired": "Voto expirado", - "until": "Expira em <0 />" + "until": "Expira <0 />" } } } diff --git a/src/i18n/vi/components/contextMenu.json b/src/i18n/vi/components/contextMenu.json index 37be0217..6e32fff5 100644 --- a/src/i18n/vi/components/contextMenu.json +++ b/src/i18n/vi/components/contextMenu.json @@ -3,10 +3,12 @@ "account": { "title": "Hành động người dùng", "mute": { - "action": "Ẩn người này" + "action_false": "Ẩn người này", + "action_true": "Tương tác người dùng" }, "block": { - "action": "Chặn người này" + "action_false": "Chặn người này", + "action_true": "Bỏ chặn người dùng" }, "reports": { "action": "Báo cáo" @@ -59,12 +61,12 @@ } }, "mute": { - "action-muted_false": "Ẩn tút này", - "action-muted_true": "Bỏ ẩn tút này" + "action_false": "Ẩn tút này", + "action_true": "Bỏ ẩn tút này" }, "pin": { - "action-pinned_false": "Tút ghim", - "action-pinned_true": "Bỏ ghim tút" + "action_false": "Tút ghim", + "action_true": "Bỏ ghim tút" } } } \ No newline at end of file diff --git a/src/i18n/vi/components/timeline.json b/src/i18n/vi/components/timeline.json index 73db2dbe..63f09362 100644 --- a/src/i18n/vi/components/timeline.json +++ b/src/i18n/vi/components/timeline.json @@ -139,7 +139,7 @@ }, "expiration": { "expired": "Đã kết thúc", - "until": "Kết thúc sau <0 />" + "until": "Kết thúc <0 />" } } } diff --git a/src/i18n/zh-Hans/components/contextMenu.json b/src/i18n/zh-Hans/components/contextMenu.json index a167fe6f..f2b033ef 100644 --- a/src/i18n/zh-Hans/components/contextMenu.json +++ b/src/i18n/zh-Hans/components/contextMenu.json @@ -3,10 +3,12 @@ "account": { "title": "用户操作", "mute": { - "action": "静音用户" + "action_false": "静音用户", + "action_true": "取消静音用户" }, "block": { - "action": "屏蔽用户" + "action_false": "屏蔽用户", + "action_true": "取消屏蔽用户" }, "reports": { "action": "举报用户" @@ -59,12 +61,12 @@ } }, "mute": { - "action-muted_false": "静音嘟文及回复", - "action-muted_true": "取消静音嘟文及回复" + "action_false": "静音嘟文及回复", + "action_true": "取消静音嘟文及回复" }, "pin": { - "action-pinned_false": "置顶嘟文", - "action-pinned_true": "取消置顶嘟文" + "action_false": "置顶嘟文", + "action_true": "取消置顶嘟文" } } } \ No newline at end of file diff --git a/src/i18n/zh-Hant/components/contextMenu.json b/src/i18n/zh-Hant/components/contextMenu.json index 2715b111..bcf2b253 100644 --- a/src/i18n/zh-Hant/components/contextMenu.json +++ b/src/i18n/zh-Hant/components/contextMenu.json @@ -3,10 +3,12 @@ "account": { "title": "", "mute": { - "action": "" + "action_false": "", + "action_true": "" }, "block": { - "action": "" + "action_false": "", + "action_true": "" }, "reports": { "action": "" @@ -59,12 +61,12 @@ } }, "mute": { - "action-muted_false": "", - "action-muted_true": "" + "action_false": "", + "action_true": "" }, "pin": { - "action-pinned_false": "", - "action-pinned_true": "" + "action_false": "", + "action_true": "" } } } \ No newline at end of file