Compare commits
6 Commits
b99c871999
...
cadb6f1303
Author | SHA1 | Date |
---|---|---|
Claire | cadb6f1303 | |
Claire | 113c931cda | |
Claire | b79df709a8 | |
Claire | 0e071edccc | |
GitHub Actions | c61130af33 | |
Claire | 5d15a25085 |
|
@ -544,7 +544,6 @@ class Status extends ImmutablePureComponent {
|
|||
...other
|
||||
} = this.props;
|
||||
const { isCollapsed } = this.state;
|
||||
let background = null;
|
||||
let attachments = null;
|
||||
|
||||
// Depending on user settings, some media are considered as parts of the
|
||||
|
@ -621,21 +620,10 @@ class Status extends ImmutablePureComponent {
|
|||
);
|
||||
}
|
||||
|
||||
// If user backgrounds for collapsed statuses are enabled, then we
|
||||
// initialize our background accordingly. This will only be rendered if
|
||||
// the status is collapsed.
|
||||
if (settings.getIn(['collapsed', 'backgrounds', 'user_backgrounds'])) {
|
||||
background = status.getIn(['account', 'header']);
|
||||
}
|
||||
|
||||
// This handles our media attachments.
|
||||
// If a media file is of unknwon type or if the status is muted
|
||||
// (notification), we show a list of links instead of embedded media.
|
||||
|
||||
// After we have generated our appropriate media element and stored it in
|
||||
// `media`, we snatch the thumbnail to use as our `background` if media
|
||||
// backgrounds for collapsed statuses are enabled.
|
||||
|
||||
attachments = status.get('media_attachments');
|
||||
|
||||
if (pictureInPicture.get('inUse')) {
|
||||
|
@ -728,10 +716,6 @@ class Status extends ImmutablePureComponent {
|
|||
);
|
||||
mediaIcons.push('picture-o');
|
||||
}
|
||||
|
||||
if (!status.get('sensitive') && !(status.get('spoiler_text').length > 0) && settings.getIn(['collapsed', 'backgrounds', 'preview_images'])) {
|
||||
background = attachments.getIn([0, 'preview_url']);
|
||||
}
|
||||
} else if (status.get('card') && settings.get('inline_preview_cards') && !this.props.muted) {
|
||||
media.push(
|
||||
<Card
|
||||
|
@ -802,9 +786,8 @@ class Status extends ImmutablePureComponent {
|
|||
{prepend}
|
||||
|
||||
<div
|
||||
className={classNames('status', `status-${status.get('visibility')}`, { 'status-reply': !!status.get('in_reply_to_id'), 'status--in-thread': !!rootId, 'status--first-in-thread': previousId && (!connectUp || connectToRoot), muted: this.props.muted, 'has-background': isCollapsed && background, collapsed: isCollapsed })}
|
||||
className={classNames('status', `status-${status.get('visibility')}`, { 'status-reply': !!status.get('in_reply_to_id'), 'status--in-thread': !!rootId, 'status--first-in-thread': previousId && (!connectUp || connectToRoot), muted: this.props.muted, collapsed: isCollapsed })}
|
||||
data-id={status.get('id')}
|
||||
style={isCollapsed && background ? { backgroundImage: `url(${background})` } : null}
|
||||
>
|
||||
{(connectReply || connectUp || connectToRoot) && <div className={classNames('status__line', { 'status__line--full': connectReply, 'status__line--first': !status.get('in_reply_to_id') && !connectToRoot })} />}
|
||||
|
||||
|
|
|
@ -415,28 +415,6 @@ class LocalSettingsPage extends PureComponent {
|
|||
<FormattedMessage id='settings.auto_collapse_height' defaultMessage='Height (in pixels) for a toot to be considered lengthy' />
|
||||
</LocalSettingsPageItem>
|
||||
</section>
|
||||
<section>
|
||||
<h2><FormattedMessage id='settings.image_backgrounds' defaultMessage='Image backgrounds' /></h2>
|
||||
<LocalSettingsPageItem
|
||||
settings={settings}
|
||||
item={['collapsed', 'backgrounds', 'user_backgrounds']}
|
||||
id='mastodon-settings--collapsed-user-backgrouns'
|
||||
onChange={onChange}
|
||||
dependsOn={[['collapsed', 'enabled']]}
|
||||
>
|
||||
<FormattedMessage id='settings.image_backgrounds_users' defaultMessage='Give collapsed toots an image background' />
|
||||
</LocalSettingsPageItem>
|
||||
<LocalSettingsPageItem
|
||||
settings={settings}
|
||||
item={['collapsed', 'backgrounds', 'preview_images']}
|
||||
id='mastodon-settings--collapsed-preview-images'
|
||||
onChange={onChange}
|
||||
dependsOn={[['collapsed', 'enabled']]}
|
||||
>
|
||||
<FormattedMessage id='settings.image_backgrounds_media' defaultMessage='Preview collapsed toot media' />
|
||||
<span className='hint'><FormattedMessage id='settings.image_backgrounds_media_hint' defaultMessage='If the post has any media attachment, use the first one as a background' /></span>
|
||||
</LocalSettingsPageItem>
|
||||
</section>
|
||||
</div>
|
||||
),
|
||||
({ intl, onChange, settings }) => (
|
||||
|
|
|
@ -1,17 +1,28 @@
|
|||
import { connect } from 'react-redux';
|
||||
|
||||
import { authorizeFollowRequest, rejectFollowRequest } from 'flavours/glitch/actions/accounts';
|
||||
import { makeGetAccount } from 'flavours/glitch/selectors';
|
||||
|
||||
import FollowRequest from '../components/follow_request';
|
||||
|
||||
const mapDispatchToProps = (dispatch, { account }) => ({
|
||||
const makeMapStateToProps = () => {
|
||||
const getAccount = makeGetAccount();
|
||||
|
||||
const mapStateToProps = (state, props) => ({
|
||||
account: getAccount(state, props.id),
|
||||
});
|
||||
|
||||
return mapStateToProps;
|
||||
};
|
||||
|
||||
const mapDispatchToProps = (dispatch, { id }) => ({
|
||||
onAuthorize () {
|
||||
dispatch(authorizeFollowRequest(account.get('id')));
|
||||
dispatch(authorizeFollowRequest(id));
|
||||
},
|
||||
|
||||
onReject () {
|
||||
dispatch(rejectFollowRequest(account.get('id')));
|
||||
dispatch(rejectFollowRequest(id));
|
||||
},
|
||||
});
|
||||
|
||||
export default connect(null, mapDispatchToProps)(FollowRequest);
|
||||
export default connect(makeMapStateToProps, mapDispatchToProps)(FollowRequest);
|
||||
|
|
|
@ -64,8 +64,6 @@
|
|||
"notification_purge.btn_invert": "Auswahl\numkehren",
|
||||
"notification_purge.btn_none": "Auswahl\naufheben",
|
||||
"notification_purge.start": "Benachrichtigungen-Aufräumen-Modus starten",
|
||||
"notifications.column_settings.filter_bar.advanced": "Zeige alle Kategorien an",
|
||||
"notifications.column_settings.filter_bar.category": "Schnellfilterleiste",
|
||||
"notifications.column_settings.filter_bar.show_bar": "Filterleiste anzeigen",
|
||||
"notifications.marked_clear": "Ausgewählte Benachrichtigungen entfernen",
|
||||
"notifications.marked_clear_confirmation": "Möchtest du wirklich alle auswählten Benachrichtigungen für immer entfernen?",
|
||||
|
|
|
@ -97,10 +97,6 @@
|
|||
"settings.general": "General",
|
||||
"settings.hicolor_privacy_icons": "High color privacy icons",
|
||||
"settings.hicolor_privacy_icons.hint": "Display privacy icons in bright and easily distinguishable colors",
|
||||
"settings.image_backgrounds": "Image backgrounds",
|
||||
"settings.image_backgrounds_media": "Preview collapsed toot media",
|
||||
"settings.image_backgrounds_media_hint": "If the post has any media attachment, use the first one as a background",
|
||||
"settings.image_backgrounds_users": "Give collapsed toots an image background",
|
||||
"settings.inline_preview_cards": "Inline preview cards for external links",
|
||||
"settings.layout_opts": "Layout options",
|
||||
"settings.media": "Media",
|
||||
|
|
|
@ -23,8 +23,8 @@
|
|||
"compose.content-type.markdown_meta": "Formatear tus mensajes con Markdown",
|
||||
"compose.content-type.plain": "Texto plano",
|
||||
"compose.content-type.plain_meta": "Escribir sin formato avanzado",
|
||||
"compose.disable_threaded_mode": "Deshabilitar Modo Hilo",
|
||||
"compose.enable_threaded_mode": "Habilitar Modo Hilo",
|
||||
"compose.disable_threaded_mode": "Deshabilitar modo de hilo",
|
||||
"compose.enable_threaded_mode": "Habilitar modo de hilo",
|
||||
"compose_form.sensitive.hide": "{count, plural, one {Marca medios como sensible} other {Marca los medios como sensibles}}",
|
||||
"compose_form.sensitive.marked": "{count, plural, one {El medio está marcado como sensible} other {Los medios están marcados como sensibles}}",
|
||||
"compose_form.sensitive.unmarked": "{count, plural, one {El medio no está marcado como sensible} other {Los medios no están marcados como sensibles}}",
|
||||
|
@ -64,8 +64,6 @@
|
|||
"notification_purge.btn_invert": "Invertir\nselección",
|
||||
"notification_purge.btn_none": "Seleccionar\nnada",
|
||||
"notification_purge.start": "Entrar en modo de limpieza de notificaciones",
|
||||
"notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
|
||||
"notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
|
||||
"notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros",
|
||||
"notifications.marked_clear": "Limpiar notificaciones seleccionadas",
|
||||
"notifications.marked_clear_confirmation": "¿Deseas borrar permanentemente todas las notificaciones seleccionadas?",
|
||||
|
|
|
@ -14,9 +14,17 @@
|
|||
"column_subheading.lists": "Listas",
|
||||
"column_subheading.navigation": "Navegación",
|
||||
"community.column_settings.allow_local_only": "Mostrar sólo toots locales",
|
||||
"compose.attach.doodle": "Dibujar algo",
|
||||
"compose.change_federation": "Cambiar configuración de la federación",
|
||||
"compose.content-type.change": "Cambiar opciones avanzadas de formato",
|
||||
"compose.content-type.html": "HTML",
|
||||
"compose.content-type.html_meta": "Formatear tus publicaciones con HTML",
|
||||
"compose.content-type.markdown": "Markdown",
|
||||
"compose.content-type.markdown_meta": "Formatear tus publicaciones con Markdown",
|
||||
"compose.content-type.plain": "Texto plano",
|
||||
"compose.content-type.plain_meta": "Escribir sin formato avanzado",
|
||||
"compose.disable_threaded_mode": "Deshabilitar modo de hilo",
|
||||
"compose.enable_threaded_mode": "Habilitar modo de hilo",
|
||||
"confirmation_modal.do_not_ask_again": "No preguntar por la confirmación de nuevo",
|
||||
"confirmations.deprecated_settings.confirm": "Usar las preferencias de Mastodon",
|
||||
"confirmations.deprecated_settings.message": "Algunas de las {app_settings} de glitch-soc, específicas para el dispositivo que estás usando han sido reemplazadas en las {preferences} de Mastodon y serán sobreescritas:",
|
||||
|
@ -30,6 +38,10 @@
|
|||
"direct.group_by_conversations": "Agrupar por conversación",
|
||||
"endorsed_accounts_editor.endorsed_accounts": "Cuentas destacadas",
|
||||
"favourite_modal.combo": "Puedes presionar {combo} para omitir esto la próxima vez",
|
||||
"federation.federated.long": "Permitir que esta publicación llegue a otros servidores",
|
||||
"federation.federated.short": "Federado",
|
||||
"federation.local_only.long": "Evitar que esta publicación llegue a otros servidores",
|
||||
"federation.local_only.short": "Solo local",
|
||||
"firehose.column_settings.allow_local_only": "Mostrar mensajes solo-locales en \"Todo\"",
|
||||
"home.column_settings.advanced": "Avanzado",
|
||||
"home.column_settings.filter_regex": "Filtrar por expresiones regulares",
|
||||
|
@ -112,6 +124,7 @@
|
|||
"settings.shared_settings_link": "preferencias de usuario",
|
||||
"settings.show_action_bar": "Mostrar botones de acción en toots colapsados",
|
||||
"settings.show_content_type_choice": "Mostrar selección de tipo de contenido al crear toots",
|
||||
"settings.show_published_toast": "Mostrar mensaje al publicar/guardar una publicación",
|
||||
"settings.show_reply_counter": "Mostrar un conteo estimado de respuestas",
|
||||
"settings.side_arm": "Botón secundario:",
|
||||
"settings.side_arm.none": "Ninguno",
|
||||
|
|
|
@ -14,9 +14,17 @@
|
|||
"column_subheading.lists": "Listas",
|
||||
"column_subheading.navigation": "Navegación",
|
||||
"community.column_settings.allow_local_only": "Mostrar toots solo-locales",
|
||||
"compose.attach.doodle": "Dibujar algo",
|
||||
"compose.change_federation": "Cambiar configuración de la federación",
|
||||
"compose.content-type.change": "Cambiar opciones avanzadas de formato",
|
||||
"compose.content-type.html": "HTML",
|
||||
"compose.content-type.html_meta": "Formatear tus publicaciones con HTML",
|
||||
"compose.content-type.markdown": "Markdown",
|
||||
"compose.content-type.markdown_meta": "Formatear tus publicaciones con Markdown",
|
||||
"compose.content-type.plain": "Texto plano",
|
||||
"compose.content-type.plain_meta": "Escribir sin formato avanzado",
|
||||
"compose.disable_threaded_mode": "Deshabilitar modo de hilo",
|
||||
"compose.enable_threaded_mode": "Habilitar modo de hilo",
|
||||
"confirmation_modal.do_not_ask_again": "No preguntar por la confirmación de nuevo",
|
||||
"confirmations.deprecated_settings.confirm": "Usar las preferencias de Mastodon",
|
||||
"confirmations.deprecated_settings.message": "Algunas de las {app_settings} de glitch-soc, específicas para el dispositivo que estás usando han sido reemplazadas en las {preferences} de Mastodon y serán sobreescritas:",
|
||||
|
@ -30,6 +38,10 @@
|
|||
"direct.group_by_conversations": "Agrupar por conversación",
|
||||
"endorsed_accounts_editor.endorsed_accounts": "Cuentas destacadas",
|
||||
"favourite_modal.combo": "Puedes presionar {combo} para omitir esto la próxima vez",
|
||||
"federation.federated.long": "Permitir que esta publicación llegue a otros servidores",
|
||||
"federation.federated.short": "Federado",
|
||||
"federation.local_only.long": "Evitar que esta publicación llegue a otros servidores",
|
||||
"federation.local_only.short": "Solo local",
|
||||
"firehose.column_settings.allow_local_only": "Mostrar mensajes solo-locales en \"Todo\"",
|
||||
"home.column_settings.advanced": "Avanzado",
|
||||
"home.column_settings.filter_regex": "Filtrar por expresiones regulares",
|
||||
|
@ -112,6 +124,7 @@
|
|||
"settings.shared_settings_link": "preferencias de usuario",
|
||||
"settings.show_action_bar": "Mostrar botones de acción en publicaciones colapsadas",
|
||||
"settings.show_content_type_choice": "Mostrar selección de tipo de contenido al crear publicaciones",
|
||||
"settings.show_published_toast": "Mostrar mensaje al publicar/guardar una publicación",
|
||||
"settings.show_reply_counter": "Mostrar un conteo estimado de respuestas",
|
||||
"settings.side_arm": "Botón secundario:",
|
||||
"settings.side_arm.none": "Ninguno",
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
"about.fork_disclaimer": "Glitch-socはMastodonからフォークされたフリーなオープンソースソフトウェアです。",
|
||||
"account.disclaimer_full": "このユーザー情報は不正確な可能性があります。",
|
||||
"account.follows": "フォロー",
|
||||
"account.follows_you": "フォローされています",
|
||||
"account.suspended_disclaimer_full": "このユーザーはモデレータにより停止されました。",
|
||||
"account.view_full_profile": "正確な情報を見る",
|
||||
"boost_modal.missing_description": "このトゥートには少なくとも1つの画像に説明が付与されていません",
|
||||
|
@ -14,8 +15,12 @@
|
|||
"column_subheading.navigation": "ナビゲーション",
|
||||
"community.column_settings.allow_local_only": "ローカル限定投稿を表示する",
|
||||
"compose.content-type.html": "HTML",
|
||||
"compose.content-type.html_meta": "投稿に HTML を使用する",
|
||||
"compose.content-type.markdown": "マークダウン",
|
||||
"compose.content-type.markdown_meta": "投稿に Markdown を使用する",
|
||||
"compose.content-type.plain": "プレーンテキスト",
|
||||
"compose.disable_threaded_mode": "スレッドモードを無効にする",
|
||||
"compose.enable_threaded_mode": "スレッドモードを有効にする",
|
||||
"confirmation_modal.do_not_ask_again": "もう1度尋ねない",
|
||||
"confirmations.deprecated_settings.confirm": "Mastodonの設定を使用",
|
||||
"confirmations.missing_media_description.confirm": "このまま投稿",
|
||||
|
@ -28,6 +33,8 @@
|
|||
"direct.group_by_conversations": "会話でグループ化",
|
||||
"endorsed_accounts_editor.endorsed_accounts": "紹介しているユーザー",
|
||||
"favourite_modal.combo": "次からは {combo} を押せば、これをスキップできます。",
|
||||
"federation.federated.short": "連合",
|
||||
"federation.local_only.short": "ローカル限定",
|
||||
"home.column_settings.advanced": "高度",
|
||||
"home.column_settings.filter_regex": "正規表現でフィルター",
|
||||
"home.column_settings.show_direct": "DMを表示",
|
||||
|
@ -97,6 +104,7 @@
|
|||
"settings.rewrite_mentions_acct": "ユーザー名とドメイン名(アカウントがリモートの場合)を表示するように書き換える",
|
||||
"settings.rewrite_mentions_no": "書き換えない",
|
||||
"settings.rewrite_mentions_username": "ユーザー名を表示するように書き換える",
|
||||
"settings.shared_settings_link": "ユーザー設定",
|
||||
"settings.show_action_bar": "アクションバーを表示",
|
||||
"settings.show_content_type_choice": "トゥートを書くときコンテンツ形式の選択ボタンを表示する",
|
||||
"settings.show_reply_counter": "投稿に対するリプライの数を表示する",
|
||||
|
|
|
@ -64,8 +64,6 @@
|
|||
"notification_purge.btn_invert": "反选",
|
||||
"notification_purge.btn_none": "取消全选",
|
||||
"notification_purge.start": "进入通知清理模式",
|
||||
"notifications.column_settings.filter_bar.advanced": "显示所有类别",
|
||||
"notifications.column_settings.filter_bar.category": "快速筛选栏",
|
||||
"notifications.column_settings.filter_bar.show_bar": "显示筛选栏",
|
||||
"notifications.marked_clear": "清除选择的通知",
|
||||
"notifications.marked_clear_confirmation": "你确定要永久清除所有选择的通知吗?",
|
||||
|
|
|
@ -60,8 +60,6 @@
|
|||
"notification_purge.btn_invert": "反向選擇",
|
||||
"notification_purge.btn_none": "取消選取",
|
||||
"notification_purge.start": "進入通知清理模式",
|
||||
"notifications.column_settings.filter_bar.advanced": "顯示所有分類",
|
||||
"notifications.column_settings.filter_bar.category": "快速過濾欄",
|
||||
"notifications.column_settings.filter_bar.show_bar": "顯示過濾器",
|
||||
"notifications.marked_clear": "清除被選取的通知訊息",
|
||||
"notifications.marked_clear_confirmation": "您確定要永久清除所有被選取的通知訊息嗎?",
|
||||
|
|
|
@ -37,10 +37,6 @@ const initialState = ImmutableMap({
|
|||
media : false,
|
||||
height : 400,
|
||||
}),
|
||||
backgrounds : ImmutableMap({
|
||||
user_backgrounds : false,
|
||||
preview_images : false,
|
||||
}),
|
||||
show_action_bar : true,
|
||||
}),
|
||||
media : ImmutableMap({
|
||||
|
|
|
@ -1523,23 +1523,6 @@ body > [data-popper-placement] {
|
|||
user-select: none;
|
||||
min-height: 0;
|
||||
|
||||
&.has-background::before {
|
||||
display: block;
|
||||
position: absolute;
|
||||
inset-inline-start: 0;
|
||||
inset-inline-end: 0;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
background-image: linear-gradient(
|
||||
to bottom,
|
||||
rgba($base-shadow-color, 0.75),
|
||||
rgba($base-shadow-color, 0.65) 24px,
|
||||
rgba($base-shadow-color, 0.8)
|
||||
);
|
||||
pointer-events: none;
|
||||
content: '';
|
||||
}
|
||||
|
||||
.display-name:hover .display-name__html {
|
||||
text-decoration: none;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue