diff --git a/app/javascript/mastodon/features/ui/components/document_title.js b/app/javascript/mastodon/features/ui/components/document_title.js
index cd081b20c..86ba738b0 100644
--- a/app/javascript/mastodon/features/ui/components/document_title.js
+++ b/app/javascript/mastodon/features/ui/components/document_title.js
@@ -23,15 +23,7 @@ class DocumentTitle extends PureComponent {
}
_sideEffects () {
- const { unread } = this.props;
-
- if (unread > 99) {
- document.title = `(*) ${title}`;
- } else if (unread > 0) {
- document.title = `(${unread}) ${title}`;
- } else {
- document.title = title;
- }
+ document.title = title;
}
render () {
diff --git a/app/javascript/mastodon/locales/en-CY.json b/app/javascript/mastodon/locales/en-CY.json
new file mode 100644
index 000000000..2ae215249
--- /dev/null
+++ b/app/javascript/mastodon/locales/en-CY.json
@@ -0,0 +1,293 @@
+{
+ "account.block": "Block @{name}",
+ "account.block_domain": "Hide everything from {domain}",
+ "account.blocked": "Blocked",
+ "account.disclaimer_full": "THESE NUMBERS ARE THE STUFF WHAT YOUR SERVER KNOWS ABOUT AND THERE MIGHT BE MORE THAT IT DONT KNOW ABOUT.",
+ "account.domain_blocked": "Domain hidden",
+ "account.edit_profile": "edit ~/.profile",
+ "account.follow": "Follow",
+ "account.followers": "Followers",
+ "account.follows": "Follows",
+ "account.follows_you": "Follows you",
+ "account.hide_reblogs": "Hide boosts from @{name}",
+ "account.media": "Media",
+ "account.mention": "Mention @{name}",
+ "account.moved_to": "{name} has moved to:",
+ "account.mute": "Mute @{name}",
+ "account.mute_notifications": "Mute notifications from @{name}",
+ "account.muted": "Muted",
+ "account.posts": "Pings",
+ "account.posts_with_replies": "Pings with replies",
+ "account.report": "Report @{name}",
+ "account.requested": "Awaiting approval. Click to cancel follow request",
+ "account.share": "Share @{name}'s profile",
+ "account.show_reblogs": "Show boosts from @{name}",
+ "account.unblock": "Unblock @{name}",
+ "account.unblock_domain": "Unhide {domain}",
+ "account.unfollow": "Unfollow",
+ "account.unmute": "Unmute @{name}",
+ "account.unmute_notifications": "Unmute notifications from @{name}",
+ "account.view_full_profile": "View full profile",
+ "boost_modal.combo": "You can press {combo} to skip this next time",
+ "bundle_column_error.body": "Something went wrong while loading this component.",
+ "bundle_column_error.retry": "Try again",
+ "bundle_column_error.title": "Network error",
+ "bundle_modal_error.close": "Close",
+ "bundle_modal_error.message": "Something went wrong while loading this component.",
+ "bundle_modal_error.retry": "Try again",
+ "column.blocks": "~/.blocked",
+ "column.community": "/timelines/local",
+ "column.direct": "~/.dms",
+ "column.favourites": "~/.florps",
+ "column.follow_requests": "~/.follow-requests",
+ "column.home": "/timelines/home",
+ "column.lists": "Lists",
+ "column.mutes": "~/.muted",
+ "column.notifications": "~/.notifications",
+ "column.pins": "~/.pinned",
+ "column.public": "/timelines/federated",
+ "column_back_button.label": "Back",
+ "column_header.hide_settings": "Hide settings",
+ "column_header.moveLeft_settings": "Move column to the left",
+ "column_header.moveRight_settings": "Move column to the right",
+ "column_header.pin": "Pin",
+ "column_header.show_settings": "Show settings",
+ "column_header.unpin": "Unpin",
+ "column_subheading.navigation": "Navigation",
+ "column_subheading.settings": "Settings",
+ "compose.attach": "Attach...",
+ "compose.attach.doodle": "Draw something",
+ "compose.attach.upload": "Upload a file",
+ "compose_form.hashtag_warning": "This ping won't be listed under any hashtag as it is unlisted. Only public pings can be searched by hashtag.",
+ "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
+ "compose_form.lock_disclaimer.lock": "locked",
+ "compose_form.placeholder": "What is in your databanks?",
+ "compose_form.publish": "Ping",
+ "compose_form.publish_loud": "{publish}!",
+ "compose_form.sensitive.marked": "Media is marked as sensitive",
+ "compose_form.sensitive.unmarked": "Media is not marked as sensitive",
+ "compose_form.spoiler.marked": "Text is hidden behind warning",
+ "compose_form.spoiler.unmarked": "Text is not hidden",
+ "compose_form.spoiler_placeholder": "Write your warning here",
+ "confirmation_modal.cancel": "Cancel",
+ "confirmations.block.confirm": "Block",
+ "confirmations.block.message": "Are you sure you want to block {name}?",
+ "confirmations.delete.confirm": "Delete",
+ "confirmations.delete.message": "Are you sure you want to delete this status?",
+ "confirmations.delete_list.confirm": "Delete",
+ "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
+ "confirmations.domain_block.confirm": "Hide entire domain",
+ "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
+ "confirmations.mute.confirm": "Mute",
+ "confirmations.mute.message": "Are you sure you want to mute {name}?",
+ "confirmations.unfollow.confirm": "Unfollow",
+ "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
+ "doodle_button.label": "Add a drawing",
+ "embed.instructions": "Embed this status on your website by copying the code below.",
+ "embed.preview": "Here is what it will look like:",
+ "emoji_button.activity": "Activity",
+ "emoji_button.custom": "Custom",
+ "emoji_button.flags": "Flags",
+ "emoji_button.food": "Food & Drink",
+ "emoji_button.label": "Insert emoji",
+ "emoji_button.nature": "Nature",
+ "emoji_button.not_found": "No emojos!! (╯°□°）╯︵ ┻━┻",
+ "emoji_button.objects": "Objects",
+ "emoji_button.people": "People",
+ "emoji_button.recent": "Frequently used",
+ "emoji_button.search": "Search...",
+ "emoji_button.search_results": "Search results",
+ "emoji_button.symbols": "Symbols",
+ "emoji_button.travel": "Travel & Places",
+ "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
+ "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
+ "empty_column.hashtag": "There is nothing in this hashtag yet.",
+ "empty_column.home": "Your home timeline is empty! Visit {public} or use query to get started and meet other users.",
+ "empty_column.home.public_timeline": "the public timeline",
+ "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
+ "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
+ "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other instances to fill it up",
+ "follow_request.authorize": "Authorize",
+ "follow_request.reject": "Reject",
+ "getting_started.appsshort": "Apps",
+ "getting_started.faq": "FAQ",
+ "getting_started.heading": "Getting started",
+ "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
+ "getting_started.userguide": "User Guide",
+ "home.column_settings.advanced": "Advanced",
+ "home.column_settings.basic": "Basic",
+ "home.column_settings.filter_regex": "Filter out by regular expressions",
+ "home.column_settings.show_reblogs": "Show relays",
+ "home.column_settings.show_replies": "Show replies",
+ "home.settings": "Column settings",
+ "keyboard_shortcuts.back": "to navigate back",
+ "keyboard_shortcuts.boost": "to boost",
+ "keyboard_shortcuts.column": "to focus a status in one of the columns",
+ "keyboard_shortcuts.compose": "to focus the compose textarea",
+ "keyboard_shortcuts.description": "Description",
+ "keyboard_shortcuts.down": "to move down in the list",
+ "keyboard_shortcuts.enter": "to open status",
+ "keyboard_shortcuts.favourite": "to favourite",
+ "keyboard_shortcuts.heading": "Keyboard Shortcuts",
+ "keyboard_shortcuts.hotkey": "Hotkey",
+ "keyboard_shortcuts.legend": "to display this legend",
+ "keyboard_shortcuts.mention": "to mention author",
+ "keyboard_shortcuts.reply": "to reply",
+ "keyboard_shortcuts.search": "to focus search",
+ "keyboard_shortcuts.toot": "to start a brand new ping",
+ "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
+ "keyboard_shortcuts.up": "to move up in the list",
+ "lightbox.close": "Close",
+ "lightbox.next": "Next",
+ "lightbox.previous": "Previous",
+ "lists.account.add": "Add to list",
+ "lists.account.remove": "Remove from list",
+ "lists.delete": "Delete list",
+ "lists.edit": "Edit list",
+ "lists.new.create": "Add list",
+ "lists.new.title_placeholder": "New list title",
+ "lists.search": "Search among people you follow",
+ "lists.subheading": "Your lists",
+ "loading_indicator.label": "Loading...",
+ "media_gallery.toggle_visible": "Toggle visibility",
+ "missing_indicator.label": "Not found",
+ "missing_indicator.sublabel": "This resource could not be found",
+ "mute_modal.hide_notifications": "Hide notifications from this user?",
+ "navigation_bar.blocks": "~/.blocks",
+ "navigation_bar.community_timeline": "/timelines/local",
+ "navigation_bar.direct": "~/.dms",
+ "navigation_bar.edit_profile": "edit ~/.profile",
+ "navigation_bar.favourites": "~/.florps",
+ "navigation_bar.follow_requests": "~/.follow-requests",
+ "navigation_bar.info": "/about/more",
+ "navigation_bar.keyboard_shortcuts": "~/.kbd/shortcuts.conf",
+ "navigation_bar.lists": "~/.lists",
+ "navigation_bar.logout": "Jack out",
+ "navigation_bar.mutes": "~/.muted",
+ "navigation_bar.pins": "~/.pinned",
+ "navigation_bar.preferences": "edit ~/.config",
+ "navigation_bar.public_timeline": "/timelines/federated",
+ "notification.favourite": "{name} florped your ping",
+ "notification.follow": "{name} followed you",
+ "notification.mention": "{name} mentioned you",
+ "notification.reblog": "{name} relayed your ping",
+ "notifications.clear": "Clear notifications",
+ "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+ "notifications.column_settings.alert": "Desktop notifications",
+ "notifications.column_settings.favourite": "Favourites:",
+ "notifications.column_settings.follow": "New followers:",
+ "notifications.column_settings.mention": "Mentions:",
+ "notifications.column_settings.push": "Push notifications",
+ "notifications.column_settings.push_meta": "This device",
+ "notifications.column_settings.reblog": "Boosts:",
+ "notifications.column_settings.show": "Show in column",
+ "notifications.column_settings.sound": "Play sound",
+ "onboarding.done": "Done",
+ "onboarding.next": "Next",
+ "onboarding.page_five.public_timelines": "The local timeline shows public posts from everyone on {domain}. The federated timeline shows public posts from everyone who people on {domain} follow. These are the Public Timelines, a great way to discover new people.",
+ "onboarding.page_four.home": "The home timeline shows posts from people you follow.",
+ "onboarding.page_four.notifications": "The notifications column shows when someone interacts with you.",
+ "onboarding.page_one.federation": "Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.",
+ "onboarding.page_one.full_handle": "Your full handle",
+ "onboarding.page_one.handle_hint": "This is what you would tell your friends to search for.",
+ "onboarding.page_one.welcome": "Welcome to Mastodon!",
+ "onboarding.page_six.admin": "Your instance's admin is {admin}.",
+ "onboarding.page_six.almost_done": "Almost done...",
+ "onboarding.page_six.appetoot": "Hang ten on the cybrewaves!",
+ "onboarding.page_six.apps_available": "There are {apps} available for iOS, Android and other platforms.",
+ "onboarding.page_six.github": "Mastodon is free open-source software. You can report bugs, request features, or contribute to the code on {github}.",
+ "onboarding.page_six.guidelines": "community guidelines",
+ "onboarding.page_six.read_guidelines": "Please read {domain}'s {guidelines}!",
+ "onboarding.page_six.various_app": "mobile apps",
+ "onboarding.page_three.profile": "Edit your profile to change your avatar, bio, and display name. There, you will also find other preferences.",
+ "onboarding.page_three.search": "Use the search bar to find people and look at hashtags, such as {illustration} and {introductions}. To look for a person who is not on this instance, use their full handle.",
+ "onboarding.page_two.compose": "Write posts from the compose column. You can upload images, change privacy settings, and add content warnings with the icons below.",
+ "onboarding.skip": "Skip",
+ "privacy.change": "Adjust status privacy",
+ "privacy.direct.long": "Post to mentioned users only",
+ "privacy.direct.short": "Direct",
+ "privacy.private.long": "Post to followers only",
+ "privacy.private.short": "Followers-only",
+ "privacy.public.long": "Post to public timelines",
+ "privacy.public.short": "Public",
+ "privacy.unlisted.long": "Do not post to public timelines",
+ "privacy.unlisted.short": "Unlisted",
+ "regeneration_indicator.label": "Loading…",
+ "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+ "relative_time.days": "{number}d",
+ "relative_time.hours": "{number}h",
+ "relative_time.just_now": "now",
+ "relative_time.minutes": "{number}m",
+ "relative_time.seconds": "{number}s",
+ "reply_indicator.cancel": "Cancel",
+ "report.forward": "Forward to {target}",
+ "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
+ "report.hint": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
+ "report.placeholder": "Additional comments",
+ "report.submit": "Submit",
+ "report.target": "Reporting {target}",
+ "search.placeholder": "Query...",
+ "search_popout.search_format": "Advanced search format",
+ "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
+ "search_popout.tips.hashtag": "hashtag",
+ "search_popout.tips.status": "status",
+ "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
+ "search_popout.tips.user": "user",
+ "search_results.accounts": "People",
+ "search_results.hashtags": "Hashtags",
+ "search_results.statuses": "Pings",
+ "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+ "standalone.public_title": "Peer into the data grid...",
+ "status.block": "Block @{name}",
+ "status.cannot_reblog": "This ping cannot be relayed",
+ "status.delete": "Delete",
+ "status.embed": "Embed",
+ "status.favourite": "Florp",
+ "status.load_more": "Load more",
+ "status.media_hidden": "Media hidden",
+ "status.mention": "Mention @{name}",
+ "status.more": "More",
+ "status.mute": "Mute @{name}",
+ "status.mute_conversation": "Mute conversation",
+ "status.open": "Expand this status",
+ "status.pin": "Pin on profile",
+ "status.pinned": "Pinned ping",
+ "status.reblog": "Relay",
+ "status.reblogged_by": "{name} relayed",
+ "status.reply": "Reply",
+ "status.replyAll": "Reply to thread",
+ "status.report": "Report @{name}",
+ "status.sensitive_toggle": "Click to view",
+ "status.sensitive_warning": "Sensitive content",
+ "status.share": "Share",
+ "status.show_less": "Show less",
+ "status.show_less_all": "Show less for all",
+ "status.show_more": "Show more",
+ "status.show_more_all": "Show more for all",
+ "status.unmute_conversation": "Unmute conversation",
+ "status.unpin": "Unpin from profile",
+ "tabs_bar.federated_timeline": "/timelines/federated",
+ "tabs_bar.home": "/timelines/home",
+ "tabs_bar.local_timeline": "/timelines/local",
+ "tabs_bar.notifications": "~/.notifications",
+ "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
+ "upload_area.title": "Drag & drop to upload",
+ "upload_button.label": "Add media",
+ "upload_form.description": "Describe for the visually impaired",
+ "upload_form.focus": "Crop",
+ "upload_form.undo": "Undo",
+ "upload_progress.label": "Uploading...",
+ "video.close": "Close video",
+ "video.exit_fullscreen": "Exit full screen",
+ "video.expand": "Expand video",
+ "video.fullscreen": "Full screen",
+ "video.hide": "Hide video",
+ "video.mute": "Mute sound",
+ "video.pause": "Pause",
+ "video.play": "Play",
+ "video.unmute": "Unmute sound",
+ "video_player.expand": "Expand video",
+ "video_player.toggle_sound": "Toggle sound",
+ "video_player.toggle_visible": "Toggle visibility",
+ "video_player.video_error": "Video could not be played"
+}
diff --git a/app/javascript/mastodon/locales/whitelist_en-CY.json b/app/javascript/mastodon/locales/whitelist_en-CY.json
new file mode 100644
index 000000000..0d4f101c7
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_en-CY.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index 91240aecf..3d021a632 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -9,3 +9,5 @@ loadPolyfills().then(() => {
}).catch(e => {
console.error(e);
});
+
+require('what-input');
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index 8c5c15b8f..b2afe3fd6 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -20,6 +20,12 @@ window.addEventListener('message', e => {
id: data.id,
height: document.getElementsByTagName('html')[0].scrollHeight,
}, '*');
+
+ if (document.fonts && document.fonts.ready) {
+ document.fonts.ready.then(sizeBioText);
+ } else {
+ sizeBioText();
+ }
});
});
@@ -142,6 +148,7 @@ function main() {
delegate(document, '.custom-emoji', 'mouseover', getEmojiAnimationHandler('data-original'));
delegate(document, '.custom-emoji', 'mouseout', getEmojiAnimationHandler('data-static'));
+<<<<<<< HEAD
delegate(document, '.status__content__spoiler-link', 'click', function() {
const statusEl = this.parentNode.parentNode;
@@ -161,6 +168,26 @@ function main() {
const message = (statusEl.dataset.spoiler === 'expanded') ? (messages['status.show_less'] || 'Show less') : (messages['status.show_more'] || 'Show more');
spoilerLink.textContent = (new IntlMessageFormat(message, locale)).format();
});
+=======
+ if (document.body.classList.contains('with-modals')) {
+ const scrollbarWidth = window.innerWidth - document.documentElement.clientWidth;
+ const scrollbarWidthStyle = document.createElement('style');
+ scrollbarWidthStyle.id = 'scrollbar-width';
+ document.head.appendChild(scrollbarWidthStyle);
+ scrollbarWidthStyle.sheet.insertRule(`body.with-modals--active { margin-right: ${scrollbarWidth}px; }`, 0);
+ }
+
+ [].forEach.call(document.querySelectorAll('[data-component="Card"]'), (content) => {
+ const props = JSON.parse(content.getAttribute('data-props'));
+ ReactDOM.render(
, content);
+ });
+
+ if (document.fonts && document.fonts.ready) {
+ document.fonts.ready.then(sizeBioText);
+ } else {
+ sizeBioText();
+ }
+>>>>>>> Bio length -> 500 characters
});
delegate(document, '.webapp-btn', 'click', ({ target, button }) => {
@@ -291,6 +318,22 @@ function main() {
}
});
});
+
+ delegate(document, '#account_note', 'input', sizeBioText);
+
+ function sizeBioText() {
+ const noteCounter = document.querySelector('.note-counter');
+ const bioTextArea = document.querySelector('#account_note');
+
+ if (noteCounter) {
+ noteCounter.textContent = 500 - length(bioTextArea.value);
+ }
+
+ if (bioTextArea) {
+ bioTextArea.style.height = 'auto';
+ bioTextArea.style.height = (bioTextArea.scrollHeight+3) + 'px';
+ }
+ }
}
loadPolyfills()
diff --git a/app/javascript/styles/mastodon/containers.scss b/app/javascript/styles/mastodon/containers.scss
index 1df9af91d..3684c699c 100644
--- a/app/javascript/styles/mastodon/containers.scss
+++ b/app/javascript/styles/mastodon/containers.scss
@@ -296,6 +296,12 @@
min-height: 1px;
}
+ h2 {
+ font-size: 1rem;
+ align-items: center;
+ display: flex;
+ }
+
.nav-left {
display: flex;
align-items: stretch;
diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb
index 2b5d3ffc2..85a3370ee 100644
--- a/app/lib/activitypub/activity.rb
+++ b/app/lib/activitypub/activity.rb
@@ -98,7 +98,7 @@ class ActivityPub::Activity
crawl_links(status)
notify_about_reblog(status) if reblog_of_local_account?(status) && !reblog_by_following_group_account?(status)
- notify_about_mentions(status)
+ notify_about_mentions(status) unless spammy_mentions?(status)
# Only continue if the status is supposed to have arrived in real-time.
# Note that if @options[:override_timestamps] isn't set, the status
@@ -117,6 +117,11 @@ class ActivityPub::Activity
status.reblog? && status.account.group? && status.reblog.account.following?(status.account)
end
+ def spammy_mentions?(status)
+ status.has_non_mention_links? &&
+ @account.followers.local.count == 0
+ end
+
def notify_about_reblog(status)
NotifyService.new.call(status.reblog.account, :reblog, status)
end
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index 7f217ae9f..e0e5012de 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -267,8 +267,9 @@ class Formatter
def link_to_mention(entity, linkable_accounts)
acct = entity[:screen_name]
+ username, domain = acct.split('@')
- return link_to_account(acct) unless linkable_accounts
+ return link_to_account(acct) unless linkable_accounts and domain != "twitter.com"
account = linkable_accounts.find { |item| TagManager.instance.same_acct?(item.acct, acct) }
account ? mention_html(account) : "@#{encode(acct)}"
@@ -277,6 +278,10 @@ class Formatter
def link_to_account(acct)
username, domain = acct.split('@')
+ if domain == "twitter.com"
+ return mention_twitter_html(username)
+ end
+
domain = nil if TagManager.instance.local_domain?(domain)
account = EntityCache.instance.mention(username, domain)
@@ -304,4 +309,8 @@ class Formatter
def mention_html(account)
"
@#{encode(account.username)}"
end
+
+ def mention_twitter_html(username)
+ "
@#{username}@twitter.com"
+ end
end
diff --git a/app/models/account.rb b/app/models/account.rb
index e6cf03fa8..9a1c4cd40 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -89,6 +89,7 @@ class Account < ApplicationRecord
validates_with UnreservedUsernameValidator, if: -> { local? && will_save_change_to_username? }
validates :display_name, length: { maximum: 30 }, if: -> { local? && will_save_change_to_display_name? }
validates :note, note_length: { maximum: 500 }, if: -> { local? && will_save_change_to_note? }
+ validate :note_has_eight_newlines?, if: -> { local? && will_save_change_to_note? }
validates :fields, length: { maximum: 4 }, if: -> { local? && will_save_change_to_fields? }
scope :remote, -> { where.not(domain: nil) }
@@ -346,7 +347,6 @@ class Account < ApplicationRecord
rescue ActiveRecord::RecordInvalid
self.avatar = nil
self.header = nil
-
save!
end
@@ -382,6 +382,10 @@ class Account < ApplicationRecord
return 'local' if local?
@synchronization_uri_prefix ||= uri[/http(s?):\/\/[^\/]+\//]
+ end
+
+ def note_has_eight_newlines?
+ errors.add(:note, 'Bio can\'t have more then 8 newlines') unless note.count("\n") <= 8
end
class Field < ActiveModelSerializers::Model
diff --git a/app/models/status.rb b/app/models/status.rb
index b426f9d5b..5716b93d4 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -351,6 +351,14 @@ class Status < ApplicationRecord
super || build_status_stat
end
+ def has_non_mention_links?
+ if local?
+ text.match? %r{https?://\w}
+ else
+ Nokogiri::HTML.fragment(text).css('a:not(.mention)').present?
+ end
+ end
+
private
def update_status_stat!(attrs)
diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
index b388e448e..e2aa35c4e 100644
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@ -5,7 +5,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
attributes :uri, :title, :short_description, :description, :email,
:version, :urls, :stats, :thumbnail,
- :languages, :registrations, :approval_required, :invites_enabled
+ :languages, :registrations, :approval_required, :invites_enabled, :max_toot_chars
has_one :contact_account, serializer: REST::AccountSerializer
@@ -39,6 +39,10 @@ class REST::InstanceSerializer < ActiveModel::Serializer
instance_presenter.thumbnail ? full_asset_url(instance_presenter.thumbnail.file.url) : full_pack_url('media/images/preview.jpg')
end
+ def max_toot_chars
+ StatusLengthValidator::MAX_CHARS
+ end
+
def stats
{
user_count: instance_presenter.user_count,
diff --git a/app/validators/status_length_validator.rb b/app/validators/status_length_validator.rb
index 93bae2fa8..e67b794ab 100644
--- a/app/validators/status_length_validator.rb
+++ b/app/validators/status_length_validator.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
class StatusLengthValidator < ActiveModel::Validator
- MAX_CHARS = 500
+ MAX_CHARS = 1024
def validate(status)
return unless status.local? && !status.reblog?
diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml
index 1a81b96f6..aa2c83dec 100644
--- a/app/views/accounts/show.html.haml
+++ b/app/views/accounts/show.html.haml
@@ -19,6 +19,11 @@
= render 'header', account: @account, with_bio: true
+- if @account.user&.disabled?
+ .header
+ .nav-center
+ %h2 This user's account has been locked by a moderator.
+
.grid
.column-0
.h-feed
diff --git a/app/views/statuses/_simple_status.html.haml b/app/views/statuses/_simple_status.html.haml
index 4ea79f10d..c70d199d7 100644
--- a/app/views/statuses/_simple_status.html.haml
+++ b/app/views/statuses/_simple_status.html.haml
@@ -60,7 +60,6 @@
= fa_icon 'reply fw'
- else
= fa_icon 'reply-all fw'
- %span.icon-button__counter= obscured_counter status.replies_count
= link_to remote_interaction_path(status, type: :reblog), class: 'status__action-bar-button icon-button modal-button' do
- if status.distributable?
= fa_icon 'retweet fw'
diff --git a/config/application.rb b/config/application.rb
index af7735221..ead6e838d 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -47,6 +47,8 @@ module Mastodon
# All translations from config/locales/*.rb,yml are auto loaded.
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
config.i18n.available_locales = [
+ :en,
+ :'en-CY',
:ar,
:ast,
:bg,
@@ -123,9 +125,11 @@ module Mastodon
]
config.i18n.default_locale = ENV['DEFAULT_LOCALE']&.to_sym
-
- unless config.i18n.available_locales.include?(config.i18n.default_locale)
- config.i18n.default_locale = :en
+ if config.i18n.available_locales.include?(config.i18n.default_locale)
+ config.i18n.fallbacks = [:en]
+ else
+ config.i18n.default_locale = :'en-CY'
+ config.i18n.fallbacks = [:en]
end
# config.paths.add File.join('app', 'api'), glob: File.join('**', '*.rb')
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index 2dc6f880b..1da1f3adf 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -30,6 +30,7 @@ search:
- app/assets/images
- app/assets/fonts
- app/assets/videos
+ - app/javascript/images
ignore_missing:
- 'activemodel.errors.*'
diff --git a/config/locales/devise.en-CY.yml b/config/locales/devise.en-CY.yml
new file mode 100644
index 000000000..fc74bfb98
--- /dev/null
+++ b/config/locales/devise.en-CY.yml
@@ -0,0 +1,61 @@
+---
+en-CY:
+ devise:
+ confirmations:
+ confirmed: Your email address has been successfully confirmed.
+ send_instructions: You will receive an email with instructions for how to confirm your email address in a few minutes. Please check your spam folder if you didn't receive this email.
+ send_paranoid_instructions: If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes. Please check your spam folder if you didn't receive this email.
+ failure:
+ already_authenticated: You are already signed in.
+ inactive: Your account is not activated yet.
+ invalid: Invalid %{authentication_keys} or password.
+ last_attempt: You have one more attempt before your account is locked.
+ locked: Your account is locked.
+ not_found_in_database: Invalid %{authentication_keys} or password.
+ timeout: Your session expired. Please sign in again to continue.
+ unauthenticated: You need to sign in or sign up before continuing.
+ unconfirmed: You have to confirm your email address before continuing.
+ mailer:
+ confirmation_instructions:
+ subject: 'Mastodon: Confirmation instructions for %{instance}'
+ password_change:
+ subject: 'Mastodon: Password changed'
+ reset_password_instructions:
+ subject: 'Mastodon: Reset password instructions'
+ unlock_instructions:
+ subject: 'Mastodon: Unlock instructions'
+ omniauth_callbacks:
+ failure: Could not authenticate you from %{kind} because "%{reason}".
+ success: Successfully authenticated from %{kind} account.
+ passwords:
+ no_token: You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided.
+ send_instructions: If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes. Please check your spam folder if you didn't receive this email.
+ send_paranoid_instructions: If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes. Please check your spam folder if you didn't receive this email.
+ updated: Your password has been changed successfully. You are now signed in.
+ updated_not_active: Your password has been changed successfully.
+ registrations:
+ destroyed: Bye! Your account has been successfully cancelled. We hope to see you again soon.
+ signed_up: Welcome! You have signed up successfully.
+ signed_up_but_inactive: You have signed up successfully. However, we could not sign you in because your account is not yet activated.
+ signed_up_but_locked: You have signed up successfully. However, we could not sign you in because your account is locked.
+ signed_up_but_unconfirmed: A message with a confirmation link has been sent to your email address. Please follow the link to activate your account. Please check your spam folder if you didn't receive this email.
+ update_needs_confirmation: You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address. Please check your spam folder if you didn't receive this email.
+ updated: Your account has been updated successfully.
+ sessions:
+ already_signed_out: Signed out successfully.
+ signed_in: Signed in successfully.
+ signed_out: Signed out successfully.
+ unlocks:
+ send_instructions: You will receive an email with instructions for how to unlock your account in a few minutes. Please check your spam folder if you didn't receive this email.
+ send_paranoid_instructions: If your account exists, you will receive an email with instructions for how to unlock it in a few minutes. Please check your spam folder if you didn't receive this email.
+ unlocked: Your account has been unlocked successfully. Please sign in to continue.
+ errors:
+ messages:
+ already_confirmed: was already confirmed, please try signing in
+ confirmation_period_expired: needs to be confirmed within %{period}, please request a new one
+ expired: has expired, please request a new one
+ not_found: not found
+ not_locked: was not locked
+ not_saved:
+ one: '1 error prohibited this %{resource} from being saved:'
+ other: "%{count} errors prohibited this %{resource} from being saved:"
diff --git a/config/locales/doorkeeper.en-CY.yml b/config/locales/doorkeeper.en-CY.yml
new file mode 100644
index 000000000..b8f288064
--- /dev/null
+++ b/config/locales/doorkeeper.en-CY.yml
@@ -0,0 +1,119 @@
+---
+en-CY:
+ activerecord:
+ attributes:
+ doorkeeper/application:
+ name: Application name
+ redirect_uri: Redirect URI
+ scopes: Scopes
+ website: Application website
+ errors:
+ models:
+ doorkeeper/application:
+ attributes:
+ redirect_uri:
+ fragment_present: cannot contain a fragment.
+ invalid_uri: must be a valid URI.
+ relative_uri: must be an absolute URI.
+ secured_uri: must be an HTTPS/SSL URI.
+ doorkeeper:
+ applications:
+ buttons:
+ authorize: Authorize
+ cancel: Cancel
+ destroy: Destroy
+ edit: Edit
+ submit: Submit
+ confirmations:
+ destroy: Are you sure?
+ edit:
+ title: Edit application
+ form:
+ error: Whoops! Check your form for possible errors
+ help:
+ native_redirect_uri: Use %{native_redirect_uri} for local tests
+ redirect_uri: Use one line per URI
+ scopes: Separate scopes with spaces. Leave blank to use the default scopes.
+ index:
+ application: Application
+ callback_url: Callback URL
+ delete: Delete
+ name: Name
+ new: New application
+ scopes: Scopes
+ show: Show
+ title: Your applications
+ new:
+ title: New application
+ show:
+ actions: Actions
+ application_id: Client key
+ callback_urls: Callback URLs
+ scopes: Scopes
+ secret: Client secret
+ title: 'Application: %{name}'
+ authorizations:
+ buttons:
+ authorize: Authorize
+ deny: Deny
+ error:
+ title: An error has occurred
+ new:
+ able_to: It will be able to
+ prompt: Application %{client_name} requests access to your account
+ title: Authorization required
+ show:
+ title: Authorization code
+ authorized_applications:
+ buttons:
+ revoke: Revoke
+ confirmations:
+ revoke: Are you sure?
+ index:
+ application: Application
+ created_at: Authorized
+ date_format: "%Y-%m-%d %H:%M:%S"
+ scopes: Scopes
+ title: Your authorized applications
+ errors:
+ messages:
+ access_denied: The resource owner or authorization server denied the request.
+ credential_flow_not_configured: Resource Owner Password Credentials flow failed due to Doorkeeper.configure.resource_owner_from_credentials being unconfigured.
+ invalid_client: Client authentication failed due to unknown client, no client authentication included, or unsupported authentication method.
+ invalid_grant: The provided authorization grant is invalid, expired, revoked, does not match the redirection URI used in the authorization request, or was issued to another client.
+ invalid_redirect_uri: The redirect uri included is not valid.
+ invalid_request: The request is missing a required parameter, includes an unsupported parameter value, or is otherwise malformed.
+ invalid_resource_owner: The provided resource owner credentials are not valid, or resource owner cannot be found
+ invalid_scope: The requested scope is invalid, unknown, or malformed.
+ invalid_token:
+ expired: The access token expired
+ revoked: The access token was revoked
+ unknown: The access token is invalid
+ resource_owner_authenticator_not_configured: Resource Owner find failed due to Doorkeeper.configure.resource_owner_authenticator being unconfiged.
+ server_error: The authorization server encountered an unexpected condition which prevented it from fulfilling the request.
+ temporarily_unavailable: The authorization server is currently unable to handle the request due to a temporary overloading or maintenance of the server.
+ unauthorized_client: The client is not authorized to perform this request using this method.
+ unsupported_grant_type: The authorization grant type is not supported by the authorization server.
+ unsupported_response_type: The authorization server does not support this response type.
+ flash:
+ applications:
+ create:
+ notice: Application created.
+ destroy:
+ notice: Application deleted.
+ update:
+ notice: Application updated.
+ authorized_applications:
+ destroy:
+ notice: Application revoked.
+ layouts:
+ admin:
+ nav:
+ applications: Applications
+ oauth2_provider: OAuth2 Provider
+ application:
+ title: OAuth authorization required
+ scopes:
+ follow: follow, block, unblock and unfollow accounts
+ read: read your account's data
+ write: post on your behalf
diff --git a/config/locales/en-CY.yml b/config/locales/en-CY.yml
new file mode 100644
index 000000000..9c48ee2ab
--- /dev/null
+++ b/config/locales/en-CY.yml
@@ -0,0 +1,563 @@
+---
+en-CY:
+ about:
+ about_hashtag_html: These are public pings tagged with
#%{hashtag}. You can interact with them if you have an account anywhere in the fediverse
+ about_mastodon_html: Cybrespace is an instance of Mastodon, a social network based on open web protocols and free, open-source software. It is decentralized like e-mail.
+ about_this: About
+ closed_registrations: Registrations are currently closed on this instance. However! You can find a different instance to make an account on and get access to the very same network from there.
+ contact: Contact
+ contact_missing: Not set
+ contact_unavailable: N/A
+ description_headline: What is %{domain}?
+ domain_count_after: other instances
+ domain_count_before: Connected to
+ extended_description_html: |
+
A good place for rules
+
The extended description has not been set up yet.
+ features:
+ humane_approach_body: Learning from failures of other networks, Mastodon aims to make ethical design choices to combat the misuse of social media.
+ humane_approach_title: A more humane approach
+ not_a_product_body: Mastodon is not a commercial network. No advertising, no data mining, no walled gardens. There is no central authority.
+ not_a_product_title: You’re a person, not a product
+ real_conversation_body: With 512 characters at your disposal and support for granular content and media warnings, you can express yourself the way you want to.
+ real_conversation_title: Built for real conversation
+ within_reach_body: Multiple apps for iOS, Android, and other platforms thanks to a developer-friendly API ecosystem allow you to keep up with your friends anywhere.
+ within_reach_title: Always within reach
+ find_another_instance: Find another instance
+ generic_description: "%{domain} is one server in the network"
+ hosted_on: Mastodon hosted on %{domain}
+ learn_more: Learn more
+ other_instances: Instance list
+ source_code: Source code
+ status_count_after: pings
+ status_count_before: Who authored
+ user_count_after: users
+ user_count_before: Home to
+ what_is_mastodon: What is Mastodon?
+ accounts:
+ follow: Follow
+ followers: Followers
+ following: Following
+ media: Media
+ nothing_here: There is nothing here!
+ people_followed_by: People whom %{name} follows
+ people_who_follow: People who follow %{name}
+ posts: Pings
+ posts_with_replies: Pings with replies
+ remote_follow: Remote follow
+ reserved_username: The username is reserved
+ roles:
+ admin: Admin
+ unfollow: Unfollow
+ admin:
+ accounts:
+ are_you_sure: Are you sure?
+ confirm: Confirm
+ confirmed: Confirmed
+ disable_two_factor_authentication: Disable 2FA
+ display_name: Display name
+ domain: Domain
+ edit: Edit
+ email: E-mail
+ feed_url: Feed URL
+ followers: Followers
+ follows: Follows
+ inbox_url: Inbox URL
+ ip: IP
+ location:
+ all: All
+ local: Local
+ remote: Remote
+ title: Location
+ media_attachments: Media attachments
+ moderation:
+ all: All
+ silenced: Silenced
+ suspended: Suspended
+ title: Moderation
+ most_recent_activity: Most recent activity
+ most_recent_ip: Most recent IP
+ not_subscribed: Not subscribed
+ order:
+ alphabetic: Alphabetic
+ most_recent: Most recent
+ title: Order
+ outbox_url: Outbox URL
+ perform_full_suspension: Perform full suspension
+ profile_url: Profile URL
+ protocol: Protocol
+ public: Public
+ push_subscription_expires: PuSH subscription expires
+ redownload: Refresh avatar
+ reset: Reset
+ reset_password: Reset password
+ resubscribe: Resubscribe
+ salmon_url: Salmon URL
+ search: Query...
+ show:
+ created_reports: Reports created by this account
+ report: report
+ targeted_reports: Reports made about this account
+ silence: Silence
+ statuses: Statuses
+ subscribe: Subscribe
+ title: Accounts
+ undo_silenced: Undo silence
+ undo_suspension: Undo suspension
+ unsubscribe: Unsubscribe
+ username: Username
+ web: Web
+ domain_blocks:
+ add_new: Add new
+ created_msg: Domain block is now being processed
+ destroyed_msg: Domain block has been undone
+ domain: Domain
+ new:
+ create: Create block
+ hint: The domain block will not prevent creation of account entries in the database, but will retroactively and automatically apply specific moderation methods on those accounts.
+ severity:
+ desc_html: "
Silence will make the account's posts invisible to anyone who isn't following them.
Suspend will remove all of the account's content, media, and profile data. Use
None if you just want to reject media files."
+ noop: None
+ silence: Silence
+ suspend: Suspend
+ title: New domain block
+ reject_media: Reject media files
+ reject_media_hint: Removes locally stored media files and refuses to download any in the future. Irrelevant for suspensions
+ severities:
+ noop: None
+ silence: Silence
+ suspend: Suspend
+ severity: Severity
+ show:
+ affected_accounts:
+ one: One account in the database affected
+ other: "%{count} accounts in the database affected"
+ retroactive:
+ silence: Unsilence all existing accounts from this domain
+ suspend: Unsuspend all existing accounts from this domain
+ title: Undo domain block for %{domain}
+ undo: Undo
+ title: Domain Blocks
+ undo: Undo
+ instances:
+ account_count: Known accounts
+ domain_name: Domain
+ title: Known Instances
+ reports:
+ action_taken_by: Action taken by
+ are_you_sure: Are you sure?
+ comment:
+ label: Comment
+ none: None
+ delete: Delete
+ id: ID
+ mark_as_resolved: Mark as resolved
+ nsfw:
+ 'false': Unhide media attachments
+ 'true': Hide media attachments
+ report: 'Report #%{id}'
+ report_contents: Contents
+ reported_account: Reported account
+ reported_by: Reported by
+ resolved: Resolved
+ silence_account: Silence account
+ status: Status
+ suspend_account: Suspend account
+ target: Target
+ title: Reports
+ unresolved: Unresolved
+ view: View
+ settings:
+ bootstrap_timeline_accounts:
+ desc_html: Separate multiple usernames by comma. Only local and unlocked accounts will work. Default when empty is all local admins.
+ title: Default follows for new users
+ contact_information:
+ email: Business e-mail
+ username: Contact username
+ registrations:
+ closed_message:
+ desc_html: Displayed on frontpage when registrations are closed. You can use HTML tags
+ title: Closed registration message
+ deletion:
+ desc_html: Allow anyone to delete their account
+ title: Open account deletion
+ open:
+ desc_html: Allow anyone to create an account
+ title: Open registration
+ site_description:
+ desc_html: Introductory paragraph on the frontpage and in meta tags. You can use HTML tags, in particular
<a> and
<em>.
+ title: Instance description
+ site_description_extended:
+ desc_html: A good place for your code of conduct, rules, guidelines and other things that set your instance apart. You can use HTML tags
+ title: Custom extended information
+ site_terms:
+ desc_html: You can write your own privacy policy, terms of service or other legalese. You can use HTML tags
+ title: Custom terms of service
+ site_title: Instance name
+ timeline_preview:
+ desc_html: Display public timeline on landing page
+ title: Timeline preview
+ title: Site Settings
+ statuses:
+ back_to_account: Back to account page
+ batch:
+ delete: Delete
+ nsfw_off: NSFW OFF
+ nsfw_on: NSFW ON
+ execute: Execute
+ failed_to_execute: Failed to execute
+ media:
+ hide: Hide media
+ show: Show media
+ title: Media
+ no_media: No media
+ title: Account statuses
+ with_media: With media
+ subscriptions:
+ callback_url: Callback URL
+ confirmed: Confirmed
+ expires_in: Expires in
+ last_delivery: Last delivery
+ title: WebSub
+ topic: Topic
+ title: Administration
+ admin_mailer:
+ new_report:
+ body: "%{reporter} has reported %{target}"
+ subject: New report for %{instance} (#%{id})
+ application_mailer:
+ salutation: "%{name},"
+ settings: 'Change e-mail preferences: %{link}'
+ signature: Mastodon notifications from %{instance}
+ view: 'View:'
+ applications:
+ created: Application successfully created
+ destroyed: Application successfully deleted
+ invalid_url: The provided URL is invalid
+ regenerate_token: Regenerate access token
+ token_regenerated: Access token successfully regenerated
+ warning: Be very careful with this data. Never share it with anyone!
+ your_token: Your access token
+ auth:
+ agreement_html: By signing up you agree to
our terms of service and
privacy policy.
+ change_password: Security
+ delete_account: Delete account
+ delete_account_html: If you wish to delete your account, you can
proceed here. You will be asked for confirmation.
+ didnt_get_confirmation: Didn't receive confirmation instructions?
+ forgot_password: Forgot your password?
+ invalid_reset_password_token: Password reset token is invalid or expired. Please try again.
+ login: Jack in
+ logout: Jack out
+ register: Apply for upload
+ resend_confirmation: Resend confirmation instructions
+ reset_password: Reset password
+ set_new_password: Set new password
+ authorize_follow:
+ error: Unfortunately, there was an error looking up the remote account
+ follow: Follow
+ follow_request: 'You have sent a follow request to:'
+ following: 'Success! You are now following:'
+ post_follow:
+ close: Or, you can just close this window.
+ return: Return to the user's profile
+ web: Go to web
+ title: Follow %{acct}
+ datetime:
+ distance_in_words:
+ about_x_hours: "%{count}h"
+ about_x_months: "%{count}mo"
+ about_x_years: "%{count}y"
+ almost_x_years: "%{count}y"
+ half_a_minute: Just now
+ less_than_x_minutes: "%{count}m"
+ less_than_x_seconds: Just now
+ over_x_years: "%{count}y"
+ x_days: "%{count}d"
+ x_minutes: "%{count}m"
+ x_months: "%{count}mo"
+ x_seconds: "%{count}s"
+ deletes:
+ bad_password_msg: Nice try, hackers! Incorrect password
+ confirm_password: Enter your current password to verify your identity
+ description_html: This will
permanently, irreversibly remove content from your account and deactivate it. Your username will remain reserved to prevent future impersonations.
+ proceed: Delete account
+ success_msg: Your account was successfully deleted
+ warning_html: Only deletion of content from this particular instance is guaranteed. Content that has been widely shared is likely to leave traces. Offline servers and servers that have unsubscribed from your updates will not update their databases.
+ warning_title: Disseminated content availability
+ errors:
+ '403': You don't have permission to view this page.
+ '404': The page you were looking for doesn't exist.
+ '410': The page you were looking for doesn't exist anymore.
+ '422':
+ content: Security verification failed. Are you blocking cookies?
+ title: Security verification failed
+ '429': Throttled
+ noscript_html: To use the Mastodon web application, please enable JavaScript. Alternatively, try one of the
native apps for Mastodon for your platform.
+ exports:
+ blocks: You block
+ csv: CSV
+ follows: You follow
+ mutes: You mute
+ storage: Media storage
+ followers:
+ domain: Domain
+ explanation_html: If you want to ensure the privacy of your pings , you must be aware of who is following you.
Your private pings are delivered to all instances where you have followers. You may wish to review them, and remove followers if you do not trust your privacy to be respected by the staff or software of those instances.
+ followers_count: Number of followers
+ lock_link: Lock your account
+ purge: Remove from followers
+ success:
+ one: In the process of soft-blocking followers from one domain...
+ other: In the process of soft-blocking followers from %{count} domains...
+ true_privacy_html: Please mind that
true privacy can only be achieved with end-to-end encryption.
+ unlocked_warning_html: Anyone can follow you to immediately view your private pings. %{lock_link} to be able to review and reject followers.
+ unlocked_warning_title: Your account is not locked
+ generic:
+ changes_saved_msg: Changes successfully saved!
+ powered_by: powered by %{link}
+ save_changes: Save changes
+ validation_errors:
+ one: Something isn't quite right yet! Please review the error below
+ other: Something isn't quite right yet! Please review %{count} errors below
+ imports:
+ preface: You can import data that you have exported from another instance, such as a list of the people you are following or blocking.
+ success: Your data was successfully uploaded and will now be processed in due time
+ types:
+ blocking: Blocking list
+ following: Following list
+ muting: Muting list
+ upload: Upload
+ landing_strip_html: "
%{name} is a user on %{link_to_root_path}. You can follow them or interact with them if you have an account anywhere in the fediverse."
+ landing_strip_signup_html: If you don't, you can
sign up here.
+ media_attachments:
+ validations:
+ images_and_video: Cannot attach a video to a ping that already contains images
+ too_many: Cannot attach more than 4 files
+ notification_mailer:
+ digest:
+ body: 'Here is a brief summary of what you missed on %{instance} since your last visit on %{since}:'
+ mention: "%{name} mentioned you in:"
+ new_followers_summary:
+ one: You have acquired one new follower! Yay!
+ other: You have gotten %{count} new followers! Amazing!
+ subject:
+ one: "1 new notification since your last visit \U0001F418"
+ other: "%{count} new notifications since your last visit \U0001F418"
+ favourite:
+ body: 'Your ping was florped by %{name}:'
+ subject: "%{name} florped your ping"
+ follow:
+ body: "%{name} is now following you!"
+ subject: "%{name} is now following you"
+ follow_request:
+ body: "%{name} has requested to follow you"
+ subject: 'Pending follower: %{name}'
+ mention:
+ body: 'You were mentioned by %{name} in:'
+ subject: You were mentioned by %{name}
+ reblog:
+ body: 'Your ping was relayed by %{name}:'
+ subject: "%{name} relayed your ping"
+ number:
+ human:
+ decimal_units:
+ format: "%n%u"
+ units:
+ billion: B
+ million: M
+ quadrillion: Q
+ thousand: K
+ trillion: T
+ unit: ''
+ pagination:
+ next: Next
+ prev: Prev
+ truncate: "…"
+ push_notifications:
+ favourite:
+ title: "%{name} favourited your status"
+ follow:
+ title: "%{name} is now following you"
+ group:
+ title: "%{count} notifications"
+ mention:
+ action_boost: Boost
+ action_expand: Show more
+ action_favourite: Favourite
+ title: "%{name} mentioned you"
+ reblog:
+ title: "%{name} boosted your status"
+ remote_follow:
+ acct: Enter your username@domain you want to follow from
+ missing_resource: Could not find the required redirect URL for your account
+ proceed: Proceed to follow
+ prompt: 'You are going to follow:'
+ sessions:
+ activity: Last activity
+ browser: Browser
+ browsers:
+ alipay: Alipay
+ blackberry: Blackberry
+ chrome: Chrome
+ edge: Microsoft Edge
+ firefox: Firefox
+ generic: Unknown browser
+ ie: Internet Explorer
+ micro_messenger: MicroMessenger
+ nokia: Nokia S40 Ovi Browser
+ opera: Opera
+ phantom_js: PhantomJS
+ qq: QQ Browser
+ safari: Safari
+ uc_browser: UCBrowser
+ weibo: Weibo
+ current_session: Current session
+ description: "%{browser} on %{platform}"
+ explanation: These are the web browsers currently logged in to your cybre.space account.
+ ip: IP
+ platforms:
+ adobe_air: Adobe Air
+ android: Android
+ blackberry: Blackberry
+ chrome_os: ChromeOS
+ firefox_os: Firefox OS
+ ios: iOS
+ linux: Linux
+ mac: Mac
+ other: unknown platform
+ windows: Windows
+ windows_mobile: Windows Mobile
+ windows_phone: Windows Phone
+ revoke: Revoke
+ revoke_success: Session successfully revoked
+ title: Sessions
+ settings:
+ authorized_apps: Authorized apps
+ back: Back to Mastodon
+ delete: Account deletion
+ development: Development
+ edit_profile: edit ~/.profile
+ export: Data export
+ followers: Authorized followers
+ import: Import
+ preferences: Preferences
+ settings: Settings
+ two_factor_authentication: Two-factor Authentication
+ your_apps: Your applications
+ statuses:
+ open_in_web: Open in web
+ over_character_limit: character limit of %{max} exceeded
+ pin_errors:
+ limit: You have already pinned the maximum number of pings
+ ownership: Someone else's ping cannot be pinned
+ private: Non-public pings cannot be pinned
+ reblog: A boost cannot be pinned
+ show_more: Show more
+ visibilities:
+ private: Followers-only
+ private_long: Only show to followers
+ public: Public
+ public_long: Everyone can see
+ unlisted: Unlisted
+ unlisted_long: Everyone can see, but not listed on public timelines
+ stream_entries:
+ click_to_show: Click to show
+ pinned: Pinned ping
+ reblogged: relayed
+ sensitive_content: Sensitive content
+ terms:
+ body_html: |
+
Privacy Policy
+
+
What information do we collect?
+
+
We collect information from you when you register on our site and gather data when you participate in the forum by reading, writing, and evaluating the content shared here.
+
+
When registering on our site, you may be asked to enter your name and e-mail address. You may, however, visit our site without registering. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address.
+
+
When registered and posting, we record the IP address that the post originated from. We also may retain server logs which include the IP address of every request to our server.
+
+
What do we use your information for?
+
+
Any of the information we collect from you may be used in one of the following ways:
+
+
+ - To personalize your experience — your information helps us to better respond to your individual needs.
+ - To improve our site — we continually strive to improve our site offerings based on the information and feedback we receive from you.
+ - To improve customer service — your information helps us to more effectively respond to your customer service requests and support needs.
+ - To send periodic emails — The email address you provide may be used to send you information, notifications that you request about changes to topics or in response to your user name, respond to inquiries, and/or other requests or questions.
+
+
+
How do we protect your information?
+
+
We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information.
+
+
What is your data retention policy?
+
+
We will make a good faith effort to:
+
+
+ - Retain server logs containing the IP address of all requests to this server no more than 90 days.
+ - Retain the IP addresses associated with registered users and their posts no more than 5 years.
+
+
+
Do we use cookies?
+
+
Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.
+
+
We use cookies to understand and save your preferences for future visits and compile aggregate data about site traffic and site interaction so that we can offer better site experiences and tools in the future. We may contract with third-party service providers to assist us in better understanding our site visitors. These service providers are not permitted to use the information collected on our behalf except to help us conduct and improve our business.
+
+
Do we disclose any information to outside parties?
+
+
We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety. However, non-personally identifiable visitor information may be provided to other parties for marketing, advertising, or other uses.
+
+
Third party links
+
+
Occasionally, at our discretion, we may include or offer third party products or services on our site. These third party sites have separate and independent privacy policies. We therefore have no responsibility or liability for the content and activities of these linked sites. Nonetheless, we seek to protect the integrity of our site and welcome any feedback about these sites.
+
+
Children's Online Privacy Protection Act Compliance
+
+
Our site, products and services are all directed to people who are at least 13 years old. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA (Children's Online Privacy Protection Act) do not use this site.
+
+
Online Privacy Policy Only
+
+
This online privacy policy applies only to information collected through our site and not to information collected offline.
+
+
Your Consent
+
+
By using our site, you consent to our web site privacy policy.
+
+
Changes to our Privacy Policy
+
+
If we decide to change our privacy policy, we will post those changes on this page.
+
+
This document is CC-BY-SA. It was last updated May 31, 2013.
+
+
Originally adapted from the Discourse privacy policy.
+ title: "%{instance} Terms of Service and Privacy Policy"
+ themes:
+ default: Cybrespace
+ mastodon: Mastodon
+ win95: Ｍａｓｔｏ 95
+ time:
+ formats:
+ default: "%b %d, %Y, %H:%M"
+ two_factor_authentication:
+ code_hint: Enter the code generated by your authenticator app to confirm
+ description_html: If you enable
two-factor authentication, logging in will require you to be in possession of your phone, which will generate tokens for you to enter.
+ disable: Disable
+ enable: Enable
+ enabled: Two-factor authentication is enabled
+ enabled_success: Two-factor authentication successfully enabled
+ generate_recovery_codes: Generate recovery codes
+ instructions_html: "
Scan this QR code into Google Authenticator or a similiar TOTP app on your phone. From now on, that app will generate tokens that you will have to enter when logging in."
+ lost_recovery_codes: Recovery codes allow you to regain access to your account if you lose your phone. If you've lost your recovery codes, you can regenerate them here. Your old recovery codes will be invalidated.
+ manual_instructions: 'If you can''t scan the QR code and need to enter it manually, here is the plain-text secret:'
+ recovery_codes: Backup recovery codes
+ recovery_codes_regenerated: Recovery codes successfully regenerated
+ recovery_instructions_html: If you ever lose access to your phone, you can use one of the recovery codes below to regain access to your account.
Keep the recovery codes safe. For example, you may print them and store them with other important documents.
+ setup: Set up
+ wrong_code: The entered code was invalid! Are server time and device time correct?
+ users:
+ invalid_email: The e-mail address is invalid
+ invalid_otp_token: Invalid two-factor code
+ signed_in_as: 'Signed in as:'
diff --git a/config/locales/simple_form.en-CY.yml b/config/locales/simple_form.en-CY.yml
new file mode 100644
index 000000000..44acd8a39
--- /dev/null
+++ b/config/locales/simple_form.en-CY.yml
@@ -0,0 +1,127 @@
+---
+en-CY:
+ simple_form:
+ hints:
+ account_warning_preset:
+ text: You can use ping syntax, such as URLs, hashtags and mentions
+ admin_account_action:
+ send_email_notification: The user will receive an explanation of what happened with their account
+ text_html: Optional. You can use ping syntax. You can
add warning presets to save time
+ type_html: Choose what to do with
%{acct}
+ warning_preset_id: Optional. You can still add custom text to end of the preset
+ defaults:
+ autofollow: People who sign up through the invite will automatically follow you
+ avatar: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
+ bot: This account mainly performs automated actions and might not be monitored
+ context: One or multiple contexts where the filter should apply
+ digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence
+ discoverable_html: The
directory lets people find accounts based on interests and activity. Requires at least %{min_followers} followers
+ email: You will be sent a confirmation e-mail
+ fields: You can have up to 4 items displayed as a table on your profile
+ header: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
+ inbox_url: Copy the URL from the frontpage of the relay you want to use
+ irreversible: Filtered pings will disappear irreversibly, even if filter is later removed
+ locale: The language of the user interface, e-mails and push notifications
+ locked: Requires you to manually approve followers
+ password: Use at least 8 characters
+ phrase: Will be matched regardless of casing in text or content warning of a pings
+ scopes: Which APIs the application will be allowed to access. If you select a top-level scope, you don't need to select individual ones.
+ setting_aggregate_reblogs: Do not show new relays for pings that have been recently relayed (only affects newly-received relays)
+ setting_default_language: The language of your pings can be detected automatically, but it's not always accurate
+ setting_display_media_default: Hide media marked as sensitive
+ setting_display_media_hide_all: Always hide all media
+ setting_display_media_show_all: Always show media marked as sensitive
+ setting_hide_network: Who you follow and who follows you will not be shown on your profile
+ setting_noindex: Affects your public profile and status pages
+ setting_theme: Affects how Mastodon looks when you're logged in from any device.
+ username: Your username will be unique on %{domain}
+ whole_word: When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word
+ imports:
+ data: CSV file exported from another Mastodon instance
+ sessions:
+ otp: 'Enter the two-factor code generated by your phone app or use one of your recovery codes:'
+ user:
+ chosen_languages: When checked, only pings in selected languages will be displayed in public timelines
+ labels:
+ account:
+ fields:
+ name: Label
+ value: Content
+ account_warning_preset:
+ text: Preset text
+ admin_account_action:
+ send_email_notification: Notify the user per e-mail
+ text: Custom warning
+ type: Action
+ types:
+ disable: Disable
+ none: Do nothing
+ silence: Silence
+ suspend: Suspend and irreversibly delete account data
+ warning_preset_id: Use a warning preset
+ defaults:
+ autofollow: Invite to follow your account
+ avatar: Avatar
+ bot: This is a bot account
+ chosen_languages: Filter languages
+ confirm_new_password: Confirm new password
+ confirm_password: Confirm password
+ context: Filter contexts
+ current_password: Current password
+ data: Data
+ discoverable: List this account on the directory
+ display_name: Display name
+ email: E-mail address
+ expires_in: Expire after
+ fields: Profile metadata
+ header: Header
+ inbox_url: URL of the relay inbox
+ irreversible: Drop instead of hide
+ locale: Interface language
+ locked: Lock account
+ max_uses: Max number of uses
+ new_password: New password
+ note: Bio
+ otp_attempt: Two-factor code
+ password: Password
+ phrase: Keyword or phrase
+ setting_aggregate_reblogs: Group relays in timelines
+ setting_auto_play_gif: Auto-play animated GIFs
+ setting_boost_modal: Show confirmation dialog before relaying
+ setting_default_language: Posting language
+ setting_default_privacy: Post privacy
+ setting_default_sensitive: Always mark media as sensitive
+ setting_delete_modal: Show confirmation dialog before deleting a ping
+ setting_display_media: Media display
+ setting_display_media_default: Default
+ setting_display_media_hide_all: Hide all
+ setting_display_media_show_all: Show all
+ setting_expand_spoilers: Always expand pings marked with content warnings
+ setting_hide_network: Hide your network
+ setting_noindex: Opt-out of search engine indexing
+ setting_reduce_motion: Reduce motion in animations
+ setting_system_font_ui: Use system's default font
+ setting_theme: Site theme
+ setting_unfollow_modal: Show confirmation dialog before unfollowing someone
+ severity: Severity
+ type: Import type
+ username: Username
+ username_or_email: Username or Email
+ whole_word: Whole word
+ interactions:
+ must_be_follower: Block notifications from non-followers
+ must_be_following: Block notifications from people you don't follow
+ must_be_following_dm: Block direct messages from people you don't follow
+ notification_emails:
+ digest: Send digest e-mails
+ favourite: Send e-mail when someone favourites your status
+ follow: Send e-mail when someone follows you
+ follow_request: Send e-mail when someone requests to follow you
+ mention: Send e-mail when someone mentions you
+ reblog: Send e-mail when someone relays your status
+ report: Send e-mail when a new report is submitted
+ 'no': 'No'
+ required:
+ mark: "*"
+ text: required
+ 'yes': 'Yes'
diff --git a/db/migrate/20171026200500_en_to_en_cy.rb b/db/migrate/20171026200500_en_to_en_cy.rb
new file mode 100644
index 000000000..0035e1dcd
--- /dev/null
+++ b/db/migrate/20171026200500_en_to_en_cy.rb
@@ -0,0 +1,17 @@
+class EnToEnCy < ActiveRecord::Migration[5.1]
+ def up
+ User.find_each do |user|
+ if user.locale == 'en'
+ user.update(locale: 'en-CY')
+ end
+ end
+ end
+
+ def down
+ User.find_each do |user|
+ if user.locale == 'en-CY'
+ user.update(locale: 'en')
+ end
+ end
+ end
+end
diff --git a/lib/mastodon/redis_config.rb b/lib/mastodon/redis_config.rb
index c3c8ff800..4f722a03d 100644
--- a/lib/mastodon/redis_config.rb
+++ b/lib/mastodon/redis_config.rb
@@ -24,7 +24,7 @@ setup_redis_env_url
setup_redis_env_url(:cache, false)
namespace = ENV.fetch('REDIS_NAMESPACE', nil)
-cache_namespace = namespace ? namespace + '_cache' : 'cache'
+cache_namespace = [namespace, 'cache', `git rev-parse --short HEAD`.strip].compact.join('_')
REDIS_CACHE_PARAMS = {
expires_in: 10.minutes,
diff --git a/package.json b/package.json
index 7b8f49dd8..c0ce0749e 100644
--- a/package.json
+++ b/package.json
@@ -169,6 +169,7 @@
"webpack-cli": "^3.3.12",
"webpack-merge": "^5.4.0",
"wicg-inert": "^3.1.0"
+ "what-input": "^4.3.1"
},
"devDependencies": {
"@testing-library/jest-dom": "^5.11.6",
diff --git a/yarn.lock b/yarn.lock
index 4aa8f6380..95e928980 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11149,6 +11149,10 @@ websocket-extensions@>=0.1.1:
resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
+what-input@^4.3.1:
+ version "4.3.1"
+ resolved "https://registry.yarnpkg.com/what-input/-/what-input-4.3.1.tgz#b8ea7554ba1d9171887c4c6addf28185fec3d31d"
+
whatwg-encoding@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"