Updating with latest, also adding MASTO_VERSION env var for easier management

app/javascript/flavours/glitch/locales/en.json

@@ -1,25 +1,10 @@
 {
   "about.fork_disclaimer": "Glitch-soc is free open source software forked from Mastodon.",
-  "account.add_account_note": "Add note for @{name}",
   "account.disclaimer_full": "Information below may reflect the punk's profile incompletely.",
   "account.follows": "Follows",
   "account.follows_you": "Follows you",
-  "account.joined": "Joined {date}",
-  "account.mute_notifications": "Mute notifications from @{name}",
   "account.suspended_disclaimer_full": "This punk has been suspended by a custodian.",
-  "account.unmute_notifications": "Unmute notifications from @{name}",
   "account.view_full_profile": "View full profile",
-  "account_note.cancel": "Cancel",
-  "account_note.edit": "Adjust",
-  "account_note.glitch_placeholder": "No comment provided",
-  "account_note.save": "Save",
-  "advanced_options.icon_title": "Advanced options",
-  "advanced_options.local-only.long": "Do not ship to other communities",
-  "advanced_options.local-only.short": "Communal",
-  "advanced_options.local-only.tooltip": "This post is communal-only",
-  "advanced_options.threaded_mode.long": "Automatically opens a reply on planting",
-  "advanced_options.threaded_mode.short": "Threaded mode",
-  "advanced_options.threaded_mode.tooltip": "Threaded mode enabled",
   "boost_modal.missing_description": "This seed contains some media without description",
   "column.favourited_by": "Shined upon by",
   "column.heading": "Misc",
@@ -29,15 +14,19 @@
   "column_subheading.lists": "Circles",
   "column_subheading.navigation": "Navigation",
   "community.column_settings.allow_local_only": "Show communal-only toots",
-  "compose.attach": "Attach...",
+  "compose.change_federation": "Change federation settings",
-  "compose.attach.doodle": "Draw something",
+  "compose.content-type.change": "Change advanced formatting options",
-  "compose.attach.upload": "Donate a file",
   "compose.content-type.html": "HTML",
+  "compose.content-type.html_meta": "Format your seeds using HTML",
   "compose.content-type.markdown": "Markdown",
+  "compose.content-type.markdown_meta": "Format your seeds using Markdown",
   "compose.content-type.plain": "Plain text",
-  "compose_form.poll.multiple_choices": "Allow multiple choices",
+  "compose.content-type.plain_meta": "Write with no advanced formatting",
-  "compose_form.poll.single_choice": "Allow one choice",
+  "compose.disable_threaded_mode": "Disable threaded more",
-  "compose_form.spoiler": "Hide text behind warning",
+  "compose.enable_threaded_mode": "Enable threaded more",
+  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
   "confirmation_modal.do_not_ask_again": "Do not ask for confirmation again",
   "confirmations.deprecated_settings.confirm": "Use Mastodon preferences",
   "confirmations.deprecated_settings.message": "Some of the glitch-soc device-specific {app_settings} you are using have been replaced by Mastodon {preferences} and will be overriden:",
@@ -48,19 +37,21 @@
   "confirmations.unfilter.confirm": "Show",
   "confirmations.unfilter.edit_filter": "Adjust filter",
   "confirmations.unfilter.filters": "Matching {count, plural, one {filter} other {filters}}",
-  "content-type.change": "Content type",
   "direct.group_by_conversations": "Group by conversation",
   "endorsed_accounts_editor.endorsed_accounts": "Featured accounts",
   "favourite_modal.combo": "You can press {combo} to skip this next time",
-  "firehose.column_settings.allow_local_only": "Show local-only seeds in \"All\"",
+  "federation.federated.long": "Allow this seed to reach other communities",
+  "federation.federated.short": "Federated",
+  "federation.local_only.long": "Prevent this seed from reaching other communities",
+  "federation.local_only.short": "Communal",
+  "firehose.column_settings.allow_local_only": "Show communal seeds in \"All\"",
   "home.column_settings.advanced": "Advanced",
   "home.column_settings.filter_regex": "Filter out by regular expressions",
   "home.column_settings.show_direct": "Show whispers",
   "home.settings": "Column settings",
   "keyboard_shortcuts.bookmark": "to bookmark",
   "keyboard_shortcuts.secondary_toot": "to plant seed using secondary privacy setting",
-  "keyboard_shortcuts.toggle_collapse": "to collapse/uncollapse seeds",
+  "keyboard_shortcuts.toggle_collapse": "to collapse/uncollapse toots",
-  "media_gallery.sensitive": "Sensitive",
   "moved_to_warning": "This account is marked as moved to {moved_to_link}, and may thus not accept new follows.",
   "navigation_bar.app_settings": "App settings",
   "navigation_bar.featured_users": "Featured punks",
@@ -161,7 +152,6 @@
   "status.in_reply_to": "This seed is a reply",
   "status.is_poll": "This seed is a poll",
   "status.local_only": "Only visible from your community",
-  "status.sensitive_toggle": "Click to view",
   "status.uncollapse": "Uncollapse",
   "suggestions.dismiss": "Dismiss suggestion"
 }

app/javascript/mastodon/locales/en.json

@@ -5,14 +5,12 @@
   "about.domain_blocks.no_reason_available": "Reason not available",
   "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with punks from any other community in the Solarverse. These are the exceptions that have been made by the Custodians of Solarpunk.moe.",
   "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this community, unless you explicitly look it up or opt into it by following.",
-
   "about.domain_blocks.silenced.title": "Limited",
   "about.domain_blocks.suspended.explanation": "No data from this community will be processed, stored or exchanged, making any interaction or communication with punks from this community impossible.",
   "about.domain_blocks.suspended.title": "Suspended",
   "about.not_available": "This information has not been made available on this community.",
   "about.powered_by": "Decentralized social media powered by {mastodon}",
   "about.rules": "Community rules",
-
   "account.account_note_header": "Note",
   "account.add_or_remove_from_list": "Adjust circle membership",
   "account.badges.bot": "Robo",
@@ -41,7 +39,6 @@
   "account.following": "Following",
   "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
   "account.follows.empty": "This punk doesn't follow anyone yet.",
-  "account.follows_you": "Follows you",
   "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "Hide recycles from @{name}",
   "account.in_memoriam": "In Memoriam.",
@@ -92,7 +89,6 @@
   "announcement.announcement": "Proclamation",
   "attachments_list.unprocessed": "(unprocessed)",
   "audio.hide": "Hide audio",
-  "autosuggest_hashtag.per_week": "{count} per week",
   "boost_modal.combo": "You can press {combo} to skip this next time",
   "bundle_column_error.copy_stacktrace": "Copy error report",
   "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
@@ -149,22 +145,20 @@
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only seeds.",
   "compose_form.lock_disclaimer.lock": "locked",
   "compose_form.placeholder": "Plant your thoughts like seeds!",
-  "compose_form.poll.add_option": "Add a choice",
   "compose_form.poll.duration": "Poll duration",
-  "compose_form.poll.option_placeholder": "Choice {number}",
+  "compose_form.poll.multiple": "Multiple choice",
-  "compose_form.poll.remove_option": "Remove this choice",
+  "compose_form.poll.option_placeholder": "Option {number}",
+  "compose_form.poll.single": "Pick one",
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
   "compose_form.publish": "Plant",
   "compose_form.publish_form": "New seed",
+  "compose_form.reply": "Reciprocate",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.save_changes": "Apply adjustment",
-  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
   "compose_form.spoiler.marked": "Remove content warning",
   "compose_form.spoiler.unmarked": "Add content warning",
-  "compose_form.spoiler_placeholder": "Write your warning here",
+  "compose_form.spoiler_placeholder": "Content warning (optional)",
   "confirmation_modal.cancel": "Cancel",
   "confirmations.block.block_and_report": "Block & Report",
   "confirmations.block.confirm": "Block",
@@ -244,7 +238,6 @@
   "empty_column.followed_tags": "You have not followed any hashtags yet. When you do, they will show up here.",
   "empty_column.hashtag": "There is nothing in this hashtag yet.",
   "empty_column.home": "Your home crops are barren! Follow more punks to fill them up. {suggestions}",
-  "empty_column.home.suggestions": "See some suggestions",
   "empty_column.list": "There is nothing in this circle yet. When punks in this circle plant new seeds, they will appear here.",
   "empty_column.lists": "You don't have any circles yet. When you create one, it will show up here.",
   "empty_column.mutes": "You haven't muted any punks yet.",
@@ -284,6 +277,17 @@
   "follow_request.authorize": "Authorize",
   "follow_request.reject": "Reject",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "follow_suggestions.curated_suggestion": "Custodian pick",
+  "follow_suggestions.dismiss": "Don't show again",
+  "follow_suggestions.hints.featured": "This punk has been hand-picked by the {domain} team.",
+  "follow_suggestions.hints.friends_of_friends": "This punk is popular among the punks you follow.",
+  "follow_suggestions.hints.most_followed": "This punk is one of the most followed on {domain}.",
+  "follow_suggestions.hints.most_interactions": "This punk has been recently getting a lot of attention on {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "This punk is similar to the punks you have most recently followed.",
+  "follow_suggestions.personalized_suggestion": "Personalized suggestion",
+  "follow_suggestions.popular_suggestion": "Popular suggestion",
+  "follow_suggestions.view_all": "View all",
+  "follow_suggestions.who_to_follow": "Who to follow",
   "followed_tags": "Followed hashtags",
   "footer.about": "About",
   "footer.directory": "Profiles directory",
@@ -310,13 +314,9 @@
   "hashtag.follow": "Follow hashtag",
   "hashtag.unfollow": "Unfollow hashtag",
   "hashtags.and_other": "…and {count, plural, other {# more}}",
-  "home.actions.go_to_explore": "See what's trending",
-  "home.actions.go_to_suggestions": "Find punks to follow",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show recycles",
   "home.column_settings.show_replies": "Show replies",
-  "home.explore_prompt.body": "Your home crops will have a mix of seeds from the hashtags you've chosen to follow, the punks you've chosen to follow, and the seeds they recycle. It's looking pretty barren right now, so how about:",
-  "home.explore_prompt.title": "This is your home base within Mastodon.",
   "home.hide_announcements": "Hide proclamations",
   "home.pending_critical_update.body": "Please update your community as soon as possible!",
   "home.pending_critical_update.link": "See updates",
@@ -336,8 +336,7 @@
   "interaction_modal.title.favourite": "Shine upon {name}'s seed",
   "interaction_modal.title.follow": "Follow {name}",
   "interaction_modal.title.reblog": "Recycle {name}'s seed",
-  "interaction_modal.title.reply": "Reply to {name}'s seed",
+  "interaction_modal.title.reply": "Reciprocate {name}'s seed",
-
   "intervals.full.days": "{number, plural, one {# day} other {# days}}",
   "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
   "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
@@ -382,7 +381,8 @@
   "lightbox.previous": "Previous",
   "limited_account_hint.action": "Show profile anyway",
   "limited_account_hint.title": "This profile has been hidden by the custodians of the Solarverse.",
-  "lists.account.add": "Induct into circle",
+  "link_preview.author": "By {name}",
+"lists.account.add": "Induct into circle",
   "lists.account.remove": "Expel from circle",
   "lists.delete": "Ditch circle",
   "lists.edit": "Adjust circle",
@@ -412,7 +412,6 @@
   "navigation_bar.direct": "Whispers",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Blocked domains",
-  "navigation_bar.edit_profile": "Rethink yourself",
   "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "Shines",
   "navigation_bar.filters": "Muted words",
@@ -497,11 +496,7 @@
   "onboarding.profile.title": "Profile setup",
   "onboarding.profile.upload_avatar": "Upload profile picture",
   "onboarding.profile.upload_header": "Upload profile header",
-  "onboarding.share.lead": "Let punks know how they can find you on Mastodon!",
-  "onboarding.follows.empty": "Unfortunately, no results can be shown right now. You can try using search or browsing the explore page to find punks to follow, or try again later.",
   "onboarding.follows.lead": "Your home crops is the primary way to experience Mastodon. The more punks you follow, the more active and interesting it will be. To get you started, here are some suggestions:",
-  "onboarding.follows.title": "Personalize your home crops",
-  "onboarding.share.lead": "Let punks know how they can find you on Mastodon!",
   "onboarding.share.message": "I'm {username} on #Mastodon! Come follow me at {url}",
   "onboarding.share.next_steps": "Possible next steps:",
   "onboarding.share.title": "Share your profile",
@@ -540,6 +535,7 @@
   "privacy.private.short": "Followers-only",
   "privacy.public.long": "Visible for all, shown in global crops",
   "privacy.public.short": "Global",
+  "privacy.unlisted.additional": "This behaves exactly like a global seed, except the seed will not appear in live feeds or hashtags, explore, or Mastodon search, even if you are opted-in account-wide.",
   "privacy.unlisted.long": "Visible for all, but not in global crops",
   "privacy.unlisted.short": "Unlisted",
   "privacy_policy.last_updated": "Last updated {date}",
@@ -559,7 +555,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "today",
+  "reply_indicator.attachments": "{count, plural, one {# attachment} other {# attachments}}",
   "reply_indicator.cancel": "Cancel",
+  "reply_indicator.poll": "Poll",
   "report.block": "Block",
   "report.block_explanation": "You will not see their seeds. They will not be able to see your seeds or follow you. They will be able to tell that they are blocked.",
   "report.categories.legal": "Legal",
@@ -723,10 +721,8 @@
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.audio_description": "Describe for punks who are deaf or hard of hearing",
   "upload_form.description": "Describe for punks who are blind or have low vision",
-  "upload_form.description_missing": "No description added",
   "upload_form.edit": "Adjust",
   "upload_form.thumbnail": "Reimagine thumbnail",
-  "upload_form.undo": "Uproot",
   "upload_form.video_description": "Describe for punks who are deaf, hard of hearing, blind or have low vision",
   "upload_modal.analyzing_picture": "Admiring picture…",
   "upload_modal.apply": "Apply",

docker-compose.yml

@@ -48,7 +48,7 @@ services:
 
   web:
     build: .
-    image: git.solarpunk.moe/solarpunk/mastodon
+    image: git.solarpunk.moe/solarpunk/mastodon:${MASTO_VERSION}
     restart: always
     env_file: .env.production
     environment:
@@ -80,8 +80,10 @@ services:
       - ./public/system:/mastodon/public/system
 
   streaming:
-    build: .
+    build: 
-    image: git.solarpunk.moe/solarpunk/mastodon:latest
+      context: .
+      dockerfile: streaming/Dockerfile
+    image: git.solarpunk.moe/solarpunk/mastodon-streaming:${MASTO_VERSION}
     restart: always
     env_file: .env.production
     command: node ./streaming
@@ -108,7 +110,7 @@ services:
   
   sidekiq-mailers:
     build: .
-    image: git.solarpunk.moe/solarpunk/mastodon:latest
+    image: git.solarpunk.moe/solarpunk/mastodon:${MASTO_VERSION}
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq -c 2 -q mailers -q scheduler
@@ -126,7 +128,7 @@ services:
 
   sidekiq-ingress-pull-push-default:
     build: .
-    image: git.solarpunk.moe/solarpunk/mastodon:latest
+    image: git.solarpunk.moe/solarpunk/mastodon:${MASTO_VERSION}
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq -c 5 -q ingress -q pull -q push -q default
@@ -144,7 +146,7 @@ services:
 
   sidekiq-default-push-pull:
     build: .
-    image: git.solarpunk.moe/solarpunk/mastodon:latest
+    image: git.solarpunk.moe/solarpunk/mastodon:${MASTO_VERSION}
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq -c 3 -q default -q ingress -q push -q pull
@@ -162,7 +164,7 @@ services:
 
   sidekiq-pull-push-default:
     build: .
-    image: git.solarpunk.moe/solarpunk/mastodon:latest
+    image: git.solarpunk.moe/solarpunk/mastodon:${MASTO_VERSION}
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq -c 8 -q pull -q push -q default -q ingress