kopia lustrzana https://github.com/cheeaun/phanpy
Fix conflict between "always show media" vs blur filter
blur filter > show_allpull/1120/head
Lim Chee Aun
rodzic
937165ef57
commit
68bb3f21dc
|
|
@ -554,7 +554,7 @@ function Status({
|
|||
previewMode || readingExpandSpoilers || !!snapStates.spoilers[id];
|
||||
const showSpoilerMedia =
|
||||
previewMode ||
|
||||
readingExpandMedia === 'show_all' ||
|
||||
(readingExpandMedia === 'show_all' && filterInfo?.action !== 'blur') ||
|
||||
!!snapStates.spoilersMedia[id];
|
||||
|
||||
if (reblog) {
|
||||
|
|
@ -2211,7 +2211,8 @@ function Status({
|
|||
{!previewMode &&
|
||||
(sensitive || filterInfo?.action === 'blur') &&
|
||||
!!mediaAttachments.length &&
|
||||
readingExpandMedia !== 'show_all' && (
|
||||
(readingExpandMedia === 'show_all' ||
|
||||
filterInfo?.action === 'blur') && (
|
||||
<button
|
||||
class={`plain spoiler-media-button ${
|
||||
showSpoilerMedia ? 'spoiling' : ''
|
||||
|
|
|
|||
|
|
@ -114,8 +114,8 @@ msgstr ""
|
|||
#: src/components/status.jsx:1794
|
||||
#: src/components/status.jsx:1811
|
||||
#: src/components/status.jsx:1936
|
||||
#: src/components/status.jsx:2553
|
||||
#: src/components/status.jsx:2556
|
||||
#: src/components/status.jsx:2554
|
||||
#: src/components/status.jsx:2557
|
||||
#: src/pages/account-statuses.jsx:523
|
||||
#: src/pages/accounts.jsx:110
|
||||
#: src/pages/hashtag.jsx:200
|
||||
|
|
@ -203,7 +203,7 @@ msgid "Original"
|
|||
msgstr ""
|
||||
|
||||
#: src/components/account-info.jsx:926
|
||||
#: src/components/status.jsx:2337
|
||||
#: src/components/status.jsx:2338
|
||||
#: src/pages/catchup.jsx:72
|
||||
#: src/pages/catchup.jsx:1442
|
||||
#: src/pages/catchup.jsx:2057
|
||||
|
|
@ -312,7 +312,7 @@ msgstr ""
|
|||
#: src/components/account-info.jsx:1393
|
||||
#: src/components/shortcuts-settings.jsx:1059
|
||||
#: src/components/status.jsx:1243
|
||||
#: src/components/status.jsx:3324
|
||||
#: src/components/status.jsx:3325
|
||||
msgid "Copy"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -437,9 +437,9 @@ msgstr ""
|
|||
#: src/components/shortcuts-settings.jsx:230
|
||||
#: src/components/shortcuts-settings.jsx:583
|
||||
#: src/components/shortcuts-settings.jsx:783
|
||||
#: src/components/status.jsx:3048
|
||||
#: src/components/status.jsx:3288
|
||||
#: src/components/status.jsx:3789
|
||||
#: src/components/status.jsx:3049
|
||||
#: src/components/status.jsx:3289
|
||||
#: src/components/status.jsx:3790
|
||||
#: src/pages/accounts.jsx:37
|
||||
#: src/pages/catchup.jsx:1578
|
||||
#: src/pages/filters.jsx:225
|
||||
|
|
@ -756,7 +756,7 @@ msgstr "Schedule"
|
|||
#: src/components/status.jsx:1008
|
||||
#: src/components/status.jsx:1774
|
||||
#: src/components/status.jsx:1775
|
||||
#: src/components/status.jsx:2457
|
||||
#: src/components/status.jsx:2458
|
||||
msgid "Reply"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1188,9 +1188,9 @@ msgstr ""
|
|||
|
||||
#: src/components/keyboard-shortcuts-help.jsx:175
|
||||
#: src/components/status.jsx:1016
|
||||
#: src/components/status.jsx:2484
|
||||
#: src/components/status.jsx:2507
|
||||
#: src/components/status.jsx:2485
|
||||
#: src/components/status.jsx:2508
|
||||
#: src/components/status.jsx:2509
|
||||
msgid "Boost"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1200,8 +1200,8 @@ msgstr ""
|
|||
|
||||
#: src/components/keyboard-shortcuts-help.jsx:183
|
||||
#: src/components/status.jsx:1079
|
||||
#: src/components/status.jsx:2532
|
||||
#: src/components/status.jsx:2533
|
||||
#: src/components/status.jsx:2534
|
||||
msgid "Bookmark"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1305,9 +1305,9 @@ msgid "Filtered: {filterTitleStr}"
|
|||
msgstr ""
|
||||
|
||||
#: src/components/media-post.jsx:134
|
||||
#: src/components/status.jsx:3619
|
||||
#: src/components/status.jsx:3715
|
||||
#: src/components/status.jsx:3793
|
||||
#: src/components/status.jsx:3620
|
||||
#: src/components/status.jsx:3716
|
||||
#: src/components/status.jsx:3794
|
||||
#: src/components/timeline.jsx:982
|
||||
#: src/pages/catchup.jsx:76
|
||||
#: src/pages/catchup.jsx:1876
|
||||
|
|
@ -2186,13 +2186,13 @@ msgstr ""
|
|||
|
||||
#: src/components/status.jsx:1016
|
||||
#: src/components/status.jsx:1056
|
||||
#: src/components/status.jsx:2484
|
||||
#: src/components/status.jsx:2507
|
||||
#: src/components/status.jsx:2485
|
||||
#: src/components/status.jsx:2508
|
||||
msgid "Unboost"
|
||||
msgstr ""
|
||||
|
||||
#: src/components/status.jsx:1032
|
||||
#: src/components/status.jsx:2499
|
||||
#: src/components/status.jsx:2500
|
||||
msgid "Quote"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2214,20 +2214,20 @@ msgstr ""
|
|||
|
||||
#: src/components/status.jsx:1069
|
||||
#: src/components/status.jsx:1784
|
||||
#: src/components/status.jsx:2520
|
||||
#: src/components/status.jsx:2521
|
||||
msgid "Unlike"
|
||||
msgstr ""
|
||||
|
||||
#: src/components/status.jsx:1070
|
||||
#: src/components/status.jsx:1784
|
||||
#: src/components/status.jsx:1785
|
||||
#: src/components/status.jsx:2520
|
||||
#: src/components/status.jsx:2521
|
||||
#: src/components/status.jsx:2522
|
||||
msgid "Like"
|
||||
msgstr ""
|
||||
|
||||
#: src/components/status.jsx:1079
|
||||
#: src/components/status.jsx:2532
|
||||
#: src/components/status.jsx:2533
|
||||
msgid "Unbookmark"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2245,7 +2245,7 @@ msgid "Edited: {editedDateText}"
|
|||
msgstr ""
|
||||
|
||||
#: src/components/status.jsx:1278
|
||||
#: src/components/status.jsx:3293
|
||||
#: src/components/status.jsx:3294
|
||||
msgid "Embed post"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2315,17 +2315,17 @@ msgstr ""
|
|||
|
||||
#: src/components/status.jsx:1785
|
||||
#: src/components/status.jsx:1821
|
||||
#: src/components/status.jsx:2521
|
||||
#: src/components/status.jsx:2522
|
||||
msgid "Liked"
|
||||
msgstr ""
|
||||
|
||||
#: src/components/status.jsx:1818
|
||||
#: src/components/status.jsx:2508
|
||||
#: src/components/status.jsx:2509
|
||||
msgid "Boosted"
|
||||
msgstr ""
|
||||
|
||||
#: src/components/status.jsx:1828
|
||||
#: src/components/status.jsx:2533
|
||||
#: src/components/status.jsx:2534
|
||||
msgid "Bookmarked"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2334,7 +2334,7 @@ msgid "Pinned"
|
|||
msgstr ""
|
||||
|
||||
#: src/components/status.jsx:1878
|
||||
#: src/components/status.jsx:2345
|
||||
#: src/components/status.jsx:2346
|
||||
msgid "Deleted"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2349,7 +2349,7 @@ msgstr ""
|
|||
|
||||
#: src/components/status.jsx:2087
|
||||
#: src/components/status.jsx:2149
|
||||
#: src/components/status.jsx:2241
|
||||
#: src/components/status.jsx:2242
|
||||
msgid "Show less"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2360,100 +2360,100 @@ msgstr ""
|
|||
|
||||
#. placeholder {0}: filterInfo.titlesStr
|
||||
#. placeholder {0}: filterInfo?.titlesStr
|
||||
#: src/components/status.jsx:2237
|
||||
#: src/components/status.jsx:2238
|
||||
#: src/pages/catchup.jsx:1875
|
||||
msgid "Filtered: {0}"
|
||||
msgstr "Filtered: {0}"
|
||||
|
||||
#: src/components/status.jsx:2241
|
||||
#: src/components/status.jsx:2242
|
||||
msgid "Show media"
|
||||
msgstr ""
|
||||
|
||||
#: src/components/status.jsx:2381
|
||||
#: src/components/status.jsx:2382
|
||||
msgid "Edited"
|
||||
msgstr ""
|
||||
|
||||
#: src/components/status.jsx:2458
|
||||
#: src/components/status.jsx:2459
|
||||
msgid "Comments"
|
||||
msgstr ""
|
||||
|
||||
#. More from [Author]
|
||||
#: src/components/status.jsx:2751
|
||||
#: src/components/status.jsx:2752
|
||||
msgid "More from <0/>"
|
||||
msgstr "More from <0/>"
|
||||
|
||||
#: src/components/status.jsx:3053
|
||||
#: src/components/status.jsx:3054
|
||||
msgid "Edit History"
|
||||
msgstr ""
|
||||
|
||||
#: src/components/status.jsx:3057
|
||||
#: src/components/status.jsx:3058
|
||||
msgid "Failed to load history"
|
||||
msgstr ""
|
||||
|
||||
#: src/components/status.jsx:3062
|
||||
#: src/components/status.jsx:3063
|
||||
#: src/pages/annual-report.jsx:45
|
||||
msgid "Loading…"
|
||||
msgstr ""
|
||||
|
||||
#: src/components/status.jsx:3298
|
||||
#: src/components/status.jsx:3299
|
||||
msgid "HTML Code"
|
||||
msgstr ""
|
||||
|
||||
#: src/components/status.jsx:3315
|
||||
#: src/components/status.jsx:3316
|
||||
msgid "HTML code copied"
|
||||
msgstr ""
|
||||
|
||||
#: src/components/status.jsx:3318
|
||||
#: src/components/status.jsx:3319
|
||||
msgid "Unable to copy HTML code"
|
||||
msgstr ""
|
||||
|
||||
#: src/components/status.jsx:3330
|
||||
#: src/components/status.jsx:3331
|
||||
msgid "Media attachments:"
|
||||
msgstr ""
|
||||
|
||||
#: src/components/status.jsx:3352
|
||||
#: src/components/status.jsx:3353
|
||||
msgid "Account Emojis:"
|
||||
msgstr ""
|
||||
|
||||
#: src/components/status.jsx:3383
|
||||
#: src/components/status.jsx:3428
|
||||
#: src/components/status.jsx:3384
|
||||
#: src/components/status.jsx:3429
|
||||
msgid "static URL"
|
||||
msgstr ""
|
||||
|
||||
#: src/components/status.jsx:3397
|
||||
#: src/components/status.jsx:3398
|
||||
msgid "Emojis:"
|
||||
msgstr ""
|
||||
|
||||
#: src/components/status.jsx:3442
|
||||
#: src/components/status.jsx:3443
|
||||
msgid "Notes:"
|
||||
msgstr ""
|
||||
|
||||
#: src/components/status.jsx:3446
|
||||
#: src/components/status.jsx:3447
|
||||
msgid "This is static, unstyled and scriptless. You may need to apply your own styles and edit as needed."
|
||||
msgstr ""
|
||||
|
||||
#: src/components/status.jsx:3452
|
||||
#: src/components/status.jsx:3453
|
||||
msgid "Polls are not interactive, becomes a list with vote counts."
|
||||
msgstr ""
|
||||
|
||||
#: src/components/status.jsx:3457
|
||||
#: src/components/status.jsx:3458
|
||||
msgid "Media attachments can be images, videos, audios or any file types."
|
||||
msgstr ""
|
||||
|
||||
#: src/components/status.jsx:3463
|
||||
#: src/components/status.jsx:3464
|
||||
msgid "Post could be edited or deleted later."
|
||||
msgstr ""
|
||||
|
||||
#: src/components/status.jsx:3469
|
||||
#: src/components/status.jsx:3470
|
||||
msgid "Preview"
|
||||
msgstr ""
|
||||
|
||||
#: src/components/status.jsx:3478
|
||||
#: src/components/status.jsx:3479
|
||||
msgid "Note: This preview is lightly styled."
|
||||
msgstr ""
|
||||
|
||||
#. [Name] [Visibility icon] boosted
|
||||
#: src/components/status.jsx:3723
|
||||
#: src/components/status.jsx:3724
|
||||
msgid "<0/> <1/> boosted"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue