zio/bsky-app
2
0
Fork 0
Code Pull requests Releases Packages Activity

Move label appeal to post dropdown (#2236)

Browse source 
* Move appeal from post to dropdown

* Translate

* Tweak copy on the appeal label modal

---------

Co-authored-by: Paul Frazee <pfrazee@gmail.com>
This commit is contained in:
Eric Bailey 2023-12-18 16:38:59 -06:00 • committed by GitHub
parent 726bbd2b6d
commit 8df4fd4d57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 135 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/locale/locales/en/messages.po
View file

@ -75,6 +75,10 @@ msgstr ""
#~ msgid "<0>Note: Your profile and posts will remain publicly available. Third-party apps that display Bluesky content may not respect this setting.</0>" #~ msgid "<0>Note: Your profile and posts will remain publicly available. Third-party apps that display Bluesky content may not respect this setting.</0>"
#~ msgstr "" #~ msgstr ""
#: src/view/com/util/moderation/LabelInfo.tsx:45
msgid "A content warning has been applied to this {0}."
msgstr ""
#: src/lib/hooks/useOTAUpdate.ts:16 #: src/lib/hooks/useOTAUpdate.ts:16
msgid "A new version of the app is available. Please update to continue using the app." msgid "A new version of the app is available. Please update to continue using the app."
msgstr "" msgstr ""
@ -200,15 +204,23 @@ msgstr ""
msgid "App Passwords" msgid "App Passwords"
msgstr "" msgstr ""
#: src/view/com/modals/AppealLabel.tsx:65 #: src/view/com/util/forms/PostDropdownBtn.tsx:207
msgid "Appeal Decision" msgid "Appeal content warning"
msgstr "" msgstr ""
#: src/view/com/util/moderation/LabelInfo.tsx:51 #: src/view/com/modals/AppealLabel.tsx:65
msgid "Appeal Content Warning"
msgstr ""
#: src/view/com/modals/AppealLabel.tsx:65
#~ msgid "Appeal Decision"
#~ msgstr ""
#: src/view/com/util/moderation/LabelInfo.tsx:52
msgid "Appeal this decision" msgid "Appeal this decision"
msgstr "" msgstr ""
#: src/view/com/util/moderation/LabelInfo.tsx:55 #: src/view/com/util/moderation/LabelInfo.tsx:56
msgid "Appeal this decision." msgid "Appeal this decision."
msgstr "" msgstr ""
@ -232,7 +244,7 @@ msgstr ""
msgid "Are you sure?" msgid "Are you sure?"
msgstr "" msgstr ""
#: src/view/com/util/forms/PostDropdownBtn.tsx:188 #: src/view/com/util/forms/PostDropdownBtn.tsx:190
msgid "Are you sure? This cannot be undone." msgid "Are you sure? This cannot be undone."
msgstr "" msgstr ""
@ -585,7 +597,7 @@ msgstr ""
msgid "Copy link to list" msgid "Copy link to list"
msgstr "" msgstr ""
#: src/view/com/util/forms/PostDropdownBtn.tsx:129 #: src/view/com/util/forms/PostDropdownBtn.tsx:131
msgid "Copy link to post" msgid "Copy link to post"
msgstr "" msgstr ""
@ -593,7 +605,7 @@ msgstr ""
msgid "Copy link to profile" msgid "Copy link to profile"
msgstr "" msgstr ""
#: src/view/com/util/forms/PostDropdownBtn.tsx:115 #: src/view/com/util/forms/PostDropdownBtn.tsx:117
msgid "Copy post text" msgid "Copy post text"
msgstr "" msgstr ""
@ -666,11 +678,11 @@ msgstr ""
msgid "Delete my account…" msgid "Delete my account…"
msgstr "" msgstr ""
#: src/view/com/util/forms/PostDropdownBtn.tsx:183 #: src/view/com/util/forms/PostDropdownBtn.tsx:185
msgid "Delete post" msgid "Delete post"
msgstr "" msgstr ""
#: src/view/com/util/forms/PostDropdownBtn.tsx:187 #: src/view/com/util/forms/PostDropdownBtn.tsx:189
msgid "Delete this post?" msgid "Delete this post?"
msgstr "" msgstr ""
@ -1317,7 +1329,7 @@ msgstr ""
msgid "Mute these accounts?" msgid "Mute these accounts?"
msgstr "" msgstr ""
#: src/view/com/util/forms/PostDropdownBtn.tsx:147 #: src/view/com/util/forms/PostDropdownBtn.tsx:149
msgid "Mute thread" msgid "Mute thread"
msgstr "" msgstr ""
@ -1592,9 +1604,14 @@ msgstr ""
#: src/view/com/modals/AppealLabel.tsx:72 #: src/view/com/modals/AppealLabel.tsx:72
#: src/view/com/modals/AppealLabel.tsx:75 #: src/view/com/modals/AppealLabel.tsx:75
msgid "Please tell us why you think this decision was incorrect." msgid "Please tell us why you think this content warning was incorrectly applied!"
msgstr "" msgstr ""
#: src/view/com/modals/AppealLabel.tsx:72
#: src/view/com/modals/AppealLabel.tsx:75
#~ msgid "Please tell us why you think this decision was incorrect."
#~ msgstr ""
#: src/view/com/composer/Composer.tsx:337 #: src/view/com/composer/Composer.tsx:337
#: src/view/com/post-thread/PostThread.tsx:226 #: src/view/com/post-thread/PostThread.tsx:226
#: src/view/screens/PostThread.tsx:80 #: src/view/screens/PostThread.tsx:80
@ -1771,7 +1788,7 @@ msgid "Report List"
msgstr "" msgstr ""
#: src/view/com/modals/report/SendReportButton.tsx:37 #: src/view/com/modals/report/SendReportButton.tsx:37
#: src/view/com/util/forms/PostDropdownBtn.tsx:165 #: src/view/com/util/forms/PostDropdownBtn.tsx:167
msgid "Report post" msgid "Report post"
msgstr "" msgstr ""
@ -1982,7 +1999,7 @@ msgid "Sexual activity or erotic nudity."
msgstr "" msgstr ""
#: src/view/com/profile/ProfileHeader.tsx:338 #: src/view/com/profile/ProfileHeader.tsx:338
#: src/view/com/util/forms/PostDropdownBtn.tsx:129 #: src/view/com/util/forms/PostDropdownBtn.tsx:131
#: src/view/screens/ProfileList.tsx:384 #: src/view/screens/ProfileList.tsx:384
msgid "Share" msgid "Share"
msgstr "" msgstr ""
@ -2202,8 +2219,8 @@ msgid "There was an unexpected issue in the application. Please let us know if t
msgstr "" msgstr ""
#: src/view/com/util/moderation/LabelInfo.tsx:45 #: src/view/com/util/moderation/LabelInfo.tsx:45
msgid "This {0} has been labeled." #~ msgid "This {0} has been labeled."
msgstr "" #~ msgstr ""
#: src/view/com/util/moderation/ScreenHider.tsx:88 #: src/view/com/util/moderation/ScreenHider.tsx:88
msgid "This {screenDescription} has been flagged:" msgid "This {screenDescription} has been flagged:"
@ -2237,7 +2254,7 @@ msgstr ""
msgid "This link is taking you to the following website:" msgid "This link is taking you to the following website:"
msgstr "" msgstr ""
#: src/view/com/post-thread/PostThreadItem.tsx:124 #: src/view/com/post-thread/PostThreadItem.tsx:123
msgid "This post has been deleted." msgid "This post has been deleted."
msgstr "" msgstr ""
@ -2262,9 +2279,9 @@ msgstr ""
msgid "Transformations" msgid "Transformations"
msgstr "" msgstr ""
#: src/view/com/post-thread/PostThreadItem.tsx:704
#: src/view/com/post-thread/PostThreadItem.tsx:706 #: src/view/com/post-thread/PostThreadItem.tsx:706
#: src/view/com/post-thread/PostThreadItem.tsx:708 #: src/view/com/util/forms/PostDropdownBtn.tsx:103
#: src/view/com/util/forms/PostDropdownBtn.tsx:101
msgid "Translate" msgid "Translate"
msgstr "" msgstr ""
@ -2308,7 +2325,7 @@ msgstr ""
msgid "Unmute Account" msgid "Unmute Account"
msgstr "" msgstr ""
#: src/view/com/util/forms/PostDropdownBtn.tsx:147 #: src/view/com/util/forms/PostDropdownBtn.tsx:149
msgid "Unmute thread" msgid "Unmute thread"
msgstr "" msgstr ""

55
src/locale/locales/hi/messages.po
View file

@ -75,6 +75,10 @@ msgstr "<0>कुछ</0><1>पसंदीदा उपयोगकर्ता
#~ msgid "<0>Note: Your profile and posts will remain publicly available. Third-party apps that display Bluesky content may not respect this setting.</0>" #~ msgid "<0>Note: Your profile and posts will remain publicly available. Third-party apps that display Bluesky content may not respect this setting.</0>"
#~ msgstr "" #~ msgstr ""
#: src/view/com/util/moderation/LabelInfo.tsx:45
msgid "A content warning has been applied to this {0}."
msgstr ""
#: src/lib/hooks/useOTAUpdate.ts:16 #: src/lib/hooks/useOTAUpdate.ts:16
msgid "A new version of the app is available. Please update to continue using the app." msgid "A new version of the app is available. Please update to continue using the app."
msgstr "ऐप का एक नया संस्करण उपलब्ध है. कृपया ऐप का उपयोग जारी रखने के लिए अपडेट करें।" msgstr "ऐप का एक नया संस्करण उपलब्ध है. कृपया ऐप का उपयोग जारी रखने के लिए अपडेट करें।"
@ -200,15 +204,23 @@ msgstr "ऐप पासवर्ड"
msgid "App Passwords" msgid "App Passwords"
msgstr "ऐप पासवर्ड" msgstr "ऐप पासवर्ड"
#: src/view/com/modals/AppealLabel.tsx:65 #: src/view/com/util/forms/PostDropdownBtn.tsx:207
msgid "Appeal Decision" msgid "Appeal content warning"
msgstr "" msgstr ""
#: src/view/com/util/moderation/LabelInfo.tsx:51 #: src/view/com/modals/AppealLabel.tsx:65
msgid "Appeal Content Warning"
msgstr ""
#: src/view/com/modals/AppealLabel.tsx:65
#~ msgid "Appeal Decision"
#~ msgstr ""
#: src/view/com/util/moderation/LabelInfo.tsx:52
msgid "Appeal this decision" msgid "Appeal this decision"
msgstr "" msgstr ""
#: src/view/com/util/moderation/LabelInfo.tsx:55 #: src/view/com/util/moderation/LabelInfo.tsx:56
msgid "Appeal this decision." msgid "Appeal this decision."
msgstr "" msgstr ""
@ -232,7 +244,7 @@ msgstr "क्या आप वाकई इस ड्राफ्ट को ह
msgid "Are you sure?" msgid "Are you sure?"
msgstr "क्या आप वास्तव में इसे करना चाहते हैं?" msgstr "क्या आप वास्तव में इसे करना चाहते हैं?"
#: src/view/com/util/forms/PostDropdownBtn.tsx:188 #: src/view/com/util/forms/PostDropdownBtn.tsx:190
msgid "Are you sure? This cannot be undone." msgid "Are you sure? This cannot be undone."
msgstr "क्या आप वास्तव में इसे करना चाहते हैं? इसे असंपादित नहीं किया जा सकता है।" msgstr "क्या आप वास्तव में इसे करना चाहते हैं? इसे असंपादित नहीं किया जा सकता है।"
@ -581,7 +593,7 @@ msgstr "कॉपी"
msgid "Copy link to list" msgid "Copy link to list"
msgstr "" msgstr ""
#: src/view/com/util/forms/PostDropdownBtn.tsx:129 #: src/view/com/util/forms/PostDropdownBtn.tsx:131
msgid "Copy link to post" msgid "Copy link to post"
msgstr "" msgstr ""
@ -589,7 +601,7 @@ msgstr ""
msgid "Copy link to profile" msgid "Copy link to profile"
msgstr "" msgstr ""
#: src/view/com/util/forms/PostDropdownBtn.tsx:115 #: src/view/com/util/forms/PostDropdownBtn.tsx:117
msgid "Copy post text" msgid "Copy post text"
msgstr "पोस्ट टेक्स्ट कॉपी करें" msgstr "पोस्ट टेक्स्ट कॉपी करें"
@ -662,11 +674,11 @@ msgstr "मेरा खाता हटाएं"
msgid "Delete my account…" msgid "Delete my account…"
msgstr "मेरा खाता हटाएं…" msgstr "मेरा खाता हटाएं…"
#: src/view/com/util/forms/PostDropdownBtn.tsx:183 #: src/view/com/util/forms/PostDropdownBtn.tsx:185
msgid "Delete post" msgid "Delete post"
msgstr "पोस्ट को हटाएं" msgstr "पोस्ट को हटाएं"
#: src/view/com/util/forms/PostDropdownBtn.tsx:187 #: src/view/com/util/forms/PostDropdownBtn.tsx:189
msgid "Delete this post?" msgid "Delete this post?"
msgstr "इस पोस्ट को डीलीट करें?" msgstr "इस पोस्ट को डीलीट करें?"
@ -1309,7 +1321,7 @@ msgstr ""
msgid "Mute these accounts?" msgid "Mute these accounts?"
msgstr "इन खातों को म्यूट करें?" msgstr "इन खातों को म्यूट करें?"
#: src/view/com/util/forms/PostDropdownBtn.tsx:147 #: src/view/com/util/forms/PostDropdownBtn.tsx:149
msgid "Mute thread" msgid "Mute thread"
msgstr "थ्रेड म्यूट करें" msgstr "थ्रेड म्यूट करें"
@ -1584,9 +1596,14 @@ msgstr "कृपया अपना पासवर्ड भी दर्ज
#: src/view/com/modals/AppealLabel.tsx:72 #: src/view/com/modals/AppealLabel.tsx:72
#: src/view/com/modals/AppealLabel.tsx:75 #: src/view/com/modals/AppealLabel.tsx:75
msgid "Please tell us why you think this decision was incorrect." msgid "Please tell us why you think this content warning was incorrectly applied!"
msgstr "" msgstr ""
#: src/view/com/modals/AppealLabel.tsx:72
#: src/view/com/modals/AppealLabel.tsx:75
#~ msgid "Please tell us why you think this decision was incorrect."
#~ msgstr ""
#: src/view/com/composer/Composer.tsx:337 #: src/view/com/composer/Composer.tsx:337
#: src/view/com/post-thread/PostThread.tsx:226 #: src/view/com/post-thread/PostThread.tsx:226
#: src/view/screens/PostThread.tsx:80 #: src/view/screens/PostThread.tsx:80
@ -1763,7 +1780,7 @@ msgid "Report List"
msgstr "रिपोर्ट सूची" msgstr "रिपोर्ट सूची"
#: src/view/com/modals/report/SendReportButton.tsx:37 #: src/view/com/modals/report/SendReportButton.tsx:37
#: src/view/com/util/forms/PostDropdownBtn.tsx:165 #: src/view/com/util/forms/PostDropdownBtn.tsx:167
msgid "Report post" msgid "Report post"
msgstr "रिपोर्ट पोस्ट" msgstr "रिपोर्ट पोस्ट"
@ -1974,7 +1991,7 @@ msgid "Sexual activity or erotic nudity."
msgstr "यौन गतिविधि या कामुक नग्नता।।" msgstr "यौन गतिविधि या कामुक नग्नता।।"
#: src/view/com/profile/ProfileHeader.tsx:338 #: src/view/com/profile/ProfileHeader.tsx:338
#: src/view/com/util/forms/PostDropdownBtn.tsx:129 #: src/view/com/util/forms/PostDropdownBtn.tsx:131
#: src/view/screens/ProfileList.tsx:384 #: src/view/screens/ProfileList.tsx:384
msgid "Share" msgid "Share"
msgstr "शेयर" msgstr "शेयर"
@ -2194,8 +2211,8 @@ msgid "There was an unexpected issue in the application. Please let us know if t
msgstr "एप्लिकेशन में एक अप्रत्याशित समस्या थी. कृपया हमें बताएं कि क्या आपके साथ ऐसा हुआ है!" msgstr "एप्लिकेशन में एक अप्रत्याशित समस्या थी. कृपया हमें बताएं कि क्या आपके साथ ऐसा हुआ है!"
#: src/view/com/util/moderation/LabelInfo.tsx:45 #: src/view/com/util/moderation/LabelInfo.tsx:45
msgid "This {0} has been labeled." #~ msgid "This {0} has been labeled."
msgstr "" #~ msgstr ""
#: src/view/com/util/moderation/ScreenHider.tsx:88 #: src/view/com/util/moderation/ScreenHider.tsx:88
msgid "This {screenDescription} has been flagged:" msgid "This {screenDescription} has been flagged:"
@ -2229,7 +2246,7 @@ msgstr "यह वह सेवा है जो आपको ऑनलाइन
msgid "This link is taking you to the following website:" msgid "This link is taking you to the following website:"
msgstr "यह लिंक आपको निम्नलिखित वेबसाइट पर ले जा रहा है:" msgstr "यह लिंक आपको निम्नलिखित वेबसाइट पर ले जा रहा है:"
#: src/view/com/post-thread/PostThreadItem.tsx:124 #: src/view/com/post-thread/PostThreadItem.tsx:123
msgid "This post has been deleted." msgid "This post has been deleted."
msgstr "इस पोस्ट को हटा दिया गया है।।" msgstr "इस पोस्ट को हटा दिया गया है।।"
@ -2254,9 +2271,9 @@ msgstr "ड्रॉपडाउन टॉगल करें"
msgid "Transformations" msgid "Transformations"
msgstr "परिवर्तन" msgstr "परिवर्तन"
#: src/view/com/post-thread/PostThreadItem.tsx:704
#: src/view/com/post-thread/PostThreadItem.tsx:706 #: src/view/com/post-thread/PostThreadItem.tsx:706
#: src/view/com/post-thread/PostThreadItem.tsx:708 #: src/view/com/util/forms/PostDropdownBtn.tsx:103
#: src/view/com/util/forms/PostDropdownBtn.tsx:101
msgid "Translate" msgid "Translate"
msgstr "अनुवाद" msgstr "अनुवाद"
@ -2300,7 +2317,7 @@ msgstr ""
msgid "Unmute Account" msgid "Unmute Account"
msgstr "अनम्यूट खाता" msgstr "अनम्यूट खाता"
#: src/view/com/util/forms/PostDropdownBtn.tsx:147 #: src/view/com/util/forms/PostDropdownBtn.tsx:149
msgid "Unmute thread" msgid "Unmute thread"
msgstr "थ्रेड को अनम्यूट करें" msgstr "थ्रेड को अनम्यूट करें"

59
src/locale/locales/ja/messages.po
View file

@ -55,6 +55,10 @@ msgstr "<1>おすすめの</1><2>フィード</2><0>を選択</0>"
msgid "<0>Follow some</0><1>Recommended</1><2>Users</2>" msgid "<0>Follow some</0><1>Recommended</1><2>Users</2>"
msgstr "<1>おすすめの</1><2>ユーザー</2><0>をフォロー</0>" msgstr "<1>おすすめの</1><2>ユーザー</2><0>をフォロー</0>"
#: src/view/com/util/moderation/LabelInfo.tsx:45
msgid "A content warning has been applied to this {0}."
msgstr ""
#: src/lib/hooks/useOTAUpdate.ts:16 #: src/lib/hooks/useOTAUpdate.ts:16
msgid "A new version of the app is available. Please update to continue using the app." msgid "A new version of the app is available. Please update to continue using the app."
msgstr "新しいバージョンのアプリが利用可能です。継続して使用するためにはアップデートしてください。" msgstr "新しいバージョンのアプリが利用可能です。継続して使用するためにはアップデートしてください。"
@ -180,15 +184,23 @@ msgstr "アプリパスワード"
msgid "App Passwords" msgid "App Passwords"
msgstr "アプリパスワード" msgstr "アプリパスワード"
#: src/view/com/modals/AppealLabel.tsx:65 #: src/view/com/util/forms/PostDropdownBtn.tsx:207
msgid "Appeal Decision" msgid "Appeal content warning"
msgstr "判断に異議" msgstr ""
#: src/view/com/util/moderation/LabelInfo.tsx:51 #: src/view/com/modals/AppealLabel.tsx:65
msgid "Appeal Content Warning"
msgstr ""
#: src/view/com/modals/AppealLabel.tsx:65
#~ msgid "Appeal Decision"
#~ msgstr "判断に異議"
#: src/view/com/util/moderation/LabelInfo.tsx:52
msgid "Appeal this decision" msgid "Appeal this decision"
msgstr "この判断に異議を申し立てる" msgstr "この判断に異議を申し立てる"
#: src/view/com/util/moderation/LabelInfo.tsx:55 #: src/view/com/util/moderation/LabelInfo.tsx:56
msgid "Appeal this decision." msgid "Appeal this decision."
msgstr "この判断に異議を申し立てる" msgstr "この判断に異議を申し立てる"
@ -208,7 +220,7 @@ msgstr "本当にこの下書きを破棄しますか？"
msgid "Are you sure?" msgid "Are you sure?"
msgstr "本当によろしいですか？" msgstr "本当によろしいですか？"
#: src/view/com/util/forms/PostDropdownBtn.tsx:188 #: src/view/com/util/forms/PostDropdownBtn.tsx:190
msgid "Are you sure? This cannot be undone." msgid "Are you sure? This cannot be undone."
msgstr "本当によろしいですか？これは元に戻せません。" msgstr "本当によろしいですか？これは元に戻せません。"
@ -553,7 +565,7 @@ msgstr "コピー"
msgid "Copy link to list" msgid "Copy link to list"
msgstr "リストへのリンクをコピー" msgstr "リストへのリンクをコピー"
#: src/view/com/util/forms/PostDropdownBtn.tsx:129 #: src/view/com/util/forms/PostDropdownBtn.tsx:131
msgid "Copy link to post" msgid "Copy link to post"
msgstr "投稿へのリンクをコピー" msgstr "投稿へのリンクをコピー"
@ -561,7 +573,7 @@ msgstr "投稿へのリンクをコピー"
msgid "Copy link to profile" msgid "Copy link to profile"
msgstr "プロフィールへのリンクをコピー" msgstr "プロフィールへのリンクをコピー"
#: src/view/com/util/forms/PostDropdownBtn.tsx:115 #: src/view/com/util/forms/PostDropdownBtn.tsx:117
msgid "Copy post text" msgid "Copy post text"
msgstr "投稿のテキストをコピー" msgstr "投稿のテキストをコピー"
@ -630,11 +642,11 @@ msgstr "マイアカウントを削除"
msgid "Delete my account…" msgid "Delete my account…"
msgstr "マイアカウントを削除…" msgstr "マイアカウントを削除…"
#: src/view/com/util/forms/PostDropdownBtn.tsx:183 #: src/view/com/util/forms/PostDropdownBtn.tsx:185
msgid "Delete post" msgid "Delete post"
msgstr "投稿を削除" msgstr "投稿を削除"
#: src/view/com/util/forms/PostDropdownBtn.tsx:187 #: src/view/com/util/forms/PostDropdownBtn.tsx:189
msgid "Delete this post?" msgid "Delete this post?"
msgstr "この投稿を削除しますか？" msgstr "この投稿を削除しますか？"
@ -1252,7 +1264,7 @@ msgstr "リストをミュート"
msgid "Mute these accounts?" msgid "Mute these accounts?"
msgstr "これらのアカウントをミュートしますか？" msgstr "これらのアカウントをミュートしますか？"
#: src/view/com/util/forms/PostDropdownBtn.tsx:147 #: src/view/com/util/forms/PostDropdownBtn.tsx:149
msgid "Mute thread" msgid "Mute thread"
msgstr "スレッドをミュート" msgstr "スレッドをミュート"
@ -1510,8 +1522,13 @@ msgstr "パスワードも入力してください："
#: src/view/com/modals/AppealLabel.tsx:72 #: src/view/com/modals/AppealLabel.tsx:72
#: src/view/com/modals/AppealLabel.tsx:75 #: src/view/com/modals/AppealLabel.tsx:75
msgid "Please tell us why you think this decision was incorrect." msgid "Please tell us why you think this content warning was incorrectly applied!"
msgstr "この判断が誤っていると考える理由を教えてください。" msgstr ""
#: src/view/com/modals/AppealLabel.tsx:72
#: src/view/com/modals/AppealLabel.tsx:75
#~ msgid "Please tell us why you think this decision was incorrect."
#~ msgstr "この判断が誤っていると考える理由を教えてください。"
#: src/view/com/composer/Composer.tsx:337 #: src/view/com/composer/Composer.tsx:337
#: src/view/com/post-thread/PostThread.tsx:226 #: src/view/com/post-thread/PostThread.tsx:226
@ -1684,7 +1701,7 @@ msgid "Report List"
msgstr "リストを報告" msgstr "リストを報告"
#: src/view/com/modals/report/SendReportButton.tsx:37 #: src/view/com/modals/report/SendReportButton.tsx:37
#: src/view/com/util/forms/PostDropdownBtn.tsx:165 #: src/view/com/util/forms/PostDropdownBtn.tsx:167
msgid "Report post" msgid "Report post"
msgstr "投稿を報告" msgstr "投稿を報告"
@ -1879,7 +1896,7 @@ msgid "Sexual activity or erotic nudity."
msgstr "性的行為または性的なヌード。" msgstr "性的行為または性的なヌード。"
#: src/view/com/profile/ProfileHeader.tsx:338 #: src/view/com/profile/ProfileHeader.tsx:338
#: src/view/com/util/forms/PostDropdownBtn.tsx:129 #: src/view/com/util/forms/PostDropdownBtn.tsx:131
#: src/view/screens/ProfileList.tsx:384 #: src/view/screens/ProfileList.tsx:384
msgid "Share" msgid "Share"
msgstr "共有" msgstr "共有"
@ -2091,8 +2108,8 @@ msgid "There was an unexpected issue in the application. Please let us know if t
msgstr "アプリケーションに予期しない問題が発生しました。このようなことがありましたらお知らせください！" msgstr "アプリケーションに予期しない問題が発生しました。このようなことがありましたらお知らせください！"
#: src/view/com/util/moderation/LabelInfo.tsx:45 #: src/view/com/util/moderation/LabelInfo.tsx:45
msgid "This {0} has been labeled." #~ msgid "This {0} has been labeled."
msgstr "この{0}にはラベルが貼られています" #~ msgstr "この{0}にはラベルが貼られています"
#: src/view/com/util/moderation/ScreenHider.tsx:88 #: src/view/com/util/moderation/ScreenHider.tsx:88
msgid "This {screenDescription} has been flagged:" msgid "This {screenDescription} has been flagged:"
@ -2126,7 +2143,7 @@ msgstr "これはオンラインを維持するためのサービスです。"
msgid "This link is taking you to the following website:" msgid "This link is taking you to the following website:"
msgstr "このリンクは次のウェブサイトへリンクしています：" msgstr "このリンクは次のウェブサイトへリンクしています："
#: src/view/com/post-thread/PostThreadItem.tsx:124 #: src/view/com/post-thread/PostThreadItem.tsx:123
msgid "This post has been deleted." msgid "This post has been deleted."
msgstr "この投稿は削除されました。" msgstr "この投稿は削除されました。"
@ -2151,9 +2168,9 @@ msgstr "ドロップダウンをトグル"
msgid "Transformations" msgid "Transformations"
msgstr "変換" msgstr "変換"
#: src/view/com/post-thread/PostThreadItem.tsx:704
#: src/view/com/post-thread/PostThreadItem.tsx:706 #: src/view/com/post-thread/PostThreadItem.tsx:706
#: src/view/com/post-thread/PostThreadItem.tsx:708 #: src/view/com/util/forms/PostDropdownBtn.tsx:103
#: src/view/com/util/forms/PostDropdownBtn.tsx:101
msgid "Translate" msgid "Translate"
msgstr "翻訳" msgstr "翻訳"
@ -2197,7 +2214,7 @@ msgstr "残念ながら、アカウントを作成するための要件を満た
msgid "Unmute Account" msgid "Unmute Account"
msgstr "アカウントのミュートを解除" msgstr "アカウントのミュートを解除"
#: src/view/com/util/forms/PostDropdownBtn.tsx:147 #: src/view/com/util/forms/PostDropdownBtn.tsx:149
msgid "Unmute thread" msgid "Unmute thread"
msgstr "スレッドのミュートを解除" msgstr "スレッドのミュートを解除"

6
src/view/com/modals/AppealLabel.tsx
View file

@ -62,17 +62,17 @@ export function Component(props: ReportComponentProps) {
<Text <Text
type="2xl-bold" type="2xl-bold"
style={[pal.text, s.textCenter, {paddingBottom: 8}]}> style={[pal.text, s.textCenter, {paddingBottom: 8}]}>
<Trans>Appeal Decision</Trans> <Trans>Appeal Content Warning</Trans>
</Text> </Text>
<ScrollView> <ScrollView>
<View style={[pal.btn, styles.detailsInputContainer]}> <View style={[pal.btn, styles.detailsInputContainer]}>
<TextInput <TextInput
accessibilityLabel={_(msg`Text input field`)} accessibilityLabel={_(msg`Text input field`)}
accessibilityHint={_( accessibilityHint={_(
msg`Please tell us why you think this decision was incorrect.`, msg`Please tell us why you think this content warning was incorrectly applied!`,
)} )}
placeholder={_( placeholder={_(
msg`Please tell us why you think this decision was incorrect.`, msg`Please tell us why you think this content warning was incorrectly applied!`,
)} )}
placeholderTextColor={pal.textLight.color} placeholderTextColor={pal.textLight.color}
value={details} value={details}

11
src/view/com/post-thread/PostThreadItem.tsx
View file

@ -42,7 +42,6 @@ import {useComposerControls} from '#/state/shell/composer'
import {useModerationOpts} from '#/state/queries/preferences' import {useModerationOpts} from '#/state/queries/preferences'
import {Shadow, usePostShadow, POST_TOMBSTONE} from '#/state/cache/post-shadow' import {Shadow, usePostShadow, POST_TOMBSTONE} from '#/state/cache/post-shadow'
import {ThreadPost} from '#/state/queries/post-thread' import {ThreadPost} from '#/state/queries/post-thread'
import {LabelInfo} from '../util/moderation/LabelInfo'
import {useSession} from '#/state/session' import {useSession} from '#/state/session'
import {WhoCanReply} from '../threadgate/WhoCanReply' import {WhoCanReply} from '../threadgate/WhoCanReply'
@ -335,6 +334,9 @@ let PostThreadItemLoaded = ({
postCid={post.cid} postCid={post.cid}
postUri={post.uri} postUri={post.uri}
record={record} record={record}
showAppealLabelItem={
post.author.did === currentAccount?.did && !isSelfLabeledPost
}
style={{ style={{
paddingVertical: 6, paddingVertical: 6,
paddingHorizontal: 10, paddingHorizontal: 10,
@ -354,13 +356,6 @@ let PostThreadItemLoaded = ({
includeMute includeMute
style={styles.alert} style={styles.alert}
/> />
{post.author.did === currentAccount?.did && !isSelfLabeledPost ? (
<LabelInfo
details={{uri: post.uri, cid: post.cid}}
labels={post.labels}
style={{marginBottom: 8}}
/>
) : null}
{richText?.text ? ( {richText?.text ? (
<View <View
style={[ style={[

19
src/view/com/util/forms/PostDropdownBtn.tsx
View file

@ -31,6 +31,7 @@ let PostDropdownBtn = ({
postUri, postUri,
record, record,
style, style,
showAppealLabelItem,
}: { }: {
testID: string testID: string
postAuthor: AppBskyActorDefs.ProfileViewBasic postAuthor: AppBskyActorDefs.ProfileViewBasic
@ -38,6 +39,7 @@ let PostDropdownBtn = ({
postUri: string postUri: string
record: AppBskyFeedPost.Record record: AppBskyFeedPost.Record
style?: StyleProp<ViewStyle> style?: StyleProp<ViewStyle>
showAppealLabelItem?: boolean
}): React.ReactNode => { }): React.ReactNode => {
const {hasSession, currentAccount} = useSession() const {hasSession, currentAccount} = useSession()
const theme = useTheme() const theme = useTheme()
@ -198,6 +200,23 @@ let PostDropdownBtn = ({
web: ['far', 'trash-can'], web: ['far', 'trash-can'],
}, },
}, },
showAppealLabelItem && {
label: 'separator',
},
showAppealLabelItem && {
label: _(msg`Appeal content warning`),
onPress() {
openModal({name: 'appeal-label', uri: postUri, cid: postCid})
},
testID: 'postDropdownAppealBtn',
icon: {
ios: {
name: 'exclamationmark.triangle',
},
android: 'ic_menu_report_image',
web: 'circle-exclamation',
},
},
].filter(Boolean) as NativeDropdownItem[] ].filter(Boolean) as NativeDropdownItem[]
return ( return (