diff --git a/app/javascript/mastodon/features/direct_timeline/components/conversation.js b/app/javascript/mastodon/features/direct_timeline/components/conversation.js
index 7277b7f0f..ffcd6d281 100644
--- a/app/javascript/mastodon/features/direct_timeline/components/conversation.js
+++ b/app/javascript/mastodon/features/direct_timeline/components/conversation.js
@@ -56,6 +56,7 @@ export default class Conversation extends ImmutablePureComponent {
otherAccounts={accounts}
onMoveUp={this.handleHotkeyMoveUp}
onMoveDown={this.handleHotkeyMoveDown}
+ onClick={this.handleClick}
/>
);
}
diff --git a/app/javascript/mastodon/features/direct_timeline/components/conversations_list.js b/app/javascript/mastodon/features/direct_timeline/components/conversations_list.js
index 4684548e0..635c03c1d 100644
--- a/app/javascript/mastodon/features/direct_timeline/components/conversations_list.js
+++ b/app/javascript/mastodon/features/direct_timeline/components/conversations_list.js
@@ -9,14 +9,14 @@ import { debounce } from 'lodash';
export default class ConversationsList extends ImmutablePureComponent {
static propTypes = {
- conversationIds: ImmutablePropTypes.list.isRequired,
+ conversations: ImmutablePropTypes.list.isRequired,
hasMore: PropTypes.bool,
isLoading: PropTypes.bool,
onLoadMore: PropTypes.func,
shouldUpdateScroll: PropTypes.func,
};
- getCurrentIndex = id => this.props.conversationIds.indexOf(id)
+ getCurrentIndex = id => this.props.conversations.findIndex(x => x.get('id') === id)
handleMoveUp = id => {
const elementIndex = this.getCurrentIndex(id) - 1;
@@ -41,22 +41,22 @@ export default class ConversationsList extends ImmutablePureComponent {
}
handleLoadOlder = debounce(() => {
- const last = this.props.conversationIds.last();
+ const last = this.props.conversations.last();
- if (last) {
- this.props.onLoadMore(last);
+ if (last && last.get('last_status')) {
+ this.props.onLoadMore(last.get('last_status'));
}
}, 300, { leading: true })
render () {
- const { conversationIds, onLoadMore, ...other } = this.props;
+ const { conversations, onLoadMore, ...other } = this.props;
return (
- {conversationIds.map(item => (
+ {conversations.map(item => (
diff --git a/app/javascript/mastodon/features/direct_timeline/containers/conversations_list_container.js b/app/javascript/mastodon/features/direct_timeline/containers/conversations_list_container.js
index 81ea812ad..57e17d96f 100644
--- a/app/javascript/mastodon/features/direct_timeline/containers/conversations_list_container.js
+++ b/app/javascript/mastodon/features/direct_timeline/containers/conversations_list_container.js
@@ -3,7 +3,7 @@ import ConversationsList from '../components/conversations_list';
import { expandConversations } from '../../../actions/conversations';
const mapStateToProps = state => ({
- conversationIds: state.getIn(['conversations', 'items']).map(x => x.get('id')),
+ conversations: state.getIn(['conversations', 'items']),
isLoading: state.getIn(['conversations', 'isLoading'], true),
hasMore: state.getIn(['conversations', 'hasMore'], false),
});
diff --git a/app/javascript/mastodon/features/emoji/emoji_mart_search_light.js b/app/javascript/mastodon/features/emoji/emoji_mart_search_light.js
index 36351ec02..164fdcc0b 100644
--- a/app/javascript/mastodon/features/emoji/emoji_mart_search_light.js
+++ b/app/javascript/mastodon/features/emoji/emoji_mart_search_light.js
@@ -2,7 +2,7 @@
// https://github.com/missive/emoji-mart/blob/5f2ffcc/src/utils/emoji-index.js
import data from './emoji_mart_data_light';
-import { getData, getSanitizedData, intersect } from './emoji_utils';
+import { getData, getSanitizedData, uniq, intersect } from './emoji_utils';
let originalPool = {};
let index = {};
@@ -103,7 +103,7 @@ function search(value, { emojisToShowFilter, maxResults, include, exclude, custo
}
}
- allResults = values.map((value) => {
+ const searchValue = (value) => {
let aPool = pool,
aIndex = index,
length = 0;
@@ -150,15 +150,23 @@ function search(value, { emojisToShowFilter, maxResults, include, exclude, custo
}
return aIndex.results;
- }).filter(a => a);
+ };
- if (allResults.length > 1) {
- results = intersect.apply(null, allResults);
- } else if (allResults.length) {
- results = allResults[0];
+ if (values.length > 1) {
+ results = searchValue(value);
} else {
results = [];
}
+
+ allResults = values.map(searchValue).filter(a => a);
+
+ if (allResults.length > 1) {
+ allResults = intersect.apply(null, allResults);
+ } else if (allResults.length) {
+ allResults = allResults[0];
+ }
+
+ results = uniq(results.concat(allResults));
}
if (results) {
diff --git a/app/javascript/mastodon/features/status/components/card.js b/app/javascript/mastodon/features/status/components/card.js
index b52f3c4fa..9a87f7a3f 100644
--- a/app/javascript/mastodon/features/status/components/card.js
+++ b/app/javascript/mastodon/features/status/components/card.js
@@ -59,10 +59,12 @@ export default class Card extends React.PureComponent {
card: ImmutablePropTypes.map,
maxDescription: PropTypes.number,
onOpenMedia: PropTypes.func.isRequired,
+ compact: PropTypes.boolean,
};
static defaultProps = {
maxDescription: 50,
+ compact: false,
};
state = {
@@ -131,25 +133,25 @@ export default class Card extends React.PureComponent {
}
render () {
- const { card, maxDescription } = this.props;
- const { width, embedded } = this.state;
+ const { card, maxDescription, compact } = this.props;
+ const { width, embedded } = this.state;
if (card === null) {
return null;
}
const provider = card.get('provider_name').length === 0 ? decodeIDNA(getHostname(card.get('url'))) : card.get('provider_name');
- const horizontal = card.get('width') > card.get('height') && (card.get('width') + 100 >= width) || card.get('type') !== 'link';
- const className = classnames('status-card', { horizontal });
+ const horizontal = (!compact && card.get('width') > card.get('height') && (card.get('width') + 100 >= width)) || card.get('type') !== 'link' || embedded;
const interactive = card.get('type') !== 'link';
+ const className = classnames('status-card', { horizontal, compact, interactive });
const title = interactive ? {card.get('title')} : {card.get('title')};
- const ratio = card.get('width') / card.get('height');
+ const ratio = compact ? 16 / 9 : card.get('width') / card.get('height');
const height = card.get('width') > card.get('height') ? (width / ratio) : (width * ratio);
const description = (
{title}
- {!horizontal &&
{trim(card.get('description') || '', maxDescription)}
}
+ {!(horizontal || compact) &&
{trim(card.get('description') || '', maxDescription)}
}
{provider}
{embed}
- {description}
+ {!compact && description}
);
} else if (card.get('image')) {
diff --git a/app/javascript/mastodon/features/status/containers/card_container.js b/app/javascript/mastodon/features/status/containers/card_container.js
index a97404de1..6170d9fd8 100644
--- a/app/javascript/mastodon/features/status/containers/card_container.js
+++ b/app/javascript/mastodon/features/status/containers/card_container.js
@@ -2,7 +2,7 @@ import { connect } from 'react-redux';
import Card from '../components/card';
const mapStateToProps = (state, { statusId }) => ({
- card: state.getIn(['cards', statusId], null),
+ card: state.getIn(['statuses', statusId, 'card'], null),
});
export default connect(mapStateToProps)(Card);
diff --git a/app/javascript/mastodon/reducers/index.js b/app/javascript/mastodon/reducers/index.js
index e98566e26..2c98af1db 100644
--- a/app/javascript/mastodon/reducers/index.js
+++ b/app/javascript/mastodon/reducers/index.js
@@ -14,7 +14,6 @@ import relationships from './relationships';
import settings from './settings';
import push_notifications from './push_notifications';
import status_lists from './status_lists';
-import cards from './cards';
import mutes from './mutes';
import reports from './reports';
import contexts from './contexts';
@@ -46,7 +45,6 @@ const reducers = {
relationships,
settings,
push_notifications,
- cards,
mutes,
reports,
contexts,
diff --git a/app/javascript/mastodon/reducers/statuses.js b/app/javascript/mastodon/reducers/statuses.js
index 6e3d830da..2c58969f3 100644
--- a/app/javascript/mastodon/reducers/statuses.js
+++ b/app/javascript/mastodon/reducers/statuses.js
@@ -10,6 +10,7 @@ import {
STATUS_REVEAL,
STATUS_HIDE,
} from '../actions/statuses';
+import { STATUS_CARD_FETCH_SUCCESS } from '../actions/cards';
import { TIMELINE_DELETE } from '../actions/timelines';
import { STATUS_IMPORT, STATUSES_IMPORT } from '../actions/importer';
import { Map as ImmutableMap, fromJS } from 'immutable';
@@ -65,6 +66,8 @@ export default function statuses(state = initialState, action) {
});
case TIMELINE_DELETE:
return deleteStatus(state, action.id, action.references);
+ case STATUS_CARD_FETCH_SUCCESS:
+ return state.setIn([action.id, 'card'], fromJS(action.card));
default:
return state;
}
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index a62974ec0..9cf783c84 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -5,7 +5,6 @@ import { start } from '../mastodon/common';
start();
function main() {
- const { length } = require('stringz');
const IntlMessageFormat = require('intl-messageformat').default;
const { timeAgoString } = require('../mastodon/components/relative_timestamp');
const { delegate } = require('rails-ujs');
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index f8eb37c58..f778ba06b 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1669,6 +1669,7 @@ a.account__display-name {
padding: 4px 0;
border-radius: 4px;
box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4);
+ z-index: 9999;
ul {
list-style: none;
@@ -2560,6 +2561,9 @@ a.status-card {
display: block;
margin-top: 5px;
font-size: 13px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
.status-card__image {
@@ -2584,6 +2588,31 @@ a.status-card {
}
}
+.status-card.compact {
+ border-color: lighten($ui-base-color, 4%);
+
+ &.interactive {
+ border: 0;
+ }
+
+ .status-card__content {
+ padding: 8px;
+ padding-top: 10px;
+ }
+
+ .status-card__title {
+ white-space: nowrap;
+ }
+
+ .status-card__image {
+ flex: 0 0 60px;
+ }
+}
+
+a.status-card.compact:hover {
+ background-color: lighten($ui-base-color, 4%);
+}
+
.status-card__image-image {
border-radius: 4px 0 0 4px;
display: block;
diff --git a/app/javascript/styles/mastodon/rtl.scss b/app/javascript/styles/mastodon/rtl.scss
index a86e3e632..176fb5ce0 100644
--- a/app/javascript/styles/mastodon/rtl.scss
+++ b/app/javascript/styles/mastodon/rtl.scss
@@ -130,17 +130,6 @@ body.rtl {
float: left;
}
- .activity-stream .detailed-status.light .detailed-status__display-name > div {
- float: right;
- margin-right: 0;
- margin-left: 10px;
- }
-
- .activity-stream .detailed-status.light .detailed-status__meta span > span {
- margin-left: 0;
- margin-right: 6px;
- }
-
.status__action-bar {
&__counter {
@@ -174,6 +163,10 @@ body.rtl {
margin-right: 0;
}
+ .detailed-status__display-name .display-name {
+ text-align: right;
+ }
+
.detailed-status__display-avatar {
margin-right: 0;
margin-left: 10px;
@@ -359,4 +352,22 @@ body.rtl {
margin-right: 15px;
text-align: right;
}
+
+ .fa-chevron-left::before {
+ content: "\F054";
+ }
+
+ .fa-chevron-right::before {
+ content: "\F053";
+ }
+
+ .column-back-button__icon {
+ margin-right: 0;
+ margin-left: 5px;
+ }
+
+ .column-header__setting-arrows .column-header__setting-btn:last-child {
+ padding-left: 0;
+ padding-right: 10px;
+ }
}
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 7e6702a63..f1b38b18a 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -81,11 +81,22 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
@mentions << Mention.new(account: account, silent: true)
# If there is at least one silent mention, then the status can be considered
- # as a limited-audience status, and not strictly a direct message
+ # as a limited-audience status, and not strictly a direct message, but only
+ # if we considered a direct message in the first place
next unless @params[:visibility] == :direct
@params[:visibility] = :limited
end
+
+ # If the payload was delivered to a specific inbox, the inbox owner must have
+ # access to it, unless they already have access to it anyway
+ return if @options[:delivered_to_account_id].nil? || @mentions.any? { |mention| mention.account_id == @options[:delivered_to_account_id] }
+
+ @mentions << Mention.new(account_id: @options[:delivered_to_account_id], silent: true)
+
+ return unless @params[:visibility] == :direct
+
+ @params[:visibility] = :limited
end
def attach_tags(status)
@@ -118,7 +129,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
return if tag['name'].blank?
hashtag = tag['name'].gsub(/\A#/, '').mb_chars.downcase
- hashtag = Tag.where(name: hashtag).first_or_create(name: hashtag)
+ hashtag = Tag.where(name: hashtag).first_or_create!(name: hashtag)
return if @tags.include?(hashtag)
diff --git a/app/models/account_conversation.rb b/app/models/account_conversation.rb
index b7447d805..cc6b39279 100644
--- a/app/models/account_conversation.rb
+++ b/app/models/account_conversation.rb
@@ -58,6 +58,9 @@ class AccountConversation < ApplicationRecord
def add_status(recipient, status)
conversation = find_or_initialize_by(account: recipient, conversation_id: status.conversation_id, participant_account_ids: participants_from_status(recipient, status))
+
+ return conversation if conversation.status_ids.include?(status.id)
+
conversation.status_ids << status.id
conversation.unread = status.account_id != recipient.id
conversation.save
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index 3e3cbdaed..0f787ebc4 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -148,6 +148,7 @@ class MediaAttachment < ApplicationRecord
"#{x},#{y}"
end
+ after_commit :reset_parent_cache, on: :update
before_create :prepare_description, unless: :local?
before_create :set_shortcode
before_post_process :set_type_and_extension
@@ -252,4 +253,9 @@ class MediaAttachment < ApplicationRecord
bitrate: movie.bitrate,
}
end
+
+ def reset_parent_cache
+ return if status_id.nil?
+ Rails.cache.delete("statuses/#{status_id}")
+ end
end
diff --git a/app/models/status.rb b/app/models/status.rb
index 438863589..f67a05b3c 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -94,6 +94,7 @@ class Status < ApplicationRecord
:conversation,
:status_stat,
:tags,
+ :preview_cards,
:stream_entry,
active_mentions: :account,
reblog: [
@@ -101,6 +102,7 @@ class Status < ApplicationRecord
:application,
:stream_entry,
:tags,
+ :preview_cards,
:media_attachments,
:conversation,
:status_stat,
@@ -168,6 +170,10 @@ class Status < ApplicationRecord
reblog
end
+ def preview_card
+ preview_cards.first
+ end
+
def title
if destroyed?
"#{account.acct} deleted status"
@@ -241,10 +247,6 @@ class Status < ApplicationRecord
before_validation :set_local
class << self
- def cache_ids
- left_outer_joins(:status_stat).select('statuses.id, greatest(statuses.updated_at, status_stats.updated_at) AS updated_at')
- end
-
def selectable_visibilities
visibilities.keys - %w(direct limited)
end
diff --git a/app/models/status_stat.rb b/app/models/status_stat.rb
index 9d358776b..024c467e7 100644
--- a/app/models/status_stat.rb
+++ b/app/models/status_stat.rb
@@ -14,4 +14,12 @@
class StatusStat < ApplicationRecord
belongs_to :status, inverse_of: :status_stat
+
+ after_commit :reset_parent_cache
+
+ private
+
+ def reset_parent_cache
+ Rails.cache.delete("statuses/#{status_id}")
+ end
end
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index 07839c5ae..8a61c1056 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -21,6 +21,8 @@ class REST::StatusSerializer < ActiveModel::Serializer
has_many :tags
has_many :emojis, serializer: REST::CustomEmojiSerializer
+ has_one :preview_card, key: :card, serializer: REST::PreviewCardSerializer
+
def id
object.id.to_s
end
diff --git a/app/services/activitypub/fetch_remote_account_service.rb b/app/services/activitypub/fetch_remote_account_service.rb
index 1ec9ee5dd..8430d12d5 100644
--- a/app/services/activitypub/fetch_remote_account_service.rb
+++ b/app/services/activitypub/fetch_remote_account_service.rb
@@ -5,9 +5,10 @@ class ActivityPub::FetchRemoteAccountService < BaseService
SUPPORTED_TYPES = %w(Application Group Organization Person Service).freeze
- # Should be called when uri has already been checked for locality
# Does a WebFinger roundtrip on each call
def call(uri, id: true, prefetched_body: nil, break_on_redirect: false)
+ return ActivityPub::TagManager.instance.uri_to_resource(uri, Account) if ActivityPub::TagManager.instance.local_uri?(uri)
+
@json = if prefetched_body.nil?
fetch_resource(uri, id)
else
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index 4169c685b..462e5ee13 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -17,7 +17,8 @@ class FetchLinkCardService < BaseService
return if @url.nil? || @status.preview_cards.any?
- @url = @url.to_s
+ @mentions = status.mentions
+ @url = @url.to_s
RedisLock.acquire(lock_options) do |lock|
if lock.acquired?
@@ -62,6 +63,7 @@ class FetchLinkCardService < BaseService
def attach_card
@status.preview_cards << @card
+ Rails.cache.delete(@status)
end
def parse_urls
@@ -81,9 +83,16 @@ class FetchLinkCardService < BaseService
uri.host.blank? || TagManager.instance.local_url?(uri.to_s) || !%w(http https).include?(uri.scheme)
end
+ def mention_link?(a)
+ return false if @mentions.nil?
+ @mentions.any? do |mention|
+ a['href'] == TagManager.instance.url_for(mention.target)
+ end
+ end
+
def skip_link?(a)
# Avoid links for hashtags and mentions (microformats)
- a['rel']&.include?('tag') || a['class']&.include?('u-url')
+ a['rel']&.include?('tag') || a['class']&.include?('u-url') || mention_link?(a)
end
def attempt_oembed
diff --git a/app/services/verify_link_service.rb b/app/services/verify_link_service.rb
index 3453b54c5..9f56249c7 100644
--- a/app/services/verify_link_service.rb
+++ b/app/services/verify_link_service.rb
@@ -25,7 +25,7 @@ class VerifyLinkService < BaseService
end
def link_back_present?
- return false if @body.empty?
+ return false if @body.blank?
links = Nokogiri::HTML(@body).xpath('//a[contains(concat(" ", normalize-space(@rel), " "), " me ")]|//link[contains(concat(" ", normalize-space(@rel), " "), " me ")]')
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index 66382db50..0e52702dc 100644
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -14,4 +14,4 @@
= yield
-= render template: 'layouts/application', locals: { body_classes: 'admin' }
+= render template: 'layouts/application'
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml
index 6b61fa9c9..516851b04 100644
--- a/app/views/settings/profiles/show.html.haml
+++ b/app/views/settings/profiles/show.html.haml
@@ -6,8 +6,8 @@
.fields-row
.fields-row__column.fields-group.fields-row__column-6
- = f.input :display_name, wrapper: :with_label, hint: t('simple_form.hints.defaults.display_name', count: 30 - @account.display_name.size).html_safe
- = f.input :note, wrapper: :with_label, hint: t('simple_form.hints.defaults.note', count: 500 - @account.note.size).html_safe
+ = f.input :display_name, wrapper: :with_label, input_html: { maxlength: 30 }, hint: false
+ = f.input :note, wrapper: :with_label, input_html: { maxlength: 500 }, hint: false
.fields-row
.fields-row__column.fields-row__column-6
@@ -36,8 +36,8 @@
= f.simple_fields_for :fields do |fields_f|
.row
- = fields_f.input :name, placeholder: t('simple_form.labels.account.fields.name')
- = fields_f.input :value, placeholder: t('simple_form.labels.account.fields.value')
+ = fields_f.input :name, placeholder: t('simple_form.labels.account.fields.name'), input_html: { maxlength: 255 }
+ = fields_f.input :value, placeholder: t('simple_form.labels.account.fields.value'), input_html: { maxlength: 255 }
.fields-row__column.fields-group.fields-row__column-6
%h6= t('verification.verification')
diff --git a/app/views/stream_entries/_simple_status.html.haml b/app/views/stream_entries/_simple_status.html.haml
index cd0531ba2..e996d5052 100644
--- a/app/views/stream_entries/_simple_status.html.haml
+++ b/app/views/stream_entries/_simple_status.html.haml
@@ -15,6 +15,7 @@
%span.display-name
%bdi
%strong.display-name__html.p-name.emojify= display_name(status.account, custom_emojify: true, autoplay: autoplay)
+
%span.display-name__account
= acct(status.account)
= fa_icon('lock') if status.account.locked?
diff --git a/app/workers/activitypub/processing_worker.rb b/app/workers/activitypub/processing_worker.rb
index 0e2e0eddd..a8a3ebf0f 100644
--- a/app/workers/activitypub/processing_worker.rb
+++ b/app/workers/activitypub/processing_worker.rb
@@ -5,7 +5,7 @@ class ActivityPub::ProcessingWorker
sidekiq_options backtrace: true
- def perform(account_id, body)
- ActivityPub::ProcessCollectionService.new.call(body, Account.find(account_id), override_timestamps: true)
+ def perform(account_id, body, delivered_to_account_id = nil)
+ ActivityPub::ProcessCollectionService.new.call(body, Account.find(account_id), override_timestamps: true, delivered_to_account_id: delivered_to_account_id)
end
end
diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb
index 36e2694e3..7b5b47b5e 100644
--- a/config/initializers/cors.rb
+++ b/config/initializers/cors.rb
@@ -9,6 +9,10 @@ Rails.application.config.middleware.insert_before 0, Rack::Cors do
allow do
origins '*'
+ resource '/.well-known/*',
+ headers: :any,
+ methods: [:get],
+ credentials: false
resource '/@:username',
headers: :any,
methods: [:get],
diff --git a/config/locales/activerecord.ast.yml b/config/locales/activerecord.ast.yml
index 0d161faf2..6e32cbc2f 100644
--- a/config/locales/activerecord.ast.yml
+++ b/config/locales/activerecord.ast.yml
@@ -1 +1,2 @@
+---
ast: {}
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 4499830f9..afbb32088 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -30,22 +30,16 @@ ar:
other_instances: خوادم أخرى
privacy_policy: سياسة الخصوصية
source_code: الشفرة المصدرية
- status_count_after:
- one: منشور
- other: منشورات
+ status_count_after: منشورات
status_count_before: نشروا
terms: شروط الخدمة
- user_count_after:
- one: مستخدِم
- other: مستخدِمين
+ user_count_after: مستخدِمين
user_count_before: يستضيف
what_is_mastodon: ما هو ماستدون ؟
accounts:
choices_html: 'توصيات %{name} :'
follow: إتبع
- followers:
- one: مُتابِع
- other: مُتابِعون
+ followers: مُتابِعون
following: مُتابَع
joined: انضم·ت في %{date}
link_verified_on: تم التحقق مِن مالك هذا الرابط بتاريخ %{date}
@@ -57,9 +51,7 @@ ar:
people_who_follow: الأشخاص الذين يتبعون %{name}
pin_errors:
following: يجب أن تكون مِن متابعي حساب الشخص الذي تريد إبرازه
- posts:
- one: تبويق
- other: تبويقات
+ posts: تبويقات
posts_tab_heading: تبويقات
posts_with_replies: التبويقات و الردود
reserved_username: إسم المستخدم محجوز
@@ -170,8 +162,8 @@ ar:
web: الويب
action_logs:
actions:
- assigned_to_self_report: قام {name} بتعيين التقرير٪ {target} لأنفسهم
- change_email_user: غيّر٪ {name} عنوان البريد الإلكتروني للمستخدم٪ {target}
+ assigned_to_self_report: قام %{name} بتعيين التقرير %{target} لأنفسهم
+ change_email_user: غيّر %{name} عنوان البريد الإلكتروني للمستخدم %{target}
confirm_user: "%{name} قد قام بتأكيد عنوان البريد الإلكتروني لـ %{target}"
create_custom_emoji: "%{name} قام برفع إيموجي جديد %{target}"
create_domain_block: "%{name} قام بحجب نطاق %{target}"
@@ -187,13 +179,13 @@ ar:
enable_user: لقد قام %{name} بتنشيط تسجيل الدخول للمستخدِم %{target}
memorialize_account: لقد قام %{name} بتحويل حساب %{target} إلى صفحة تذكارية
promote_user: "%{name} قام بترقية المستخدم %{target}"
- remove_avatar_user: تمت إزالة٪ {name} الصورة الرمزية٪ {target}
- reopen_report: تمت إعادة فتح التقرير {name}٪ {target}
+ remove_avatar_user: تمت إزالة %{name} الصورة الرمزية %{target}
+ reopen_report: تمت إعادة فتح التقرير %{name} %{target}
reset_password_user: "%{name} لقد قام بإعادة تعيين الكلمة السرية الخاصة بـ %{target}"
resolve_report: قام %{name} بحل التقرير %{target}
silence_account: لقد قام %{name} بكتم حساب %{target}
suspend_account: لقد قام %{name} بتعليق حساب %{target}
- unassigned_report: "٪ {name} تقرير غير معتمد٪ {target}"
+ unassigned_report: "%{name} تقرير غير معتمد %{target}"
unsilence_account: لقد قام %{name} بإلغاء الكتم عن حساب %{target}
unsuspend_account: لقد قام %{name} بإلغاء التعليق المفروض على حساب %{target}
update_custom_emoji: "%{name} قام بتحديث الإيموجي %{target}"
@@ -268,9 +260,7 @@ ar:
suspend: تعليق
severity: الشدة
show:
- affected_accounts:
- one: حساب واحد معني في قاعدة البيانات
- other: "%{count} حسابات معنية في قاعدة البيانات"
+ affected_accounts: "%{count} حسابات معنية في قاعدة البيانات"
retroactive:
silence: إلغاء الكتم عن كافة الحسابات المتواجدة على هذا النطاق
suspend: إلغاء التعليق المفروض على كافة حسابات هذا النطاق
@@ -441,7 +431,7 @@ ar:
admin_mailer:
new_report:
body: قام %{reporter} بالإبلاغ عن %{target}
- body_remote: أبلغ شخص ما من٪ {domain} عن٪ {target}
+ body_remote: أبلغ شخص ما من %{domain} عن %{target}
subject: تقرير جديد ل%{instance} (#%{id})
application_mailer:
notification_preferences: تعديل خيارات البريد الإلكتروني
@@ -570,9 +560,7 @@ ar:
generic:
changes_saved_msg: تم حفظ التعديلات بنجاح !
save_changes: حفظ التغييرات
- validation_errors:
- one: هناك شيء ما لا يبدو أنه على ما يُرام بعدُ. يُرجى الإطلاع على الخطأ أدناه
- other: هناك شيء ليس على ما يُرام! يُرجى معاينة الأخطاء الـ %{count} التالية
+ validation_errors: هناك شيء ليس على ما يُرام! يُرجى معاينة الأخطاء الـ %{count} التالية
imports:
preface: بإمكانك استيراد بيانات قد قُمتَ بتصديرها مِن مثيل خادوم آخَر، كقوائم المستخدِمين الذين كنتَ تتابِعهم أو قُمتَ بحظرهم.
success: تم تحميل بياناتك بنجاح وسيتم معالجتها في الوقت المناسب
@@ -595,9 +583,7 @@ ar:
expires_in_prompt: أبدا
generate: توليد
invited_by: 'تمت دعوتك من طرف :'
- max_uses:
- one: استعمال واحد
- other: "%{count} استخدامات"
+ max_uses: "%{count} استخدامات"
max_uses_prompt: بلا حدود
prompt: توليد و مشاركة روابط للسماح للآخَرين بالنفاذ إلى مثيل الخادوم هذا
table:
@@ -623,12 +609,8 @@ ar:
action: معاينة كافة الإشعارات
body: هذا هو مُلَخَّص الرسائل التي فاتتك وذلك منذ آخر زيارة لك في %{since}
mention: "%{name} أشار إليك في :"
- new_followers_summary:
- one: و لقد تحصّلت أيضا على متابِع جديد أثناء فترة غيابك! يا للروعة!
- other: رائع، لقد قام بمتابعتك %{count} مُتابِعون جُدد أثناء فترة غيابك عن ماستدون !
- subject:
- one: "إشعار جديد واحد منذ آخر زيارة لك لـ \U0001F418"
- other: "%{count} إشعارات جديدة منذ آخر زيارة لك إلى \U0001F418"
+ new_followers_summary: رائع، لقد قام بمتابعتك %{count} مُتابِعون جُدد أثناء فترة غيابك عن ماستدون !
+ subject: "%{count} إشعارات جديدة منذ آخر زيارة لك إلى \U0001F418"
title: أثناء فترة غيابك …
favourite:
body: 'أُعجب %{name} بمنشورك :'
@@ -746,17 +728,11 @@ ar:
statuses:
attached:
description: 'مُرفَق : %{attached}'
- image:
- one: "%{count} صورة"
- other: "%{count} صُوَر"
- video:
- one: "%{count} فيديو"
- other: "%{count} فيديوهات"
+ image: "%{count} صُوَر"
+ video: "%{count} فيديوهات"
boosted_from_html: تم إعادة ترقيته مِن %{acct_link}
content_warning: 'تحذير عن المحتوى : %{warning}'
- disallowed_hashtags:
- one: 'يحتوي على وسم ممنوع: %{tags}'
- other: 'يحتوي على أحد الوسوم الممنوعة: %{tags}'
+ disallowed_hashtags: 'يحتوي على أحد الوسوم الممنوعة: %{tags}'
language_detection: اكتشاف اللغة تلقائيا
open_in_web: إفتح في الويب
over_character_limit: تم تجاوز حد الـ %{max} حرف المسموح بها
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 98986cdd0..f787e98f8 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -21,8 +21,7 @@ ast:
hosted_on: Mastodon ta agospiáu en %{domain}
learn_more: Deprendi más
source_code: Códigu fonte
- status_count_after:
- other: estaos
+ status_count_after: estaos
terms: Términos del serviciu
user_count_after: usuarios
what_is_mastodon: "¿Qué ye Mastodon?"
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 8c11ac7b7..9813aea6f 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -61,9 +61,7 @@ bg:
generic:
changes_saved_msg: Успешно запазване на промените!
save_changes: Запази промените
- validation_errors:
- one: Нещо все още не е наред! Моля, прегледай грешката по-долу
- other: Нещо все още не е наред! Моля, прегледай грешките по-долу
+ validation_errors: Нещо все още не е наред! Моля, прегледай грешките по-долу
imports:
preface: Можеш да импортираш някои данни, като например всички хора, които следваш или блокираш в акаунта си на тази инстанция, от файлове, създадени чрез експорт в друга инстанция.
success: Твоите данни бяха успешно качени и ще бъдат обработени впоследствие.
@@ -77,7 +75,7 @@ bg:
too_many: Не мога да прикача повече от 4 файла
notification_mailer:
digest:
- body: 'Ето кратко резюме на нещата, които се случиха от последното ти посещение в %{instance} на %{since}:'
+ body: 'Ето кратко резюме на нещата, които се случиха от последното ти посещение на %{since}:'
mention: "%{name} те спомена в:"
new_followers_summary:
one: Имаш един нов последовател! Ура!
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 42f657fd5..fdf271c9f 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -617,7 +617,7 @@ ca:
notification_mailer:
digest:
action: Veure totes les notificacions
- body: Un resum del que et vas perdre en %{instance} desde la darrera visita el %{since}
+ body: Un resum del que et vas perdre desde la darrera visita el %{since}
mention: "%{name} t'ha mencionat en:"
new_followers_summary:
one: A més, has adquirit un nou seguidor durant la teva absència! Visca!
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 67bda70f1..c73c4fee1 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -30,22 +30,16 @@ cs:
other_instances: Seznam instancí
privacy_policy: Zásady soukromí
source_code: Zdrojový kód
- status_count_after:
- one: příspěvek
- other: příspěvků
+ status_count_after: příspěvků
status_count_before: Kteří napsali
terms: Podmínky používání
- user_count_after:
- one: uživatele
- other: uživatelů
+ user_count_after: uživatelů
user_count_before: Domov
what_is_mastodon: Co je Mastodon?
accounts:
choices_html: 'Volby uživatele %{name}:'
follow: Sledovat
- followers:
- one: Sledovatel
- other: Sledovatelé
+ followers: Sledovatelé
following: Sledovaní
joined: Připojil/a se v %{date}
link_verified_on: Vlastnictví tohoto odkazu bylo zkontrolováno %{date}
@@ -57,9 +51,7 @@ cs:
people_who_follow: Lidé, kteří sledují uživatele %{name}
pin_errors:
following: Musíte již sledovat osobu, kterou chcete podpořit
- posts:
- one: Toot
- other: Tooty
+ posts: Tooty
posts_tab_heading: Tooty
posts_with_replies: Tooty a odpovědi
reserved_username: Toto uživatelské jméno je rezervováno
@@ -268,9 +260,7 @@ cs:
suspend: Suspendovat
severity: Přísnost
show:
- affected_accounts:
- one: Jeden účet v databázi byl ovlivněn
- other: "%{count} účtů v databázi byl ovlivněn"
+ affected_accounts: "%{count} účtů v databázi byl ovlivněn"
retroactive:
silence: Odtišit všechny existující účty z této domény
suspend: Zrušit suspenzaci všech existujících účtů z této domény
@@ -562,9 +552,7 @@ cs:
followers_count: Počet sledovatelů
lock_link: Zamkněte svůj účet
purge: Odstranit ze sledovatelů
- success:
- one: V průběhu utišování sledovatelů z jedné domény...
- other: V průběhu utišování sledovatelů z %{count} domén...
+ success: V průběhu utišování sledovatelů z %{count} domén...
true_privacy_html: Berte prosím na vědomí, že