From 1e1d6e40bc15c1f0a7c1ff508bdfd9cb991db265 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Tue, 20 Aug 2024 18:54:00 +0200 Subject: [PATCH 01/14] Add support for local instance posts A new platform feature is defined, `@akkoma/local-only`, which is marked as present only if the string `akkoma` is found in the instance version string. If this feature is supported, a new post visibility option is added to the post compose visibility selector, "Local instance", which sets the visibility to `"local"`. The post viewer is also updated accordingly; while local-only posts could already be seen previously, they didn't have anything written in the `.extra-meta` section, and didn't display a visibility icon. The `building` icon has been selected as the symbol for "Local instance" posts, as it's already used in the main menu to denote the Local timeline. --- src/components/compose.jsx | 5 +++++ src/components/status.jsx | 1 + src/utils/supports.js | 3 +++ src/utils/visibility-icons-map.js | 1 + 4 files changed, 10 insertions(+) diff --git a/src/components/compose.jsx b/src/components/compose.jsx index 17d4c43ba..64470675c 100644 --- a/src/components/compose.jsx +++ b/src/components/compose.jsx @@ -1178,6 +1178,11 @@ function Compose({ + {supports('@akkoma/local-only') && + + } {' '} diff --git a/src/components/status.jsx b/src/components/status.jsx index b7babb606..85c72c146 100644 --- a/src/components/status.jsx +++ b/src/components/status.jsx @@ -94,6 +94,7 @@ const visibilityText = { unlisted: msg`Unlisted`, private: msg`Followers only`, direct: msg`Private mention`, + local: msg`Local instance`, }; const isIOS = diff --git a/src/utils/supports.js b/src/utils/supports.js index adfd1e356..1560e7181 100644 --- a/src/utils/supports.js +++ b/src/utils/supports.js @@ -7,6 +7,8 @@ import { getCurrentInstance } from './store-utils'; // Non-semver(?) UA string detection const containPixelfed = /pixelfed/i; const notContainPixelfed = /^(?!.*pixelfed).*$/i; +const containAkkoma = /akkoma/i +const notContainAkkoma = /^(?! *akkoma) *$/i const platformFeatures = { '@mastodon/lists': notContainPixelfed, '@mastodon/filters': notContainPixelfed, @@ -20,6 +22,7 @@ const platformFeatures = { '@pixelfed/trending': containPixelfed, '@pixelfed/home-include-reblogs': containPixelfed, '@pixelfed/global-feed': containPixelfed, + '@akkoma/local-only': containAkkoma, }; const supportsCache = {}; diff --git a/src/utils/visibility-icons-map.js b/src/utils/visibility-icons-map.js index 867c2dba2..835f74065 100644 --- a/src/utils/visibility-icons-map.js +++ b/src/utils/visibility-icons-map.js @@ -3,4 +3,5 @@ export default { unlisted: 'group', private: 'lock', direct: 'message', + local: 'building', }; From a2ce79a2a7ee6c8fd05a6204556b40c71f86475b Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Tue, 20 Aug 2024 19:03:04 +0200 Subject: [PATCH 02/14] Update english localization file --- src/locales/en.po | 385 +++++++++++++++++++++++----------------------- 1 file changed, 195 insertions(+), 190 deletions(-) diff --git a/src/locales/en.po b/src/locales/en.po index 566dbb2b0..1e533f1cd 100644 --- a/src/locales/en.po +++ b/src/locales/en.po @@ -32,7 +32,7 @@ msgstr "" #: src/components/account-block.jsx:166 #: src/components/account-info.jsx:640 -#: src/components/status.jsx:439 +#: src/components/status.jsx:440 #: src/pages/catchup.jsx:1438 msgid "Group" msgstr "" @@ -105,14 +105,14 @@ msgstr "" #: src/components/account-info.jsx:428 #: src/components/account-info.jsx:1116 -#: src/components/compose.jsx:2444 +#: src/components/compose.jsx:2449 #: src/components/media-alt-modal.jsx:45 #: src/components/media-modal.jsx:283 -#: src/components/status.jsx:1628 -#: src/components/status.jsx:1645 -#: src/components/status.jsx:1769 -#: src/components/status.jsx:2364 -#: src/components/status.jsx:2367 +#: src/components/status.jsx:1629 +#: src/components/status.jsx:1646 +#: src/components/status.jsx:1770 +#: src/components/status.jsx:2365 +#: src/components/status.jsx:2368 #: src/pages/account-statuses.jsx:528 #: src/pages/accounts.jsx:106 #: src/pages/hashtag.jsx:199 @@ -181,7 +181,7 @@ msgid "Original" msgstr "" #: src/components/account-info.jsx:860 -#: src/components/status.jsx:2155 +#: src/components/status.jsx:2156 #: src/pages/catchup.jsx:71 #: src/pages/catchup.jsx:1412 #: src/pages/catchup.jsx:2023 @@ -277,30 +277,30 @@ msgid "Add/Remove from Lists" msgstr "" #: src/components/account-info.jsx:1300 -#: src/components/status.jsx:1071 +#: src/components/status.jsx:1072 msgid "Link copied" msgstr "" #: src/components/account-info.jsx:1303 -#: src/components/status.jsx:1074 +#: src/components/status.jsx:1075 msgid "Unable to copy link" msgstr "" #: src/components/account-info.jsx:1309 #: src/components/shortcuts-settings.jsx:1056 -#: src/components/status.jsx:1080 -#: src/components/status.jsx:3102 +#: src/components/status.jsx:1081 +#: src/components/status.jsx:3103 msgid "Copy" msgstr "" #: src/components/account-info.jsx:1324 #: src/components/shortcuts-settings.jsx:1074 -#: src/components/status.jsx:1096 +#: src/components/status.jsx:1097 msgid "Sharing doesn't seem to work." msgstr "" #: src/components/account-info.jsx:1330 -#: src/components/status.jsx:1102 +#: src/components/status.jsx:1103 msgid "Share…" msgstr "" @@ -401,10 +401,10 @@ msgstr "" #: src/components/account-info.jsx:2087 #: src/components/account-sheet.jsx:37 #: src/components/compose.jsx:797 -#: src/components/compose.jsx:2400 -#: src/components/compose.jsx:2873 -#: src/components/compose.jsx:3081 -#: src/components/compose.jsx:3311 +#: src/components/compose.jsx:2405 +#: src/components/compose.jsx:2878 +#: src/components/compose.jsx:3086 +#: src/components/compose.jsx:3316 #: src/components/drafts.jsx:58 #: src/components/embed-modal.jsx:12 #: src/components/generic-accounts.jsx:142 @@ -417,9 +417,9 @@ msgstr "" #: src/components/shortcuts-settings.jsx:227 #: src/components/shortcuts-settings.jsx:580 #: src/components/shortcuts-settings.jsx:780 -#: src/components/status.jsx:2827 -#: src/components/status.jsx:3066 -#: src/components/status.jsx:3564 +#: src/components/status.jsx:2828 +#: src/components/status.jsx:3067 +#: src/components/status.jsx:3565 #: src/pages/accounts.jsx:33 #: src/pages/catchup.jsx:1548 #: src/pages/filters.jsx:224 @@ -542,8 +542,8 @@ msgstr "" #: src/components/compose.jsx:614 #: src/components/compose.jsx:630 -#: src/components/compose.jsx:1328 -#: src/components/compose.jsx:1582 +#: src/components/compose.jsx:1333 +#: src/components/compose.jsx:1587 msgid "{maxMediaAttachments, plural, one {You can only attach up to 1 file.} other {You can only attach up to # files.}}" msgstr "" @@ -600,7 +600,7 @@ msgid "Attachment #{i} failed" msgstr "" #: src/components/compose.jsx:1118 -#: src/components/status.jsx:1954 +#: src/components/status.jsx:1955 #: src/components/timeline.jsx:975 msgid "Content warning" msgstr "" @@ -629,231 +629,236 @@ msgstr "" #: src/components/compose.jsx:1179 #: src/components/status.jsx:96 -#: src/components/status.jsx:1832 +#: src/components/status.jsx:1833 msgid "Private mention" msgstr "" -#: src/components/compose.jsx:1188 +#: src/components/compose.jsx:1183 +#: src/components/status.jsx:97 +msgid "Local instance" +msgstr "" + +#: src/components/compose.jsx:1193 msgid "Post your reply" msgstr "" -#: src/components/compose.jsx:1190 +#: src/components/compose.jsx:1195 msgid "Edit your post" msgstr "" -#: src/components/compose.jsx:1191 +#: src/components/compose.jsx:1196 msgid "What are you doing?" msgstr "" -#: src/components/compose.jsx:1266 +#: src/components/compose.jsx:1271 msgid "Mark media as sensitive" msgstr "" -#: src/components/compose.jsx:1364 +#: src/components/compose.jsx:1369 msgid "Add poll" msgstr "" -#: src/components/compose.jsx:1386 +#: src/components/compose.jsx:1391 msgid "Add custom emoji" msgstr "" -#: src/components/compose.jsx:1469 +#: src/components/compose.jsx:1474 #: src/components/keyboard-shortcuts-help.jsx:143 -#: src/components/status.jsx:830 -#: src/components/status.jsx:1608 +#: src/components/status.jsx:831 #: src/components/status.jsx:1609 -#: src/components/status.jsx:2260 +#: src/components/status.jsx:1610 +#: src/components/status.jsx:2261 msgid "Reply" msgstr "" -#: src/components/compose.jsx:1469 +#: src/components/compose.jsx:1474 msgid "Update" msgstr "" -#: src/components/compose.jsx:1469 +#: src/components/compose.jsx:1474 #: src/pages/status.jsx:565 msgid "Post" msgstr "" -#: src/components/compose.jsx:1594 +#: src/components/compose.jsx:1599 msgid "Downloading GIF…" msgstr "" -#: src/components/compose.jsx:1622 +#: src/components/compose.jsx:1627 msgid "Failed to download GIF" msgstr "" -#: src/components/compose.jsx:1733 -#: src/components/compose.jsx:1810 +#: src/components/compose.jsx:1738 +#: src/components/compose.jsx:1815 #: src/components/nav-menu.jsx:287 msgid "More…" msgstr "" -#: src/components/compose.jsx:2213 +#: src/components/compose.jsx:2218 msgid "Uploaded" msgstr "" -#: src/components/compose.jsx:2226 +#: src/components/compose.jsx:2231 msgid "Image description" msgstr "" -#: src/components/compose.jsx:2227 +#: src/components/compose.jsx:2232 msgid "Video description" msgstr "" -#: src/components/compose.jsx:2228 +#: src/components/compose.jsx:2233 msgid "Audio description" msgstr "" -#: src/components/compose.jsx:2264 -#: src/components/compose.jsx:2284 +#: src/components/compose.jsx:2269 +#: src/components/compose.jsx:2289 msgid "File size too large. Uploading might encounter issues. Try reduce the file size from {0} to {1} or lower." msgstr "" -#: src/components/compose.jsx:2276 -#: src/components/compose.jsx:2296 +#: src/components/compose.jsx:2281 +#: src/components/compose.jsx:2301 msgid "Dimension too large. Uploading might encounter issues. Try reduce dimension from {0}×{1}px to {2}×{3}px." msgstr "" -#: src/components/compose.jsx:2304 +#: src/components/compose.jsx:2309 msgid "Frame rate too high. Uploading might encounter issues." msgstr "" -#: src/components/compose.jsx:2364 -#: src/components/compose.jsx:2614 +#: src/components/compose.jsx:2369 +#: src/components/compose.jsx:2619 #: src/components/shortcuts-settings.jsx:723 #: src/pages/catchup.jsx:1058 #: src/pages/filters.jsx:412 msgid "Remove" msgstr "" -#: src/components/compose.jsx:2381 +#: src/components/compose.jsx:2386 msgid "Error" msgstr "" -#: src/components/compose.jsx:2406 +#: src/components/compose.jsx:2411 msgid "Edit image description" msgstr "" -#: src/components/compose.jsx:2407 +#: src/components/compose.jsx:2412 msgid "Edit video description" msgstr "" -#: src/components/compose.jsx:2408 +#: src/components/compose.jsx:2413 msgid "Edit audio description" msgstr "" -#: src/components/compose.jsx:2453 -#: src/components/compose.jsx:2502 +#: src/components/compose.jsx:2458 +#: src/components/compose.jsx:2507 msgid "Generating description. Please wait…" msgstr "" -#: src/components/compose.jsx:2473 +#: src/components/compose.jsx:2478 msgid "Failed to generate description: {0}" msgstr "" -#: src/components/compose.jsx:2474 +#: src/components/compose.jsx:2479 msgid "Failed to generate description" msgstr "" -#: src/components/compose.jsx:2486 -#: src/components/compose.jsx:2492 -#: src/components/compose.jsx:2538 +#: src/components/compose.jsx:2491 +#: src/components/compose.jsx:2497 +#: src/components/compose.jsx:2543 msgid "Generate description…" msgstr "" -#: src/components/compose.jsx:2525 +#: src/components/compose.jsx:2530 msgid "Failed to generate description{0}" msgstr "" -#: src/components/compose.jsx:2540 +#: src/components/compose.jsx:2545 msgid "({0}) <0>— experimental" msgstr "" -#: src/components/compose.jsx:2559 +#: src/components/compose.jsx:2564 msgid "Done" msgstr "" -#: src/components/compose.jsx:2595 +#: src/components/compose.jsx:2600 msgid "Choice {0}" msgstr "" -#: src/components/compose.jsx:2642 +#: src/components/compose.jsx:2647 msgid "Multiple choices" msgstr "" -#: src/components/compose.jsx:2645 +#: src/components/compose.jsx:2650 msgid "Duration" msgstr "" -#: src/components/compose.jsx:2676 +#: src/components/compose.jsx:2681 msgid "Remove poll" msgstr "" -#: src/components/compose.jsx:2890 +#: src/components/compose.jsx:2895 msgid "Search accounts" msgstr "" -#: src/components/compose.jsx:2931 +#: src/components/compose.jsx:2936 #: src/components/shortcuts-settings.jsx:712 #: src/pages/list.jsx:359 msgid "Add" msgstr "" -#: src/components/compose.jsx:2944 +#: src/components/compose.jsx:2949 #: src/components/generic-accounts.jsx:227 msgid "Error loading accounts" msgstr "" -#: src/components/compose.jsx:3087 +#: src/components/compose.jsx:3092 msgid "Custom emojis" msgstr "" -#: src/components/compose.jsx:3107 +#: src/components/compose.jsx:3112 msgid "Search emoji" msgstr "" -#: src/components/compose.jsx:3138 +#: src/components/compose.jsx:3143 msgid "Error loading custom emojis" msgstr "" -#: src/components/compose.jsx:3149 +#: src/components/compose.jsx:3154 msgid "Recently used" msgstr "" -#: src/components/compose.jsx:3150 +#: src/components/compose.jsx:3155 msgid "Others" msgstr "" -#: src/components/compose.jsx:3188 +#: src/components/compose.jsx:3193 msgid "{0} more…" msgstr "" -#: src/components/compose.jsx:3326 +#: src/components/compose.jsx:3331 msgid "Search GIFs" msgstr "" -#: src/components/compose.jsx:3341 +#: src/components/compose.jsx:3346 msgid "Powered by GIPHY" msgstr "" -#: src/components/compose.jsx:3349 +#: src/components/compose.jsx:3354 msgid "Type to search GIFs" msgstr "" -#: src/components/compose.jsx:3447 +#: src/components/compose.jsx:3452 #: src/components/media-modal.jsx:387 #: src/components/timeline.jsx:880 msgid "Previous" msgstr "" -#: src/components/compose.jsx:3465 +#: src/components/compose.jsx:3470 #: src/components/media-modal.jsx:406 #: src/components/timeline.jsx:897 msgid "Next" msgstr "" -#: src/components/compose.jsx:3482 +#: src/components/compose.jsx:3487 msgid "Error loading GIFs" msgstr "" @@ -876,7 +881,7 @@ msgstr "" #: src/components/drafts.jsx:127 #: src/components/list-add-edit.jsx:183 -#: src/components/status.jsx:1243 +#: src/components/status.jsx:1244 #: src/pages/filters.jsx:587 msgid "Delete…" msgstr "" @@ -1076,10 +1081,10 @@ msgid "<0>l or <1>f" msgstr "" #: src/components/keyboard-shortcuts-help.jsx:164 -#: src/components/status.jsx:838 -#: src/components/status.jsx:2286 -#: src/components/status.jsx:2318 +#: src/components/status.jsx:839 +#: src/components/status.jsx:2287 #: src/components/status.jsx:2319 +#: src/components/status.jsx:2320 msgid "Boost" msgstr "" @@ -1088,9 +1093,9 @@ msgid "<0>Shift + <1>b" msgstr "" #: src/components/keyboard-shortcuts-help.jsx:172 -#: src/components/status.jsx:923 -#: src/components/status.jsx:2343 +#: src/components/status.jsx:924 #: src/components/status.jsx:2344 +#: src/components/status.jsx:2345 msgid "Bookmark" msgstr "" @@ -1153,15 +1158,15 @@ msgid "Media description" msgstr "" #: src/components/media-alt-modal.jsx:57 -#: src/components/status.jsx:967 -#: src/components/status.jsx:994 +#: src/components/status.jsx:968 +#: src/components/status.jsx:995 #: src/components/translation-block.jsx:195 msgid "Translate" msgstr "" #: src/components/media-alt-modal.jsx:68 -#: src/components/status.jsx:981 -#: src/components/status.jsx:1008 +#: src/components/status.jsx:982 +#: src/components/status.jsx:1009 msgid "Speak" msgstr "" @@ -1198,9 +1203,9 @@ msgid "Filtered: {filterTitleStr}" msgstr "" #: src/components/media-post.jsx:133 -#: src/components/status.jsx:3394 -#: src/components/status.jsx:3490 -#: src/components/status.jsx:3568 +#: src/components/status.jsx:3395 +#: src/components/status.jsx:3491 +#: src/components/status.jsx:3569 #: src/components/timeline.jsx:964 #: src/pages/catchup.jsx:75 #: src/pages/catchup.jsx:1843 @@ -1485,8 +1490,8 @@ msgid "[Unknown notification type: {type}]" msgstr "" #: src/components/notification.jsx:425 -#: src/components/status.jsx:937 -#: src/components/status.jsx:947 +#: src/components/status.jsx:938 +#: src/components/status.jsx:948 msgid "Boosted/Liked by…" msgstr "" @@ -1508,7 +1513,7 @@ msgid "Learn more <0/>" msgstr "" #: src/components/notification.jsx:680 -#: src/components/status.jsx:189 +#: src/components/status.jsx:190 msgid "Read more →" msgstr "" @@ -1797,7 +1802,7 @@ msgid "Move down" msgstr "" #: src/components/shortcuts-settings.jsx:376 -#: src/components/status.jsx:1208 +#: src/components/status.jsx:1209 #: src/pages/list.jsx:170 msgid "Edit" msgstr "" @@ -1995,291 +2000,291 @@ msgstr "" msgid "Import/export settings from/to instance server (Very experimental)" msgstr "" -#: src/components/status.jsx:463 +#: src/components/status.jsx:464 msgid "<0/> <1>boosted" msgstr "" -#: src/components/status.jsx:562 +#: src/components/status.jsx:563 msgid "Sorry, your current logged-in instance can't interact with this post from another instance." msgstr "" -#: src/components/status.jsx:715 +#: src/components/status.jsx:716 msgid "Unliked @{0}'s post" msgstr "" -#: src/components/status.jsx:716 +#: src/components/status.jsx:717 msgid "Liked @{0}'s post" msgstr "" -#: src/components/status.jsx:755 +#: src/components/status.jsx:756 msgid "Unbookmarked @{0}'s post" msgstr "" -#: src/components/status.jsx:756 +#: src/components/status.jsx:757 msgid "Bookmarked @{0}'s post" msgstr "" -#: src/components/status.jsx:838 -#: src/components/status.jsx:900 -#: src/components/status.jsx:2286 -#: src/components/status.jsx:2318 +#: src/components/status.jsx:839 +#: src/components/status.jsx:901 +#: src/components/status.jsx:2287 +#: src/components/status.jsx:2319 msgid "Unboost" msgstr "" -#: src/components/status.jsx:854 -#: src/components/status.jsx:2301 +#: src/components/status.jsx:855 +#: src/components/status.jsx:2302 msgid "Quote" msgstr "" -#: src/components/status.jsx:862 -#: src/components/status.jsx:2310 +#: src/components/status.jsx:863 +#: src/components/status.jsx:2311 msgid "Some media have no descriptions." msgstr "" -#: src/components/status.jsx:869 +#: src/components/status.jsx:870 msgid "Old post (<0>{0})" msgstr "" -#: src/components/status.jsx:888 -#: src/components/status.jsx:1333 +#: src/components/status.jsx:889 +#: src/components/status.jsx:1334 msgid "Unboosted @{0}'s post" msgstr "" -#: src/components/status.jsx:889 -#: src/components/status.jsx:1334 +#: src/components/status.jsx:890 +#: src/components/status.jsx:1335 msgid "Boosted @{0}'s post" msgstr "" -#: src/components/status.jsx:901 +#: src/components/status.jsx:902 msgid "Boost…" msgstr "" -#: src/components/status.jsx:913 -#: src/components/status.jsx:1618 -#: src/components/status.jsx:2331 +#: src/components/status.jsx:914 +#: src/components/status.jsx:1619 +#: src/components/status.jsx:2332 msgid "Unlike" msgstr "" -#: src/components/status.jsx:914 -#: src/components/status.jsx:1618 +#: src/components/status.jsx:915 #: src/components/status.jsx:1619 -#: src/components/status.jsx:2331 +#: src/components/status.jsx:1620 #: src/components/status.jsx:2332 +#: src/components/status.jsx:2333 msgid "Like" msgstr "" -#: src/components/status.jsx:923 -#: src/components/status.jsx:2343 +#: src/components/status.jsx:924 +#: src/components/status.jsx:2344 msgid "Unbookmark" msgstr "" -#: src/components/status.jsx:1031 +#: src/components/status.jsx:1032 msgid "View post by <0>@{0}" msgstr "" -#: src/components/status.jsx:1052 +#: src/components/status.jsx:1053 msgid "Show Edit History" msgstr "" -#: src/components/status.jsx:1055 +#: src/components/status.jsx:1056 msgid "Edited: {editedDateText}" msgstr "" -#: src/components/status.jsx:1115 -#: src/components/status.jsx:3071 +#: src/components/status.jsx:1116 +#: src/components/status.jsx:3072 msgid "Embed post" msgstr "" -#: src/components/status.jsx:1129 +#: src/components/status.jsx:1130 msgid "Conversation unmuted" msgstr "" -#: src/components/status.jsx:1129 +#: src/components/status.jsx:1130 msgid "Conversation muted" msgstr "" -#: src/components/status.jsx:1135 +#: src/components/status.jsx:1136 msgid "Unable to unmute conversation" msgstr "" -#: src/components/status.jsx:1136 +#: src/components/status.jsx:1137 msgid "Unable to mute conversation" msgstr "" -#: src/components/status.jsx:1145 +#: src/components/status.jsx:1146 msgid "Unmute conversation" msgstr "" -#: src/components/status.jsx:1152 +#: src/components/status.jsx:1153 msgid "Mute conversation" msgstr "" -#: src/components/status.jsx:1168 +#: src/components/status.jsx:1169 msgid "Post unpinned from profile" msgstr "" -#: src/components/status.jsx:1169 +#: src/components/status.jsx:1170 msgid "Post pinned to profile" msgstr "" -#: src/components/status.jsx:1174 +#: src/components/status.jsx:1175 msgid "Unable to unpin post" msgstr "" -#: src/components/status.jsx:1174 +#: src/components/status.jsx:1175 msgid "Unable to pin post" msgstr "" -#: src/components/status.jsx:1183 +#: src/components/status.jsx:1184 msgid "Unpin from profile" msgstr "" -#: src/components/status.jsx:1190 +#: src/components/status.jsx:1191 msgid "Pin to profile" msgstr "" -#: src/components/status.jsx:1219 +#: src/components/status.jsx:1220 msgid "Delete this post?" msgstr "" -#: src/components/status.jsx:1232 +#: src/components/status.jsx:1233 msgid "Post deleted" msgstr "" -#: src/components/status.jsx:1235 +#: src/components/status.jsx:1236 msgid "Unable to delete post" msgstr "" -#: src/components/status.jsx:1263 +#: src/components/status.jsx:1264 msgid "Report post…" msgstr "" -#: src/components/status.jsx:1619 -#: src/components/status.jsx:1655 -#: src/components/status.jsx:2332 +#: src/components/status.jsx:1620 +#: src/components/status.jsx:1656 +#: src/components/status.jsx:2333 msgid "Liked" msgstr "" -#: src/components/status.jsx:1652 -#: src/components/status.jsx:2319 +#: src/components/status.jsx:1653 +#: src/components/status.jsx:2320 msgid "Boosted" msgstr "" -#: src/components/status.jsx:1662 -#: src/components/status.jsx:2344 +#: src/components/status.jsx:1663 +#: src/components/status.jsx:2345 msgid "Bookmarked" msgstr "" -#: src/components/status.jsx:1666 +#: src/components/status.jsx:1667 msgid "Pinned" msgstr "" -#: src/components/status.jsx:1711 -#: src/components/status.jsx:2163 +#: src/components/status.jsx:1712 +#: src/components/status.jsx:2164 msgid "Deleted" msgstr "" -#: src/components/status.jsx:1752 +#: src/components/status.jsx:1753 msgid "{repliesCount, plural, one {# reply} other {# replies}}" msgstr "" -#: src/components/status.jsx:1841 +#: src/components/status.jsx:1842 msgid "Thread{0}" msgstr "" -#: src/components/status.jsx:1917 -#: src/components/status.jsx:1979 -#: src/components/status.jsx:2064 +#: src/components/status.jsx:1918 +#: src/components/status.jsx:1980 +#: src/components/status.jsx:2065 msgid "Show less" msgstr "" -#: src/components/status.jsx:1917 -#: src/components/status.jsx:1979 +#: src/components/status.jsx:1918 +#: src/components/status.jsx:1980 msgid "Show content" msgstr "" -#: src/components/status.jsx:2064 +#: src/components/status.jsx:2065 msgid "Show media" msgstr "" -#: src/components/status.jsx:2184 +#: src/components/status.jsx:2185 msgid "Edited" msgstr "" -#: src/components/status.jsx:2261 +#: src/components/status.jsx:2262 msgid "Comments" msgstr "" -#: src/components/status.jsx:2832 +#: src/components/status.jsx:2833 msgid "Edit History" msgstr "" -#: src/components/status.jsx:2836 +#: src/components/status.jsx:2837 msgid "Failed to load history" msgstr "" -#: src/components/status.jsx:2841 +#: src/components/status.jsx:2842 msgid "Loading…" msgstr "" -#: src/components/status.jsx:3076 +#: src/components/status.jsx:3077 msgid "HTML Code" msgstr "" -#: src/components/status.jsx:3093 +#: src/components/status.jsx:3094 msgid "HTML code copied" msgstr "" -#: src/components/status.jsx:3096 +#: src/components/status.jsx:3097 msgid "Unable to copy HTML code" msgstr "" -#: src/components/status.jsx:3108 +#: src/components/status.jsx:3109 msgid "Media attachments:" msgstr "" -#: src/components/status.jsx:3130 +#: src/components/status.jsx:3131 msgid "Account Emojis:" msgstr "" -#: src/components/status.jsx:3161 -#: src/components/status.jsx:3206 +#: src/components/status.jsx:3162 +#: src/components/status.jsx:3207 msgid "static URL" msgstr "" -#: src/components/status.jsx:3175 +#: src/components/status.jsx:3176 msgid "Emojis:" msgstr "" -#: src/components/status.jsx:3220 +#: src/components/status.jsx:3221 msgid "Notes:" msgstr "" -#: src/components/status.jsx:3224 +#: src/components/status.jsx:3225 msgid "This is static, unstyled and scriptless. You may need to apply your own styles and edit as needed." msgstr "" -#: src/components/status.jsx:3230 +#: src/components/status.jsx:3231 msgid "Polls are not interactive, becomes a list with vote counts." msgstr "" -#: src/components/status.jsx:3235 +#: src/components/status.jsx:3236 msgid "Media attachments can be images, videos, audios or any file types." msgstr "" -#: src/components/status.jsx:3241 +#: src/components/status.jsx:3242 msgid "Post could be edited or deleted later." msgstr "" -#: src/components/status.jsx:3247 +#: src/components/status.jsx:3248 msgid "Preview" msgstr "" -#: src/components/status.jsx:3256 +#: src/components/status.jsx:3257 msgid "Note: This preview is lightly styled." msgstr "" -#: src/components/status.jsx:3498 +#: src/components/status.jsx:3499 msgid "<0/> <1/> boosted" msgstr "" From 67cce5b9cce9ec37e49d953378e62dd394c4137d Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Tue, 20 Aug 2024 19:03:20 +0200 Subject: [PATCH 03/14] Add italian translation --- src/locales/it-IT.po | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/locales/it-IT.po b/src/locales/it-IT.po index 7cd404c74..11c6aaef4 100644 --- a/src/locales/it-IT.po +++ b/src/locales/it-IT.po @@ -638,6 +638,11 @@ msgstr "Solo seguaci" msgid "Private mention" msgstr "Menzione privata" +#: src/components/compose.jsx:1183 +#: src/components/status.jsx:97 +msgid "Local instance" +msgstr "Istanza locale" + #: src/components/compose.jsx:1188 msgid "Post your reply" msgstr "Pubblica la tua risposta" From 8f6d1da008f33a30c15ac3546679f6a4158dd159 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Wed, 28 Aug 2024 13:17:46 +0200 Subject: [PATCH 04/14] Add support for Pleroma instances --- src/components/compose.jsx | 2 +- src/utils/supports.js | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/compose.jsx b/src/components/compose.jsx index 64470675c..7b1a09533 100644 --- a/src/components/compose.jsx +++ b/src/components/compose.jsx @@ -1178,7 +1178,7 @@ function Compose({ - {supports('@akkoma/local-only') && + {supports('@pleroma/local-only') && diff --git a/src/utils/supports.js b/src/utils/supports.js index 1560e7181..c7719bcb4 100644 --- a/src/utils/supports.js +++ b/src/utils/supports.js @@ -7,8 +7,8 @@ import { getCurrentInstance } from './store-utils'; // Non-semver(?) UA string detection const containPixelfed = /pixelfed/i; const notContainPixelfed = /^(?!.*pixelfed).*$/i; -const containAkkoma = /akkoma/i -const notContainAkkoma = /^(?! *akkoma) *$/i +const containAnyOma = /(?:pler|akk)oma/i +const notContainAnyOma = /^(?! *(?:pler|akk)oma) *$/i const platformFeatures = { '@mastodon/lists': notContainPixelfed, '@mastodon/filters': notContainPixelfed, @@ -22,13 +22,14 @@ const platformFeatures = { '@pixelfed/trending': containPixelfed, '@pixelfed/home-include-reblogs': containPixelfed, '@pixelfed/global-feed': containPixelfed, - '@akkoma/local-only': containAkkoma, + '@pleroma/local-only': containAnyOma, }; const supportsCache = {}; function supports(feature) { try { const { version, domain } = getCurrentInstance(); + console.debug(version) const key = `${domain}-${feature}`; if (supportsCache[key]) return supportsCache[key]; From bf792c77f470c672baf0e5460dbc34b14e8168e1 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Thu, 5 Sep 2024 10:19:01 +0200 Subject: [PATCH 05/14] Remove unused `notContainAnyOma` regex --- src/utils/supports.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/utils/supports.js b/src/utils/supports.js index c7719bcb4..fb81d9192 100644 --- a/src/utils/supports.js +++ b/src/utils/supports.js @@ -8,7 +8,6 @@ import { getCurrentInstance } from './store-utils'; const containPixelfed = /pixelfed/i; const notContainPixelfed = /^(?!.*pixelfed).*$/i; const containAnyOma = /(?:pler|akk)oma/i -const notContainAnyOma = /^(?! *(?:pler|akk)oma) *$/i const platformFeatures = { '@mastodon/lists': notContainPixelfed, '@mastodon/filters': notContainPixelfed, From 72d735916e881e293d00824a6135c871a0569ff7 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Thu, 5 Sep 2024 10:19:53 +0200 Subject: [PATCH 06/14] Rename `@pleroma/local-only` to `@pleroma/local-visibility-post` --- src/utils/supports.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/supports.js b/src/utils/supports.js index fb81d9192..cc3962339 100644 --- a/src/utils/supports.js +++ b/src/utils/supports.js @@ -21,7 +21,7 @@ const platformFeatures = { '@pixelfed/trending': containPixelfed, '@pixelfed/home-include-reblogs': containPixelfed, '@pixelfed/global-feed': containPixelfed, - '@pleroma/local-only': containAnyOma, + '@pleroma/local-visibility-post': containAnyOma, }; const supportsCache = {}; From 392aa6b460320e001c108debb126eecc38bc4d74 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Thu, 5 Sep 2024 10:20:29 +0200 Subject: [PATCH 07/14] Exclude change to the `it-IT.po` file --- src/locales/it-IT.po | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/locales/it-IT.po b/src/locales/it-IT.po index 11c6aaef4..7cd404c74 100644 --- a/src/locales/it-IT.po +++ b/src/locales/it-IT.po @@ -638,11 +638,6 @@ msgstr "Solo seguaci" msgid "Private mention" msgstr "Menzione privata" -#: src/components/compose.jsx:1183 -#: src/components/status.jsx:97 -msgid "Local instance" -msgstr "Istanza locale" - #: src/components/compose.jsx:1188 msgid "Post your reply" msgstr "Pubblica la tua risposta" From c4a2dde20b856e39e3343347445d1dff31170bf3 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Thu, 5 Sep 2024 12:14:05 +0200 Subject: [PATCH 08/14] Rename `@pleroma/local-only` to `@pleroma/local-visibility-post`... again --- src/components/compose.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/compose.jsx b/src/components/compose.jsx index 7b1a09533..7a7fb6de2 100644 --- a/src/components/compose.jsx +++ b/src/components/compose.jsx @@ -1178,7 +1178,7 @@ function Compose({ - {supports('@pleroma/local-only') && + {supports('@pleroma/local-visibility-post') && From 109a519d14f06ba21234d46d9972011f753a158f Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Thu, 5 Sep 2024 15:50:25 +0200 Subject: [PATCH 09/14] Update .po file --- src/locales/en.po | 385 +++++++++++++++++++++++----------------------- 1 file changed, 195 insertions(+), 190 deletions(-) diff --git a/src/locales/en.po b/src/locales/en.po index a2114582d..9a6dd2f51 100644 --- a/src/locales/en.po +++ b/src/locales/en.po @@ -32,7 +32,7 @@ msgstr "" #: src/components/account-block.jsx:166 #: src/components/account-info.jsx:639 -#: src/components/status.jsx:439 +#: src/components/status.jsx:440 #: src/pages/catchup.jsx:1454 msgid "Group" msgstr "" @@ -105,14 +105,14 @@ msgstr "" #: src/components/account-info.jsx:427 #: src/components/account-info.jsx:1115 -#: src/components/compose.jsx:2451 +#: src/components/compose.jsx:2456 #: src/components/media-alt-modal.jsx:45 #: src/components/media-modal.jsx:283 -#: src/components/status.jsx:1635 -#: src/components/status.jsx:1652 -#: src/components/status.jsx:1776 -#: src/components/status.jsx:2371 -#: src/components/status.jsx:2374 +#: src/components/status.jsx:1636 +#: src/components/status.jsx:1653 +#: src/components/status.jsx:1777 +#: src/components/status.jsx:2372 +#: src/components/status.jsx:2375 #: src/pages/account-statuses.jsx:528 #: src/pages/accounts.jsx:109 #: src/pages/hashtag.jsx:199 @@ -181,7 +181,7 @@ msgid "Original" msgstr "" #: src/components/account-info.jsx:859 -#: src/components/status.jsx:2162 +#: src/components/status.jsx:2163 #: src/pages/catchup.jsx:71 #: src/pages/catchup.jsx:1428 #: src/pages/catchup.jsx:2039 @@ -277,30 +277,30 @@ msgid "Add/Remove from Lists" msgstr "" #: src/components/account-info.jsx:1299 -#: src/components/status.jsx:1078 +#: src/components/status.jsx:1079 msgid "Link copied" msgstr "" #: src/components/account-info.jsx:1302 -#: src/components/status.jsx:1081 +#: src/components/status.jsx:1082 msgid "Unable to copy link" msgstr "" #: src/components/account-info.jsx:1308 #: src/components/shortcuts-settings.jsx:1056 -#: src/components/status.jsx:1087 -#: src/components/status.jsx:3114 +#: src/components/status.jsx:1088 +#: src/components/status.jsx:3115 msgid "Copy" msgstr "" #: src/components/account-info.jsx:1323 #: src/components/shortcuts-settings.jsx:1074 -#: src/components/status.jsx:1103 +#: src/components/status.jsx:1104 msgid "Sharing doesn't seem to work." msgstr "" #: src/components/account-info.jsx:1329 -#: src/components/status.jsx:1109 +#: src/components/status.jsx:1110 msgid "Share…" msgstr "" @@ -401,10 +401,10 @@ msgstr "" #: src/components/account-info.jsx:2086 #: src/components/account-sheet.jsx:37 #: src/components/compose.jsx:797 -#: src/components/compose.jsx:2407 -#: src/components/compose.jsx:2880 -#: src/components/compose.jsx:3088 -#: src/components/compose.jsx:3318 +#: src/components/compose.jsx:2412 +#: src/components/compose.jsx:2885 +#: src/components/compose.jsx:3093 +#: src/components/compose.jsx:3323 #: src/components/drafts.jsx:58 #: src/components/embed-modal.jsx:12 #: src/components/generic-accounts.jsx:142 @@ -417,9 +417,9 @@ msgstr "" #: src/components/shortcuts-settings.jsx:227 #: src/components/shortcuts-settings.jsx:580 #: src/components/shortcuts-settings.jsx:780 -#: src/components/status.jsx:2839 -#: src/components/status.jsx:3078 -#: src/components/status.jsx:3576 +#: src/components/status.jsx:2840 +#: src/components/status.jsx:3079 +#: src/components/status.jsx:3577 #: src/pages/accounts.jsx:36 #: src/pages/catchup.jsx:1564 #: src/pages/filters.jsx:224 @@ -542,8 +542,8 @@ msgstr "" #: src/components/compose.jsx:614 #: src/components/compose.jsx:630 -#: src/components/compose.jsx:1328 -#: src/components/compose.jsx:1589 +#: src/components/compose.jsx:1333 +#: src/components/compose.jsx:1594 msgid "{maxMediaAttachments, plural, one {You can only attach up to 1 file.} other {You can only attach up to # files.}}" msgstr "" @@ -600,7 +600,7 @@ msgid "Attachment #{i} failed" msgstr "" #: src/components/compose.jsx:1118 -#: src/components/status.jsx:1961 +#: src/components/status.jsx:1962 #: src/components/timeline.jsx:979 msgid "Content warning" msgstr "" @@ -629,232 +629,237 @@ msgstr "" #: src/components/compose.jsx:1179 #: src/components/status.jsx:96 -#: src/components/status.jsx:1839 +#: src/components/status.jsx:1840 msgid "Private mention" msgstr "" -#: src/components/compose.jsx:1188 +#: src/components/compose.jsx:1183 +#: src/components/status.jsx:97 +msgid "Local instance" +msgstr "Local instance" + +#: src/components/compose.jsx:1193 msgid "Post your reply" msgstr "" -#: src/components/compose.jsx:1190 +#: src/components/compose.jsx:1195 msgid "Edit your post" msgstr "" -#: src/components/compose.jsx:1191 +#: src/components/compose.jsx:1196 msgid "What are you doing?" msgstr "" -#: src/components/compose.jsx:1266 +#: src/components/compose.jsx:1271 msgid "Mark media as sensitive" msgstr "" -#: src/components/compose.jsx:1364 +#: src/components/compose.jsx:1369 msgid "Add poll" msgstr "" -#: src/components/compose.jsx:1386 +#: src/components/compose.jsx:1391 msgid "Add custom emoji" msgstr "" -#: src/components/compose.jsx:1470 +#: src/components/compose.jsx:1475 #: src/components/keyboard-shortcuts-help.jsx:143 -#: src/components/status.jsx:830 -#: src/components/status.jsx:1615 +#: src/components/status.jsx:831 #: src/components/status.jsx:1616 -#: src/components/status.jsx:2267 +#: src/components/status.jsx:1617 +#: src/components/status.jsx:2268 msgid "Reply" msgstr "" -#: src/components/compose.jsx:1472 +#: src/components/compose.jsx:1477 msgid "Update" msgstr "" -#: src/components/compose.jsx:1473 +#: src/components/compose.jsx:1478 msgctxt "Submit button in composer" msgid "Post" msgstr "" -#: src/components/compose.jsx:1601 +#: src/components/compose.jsx:1606 msgid "Downloading GIF…" msgstr "" -#: src/components/compose.jsx:1629 +#: src/components/compose.jsx:1634 msgid "Failed to download GIF" msgstr "" -#: src/components/compose.jsx:1740 -#: src/components/compose.jsx:1817 +#: src/components/compose.jsx:1745 +#: src/components/compose.jsx:1822 #: src/components/nav-menu.jsx:287 msgid "More…" msgstr "" -#: src/components/compose.jsx:2220 +#: src/components/compose.jsx:2225 msgid "Uploaded" msgstr "" -#: src/components/compose.jsx:2233 +#: src/components/compose.jsx:2238 msgid "Image description" msgstr "" -#: src/components/compose.jsx:2234 +#: src/components/compose.jsx:2239 msgid "Video description" msgstr "" -#: src/components/compose.jsx:2235 +#: src/components/compose.jsx:2240 msgid "Audio description" msgstr "" -#: src/components/compose.jsx:2271 -#: src/components/compose.jsx:2291 +#: src/components/compose.jsx:2276 +#: src/components/compose.jsx:2296 msgid "File size too large. Uploading might encounter issues. Try reduce the file size from {0} to {1} or lower." msgstr "" -#: src/components/compose.jsx:2283 -#: src/components/compose.jsx:2303 +#: src/components/compose.jsx:2288 +#: src/components/compose.jsx:2308 msgid "Dimension too large. Uploading might encounter issues. Try reduce dimension from {0}×{1}px to {2}×{3}px." msgstr "" -#: src/components/compose.jsx:2311 +#: src/components/compose.jsx:2316 msgid "Frame rate too high. Uploading might encounter issues." msgstr "" -#: src/components/compose.jsx:2371 -#: src/components/compose.jsx:2621 +#: src/components/compose.jsx:2376 +#: src/components/compose.jsx:2626 #: src/components/shortcuts-settings.jsx:723 #: src/pages/catchup.jsx:1074 #: src/pages/filters.jsx:412 msgid "Remove" msgstr "" -#: src/components/compose.jsx:2388 +#: src/components/compose.jsx:2393 #: src/compose.jsx:83 msgid "Error" msgstr "" -#: src/components/compose.jsx:2413 +#: src/components/compose.jsx:2418 msgid "Edit image description" msgstr "" -#: src/components/compose.jsx:2414 +#: src/components/compose.jsx:2419 msgid "Edit video description" msgstr "" -#: src/components/compose.jsx:2415 +#: src/components/compose.jsx:2420 msgid "Edit audio description" msgstr "" -#: src/components/compose.jsx:2460 -#: src/components/compose.jsx:2509 +#: src/components/compose.jsx:2465 +#: src/components/compose.jsx:2514 msgid "Generating description. Please wait…" msgstr "" -#: src/components/compose.jsx:2480 +#: src/components/compose.jsx:2485 msgid "Failed to generate description: {0}" msgstr "" -#: src/components/compose.jsx:2481 +#: src/components/compose.jsx:2486 msgid "Failed to generate description" msgstr "" -#: src/components/compose.jsx:2493 -#: src/components/compose.jsx:2499 -#: src/components/compose.jsx:2545 +#: src/components/compose.jsx:2498 +#: src/components/compose.jsx:2504 +#: src/components/compose.jsx:2550 msgid "Generate description…" msgstr "" -#: src/components/compose.jsx:2532 +#: src/components/compose.jsx:2537 msgid "Failed to generate description{0}" msgstr "" -#: src/components/compose.jsx:2547 +#: src/components/compose.jsx:2552 msgid "({0}) <0>— experimental" msgstr "" -#: src/components/compose.jsx:2566 +#: src/components/compose.jsx:2571 msgid "Done" msgstr "" -#: src/components/compose.jsx:2602 +#: src/components/compose.jsx:2607 msgid "Choice {0}" msgstr "" -#: src/components/compose.jsx:2649 +#: src/components/compose.jsx:2654 msgid "Multiple choices" msgstr "" -#: src/components/compose.jsx:2652 +#: src/components/compose.jsx:2657 msgid "Duration" msgstr "" -#: src/components/compose.jsx:2683 +#: src/components/compose.jsx:2688 msgid "Remove poll" msgstr "" -#: src/components/compose.jsx:2897 +#: src/components/compose.jsx:2902 msgid "Search accounts" msgstr "" -#: src/components/compose.jsx:2938 +#: src/components/compose.jsx:2943 #: src/components/shortcuts-settings.jsx:712 #: src/pages/list.jsx:359 msgid "Add" msgstr "" -#: src/components/compose.jsx:2951 +#: src/components/compose.jsx:2956 #: src/components/generic-accounts.jsx:227 msgid "Error loading accounts" msgstr "" -#: src/components/compose.jsx:3094 +#: src/components/compose.jsx:3099 msgid "Custom emojis" msgstr "" -#: src/components/compose.jsx:3114 +#: src/components/compose.jsx:3119 msgid "Search emoji" msgstr "" -#: src/components/compose.jsx:3145 +#: src/components/compose.jsx:3150 msgid "Error loading custom emojis" msgstr "" -#: src/components/compose.jsx:3156 +#: src/components/compose.jsx:3161 msgid "Recently used" msgstr "" -#: src/components/compose.jsx:3157 +#: src/components/compose.jsx:3162 msgid "Others" msgstr "" -#: src/components/compose.jsx:3195 +#: src/components/compose.jsx:3200 msgid "{0} more…" msgstr "" -#: src/components/compose.jsx:3333 +#: src/components/compose.jsx:3338 msgid "Search GIFs" msgstr "" -#: src/components/compose.jsx:3348 +#: src/components/compose.jsx:3353 msgid "Powered by GIPHY" msgstr "" -#: src/components/compose.jsx:3356 +#: src/components/compose.jsx:3361 msgid "Type to search GIFs" msgstr "" -#: src/components/compose.jsx:3454 +#: src/components/compose.jsx:3459 #: src/components/media-modal.jsx:387 #: src/components/timeline.jsx:884 msgid "Previous" msgstr "" -#: src/components/compose.jsx:3472 +#: src/components/compose.jsx:3477 #: src/components/media-modal.jsx:406 #: src/components/timeline.jsx:901 msgid "Next" msgstr "" -#: src/components/compose.jsx:3489 +#: src/components/compose.jsx:3494 msgid "Error loading GIFs" msgstr "" @@ -877,7 +882,7 @@ msgstr "" #: src/components/drafts.jsx:127 #: src/components/list-add-edit.jsx:183 -#: src/components/status.jsx:1250 +#: src/components/status.jsx:1251 #: src/pages/filters.jsx:587 msgid "Delete…" msgstr "" @@ -1077,10 +1082,10 @@ msgid "<0>l or <1>f" msgstr "" #: src/components/keyboard-shortcuts-help.jsx:164 -#: src/components/status.jsx:838 -#: src/components/status.jsx:2293 -#: src/components/status.jsx:2325 +#: src/components/status.jsx:839 +#: src/components/status.jsx:2294 #: src/components/status.jsx:2326 +#: src/components/status.jsx:2327 msgid "Boost" msgstr "" @@ -1089,9 +1094,9 @@ msgid "<0>Shift + <1>b" msgstr "" #: src/components/keyboard-shortcuts-help.jsx:172 -#: src/components/status.jsx:923 -#: src/components/status.jsx:2350 +#: src/components/status.jsx:924 #: src/components/status.jsx:2351 +#: src/components/status.jsx:2352 msgid "Bookmark" msgstr "" @@ -1154,15 +1159,15 @@ msgid "Media description" msgstr "" #: src/components/media-alt-modal.jsx:57 -#: src/components/status.jsx:967 -#: src/components/status.jsx:994 +#: src/components/status.jsx:968 +#: src/components/status.jsx:995 #: src/components/translation-block.jsx:195 msgid "Translate" msgstr "" #: src/components/media-alt-modal.jsx:68 -#: src/components/status.jsx:981 -#: src/components/status.jsx:1008 +#: src/components/status.jsx:982 +#: src/components/status.jsx:1009 msgid "Speak" msgstr "" @@ -1199,9 +1204,9 @@ msgid "Filtered: {filterTitleStr}" msgstr "" #: src/components/media-post.jsx:133 -#: src/components/status.jsx:3406 -#: src/components/status.jsx:3502 -#: src/components/status.jsx:3580 +#: src/components/status.jsx:3407 +#: src/components/status.jsx:3503 +#: src/components/status.jsx:3581 #: src/components/timeline.jsx:968 #: src/pages/catchup.jsx:75 #: src/pages/catchup.jsx:1859 @@ -1486,8 +1491,8 @@ msgid "[Unknown notification type: {type}]" msgstr "" #: src/components/notification.jsx:425 -#: src/components/status.jsx:937 -#: src/components/status.jsx:947 +#: src/components/status.jsx:938 +#: src/components/status.jsx:948 msgid "Boosted/Liked by…" msgstr "" @@ -1509,7 +1514,7 @@ msgid "Learn more <0/>" msgstr "" #: src/components/notification.jsx:680 -#: src/components/status.jsx:189 +#: src/components/status.jsx:190 msgid "Read more →" msgstr "" @@ -1802,7 +1807,7 @@ msgid "Move down" msgstr "" #: src/components/shortcuts-settings.jsx:376 -#: src/components/status.jsx:1215 +#: src/components/status.jsx:1216 #: src/pages/list.jsx:170 msgid "Edit" msgstr "" @@ -2000,291 +2005,291 @@ msgstr "" msgid "Import/export settings from/to instance server (Very experimental)" msgstr "" -#: src/components/status.jsx:463 +#: src/components/status.jsx:464 msgid "<0/> <1>boosted" msgstr "" -#: src/components/status.jsx:562 +#: src/components/status.jsx:563 msgid "Sorry, your current logged-in instance can't interact with this post from another instance." msgstr "" -#: src/components/status.jsx:715 +#: src/components/status.jsx:716 msgid "Unliked @{0}'s post" msgstr "" -#: src/components/status.jsx:716 +#: src/components/status.jsx:717 msgid "Liked @{0}'s post" msgstr "" -#: src/components/status.jsx:755 +#: src/components/status.jsx:756 msgid "Unbookmarked @{0}'s post" msgstr "" -#: src/components/status.jsx:756 +#: src/components/status.jsx:757 msgid "Bookmarked @{0}'s post" msgstr "" -#: src/components/status.jsx:838 -#: src/components/status.jsx:900 -#: src/components/status.jsx:2293 -#: src/components/status.jsx:2325 +#: src/components/status.jsx:839 +#: src/components/status.jsx:901 +#: src/components/status.jsx:2294 +#: src/components/status.jsx:2326 msgid "Unboost" msgstr "" -#: src/components/status.jsx:854 -#: src/components/status.jsx:2308 +#: src/components/status.jsx:855 +#: src/components/status.jsx:2309 msgid "Quote" msgstr "" -#: src/components/status.jsx:862 -#: src/components/status.jsx:2317 +#: src/components/status.jsx:863 +#: src/components/status.jsx:2318 msgid "Some media have no descriptions." msgstr "" -#: src/components/status.jsx:869 +#: src/components/status.jsx:870 msgid "Old post (<0>{0})" msgstr "" -#: src/components/status.jsx:888 -#: src/components/status.jsx:1340 +#: src/components/status.jsx:889 +#: src/components/status.jsx:1341 msgid "Unboosted @{0}'s post" msgstr "" -#: src/components/status.jsx:889 -#: src/components/status.jsx:1341 +#: src/components/status.jsx:890 +#: src/components/status.jsx:1342 msgid "Boosted @{0}'s post" msgstr "" -#: src/components/status.jsx:901 +#: src/components/status.jsx:902 msgid "Boost…" msgstr "" -#: src/components/status.jsx:913 -#: src/components/status.jsx:1625 -#: src/components/status.jsx:2338 +#: src/components/status.jsx:914 +#: src/components/status.jsx:1626 +#: src/components/status.jsx:2339 msgid "Unlike" msgstr "" -#: src/components/status.jsx:914 -#: src/components/status.jsx:1625 +#: src/components/status.jsx:915 #: src/components/status.jsx:1626 -#: src/components/status.jsx:2338 +#: src/components/status.jsx:1627 #: src/components/status.jsx:2339 +#: src/components/status.jsx:2340 msgid "Like" msgstr "" -#: src/components/status.jsx:923 -#: src/components/status.jsx:2350 +#: src/components/status.jsx:924 +#: src/components/status.jsx:2351 msgid "Unbookmark" msgstr "" -#: src/components/status.jsx:1031 +#: src/components/status.jsx:1032 msgid "View post by <0>@{0}" msgstr "" -#: src/components/status.jsx:1052 +#: src/components/status.jsx:1053 msgid "Show Edit History" msgstr "" -#: src/components/status.jsx:1055 +#: src/components/status.jsx:1056 msgid "Edited: {editedDateText}" msgstr "" -#: src/components/status.jsx:1122 -#: src/components/status.jsx:3083 +#: src/components/status.jsx:1123 +#: src/components/status.jsx:3084 msgid "Embed post" msgstr "" -#: src/components/status.jsx:1136 +#: src/components/status.jsx:1137 msgid "Conversation unmuted" msgstr "" -#: src/components/status.jsx:1136 +#: src/components/status.jsx:1137 msgid "Conversation muted" msgstr "" -#: src/components/status.jsx:1142 +#: src/components/status.jsx:1143 msgid "Unable to unmute conversation" msgstr "" -#: src/components/status.jsx:1143 +#: src/components/status.jsx:1144 msgid "Unable to mute conversation" msgstr "" -#: src/components/status.jsx:1152 +#: src/components/status.jsx:1153 msgid "Unmute conversation" msgstr "" -#: src/components/status.jsx:1159 +#: src/components/status.jsx:1160 msgid "Mute conversation" msgstr "" -#: src/components/status.jsx:1175 +#: src/components/status.jsx:1176 msgid "Post unpinned from profile" msgstr "" -#: src/components/status.jsx:1176 +#: src/components/status.jsx:1177 msgid "Post pinned to profile" msgstr "" -#: src/components/status.jsx:1181 +#: src/components/status.jsx:1182 msgid "Unable to unpin post" msgstr "" -#: src/components/status.jsx:1181 +#: src/components/status.jsx:1182 msgid "Unable to pin post" msgstr "" -#: src/components/status.jsx:1190 +#: src/components/status.jsx:1191 msgid "Unpin from profile" msgstr "" -#: src/components/status.jsx:1197 +#: src/components/status.jsx:1198 msgid "Pin to profile" msgstr "" -#: src/components/status.jsx:1226 +#: src/components/status.jsx:1227 msgid "Delete this post?" msgstr "" -#: src/components/status.jsx:1239 +#: src/components/status.jsx:1240 msgid "Post deleted" msgstr "" -#: src/components/status.jsx:1242 +#: src/components/status.jsx:1243 msgid "Unable to delete post" msgstr "" -#: src/components/status.jsx:1270 +#: src/components/status.jsx:1271 msgid "Report post…" msgstr "" -#: src/components/status.jsx:1626 -#: src/components/status.jsx:1662 -#: src/components/status.jsx:2339 +#: src/components/status.jsx:1627 +#: src/components/status.jsx:1663 +#: src/components/status.jsx:2340 msgid "Liked" msgstr "" -#: src/components/status.jsx:1659 -#: src/components/status.jsx:2326 +#: src/components/status.jsx:1660 +#: src/components/status.jsx:2327 msgid "Boosted" msgstr "" -#: src/components/status.jsx:1669 -#: src/components/status.jsx:2351 +#: src/components/status.jsx:1670 +#: src/components/status.jsx:2352 msgid "Bookmarked" msgstr "" -#: src/components/status.jsx:1673 +#: src/components/status.jsx:1674 msgid "Pinned" msgstr "" -#: src/components/status.jsx:1718 -#: src/components/status.jsx:2170 +#: src/components/status.jsx:1719 +#: src/components/status.jsx:2171 msgid "Deleted" msgstr "" -#: src/components/status.jsx:1759 +#: src/components/status.jsx:1760 msgid "{repliesCount, plural, one {# reply} other {# replies}}" msgstr "" -#: src/components/status.jsx:1848 +#: src/components/status.jsx:1849 msgid "Thread{0}" msgstr "" -#: src/components/status.jsx:1924 -#: src/components/status.jsx:1986 -#: src/components/status.jsx:2071 +#: src/components/status.jsx:1925 +#: src/components/status.jsx:1987 +#: src/components/status.jsx:2072 msgid "Show less" msgstr "" -#: src/components/status.jsx:1924 -#: src/components/status.jsx:1986 +#: src/components/status.jsx:1925 +#: src/components/status.jsx:1987 msgid "Show content" msgstr "" -#: src/components/status.jsx:2071 +#: src/components/status.jsx:2072 msgid "Show media" msgstr "" -#: src/components/status.jsx:2191 +#: src/components/status.jsx:2192 msgid "Edited" msgstr "" -#: src/components/status.jsx:2268 +#: src/components/status.jsx:2269 msgid "Comments" msgstr "" -#: src/components/status.jsx:2844 +#: src/components/status.jsx:2845 msgid "Edit History" msgstr "" -#: src/components/status.jsx:2848 +#: src/components/status.jsx:2849 msgid "Failed to load history" msgstr "" -#: src/components/status.jsx:2853 +#: src/components/status.jsx:2854 msgid "Loading…" msgstr "" -#: src/components/status.jsx:3088 +#: src/components/status.jsx:3089 msgid "HTML Code" msgstr "" -#: src/components/status.jsx:3105 +#: src/components/status.jsx:3106 msgid "HTML code copied" msgstr "" -#: src/components/status.jsx:3108 +#: src/components/status.jsx:3109 msgid "Unable to copy HTML code" msgstr "" -#: src/components/status.jsx:3120 +#: src/components/status.jsx:3121 msgid "Media attachments:" msgstr "" -#: src/components/status.jsx:3142 +#: src/components/status.jsx:3143 msgid "Account Emojis:" msgstr "" -#: src/components/status.jsx:3173 -#: src/components/status.jsx:3218 +#: src/components/status.jsx:3174 +#: src/components/status.jsx:3219 msgid "static URL" msgstr "" -#: src/components/status.jsx:3187 +#: src/components/status.jsx:3188 msgid "Emojis:" msgstr "" -#: src/components/status.jsx:3232 +#: src/components/status.jsx:3233 msgid "Notes:" msgstr "" -#: src/components/status.jsx:3236 +#: src/components/status.jsx:3237 msgid "This is static, unstyled and scriptless. You may need to apply your own styles and edit as needed." msgstr "" -#: src/components/status.jsx:3242 +#: src/components/status.jsx:3243 msgid "Polls are not interactive, becomes a list with vote counts." msgstr "" -#: src/components/status.jsx:3247 +#: src/components/status.jsx:3248 msgid "Media attachments can be images, videos, audios or any file types." msgstr "" -#: src/components/status.jsx:3253 +#: src/components/status.jsx:3254 msgid "Post could be edited or deleted later." msgstr "" -#: src/components/status.jsx:3259 +#: src/components/status.jsx:3260 msgid "Preview" msgstr "" -#: src/components/status.jsx:3268 +#: src/components/status.jsx:3269 msgid "Note: This preview is lightly styled." msgstr "" -#: src/components/status.jsx:3510 +#: src/components/status.jsx:3511 msgid "<0/> <1/> boosted" msgstr "" From 9a72975aaf170f9e75bf7a80b2b29cac8e68e3a8 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Sat, 7 Sep 2024 03:11:05 +0200 Subject: [PATCH 10/14] Move local between Public and Unlisted --- src/components/compose.jsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/compose.jsx b/src/components/compose.jsx index 04c9747c8..3e2bf4ab3 100644 --- a/src/components/compose.jsx +++ b/src/components/compose.jsx @@ -1169,6 +1169,11 @@ function Compose({ + {supports('@pleroma/local-visibility-post') && + + } @@ -1178,11 +1183,6 @@ function Compose({ - {supports('@pleroma/local-visibility-post') && - - } {' '} From 1aff56a6bd916e07364ec003ee3078f4029538d1 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Sat, 7 Sep 2024 03:12:16 +0200 Subject: [PATCH 11/14] Rename "Local instance" to "Local" Co-authored-by: Lim Chee Aun --- src/components/compose.jsx | 2 +- src/components/status.jsx | 2 +- src/locales/en.po | 27 ++++++++++++--------------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/components/compose.jsx b/src/components/compose.jsx index 3e2bf4ab3..76d2262ee 100644 --- a/src/components/compose.jsx +++ b/src/components/compose.jsx @@ -1171,7 +1171,7 @@ function Compose({ {supports('@pleroma/local-visibility-post') && }