+ {node} ,
+ }}
+ />
+
+ )}
+ {node}
, + p: (node) =>{node}
, + ul: (node) =>- {node}
+
diff --git a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
index 89cc30da9efba9..b423c61e5f3ea1 100644
--- a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
@@ -14,7 +14,6 @@ import AutosuggestInput from '../../../components/autosuggest_input';
import AutosuggestTextarea from '../../../components/autosuggest_textarea';
import { Button } from '../../../components/button';
import EmojiPickerDropdown from '../containers/emoji_picker_dropdown_container';
-import LanguageDropdown from '../containers/language_dropdown_container';
import PollButtonContainer from '../containers/poll_button_container';
import PrivacyDropdownContainer from '../containers/privacy_dropdown_container';
import SpoilerButtonContainer from '../containers/spoiler_button_container';
@@ -26,6 +25,7 @@ import { CharacterCounter } from './character_counter';
import { ContentTypeButton } from './content_type_button';
import { EditIndicator } from './edit_indicator';
import { FederationButton } from './federation_button';
+import { LanguageDropdown } from './language_dropdown';
import { NavigationBar } from './navigation_bar';
import { PollForm } from "./poll_form";
import { ReplyIndicator } from './reply_indicator';
diff --git a/app/javascript/flavours/glitch/features/compose/components/language_dropdown.jsx b/app/javascript/flavours/glitch/features/compose/components/language_dropdown.jsx
deleted file mode 100644
index 82874cfbdb8077..00000000000000
--- a/app/javascript/flavours/glitch/features/compose/components/language_dropdown.jsx
+++ /dev/null
@@ -1,330 +0,0 @@
-import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
-
-import { injectIntl, defineMessages } from 'react-intl';
-
-import classNames from 'classnames';
-
-import { supportsPassiveEvents } from 'detect-passive-events';
-import fuzzysort from 'fuzzysort';
-import Overlay from 'react-overlays/Overlay';
-
-import CancelIcon from '@/material-icons/400-24px/cancel-fill.svg?react';
-import SearchIcon from '@/material-icons/400-24px/search.svg?react';
-import TranslateIcon from '@/material-icons/400-24px/translate.svg?react';
-import { Icon } from 'flavours/glitch/components/icon';
-import { languages as preloadedLanguages } from 'flavours/glitch/initial_state';
-
-const messages = defineMessages({
- changeLanguage: { id: 'compose.language.change', defaultMessage: 'Change language' },
- search: { id: 'compose.language.search', defaultMessage: 'Search languages...' },
- clear: { id: 'emoji_button.clear', defaultMessage: 'Clear' },
-});
-
-const listenerOptions = supportsPassiveEvents ? { passive: true, capture: true } : true;
-
-class LanguageDropdownMenu extends PureComponent {
-
- static propTypes = {
- value: PropTypes.string.isRequired,
- guess: PropTypes.string,
- frequentlyUsedLanguages: PropTypes.arrayOf(PropTypes.string).isRequired,
- onClose: PropTypes.func.isRequired,
- onChange: PropTypes.func.isRequired,
- languages: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.string)),
- intl: PropTypes.object,
- };
-
- static defaultProps = {
- languages: preloadedLanguages,
- };
-
- state = {
- searchValue: '',
- };
-
- handleDocumentClick = e => {
- if (this.node && !this.node.contains(e.target)) {
- this.props.onClose();
- e.stopPropagation();
- }
- };
-
- componentDidMount () {
- document.addEventListener('click', this.handleDocumentClick, { capture: true });
- document.addEventListener('touchend', this.handleDocumentClick, listenerOptions);
-
- // Because of https://github.com/react-bootstrap/react-bootstrap/issues/2614 we need
- // to wait for a frame before focusing
- requestAnimationFrame(() => {
- if (this.node) {
- const element = this.node.querySelector('input[type="search"]');
- if (element) element.focus();
- }
- });
- }
-
- componentWillUnmount () {
- document.removeEventListener('click', this.handleDocumentClick, { capture: true });
- document.removeEventListener('touchend', this.handleDocumentClick, listenerOptions);
- }
-
- setRef = c => {
- this.node = c;
- };
-
- setListRef = c => {
- this.listNode = c;
- };
-
- handleSearchChange = ({ target }) => {
- this.setState({ searchValue: target.value });
- };
-
- search () {
- const { languages, value, frequentlyUsedLanguages, guess } = this.props;
- const { searchValue } = this.state;
-
- if (searchValue === '') {
- return [...languages].sort((a, b) => {
-
- if (guess && a[0] === guess) { // Push guessed language higher than current selection
- return -1;
- } else if (guess && b[0] === guess) {
- return 1;
- } else if (a[0] === value) { // Push current selection to the top of the list
- return -1;
- } else if (b[0] === value) {
- return 1;
- } else {
- // Sort according to frequently used languages
-
- const indexOfA = frequentlyUsedLanguages.indexOf(a[0]);
- const indexOfB = frequentlyUsedLanguages.indexOf(b[0]);
-
- return ((indexOfA > -1 ? indexOfA : Infinity) - (indexOfB > -1 ? indexOfB : Infinity));
- }
- });
- }
-
- return fuzzysort.go(searchValue, languages, {
- keys: ['0', '1', '2'],
- limit: 5,
- threshold: -10000,
- }).map(result => result.obj);
- }
-
- handleClick = e => {
- const value = e.currentTarget.getAttribute('data-index');
-
- e.preventDefault();
-
- this.props.onClose();
- this.props.onChange(value);
- };
-
- handleKeyDown = e => {
- const { onClose } = this.props;
- const index = Array.from(this.listNode.childNodes).findIndex(node => node === e.currentTarget);
-
- let element = null;
-
- switch(e.key) {
- case 'Escape':
- onClose();
- break;
- case ' ':
- case 'Enter':
- this.handleClick(e);
- break;
- case 'ArrowDown':
- element = this.listNode.childNodes[index + 1] || this.listNode.firstChild;
- break;
- case 'ArrowUp':
- element = this.listNode.childNodes[index - 1] || this.listNode.lastChild;
- break;
- case 'Tab':
- if (e.shiftKey) {
- element = this.listNode.childNodes[index - 1] || this.listNode.lastChild;
- } else {
- element = this.listNode.childNodes[index + 1] || this.listNode.firstChild;
- }
- break;
- case 'Home':
- element = this.listNode.firstChild;
- break;
- case 'End':
- element = this.listNode.lastChild;
- break;
- }
-
- if (element) {
- element.focus();
- e.preventDefault();
- e.stopPropagation();
- }
- };
-
- handleSearchKeyDown = e => {
- const { onChange, onClose } = this.props;
- const { searchValue } = this.state;
-
- let element = null;
-
- switch(e.key) {
- case 'Tab':
- case 'ArrowDown':
- element = this.listNode.firstChild;
-
- if (element) {
- element.focus();
- e.preventDefault();
- e.stopPropagation();
- }
-
- break;
- case 'Enter':
- element = this.listNode.firstChild;
-
- if (element) {
- onChange(element.getAttribute('data-index'));
- onClose();
- }
- break;
- case 'Escape':
- if (searchValue !== '') {
- e.preventDefault();
- this.handleClear();
- }
-
- break;
- }
- };
-
- handleClear = () => {
- this.setState({ searchValue: '' });
- };
-
- renderItem = lang => {
- const { value } = this.props;
-
- return (
-
- {lang[2]} ({lang[1]})
-
- );
- };
-
- render () {
- const { intl } = this.props;
- const { searchValue } = this.state;
- const isSearching = searchValue !== '';
- const results = this.search();
-
- return (
-
-
- );
- }
-
-}
-
-class LanguageDropdown extends PureComponent {
-
- static propTypes = {
- value: PropTypes.string,
- frequentlyUsedLanguages: PropTypes.arrayOf(PropTypes.string),
- guess: PropTypes.string,
- intl: PropTypes.object.isRequired,
- onChange: PropTypes.func,
- };
-
- state = {
- open: false,
- placement: 'bottom',
- };
-
- handleToggle = () => {
- if (this.state.open && this.activeElement) {
- this.activeElement.focus({ preventScroll: true });
- }
-
- this.setState({ open: !this.state.open });
- };
-
- handleClose = () => {
- if (this.state.open && this.activeElement) {
- this.activeElement.focus({ preventScroll: true });
- }
-
- this.setState({ open: false });
- };
-
- handleChange = value => {
- const { onChange } = this.props;
- onChange(value);
- };
-
- setTargetRef = c => {
- this.target = c;
- };
-
- findTarget = () => {
- return this.target;
- };
-
- handleOverlayEnter = (state) => {
- this.setState({ placement: state.placement });
- };
-
- render () {
- const { value, guess, intl, frequentlyUsedLanguages } = this.props;
- const { open, placement } = this.state;
- const current = preloadedLanguages.find(lang => lang[0] === value) ?? [];
-
- return (
-
-
-
-
-
-
- {results.map(this.renderItem)}
-
-
-
-
-
- {({ props, placement }) => (
-
-
- );
- }
-
-}
-
-export default injectIntl(LanguageDropdown);
diff --git a/app/javascript/flavours/glitch/features/compose/components/language_dropdown.tsx b/app/javascript/flavours/glitch/features/compose/components/language_dropdown.tsx
new file mode 100644
index 00000000000000..e8ead66faef923
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/compose/components/language_dropdown.tsx
@@ -0,0 +1,427 @@
+import { useCallback, useRef, useState, useEffect, useMemo } from 'react';
+
+import { useIntl, defineMessages } from 'react-intl';
+
+import classNames from 'classnames';
+
+import { createSelector } from '@reduxjs/toolkit';
+import { Map as ImmutableMap } from 'immutable';
+
+import fuzzysort from 'fuzzysort';
+import Overlay from 'react-overlays/Overlay';
+import type { State, Placement } from 'react-overlays/usePopper';
+
+import CancelIcon from '@/material-icons/400-24px/cancel-fill.svg?react';
+import SearchIcon from '@/material-icons/400-24px/search.svg?react';
+import TranslateIcon from '@/material-icons/400-24px/translate.svg?react';
+import { changeComposeLanguage } from 'flavours/glitch/actions/compose';
+import { Icon } from 'flavours/glitch/components/icon';
+import { languages as preloadedLanguages } from 'flavours/glitch/initial_state';
+import type { RootState } from 'flavours/glitch/store';
+import { useAppSelector, useAppDispatch } from 'flavours/glitch/store';
+
+import { debouncedGuess } from '../util/language_detection';
+
+const messages = defineMessages({
+ changeLanguage: {
+ id: 'compose.language.change',
+ defaultMessage: 'Change language',
+ },
+ search: {
+ id: 'compose.language.search',
+ defaultMessage: 'Search languages...',
+ },
+ clear: { id: 'emoji_button.clear', defaultMessage: 'Clear' },
+});
+
+type Language = [string, string, string];
+
+const getFrequentlyUsedLanguages = createSelector(
+ [
+ (state: RootState) =>
+ (state.settings as ImmutableMap
-
- )}
-
-
-
+
+ );
+};
+
+export const LanguageDropdown: React.FC = () => {
+ const [open, setOpen] = useState(false);
+ const [placement, setPlacement] = useState
+
+
+
+
+
+ {results.map((lang) => (
+
+
+
+ {lang[2]}
+ {' '}
+
+ ({lang[1]})
+
+
+ ))}
+
+
+
+
+ {({ props, placement }) => (
+
+
+ );
+};
diff --git a/app/javascript/mastodon/features/compose/containers/language_dropdown_container.js b/app/javascript/flavours/glitch/features/compose/util/language_detection.js
similarity index 51%
rename from app/javascript/mastodon/features/compose/containers/language_dropdown_container.js
rename to app/javascript/flavours/glitch/features/compose/util/language_detection.js
index 64d6516a18cb0e..b3be07d516ff2d 100644
--- a/app/javascript/mastodon/features/compose/containers/language_dropdown_container.js
+++ b/app/javascript/flavours/glitch/features/compose/util/language_detection.js
@@ -1,23 +1,7 @@
-import { createSelector } from '@reduxjs/toolkit';
-import { Map as ImmutableMap } from 'immutable';
-import { connect } from 'react-redux';
-
import lande from 'lande';
import { debounce } from 'lodash';
-import { changeComposeLanguage } from 'mastodon/actions/compose';
-
-import LanguageDropdown from '../components/language_dropdown';
-import { urlRegex } from '../util/url_regex';
-
-const getFrequentlyUsedLanguages = createSelector([
- state => state.getIn(['settings', 'frequentlyUsedLanguages'], ImmutableMap()),
-], languageCounters => (
- languageCounters.keySeq()
- .sort((a, b) => languageCounters.get(a) - languageCounters.get(b))
- .reverse()
- .toArray()
-));
+import { urlRegex } from './url_regex';
const ISO_639_MAP = {
afr: 'af', // Afrikaans
@@ -72,47 +56,21 @@ const ISO_639_MAP = {
vie: 'vi', // Vietnamese
};
-const debouncedLande = debounce((text) => {
+const guessLanguage = (text) => {
text = text
.replace(urlRegex, '')
.replace(/(^|[^/\w])@(([a-z0-9_]+)@[a-z0-9.-]+[a-z0-9]+)/ig, '');
- if (text.length <= 20)
- return undefined;
-
- return lande(text);
-}, 500, { trailing: true });
-
-const detectedLanguage = createSelector([
- state => state.getIn(['compose', 'text']),
-], text => {
if (text.length > 20) {
- const guesses = debouncedLande(text);
- if (!guesses)
- return '';
-
- const [lang, confidence] = guesses[0];
-
- if (confidence > 0.8) {
+ const [lang, confidence] = lande(text)[0];
+
+ if (confidence > 0.8)
return ISO_639_MAP[lang];
- }
}
return '';
-});
-
-const mapStateToProps = state => ({
- frequentlyUsedLanguages: getFrequentlyUsedLanguages(state),
- value: state.getIn(['compose', 'language']),
- guess: detectedLanguage(state),
-});
-
-const mapDispatchToProps = dispatch => ({
-
- onChange (value) {
- dispatch(changeComposeLanguage(value));
- },
-
-});
+};
-export default connect(mapStateToProps, mapDispatchToProps)(LanguageDropdown);
+export const debouncedGuess = debounce((text, setGuess) => {
+ setGuess(guessLanguage(text));
+}, 500, { leading: true, trailing: true });
\ No newline at end of file
diff --git a/app/javascript/flavours/glitch/features/explore/components/card.jsx b/app/javascript/flavours/glitch/features/explore/components/card.jsx
index 4612d25e2149ce..051bedc2dab0d5 100644
--- a/app/javascript/flavours/glitch/features/explore/components/card.jsx
+++ b/app/javascript/flavours/glitch/features/explore/components/card.jsx
@@ -55,11 +55,11 @@ export const Card = ({ id, source }) => {
+
+ )}
+
+
+
- ).get(
+ 'frequentlyUsedLanguages',
+ ImmutableMap(),
+ ) as ImmutableMap,
+ ],
+ (languageCounters) =>
+ languageCounters
+ .keySeq()
+ .sort(
+ (a, b) =>
+ (languageCounters.get(a) ?? 0) - (languageCounters.get(b) ?? 0),
+ )
+ .reverse()
+ .toArray(),
+);
+
+const LanguageDropdownMenu: React.FC<{
+ value: string;
+ guess?: string;
+ onClose: () => void;
+ onChange: (arg0: string) => void;
+}> = ({ value, guess, onClose, onChange }) => {
+ const languages = preloadedLanguages as Language[];
+ const intl = useIntl();
+ const [searchValue, setSearchValue] = useState('');
+ const nodeRef = useRef(null);
+ const listNodeRef = useRef(null);
+
+ const frequentlyUsedLanguages = useAppSelector(getFrequentlyUsedLanguages);
+
+ const handleSearchChange = useCallback(
+ ({ target }: React.ChangeEvent) => {
+ setSearchValue(target.value);
+ },
+ [setSearchValue],
+ );
+
+ const handleClick = useCallback(
+ (e: React.MouseEvent | React.KeyboardEvent) => {
+ const value = e.currentTarget.getAttribute('data-index');
+
+ if (!value) {
+ return;
+ }
+
+ e.preventDefault();
+
+ onClose();
+ onChange(value);
+ },
+ [onClose, onChange],
+ );
+
+ const handleKeyDown = useCallback(
+ (e: React.KeyboardEvent) => {
+ if (!listNodeRef.current) {
+ return;
+ }
+
+ const index = Array.from(listNodeRef.current.childNodes).findIndex(
+ (node) => node === e.currentTarget,
+ );
+
+ let element = null;
+
+ switch (e.key) {
+ case 'Escape':
+ onClose();
+ break;
+ case ' ':
+ case 'Enter':
+ handleClick(e);
+ break;
+ case 'ArrowDown':
+ element =
+ listNodeRef.current.childNodes[index + 1] ??
+ listNodeRef.current.firstChild;
+ break;
+ case 'ArrowUp':
+ element =
+ listNodeRef.current.childNodes[index - 1] ??
+ listNodeRef.current.lastChild;
+ break;
+ case 'Tab':
+ if (e.shiftKey) {
+ element =
+ listNodeRef.current.childNodes[index - 1] ??
+ listNodeRef.current.lastChild;
+ } else {
+ element =
+ listNodeRef.current.childNodes[index + 1] ??
+ listNodeRef.current.firstChild;
+ }
+ break;
+ case 'Home':
+ element = listNodeRef.current.firstChild;
+ break;
+ case 'End':
+ element = listNodeRef.current.lastChild;
+ break;
+ }
+
+ if (element && element instanceof HTMLElement) {
+ element.focus();
+ e.preventDefault();
+ e.stopPropagation();
+ }
+ },
+ [onClose, handleClick],
+ );
+
+ const handleSearchKeyDown = useCallback(
+ (e: React.KeyboardEvent) => {
+ let element = null;
+
+ if (!listNodeRef.current) {
+ return;
+ }
+
+ switch (e.key) {
+ case 'Tab':
+ case 'ArrowDown':
+ element = listNodeRef.current.firstChild;
+
+ if (element && element instanceof HTMLElement) {
+ element.focus();
+ e.preventDefault();
+ e.stopPropagation();
+ }
+
+ break;
+ case 'Enter':
+ element = listNodeRef.current.firstChild;
+
+ if (element && element instanceof HTMLElement) {
+ const value = element.getAttribute('data-index');
+
+ if (value) {
+ onChange(value);
+ onClose();
+ }
+ }
+ break;
+ case 'Escape':
+ if (searchValue !== '') {
+ e.preventDefault();
+ setSearchValue('');
+ }
+
+ break;
+ }
+ },
+ [setSearchValue, onChange, onClose, searchValue],
+ );
+
+ const handleClear = useCallback(() => {
+ setSearchValue('');
+ }, [setSearchValue]);
+
+ const isSearching = searchValue !== '';
+
+ useEffect(() => {
+ const handleDocumentClick = (e: MouseEvent) => {
+ if (
+ nodeRef.current &&
+ e.target instanceof HTMLElement &&
+ !nodeRef.current.contains(e.target)
+ ) {
+ onClose();
+ e.stopPropagation();
+ }
+ };
+
+ document.addEventListener('click', handleDocumentClick, { capture: true });
+
+ // Because of https://github.com/react-bootstrap/react-bootstrap/issues/2614 we need
+ // to wait for a frame before focusing
+ requestAnimationFrame(() => {
+ if (nodeRef.current) {
+ const element = nodeRef.current.querySelector(
+ 'input[type="search"]',
+ );
+ if (element) element.focus();
+ }
+ });
+
+ return () => {
+ document.removeEventListener('click', handleDocumentClick);
+ };
+ }, [onClose]);
+
+ const results = useMemo(() => {
+ if (searchValue === '') {
+ return [...languages].sort((a, b) => {
+ if (guess && a[0] === guess) {
+ // Push guessed language higher than current selection
+ return -1;
+ } else if (guess && b[0] === guess) {
+ return 1;
+ } else if (a[0] === value) {
+ // Push current selection to the top of the list
+ return -1;
+ } else if (b[0] === value) {
+ return 1;
+ } else {
+ // Sort according to frequently used languages
+
+ const indexOfA = frequentlyUsedLanguages.indexOf(a[0]);
+ const indexOfB = frequentlyUsedLanguages.indexOf(b[0]);
+
+ return (
+ (indexOfA > -1 ? indexOfA : Infinity) -
+ (indexOfB > -1 ? indexOfB : Infinity)
+ );
+ }
+ });
+ }
+
+ return fuzzysort
+ .go(searchValue, languages, {
+ keys: ['0', '1', '2'],
+ limit: 5,
+ threshold: -10000,
+ })
+ .map((result) => result.obj);
+ }, [searchValue, languages, guess, frequentlyUsedLanguages, value]);
+
+ return (
+ ('bottom');
+ const [guess, setGuess] = useState('');
+ const activeElementRef = useRef(null);
+ const targetRef = useRef(null);
+
+ const intl = useIntl();
+
+ const dispatch = useAppDispatch();
+ const value = useAppSelector(
+ (state) => state.compose.get('language') as string,
+ );
+ const text = useAppSelector((state) => state.compose.get('text') as string);
+
+ const current =
+ (preloadedLanguages as Language[]).find((lang) => lang[0] === value) ?? [];
+
+ const handleMouseDown = useCallback(() => {
+ if (!open && document.activeElement instanceof HTMLElement) {
+ activeElementRef.current = document.activeElement;
+ }
+ }, [open]);
+
+ const handleToggle = useCallback(() => {
+ if (open && activeElementRef.current)
+ activeElementRef.current.focus({ preventScroll: true });
+
+ setOpen(!open);
+ }, [open, setOpen]);
+
+ const handleClose = useCallback(() => {
+ if (open && activeElementRef.current)
+ activeElementRef.current.focus({ preventScroll: true });
+
+ setOpen(false);
+ }, [open, setOpen]);
+
+ const handleChange = useCallback(
+ (value: string) => {
+ dispatch(changeComposeLanguage(value));
+ },
+ [dispatch],
+ );
+
+ const handleOverlayEnter = useCallback(
+ (state: Partial) => {
+ setPlacement(state.placement);
+ },
+ [setPlacement],
+ );
+
+ useEffect(() => {
+ if (text.length > 20) {
+ debouncedGuess(text, setGuess);
+ } else {
+ setGuess('');
+ }
+ }, [text, setGuess]);
+
+ return (
+
-
diff --git a/app/javascript/flavours/glitch/features/home_timeline/components/inline_follow_suggestions.tsx b/app/javascript/flavours/glitch/features/home_timeline/components/inline_follow_suggestions.tsx
index d980e698ce761e..f30efed276af60 100644
--- a/app/javascript/flavours/glitch/features/home_timeline/components/inline_follow_suggestions.tsx
+++ b/app/javascript/flavours/glitch/features/home_timeline/components/inline_follow_suggestions.tsx
@@ -145,13 +145,13 @@ const Card: React.FC<{
/>
-
+
-
+
{
+ const intl = useIntl();
+ const [open, setOpen] = useState(false);
+ const triggerRef = useRef(null);
+ const accessibilityId = useId();
+
+ const handleClick = useCallback(() => {
+ setOpen(!open);
+ }, [open, setOpen]);
+
+ return (
+ <>
+
+
+
+ {({ props }) => (
+
+
+ );
+};
diff --git a/app/javascript/mastodon/features/alt_text_modal/index.tsx b/app/javascript/mastodon/features/alt_text_modal/index.tsx
index 88ffb7c477fa13..80c4f36105e5ad 100644
--- a/app/javascript/mastodon/features/alt_text_modal/index.tsx
+++ b/app/javascript/mastodon/features/alt_text_modal/index.tsx
@@ -36,6 +36,8 @@ import type { MediaAttachment } from 'mastodon/models/media_attachment';
import { useAppSelector, useAppDispatch } from 'mastodon/store';
import { assetHost } from 'mastodon/utils/config';
+import { InfoButton } from './components/info_button';
+
const messages = defineMessages({
placeholderVisual: {
id: 'alt_text_modal.describe_for_people_with_visual_impairments',
@@ -504,6 +506,13 @@ export const AltTextModal = forwardRef>(
+ {node} ,
+ }}
+ />
+
+ )}
+ {node}
, + p: (node) =>{node}
, + ul: (node) =>- {node}
+
- {lang[2]} ({lang[1]})
-
- );
- };
-
- render () {
- const { intl } = this.props;
- const { searchValue } = this.state;
- const isSearching = searchValue !== '';
- const results = this.search();
-
- return (
-
-
- );
- }
-
-}
-
-class LanguageDropdown extends PureComponent {
-
- static propTypes = {
- value: PropTypes.string,
- frequentlyUsedLanguages: PropTypes.arrayOf(PropTypes.string),
- guess: PropTypes.string,
- intl: PropTypes.object.isRequired,
- onChange: PropTypes.func,
- };
-
- state = {
- open: false,
- placement: 'bottom',
- };
-
- handleToggle = () => {
- if (this.state.open && this.activeElement) {
- this.activeElement.focus({ preventScroll: true });
- }
-
- this.setState({ open: !this.state.open });
- };
-
- handleClose = () => {
- if (this.state.open && this.activeElement) {
- this.activeElement.focus({ preventScroll: true });
- }
-
- this.setState({ open: false });
- };
-
- handleChange = value => {
- const { onChange } = this.props;
- onChange(value);
- };
-
- setTargetRef = c => {
- this.target = c;
- };
-
- findTarget = () => {
- return this.target;
- };
-
- handleOverlayEnter = (state) => {
- this.setState({ placement: state.placement });
- };
-
- render () {
- const { value, guess, intl, frequentlyUsedLanguages } = this.props;
- const { open, placement } = this.state;
- const current = preloadedLanguages.find(lang => lang[0] === value) ?? [];
-
- return (
-
-
-
-
-
-
- {results.map(this.renderItem)}
-
-
-
-
-
- {({ props, placement }) => (
-
-
- );
- }
-
-}
-
-export default injectIntl(LanguageDropdown);
diff --git a/app/javascript/mastodon/features/compose/components/language_dropdown.tsx b/app/javascript/mastodon/features/compose/components/language_dropdown.tsx
new file mode 100644
index 00000000000000..21c43599816b95
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/components/language_dropdown.tsx
@@ -0,0 +1,427 @@
+import { useCallback, useRef, useState, useEffect, useMemo } from 'react';
+
+import { useIntl, defineMessages } from 'react-intl';
+
+import classNames from 'classnames';
+
+import { createSelector } from '@reduxjs/toolkit';
+import { Map as ImmutableMap } from 'immutable';
+
+import fuzzysort from 'fuzzysort';
+import Overlay from 'react-overlays/Overlay';
+import type { State, Placement } from 'react-overlays/usePopper';
+
+import CancelIcon from '@/material-icons/400-24px/cancel-fill.svg?react';
+import SearchIcon from '@/material-icons/400-24px/search.svg?react';
+import TranslateIcon from '@/material-icons/400-24px/translate.svg?react';
+import { changeComposeLanguage } from 'mastodon/actions/compose';
+import { Icon } from 'mastodon/components/icon';
+import { languages as preloadedLanguages } from 'mastodon/initial_state';
+import type { RootState } from 'mastodon/store';
+import { useAppSelector, useAppDispatch } from 'mastodon/store';
+
+import { debouncedGuess } from '../util/language_detection';
+
+const messages = defineMessages({
+ changeLanguage: {
+ id: 'compose.language.change',
+ defaultMessage: 'Change language',
+ },
+ search: {
+ id: 'compose.language.search',
+ defaultMessage: 'Search languages...',
+ },
+ clear: { id: 'emoji_button.clear', defaultMessage: 'Clear' },
+});
+
+type Language = [string, string, string];
+
+const getFrequentlyUsedLanguages = createSelector(
+ [
+ (state: RootState) =>
+ (state.settings as ImmutableMap
-
- )}
-
-
-
+
+ );
+};
+
+export const LanguageDropdown: React.FC = () => {
+ const [open, setOpen] = useState(false);
+ const [placement, setPlacement] = useState
+
+
+
+
+
+ {results.map((lang) => (
+
+
+
+ {lang[2]}
+ {' '}
+
+ ({lang[1]})
+
+
+ ))}
+
+
+
+
+ {({ props, placement }) => (
+
+
+ );
+};
diff --git a/app/javascript/flavours/glitch/features/compose/containers/language_dropdown_container.js b/app/javascript/mastodon/features/compose/util/language_detection.js
similarity index 51%
rename from app/javascript/flavours/glitch/features/compose/containers/language_dropdown_container.js
rename to app/javascript/mastodon/features/compose/util/language_detection.js
index f038479fd0cd1b..b3be07d516ff2d 100644
--- a/app/javascript/flavours/glitch/features/compose/containers/language_dropdown_container.js
+++ b/app/javascript/mastodon/features/compose/util/language_detection.js
@@ -1,23 +1,7 @@
-import { createSelector } from '@reduxjs/toolkit';
-import { Map as ImmutableMap } from 'immutable';
-import { connect } from 'react-redux';
-
import lande from 'lande';
import { debounce } from 'lodash';
-import { changeComposeLanguage } from 'flavours/glitch/actions/compose';
-
-import LanguageDropdown from '../components/language_dropdown';
-import { urlRegex } from '../util/url_regex';
-
-const getFrequentlyUsedLanguages = createSelector([
- state => state.getIn(['settings', 'frequentlyUsedLanguages'], ImmutableMap()),
-], languageCounters => (
- languageCounters.keySeq()
- .sort((a, b) => languageCounters.get(a) - languageCounters.get(b))
- .reverse()
- .toArray()
-));
+import { urlRegex } from './url_regex';
const ISO_639_MAP = {
afr: 'af', // Afrikaans
@@ -72,47 +56,21 @@ const ISO_639_MAP = {
vie: 'vi', // Vietnamese
};
-const debouncedLande = debounce((text) => {
+const guessLanguage = (text) => {
text = text
.replace(urlRegex, '')
.replace(/(^|[^/\w])@(([a-z0-9_]+)@[a-z0-9.-]+[a-z0-9]+)/ig, '');
- if (text.length <= 20)
- return undefined;
-
- return lande(text);
-}, 500, { trailing: true });
-
-const detectedLanguage = createSelector([
- state => state.getIn(['compose', 'text']),
-], text => {
if (text.length > 20) {
- const guesses = debouncedLande(text);
- if (!guesses)
- return '';
-
- const [lang, confidence] = guesses[0];
-
- if (confidence > 0.8) {
+ const [lang, confidence] = lande(text)[0];
+
+ if (confidence > 0.8)
return ISO_639_MAP[lang];
- }
}
return '';
-});
-
-const mapStateToProps = state => ({
- frequentlyUsedLanguages: getFrequentlyUsedLanguages(state),
- value: state.getIn(['compose', 'language']),
- guess: detectedLanguage(state),
-});
-
-const mapDispatchToProps = dispatch => ({
-
- onChange (value) {
- dispatch(changeComposeLanguage(value));
- },
-
-});
+};
-export default connect(mapStateToProps, mapDispatchToProps)(LanguageDropdown);
+export const debouncedGuess = debounce((text, setGuess) => {
+ setGuess(guessLanguage(text));
+}, 500, { leading: true, trailing: true });
\ No newline at end of file
diff --git a/app/javascript/mastodon/features/explore/components/card.jsx b/app/javascript/mastodon/features/explore/components/card.jsx
index 19086485106400..15470ec24c61a0 100644
--- a/app/javascript/mastodon/features/explore/components/card.jsx
+++ b/app/javascript/mastodon/features/explore/components/card.jsx
@@ -55,11 +55,11 @@ export const Card = ({ id, source }) => {
+
+ )}
+
+
+
-
-
diff --git a/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.tsx b/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.tsx
index 5fd47443d94efa..777ffb4e188153 100644
--- a/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.tsx
+++ b/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.tsx
@@ -145,13 +145,13 @@ const Card: React.FC<{
/>
-
+
-
+
Plasuje Cię w czołówce użytkowników {domain}. ",
"annual_report.summary.percentile.we_wont_tell_bernie": "Nie powiemy Berniemu.",
"annual_report.summary.thanks": "Dziękujemy, że jesteś częścią Mastodona!",
"attachments_list.unprocessed": "(nieprzetworzone)",
@@ -408,6 +416,10 @@
"ignore_notifications_modal.private_mentions_title": "Ignoruj powiadomienia o nieproszonych wzmiankach prywatnych?",
"interaction_modal.action.favourite": "Aby kontynuować, musisz dodać do ulubionych na swoim koncie.",
"interaction_modal.action.follow": "Aby kontynuować, musisz obserwować ze swojego konta.",
+ "interaction_modal.action.reblog": "Aby kontynuować, musisz podać dalej ze swojego konta.",
+ "interaction_modal.action.reply": "Aby kontynuować, musisz odpowiedzieć ze swojego konta.",
+ "interaction_modal.action.vote": "Aby kontynuować, musisz zagłosować ze swojego konta.",
+ "interaction_modal.go": "Dalej",
"interaction_modal.no_account_yet": "Nie masz jeszcze konta?",
"interaction_modal.on_another_server": "Na innym serwerze",
"interaction_modal.on_this_server": "Na tym serwerze",
@@ -452,6 +464,7 @@
"keyboard_shortcuts.toggle_hidden": "aby wyświetlić lub ukryć wpis spod CW",
"keyboard_shortcuts.toggle_sensitivity": "Pokaż/ukryj multimedia",
"keyboard_shortcuts.toot": "Stwórz nowy post",
+ "keyboard_shortcuts.translate": "Aby przetłumaczyć post",
"keyboard_shortcuts.unfocus": "aby opuścić pole wyszukiwania/pisania",
"keyboard_shortcuts.up": "aby przejść na górę listy",
"lightbox.close": "Zamknij",
@@ -690,6 +703,8 @@
"privacy_policy.title": "Polityka prywatności",
"recommended": "Zalecane",
"refresh": "Odśwież",
+ "regeneration_indicator.please_stand_by": "Proszę czekać.",
+ "regeneration_indicator.preparing_your_home_feed": "Przygotowywanie Twojego kanału wiadomości...",
"relative_time.days": "{number} dni",
"relative_time.full.days": "{number, plural, one {# dzień} few {# dni} many {# dni} other {# dni}} temu",
"relative_time.full.hours": "{number, plural, one {# godzinę} few {# godziny} many {# godzin} other {# godzin}} temu",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index f9cd9dfcc1fe1e..48ae395481f76e 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -414,9 +414,11 @@
"ignore_notifications_modal.not_followers_title": "Ignorar notificações de pessoas que não te seguem?",
"ignore_notifications_modal.not_following_title": "Ignorar notificações de pessoas que não segues?",
"ignore_notifications_modal.private_mentions_title": "Ignorar notificações de menções privadas não solicitadas?",
+ "info_button.label": "Ajuda",
+ "info_button.what_is_alt_text": "ni la sina nanpa sewi pi jan ale lon {domain}. ",
+ "annual_report.summary.percentile.we_wont_tell_bernie": "sona ni li len tawa ale.",
"annual_report.summary.thanks": "sina jan pi kulupu Masoton la sina pona a!",
"attachments_list.unprocessed": "(nasin open)",
"audio.hide": "o len e kalama",
+ "block_modal.remote_users_caveat": "mi pana e wile sina tawa ma {domain}. taso, o sona: ma li ken kepeken nasin len ante la pakala li ken lon. toki pi lukin ale la jan pi ma ala li ken lukin.",
"block_modal.show_less": "o lili e lukin",
- "block_modal.show_more": "o mute e lukin",
- "block_modal.they_cant_mention": "ona li ken ala toki e sina li ken ala alasa e sina",
+ "block_modal.show_more": "o suli e lukin",
+ "block_modal.they_cant_mention": "ona li ken ala toki tawa sina li ken ala kute e sina.",
"block_modal.they_cant_see_posts": "ona li ken ala lukin e toki sina. sina ken ala lukin e toki ona.",
- "block_modal.they_will_know": "ona li sona e ni: sina ala e lukin ona.",
+ "block_modal.they_will_know": "ona li sona e ni: sina weka e lukin ona.",
"block_modal.title": "o weka ala weka e jan",
- "block_modal.you_wont_see_mentions": "nimi ona li lon toki suli la sina lukin ala e toki ni.",
+ "block_modal.you_wont_see_mentions": "jan li toki e nimi ona la sina lukin ala e toki ni.",
"boost_modal.combo": "sina ken luka e nena {combo} tawa ni: sina wile ala luka e nena lon tenpo kama",
"boost_modal.reblog": "o wawa ala wawa e toki?",
- "boost_modal.undo_reblog": "o pini ala pini e wawa toki?",
+ "boost_modal.undo_reblog": "o weka ala weka e wawa toki?",
"bundle_column_error.copy_stacktrace": "o awen e sona pakala lon ilo sina",
"bundle_column_error.error.body": "ilo li ken ala pana e lipu ni. ni li ken tan pakala ilo.",
- "bundle_column_error.error.title": "ike a!",
+ "bundle_column_error.error.title": "pakala a!",
"bundle_column_error.network.body": "mi lukin pana e lipu la, pakala li lon. ken la, pakala li tan ilo nanpa sina. ken la, pakala li tan ilo nanpa suli pi ma kulupu ni.",
"bundle_column_error.network.title": "pakala la ilo sina li toki ala tawa ilo ante",
- "bundle_column_error.retry": "o ni sin",
- "bundle_column_error.return": "o tawa tomo",
+ "bundle_column_error.retry": "o alasa sin",
+ "bundle_column_error.return": "o tawa open",
"bundle_column_error.routing.body": "ilo li sona ala e lipu wile. sina pana ala pana e nasin pona tawa lipu?",
"bundle_column_error.routing.title": "pakala nanpa 404",
"bundle_modal_error.close": "o pini",
"bundle_modal_error.message": "ilo li wile kama e ijo ni, taso pakala li lon.",
- "bundle_modal_error.retry": "o ni sin",
- "closed_registrations.other_server_instructions": "kulupu Masoton li jo e jan lawa mute, la sina ken pali e sijelo lon ma ante, li ken lukin e ijo pi ma ni.",
+ "bundle_modal_error.retry": "o alasa sin",
+ "closed_registrations.other_server_instructions": "kulupu Masoton la lawa mute li lon. sina ken pali e sijelo lon ma ante la sina awen ken lukin e ijo pi ma ni.",
"closed_registrations_modal.description": "tenpo ni la, sina ken ala pali e jan lon ma {domain}. taso sina wile kepeken ilo Masoton la, sina ken pali e jan lon ma ante lon ala ma {domain}.",
"closed_registrations_modal.find_another_server": "o alasa e ma ante",
+ "closed_registrations_modal.preamble": "ilo Masoton li lon ilo wan ala. sina kepeken ma ante la sina ken lukin li ken kute e jan pi ma ni. sina wile la, sina ken pali e ma sin!",
"closed_registrations_modal.title": "sina kama lon kulupu Masoton",
"column.about": "sona",
"column.blocks": "kulupu pi jan weka",
@@ -137,8 +159,11 @@
"column.mutes": "jan len",
"column.notifications": "mu pi sona sin",
"column.pins": "toki sewi",
+ "column.public": "toki pi ma poka ale",
"column_back_button.label": "o tawa monsi",
"column_header.hide_settings": "o len e lawa",
+ "column_header.moveLeft_settings": "poki toki ni o tawa ni ←",
+ "column_header.moveRight_settings": "poki toki ni o tawa ni →",
"column_header.pin": "o sewi",
"column_header.show_settings": "o lukin e lawa",
"column_header.unpin": "o sewi ala",
@@ -154,6 +179,8 @@
"compose.saved.body": "ilo li awen e ijo pana sina.",
"compose_form.direct_message_warning_learn_more": "o kama sona e ijo ante",
"compose_form.encryption_warning": "toki li len ala lon ilo Masoton ꞏ o pana ala e sona suli len lon ilo Masoton",
+ "compose_form.lock_disclaimer": "lipu sina li open, li {locked} ala. jan ale li ken kama kute e sina, li ken lukin e toki sama ni.",
+ "compose_form.lock_disclaimer.lock": "pini",
"compose_form.placeholder": "sina wile toki e seme?",
"compose_form.poll.duration": "tenpo pana",
"compose_form.poll.multiple": "pana mute",
@@ -169,7 +196,7 @@
"compose_form.spoiler.marked": "o weka e toki pi ijo ike ken",
"compose_form.spoiler.unmarked": "o pali e toki pi ijo ike ken",
"compose_form.spoiler_placeholder": "toki pi ijo ike ken (sina ken ala e ni)",
- "confirmation_modal.cancel": "o pini",
+ "confirmation_modal.cancel": "o weka",
"confirmations.block.confirm": "o weka",
"confirmations.delete.confirm": "o weka",
"confirmations.delete.message": "sina wile ala wile weka e toki ni?",
@@ -182,22 +209,31 @@
"confirmations.edit.confirm": "o ante",
"confirmations.edit.message": "sina ante e toki sina la toki pali sina li weka. sina wile ala wile e ni?",
"confirmations.edit.title": "o weka ala weka e toki? ni la, toki li kama toki sin.",
+ "confirmations.follow_to_list.confirm": "o kute, o pana tawa lipu jan",
+ "confirmations.follow_to_list.message": "sina wile pana e {name} tawa lipu jan la o kama kute e ona.",
+ "confirmations.follow_to_list.title": "sina wile ala wile kute?",
"confirmations.logout.confirm": "o weka",
"confirmations.logout.message": "sina wile ala wile weka",
"confirmations.logout.title": "o weka?",
"confirmations.mute.confirm": "o len",
"confirmations.redraft.confirm": "o weka o pali sin e toki",
"confirmations.redraft.message": "pali sin e toki ni la sina wile ala wile weka e ona? sina ni la suli pi toki ni en wawa pi toki ni li weka. kin la toki lon toki ni li jo e mama ala.",
+ "confirmations.redraft.title": "ni li weka li pali sin e toki ni.",
"confirmations.reply.confirm": "toki lon toki ni",
"confirmations.reply.message": "sina toki lon toki ni la toki pali sina li weka. sina wile ala wile e ni?",
- "confirmations.unfollow.confirm": "o pini kute",
+ "confirmations.reply.title": "sina wile ala wile weka e toki lon?",
+ "confirmations.unfollow.confirm": "o kute ala",
"confirmations.unfollow.message": "sina o wile ala wile pini kute e jan {name}?",
+ "confirmations.unfollow.title": "sina wile ala wile pini kute?",
+ "content_warning.hide": "o len",
"content_warning.show": "o lukin",
+ "content_warning.show_more": "o lukin",
"conversation.delete": "o weka e toki ni",
"conversation.mark_as_read": "ni o sin ala",
"conversation.open": "o lukin e toki",
"conversation.with": "lon {names}",
"copy_icon_button.copied": "toki li awen lon ilo sina",
+ "copypaste.copied": "sina jo e toki",
"copypaste.copy_to_clipboard": "o awen lon ilo sina",
"directory.local": "tan {domain} taso",
"directory.new_arrivals": "jan pi kama sin",
@@ -206,15 +242,24 @@
"disabled_account_banner.text": "sina ken ala kepeken e lipu jan sina pi nimi {disabledAccount}.",
"dismissable_banner.community_timeline": "ni li toki pi tenpo poka tawa ale tan jan lon ma lawa pi nimi {domain}.",
"dismissable_banner.dismiss": "o weka",
+ "dismissable_banner.explore_links": "tenpo suno ni la jan pi kulupu ale li toki e ijo sin ni. ijo sin pi jan ante mute li sewi lon lipu ni.",
"domain_block_modal.block": "o weka e ma",
"domain_block_modal.they_wont_know": "ona li sona ala e ni: sina weka e ona.",
+ "domain_block_modal.title": "sina wile weka ala weka e ma?",
"domain_block_modal.you_will_lose_num_followers": "{followersCount, plural, other {jan {followersCountDisplay}}} li kute e sina la, ona kama kute ala e sina. sina kute e {followingCount, plural,other {jan {followingCountDisplay}}} la, sina kama kute ala e ona.",
"domain_block_modal.you_will_lose_relationships": "jan li lon kulupu ni la ona kute e sina la, ona li kama kute ala e sina. jan li lon kulupu ni la sina kute e ona la, sina kama kute ala e ona.",
"domain_block_modal.you_wont_see_posts": "sina ken ala lukin e toki tan jan pi ma ni",
"domain_pill.server": "ma",
"domain_pill.their_handle": "nimi pi ona taso li ni:",
+ "domain_pill.their_server": "ni li ma ona lon ilo. toki ale ona li lon ma ni.",
+ "domain_pill.their_username": "ni li nimi ona lon ma ni. jan mute li lon ma ante la, nimi ona li ken sama.",
"domain_pill.username": "nimi jan",
+ "domain_pill.whats_in_a_handle": "seme li lon nimi?",
+ "domain_pill.who_they_are": "nimi ilo la sona jan en sona ma li lon. ni la sina ken toki tawa jan ni lon .",
+ "domain_pill.your_handle": "nimi sina:",
+ "domain_pill.your_server": "ni li ma sina lon ilo. toki ale sina li lon ma ni. ma li ike tawa sina la, sina ken tawa ma ante. ni la jan kute sina li tawa sama.",
"domain_pill.your_username": "ni li nimi sina. ma sina la, sina taso li jo e ona. jan mute li lon ma ante la, ona li ken jo e nimi sama.",
+ "embed.instructions": "o pana e toki ni la, toki li lon lipu ante. ",
"embed.preview": "ni li jo e sitelen ni:",
"emoji_button.activity": "musi",
"emoji_button.clear": "o weka",
@@ -225,6 +270,7 @@
"emoji_button.not_found": "sitelen pilin ala li lon",
"emoji_button.objects": "ijo",
"emoji_button.people": "jan",
+ "emoji_button.recent": "kepeken suli",
"emoji_button.search": "o alasa...",
"emoji_button.search_results": "ijo pi alasa ni",
"emoji_button.symbols": "sitelen",
@@ -249,6 +295,7 @@
"explore.title": "o alasa",
"explore.trending_links": "sin",
"explore.trending_statuses": "toki",
+ "explore.trending_tags": "kulupu pi lipu suli",
"filter_modal.added.settings_link": "lipu lawa",
"filter_modal.select_filter.expired": "tenpo pini",
"filter_modal.select_filter.search": "o alasa anu pali",
@@ -277,15 +324,23 @@
"hashtag.column_settings.tag_mode.all": "ale ni",
"hashtag.column_settings.tag_mode.any": "wan ni",
"hashtag.column_settings.tag_mode.none": "ala ni",
+ "hashtag.counter_by_accounts": "{count, plural, other {jan {counter}}}",
"hashtag.counter_by_uses": "{count, plural, other {toki {counter}}}",
+ "hashtag.follow": "o kute e kulupu lipu",
+ "hashtag.unfollow": "o kute ala e kulupu lipu",
"home.pending_critical_update.link": "o lukin e ijo ilo sin",
+ "info_button.label": "sona",
+ "interaction_modal.go": "o tawa ma ni",
"interaction_modal.on_another_server": "lon ma ante",
"interaction_modal.on_this_server": "lon ma ni",
"interaction_modal.title.favourite": "o suli e toki {name}",
"interaction_modal.title.follow": "o kute e {name}",
"interaction_modal.title.reblog": "o wawa e toki {name}",
"interaction_modal.title.reply": "o toki lon toki pi jan {name}",
+ "interaction_modal.title.vote": "o pana tawa wile sona pi jan {name}",
+ "interaction_modal.username_prompt": "ni li sama ni: {example}",
"intervals.full.days": "{number, plural, other {suni #}}",
+ "intervals.full.hours": "{number, plural, other {tenpo suli #}}",
"keyboard_shortcuts.blocked": "o lukin e lipu sina pi jan weka",
"keyboard_shortcuts.boost": "o pana sin e toki",
"keyboard_shortcuts.down": "o tawa anpa lon lipu",
@@ -304,10 +359,17 @@
"lightbox.previous": "monsi",
"link_preview.author": "tan {name}",
"lists.delete": "o weka e kulupu lipu",
+ "lists.done": "ale li pini",
"lists.edit": "o ante e kulupu lipu",
+ "lists.list_members_count": "{count, plural, other {jan #}}",
+ "lists.list_name": "nimi kulupu",
+ "lists.new_list_name": "nimi pi kulupu sin",
+ "lists.no_lists_yet": "kulupu li lon ala.",
+ "lists.remove_member": "o weka",
"lists.replies_policy.followed": "jan kute ale",
"lists.replies_policy.list": "jan pi kulupu ni taso",
"lists.replies_policy.none": "jan ala",
+ "lists.search": "o alasa",
"load_pending": "{count, plural, other {ijo sin #}}",
"loading_indicator.label": "ni li kama…",
"mute_modal.title": "sina wile ala wile kute e jan ni?",
@@ -368,7 +430,7 @@
"report.category.title": "ike seme li lon {type} ni",
"report.category.title_account": "lipu",
"report.category.title_status": "toki",
- "report.close": "o pini",
+ "report.close": "ale li pona",
"report.mute": "o kute ala e ona",
"report.mute_explanation": "sina kama ala lukin e ijo pana ona. ona li awen ken kute e sina li awen ken lukin e sina li sona ala e weka kute sina e weka lukin sina.",
"report.next": "awen",
@@ -377,7 +439,7 @@
"report.reasons.other": "ni li ike tan ante",
"report.reasons.spam": "ni li ike tan toki mute",
"report.thanks.title": "sina wile ala lukin e ni anu seme?",
- "report.unfollow": "o pini kute e {name}",
+ "report.unfollow": "o kute ala e {name}",
"report_notification.categories.legal": "ike tawa nasin lawa",
"report_notification.categories.other": "ante",
"search.no_recent_searches": "alasa ala li lon tenpo poka",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 4ee3f40e56c4e5..484e6c6b731002 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -414,6 +414,8 @@
"ignore_notifications_modal.not_followers_title": "Takip etmeyen kişilerin bildirimlerini yoksay?",
"ignore_notifications_modal.not_following_title": "Takip etmediğin kişilerin bildirimlerini yoksay?",
"ignore_notifications_modal.private_mentions_title": "İstenmeyen özel bahsetmelerden gelen bildirimleri yoksay?",
+ "info_button.label": "Yardım",
+ "info_button.what_is_alt_text": "%{filename} هستید.
- other: شما در شرف مسدود کردن حداکثر %{count} حساب از %{filename} هستید.
+ one: شما در شرف مسدود کردن حداکثر %{count} حساب از %{filename} هستید.
+ other: شما در شرف مسدود کردن حداکثر %{count} حساب از %{filename} هستید.
bookmarks_html:
one: شما میخواهید تا %{count} پست را از %{filename} به نشانکها خود اضافه کنید.
other: شما میخواهید تا %{count} پست را از %{filename} به نشانکها خود اضافه کنید.
@@ -1449,10 +1450,8 @@ fa:
one: شما در حال افزودن %{count} حساب از %{filename} به لیستهای خود هستید. اگر لیستی برای افزودن وجود نداشته باشد، لیست های جدیدی ایجاد می شود.
other: شما میخواهید تا %{count} حساب از %{filename} را به فهرستهای خود اضافه کنید. اگر لیستی برای افزودن وجود نداشته باشد، لیست های جدیدی ایجاد می شود.
muting_html:
- one: 'شما در حال انجام بی صدا تا %{count} حساب کاربری از %{filename}.
-
- '
- other:
+ one: شما در حال بی صدا کردن تا %{count} حساب از %{filename} هستید.
+ other: شما در حال بی صدا کردن تا %{count} حساب از %{filename} هستید.
preface: میتوانید دادههایی را که از کارسازی دیگر برونریختهاید، چون سیاههای از افرادی که پی گرفته یا مسدود میکنید را درونریزی کنید.
recent_imports: واردشدههای اخیر
states:
@@ -1883,7 +1882,7 @@ fa:
formats:
default: "%d %b %Y, %H:%M"
month: "%b %Y"
- time: "%OH:%OM"
+ time: "%H:%M"
with_time_zone: "%b %d, %Y, %H:%M %Z"
translation:
errors:
@@ -1965,7 +1964,7 @@ fa:
none: هشدار برای %{acct}
sensitive: فرستههایتان روی %{acct} از اکنون به عنوان حسّاس علامت خواهند خورد
silence: حساب %{acct} شما محدود شده است
- suspend: حساب %{acct} شما معلق شده است
+ suspend: حساب %{acct} شما معلق شده است
title:
delete_statuses: فرستهها برداشته شدند
disable: حساب متوقف شده است
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 064ca67cbf430d..c7148772b80994 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1209,6 +1209,7 @@ fi:
too_fast: Lomake lähetettiin liian nopeasti, yritä uudelleen.
use_security_key: Käytä suojausavainta
user_agreement_html: Olen lukenut ja hyväksyn käyttöehdot ja tietosuojakäytännön
+ user_privacy_agreement_html: Olen lukenut ja hyväksyn tietosuojakäytännön
author_attribution:
example_title: Esimerkkiteksti
hint_html: Kirjoitatko uutisia tai blogitekstejä Mastodonin ulkopuolella? Määrää, kuinka tulet tunnustetuksi, kun niitä jaetaan Mastodonissa.
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 441217ec0ef833..df99926a4c46a9 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -1206,6 +1206,7 @@ fo:
too_fast: Oyðublaðið innsent ov skjótt, royn aftur.
use_security_key: Brúka trygdarlykil
user_agreement_html: Eg havi lisið og taki undir við tænastutreytunum og privatlívspolitikkinum
+ user_privacy_agreement_html: I have lisið og taki undir við privatlívspolitikkinum
author_attribution:
example_title: Tekstadømi
hint_html: Skrivar tú tíðindi ella greinar til bloggin uttanfyri Mastodon? Her kanst tú stýra, hvussu tú verður tilsipað/ur, tá ið títt tilfar verður deilt á Mastodon.
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index 4fefee7ae09a55..37c34b767848f2 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -1212,6 +1212,7 @@ fr-CA:
too_fast: Formulaire envoyé trop rapidement, veuillez réessayer.
use_security_key: Utiliser la clé de sécurité
user_agreement_html: J'ai lu et j'accepte les conditions d'utilisation et la politique de confidentialité
+ user_privacy_agreement_html: J’ai lu et j’accepte la politique de confidentialité
author_attribution:
example_title: Exemple de texte
hint_html: Vous écrivez des nouvelles ou des articles de blog en dehors de Mastodon ? Contrôlez la façon dont vous êtes crédité lorsqu'ils sont partagés sur Mastodon.
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 3000f9a4a9130d..0c1e248467ac7c 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1212,6 +1212,7 @@ fr:
too_fast: Formulaire envoyé trop rapidement, veuillez réessayer.
use_security_key: Utiliser la clé de sécurité
user_agreement_html: J'ai lu et j'accepte les conditions d'utilisation et la politique de confidentialité
+ user_privacy_agreement_html: J’ai lu et j’accepte la politique de confidentialité
author_attribution:
example_title: Exemple de texte
hint_html: Vous écrivez des nouvelles ou des articles de blog en dehors de Mastodon ? Contrôlez la façon dont vous êtes crédité lorsqu'ils sont partagés sur Mastodon.
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 63a2b9b340ab86..fe0b00fec22ac9 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1209,6 +1209,7 @@ gl:
too_fast: Formulario enviado demasiado rápido, inténtao outra vez.
use_security_key: Usa chave de seguridade
user_agreement_html: Lin e acepto os termos do servizo e a política de privacidade
+ user_privacy_agreement_html: Lin e acepto a política de privacidade
author_attribution:
example_title: Texto de mostra
hint_html: Escribes novas ou artigos nun blog alleos a Mastodon? Xestiona o xeito en que podes dar crédito da túa autoría cando os compartes en Mastodon.
diff --git a/config/locales/he.yml b/config/locales/he.yml
index eea4c631797589..0a68d338f0841c 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1247,6 +1247,7 @@ he:
too_fast: הטופס הוגש מהר מדי, נסה/י שוב.
use_security_key: שימוש במפתח אבטחה
user_agreement_html: קראתי וזו הסכמתי למסמך תנאי השירות ומדיניות הפרטיות
+ user_privacy_agreement_html: קראתי והסכמתי למדיניות הפרטיות
author_attribution:
example_title: טקסט לדוגמה
hint_html: האם יש לך בלוג או טור חדשות שמתפרסם מחוץ למסטודון? ניתן לשלוט איך יוצג הקרדיט שלך כשמשתפים את הלינק במסטודון.
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index da51e3b5a90bcd..722c3617107ba2 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1209,6 +1209,7 @@ hu:
too_fast: Túl gyorsan küldted el az űrlapot, próbáld később.
use_security_key: Biztonsági kulcs használata
user_agreement_html: Elolvastam és egyetértek a felhasználási feltételekkel és az adatvédelmi nyilatkozattal
+ user_privacy_agreement_html: Elolvastam és egyetértek az adatvédemi nyilatkozattal
author_attribution:
example_title: Mintaszöveg
hint_html: Mastodonon kívül írsz híreket vagy blogbejegyzéseket? Szabályozd, hogyan tüntethetnek fel szerzőként, amikor Mastodonon osztják meg őket.
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 229cbb56bf03ef..c4172f238d4e34 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1213,6 +1213,7 @@ is:
too_fast: Innfyllingarform sent inn of hratt, prófaðu aftur.
use_security_key: Nota öryggislykil
user_agreement_html: Ég hef lesið og samþykkt þjónustuskilmálana og stefnuna um persónuvernd
+ user_privacy_agreement_html: Ég hef lesið og samþykkt persónuverndarstefnuna
author_attribution:
example_title: Sýnitexti
hint_html: Ertu að skrifa fréttir eða bloggfærslur utan Mastodon? Stýrðu því hvernig vitnað er í þig þegar þeim er deilt á Mastodon.
diff --git a/config/locales/it.yml b/config/locales/it.yml
index a561079f3ab936..734860f3bbdcf1 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1211,6 +1211,7 @@ it:
too_fast: Modulo inviato troppo velocemente, riprova.
use_security_key: Usa la chiave di sicurezza
user_agreement_html: Ho letto e accetto i termini di servizio e l'informativa sulla privacy
+ user_privacy_agreement_html: Ho letto e accetto l'informativa sulla privacy
author_attribution:
example_title: Testo di esempio
hint_html: Stai scrivendo notizie o articoli di blog al di fuori di Mastodon? Controlla come vieni accreditato quando vengono condivisi su Mastodon.
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 201bdc1a0888c9..77670f0ec30758 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1190,6 +1190,7 @@ ja:
too_fast: フォームの送信が速すぎます。もう一度やり直してください。
use_security_key: セキュリティキーを使用
user_agreement_html: 利用規約 および プライバシーポリシーを読み、同意します。
+ user_privacy_agreement_html: プライバシーポリシーを読み、同意します
author_attribution:
example_title: サンプルテキスト
hint_html: Mastodonの外でニュースやブログなどを執筆しているユーザーは、Mastodonで自分の記事が共有されたときに著者情報を表示させることができます。
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 314029a89ede52..11cc8b331835c9 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -413,6 +413,7 @@ kab:
account: Ameskar
application: Asnas
back_to_account: Tuɣalin ɣer usebter n umiḍan
+ contents: Agbur
deleted: Yettwakkes
favourites: Imenyafen
language: Tutlayt
@@ -432,6 +433,9 @@ kab:
tags:
search: Anadi
title: Ihacṭagen
+ terms_of_service:
+ draft: Arewway
+ publish: Asuffeɣ
title: Tadbelt
trends:
allow: Sireg
@@ -781,6 +785,7 @@ kab:
delete: Tukksa n umiḍan
development: Taneflit
edit_profile: Ẓreg amaɣnu
+ export: Sifeḍ
import: Kter
import_and_export: Taktert d usifeḍ
migrate: Tunigin n umiḍan
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index f7469ce25a1cc5..5405cabd9b4002 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -301,8 +301,8 @@ ko:
update_user_role_html: "%{name} 님이 %{target} 역할을 수정했습니다"
deleted_account: 계정을 삭제했습니다
empty: 로그를 찾을 수 없습니다
- filter_by_action: 행동으로 거르기
- filter_by_user: 사용자로 거르기
+ filter_by_action: 동작 별 필터
+ filter_by_user: 사용자 기준으로 필터
title: 감사 로그
unavailable_instance: "(도메인네임 사용불가)"
announcements:
@@ -925,9 +925,12 @@ ko:
generates:
action: 생성
chance_to_review_html: "생성된 이용 약관은 자동으로 게시되지 않을 것입니다. 결과를 확인할 기회가 있습니다. 진행하려면 필요한 정보들을 입력하세요."
+ explanation_html: 제공되는 이용약관 틀은 정보 제공만을 목적으로 하며 법률 조언으로 해석하면 안 됩니다. 귀하의 상황에 맞는 법률 자문을 받아주시기 바랍니다.
title: 이용 약관 설정
history: 역사
live: 활성
+ no_history: 기록된 이용약관 변경이 아직 없습니다.
+ no_terms_of_service_html: 현재 설정된 이용약관이 없습니다. 이용약관은 명확성을 제공하고 귀하와 사용자간 분쟁에서 발생할 수 있는 책임으로부터 보호할 수 있습니다.
notified_on_html: 사용자들이 %{date}에 알림을 받았습니다
notify_users: 사용자들에게 알리기
preview:
@@ -1189,6 +1192,7 @@ ko:
too_fast: 너무 빠르게 양식이 제출되었습니다, 다시 시도하세요.
use_security_key: 보안 키 사용
user_agreement_html: 이용 약관과 개인정보처리방침을 읽었고 동의합니다
+ user_privacy_agreement_html: 개인정보처리방침을 읽었고 동의합니다
author_attribution:
example_title: 예시 텍스트
hint_html: 마스토돈 밖에서 뉴스나 블로그 글을 쓰시나요? 마스토돈에 공유되었을 때 어떻게 표시될지를 제어하세요.
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index dbca48dd37612f..7659cfcbfbd1a5 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -456,8 +456,8 @@ lt:
availability:
title: Prieinamumas
warning: Paskutinis bandymas prisijungti prie šio serverio buvo nesėkmingas
- back_to_all: Visi
- back_to_limited: Apribotas
+ back_to_all: Viskas
+ back_to_limited: Apribota
back_to_warning: Įspėjimas
by_domain: Domenas
content_policies:
@@ -864,6 +864,7 @@ lt:
self_destruct: Kadangi %{domain} uždaromas, turėsi tik ribotą prieigą prie savo paskyros.
view_strikes: Peržiūrėti ankstesnius savo paskyros pažeidimus
user_agreement_html: Perskaičiau ir sutinku su paslaugų sąlygomis ir privatumo politika
+ user_privacy_agreement_html: Perskaičiau ir sutinku su privatumo politika
author_attribution:
example_title: Teksto pavyzdys
hint_html: Ar rašote naujienas ar tinklaraščio straipsnius už „Mastodon“ ribų? Valdykite, kaip būsite nurodomi, kai jais bus bendrinama platformoje „Mastodon“.
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 9f71900040dbf6..9f05104153dac3 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1209,6 +1209,7 @@ nl:
too_fast: Formulier is te snel ingediend. Probeer het nogmaals.
use_security_key: Beveiligingssleutel gebruiken
user_agreement_html: Ik heb de gebruiksvoorwaarden en het privacybeleid gelezen en ga ermee akkoord
+ user_privacy_agreement_html: Ik heb het privacybeleid gelezen en ga ermee akkoord
author_attribution:
example_title: Voorbeeldtekst
hint_html: Schrijf je nieuws- of blogartikelen buiten Mastodon? Bepaal hoe je geattribueerd wordt als deze gedeeld worden op Mastodon.
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 83a9674f843623..e2e28600591a3c 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -285,6 +285,7 @@ pl:
enable_user_html: "%{name} przywrócił(a) możliwość logowania użytkownikowi %{target}"
memorialize_account_html: "%{name} nadał(a) kontu %{target} status in memoriam"
promote_user_html: "%{name} podniósł(a) uprawnienia użytkownikowi %{target}"
+ publish_terms_of_service_html: "%{name} opublikował aktualizacje warunków korzystania z usługi"
reject_appeal_html: "%{name} zatwierdził(-a) odwołanie decyzji moderacyjnej od %{target}"
reject_user_html: "%{name} odrzucił rejestrację od %{target}"
remove_avatar_user_html: "%{name} usunął(-ęła) awatar użytkownikowi %{target}"
@@ -955,9 +956,36 @@ pl:
title: Hashtagi
updated_msg: Pomyślnie uaktualniono ustawienia hashtagów
terms_of_service:
+ back: Powrót do warunków świadczenia usług
+ changelog: Co się zmieniło
+ create: Użyj własnego
+ current: Aktualna wersja
draft: Szkic
generate: Użyj szablonu
+ generates:
+ action: Wygeneruj
+ chance_to_review_html: "Wygenerowane warunki świadczenia usług nie zostaną automatycznie opublikowane. Będziesz miał szansę je sprawdzić raz jeszcze. Wypełnij wymagane pola, aby kontynuować."
+ explanation_html: Dostarczany wzór warunków świadczenia usług służy wyłącznie celom informacyjnym i nie powinien być interpretowany jako porada prawna w odniesieniu do żadnego przedmiotu. Proszę skonsultować się ze swoim doradcą prawnym w sprawie swojej sytuacji i konkretnych kwestii prawnych, które państwo posiadają.
+ title: Warunki korzystania z usługi
+ history: Historia
+ live: Rzeczywiste
+ no_history: Nie ma jeszcze zapisanych zmian w warunkach korzystania z usługi.
+ no_terms_of_service_html: Obecnie nie masz żadnych skonfigurowanych warunków korzystania z usługi. Warunki korzystania z usługi mają zapewnić jasność i ochronę przed potencjalnymi zobowiązaniami w sporach z użytkownikami.
+ notified_on_html: Użytkownicy powiadomieni o %{date}
+ notify_users: Powiadom użytkowników
+ preview:
+ explanation_html: 'E-mail zostanie wysłany do %{display_count} użytkowników, którzy zarejestrowali się przed %{date}. Otrzymają oni wiadomość o następującej treści:'
+ send_preview: Wyślij podgląd do %{email}
+ send_to_all:
+ few: Wyślij %{display_count} wiadomości e-mail
+ many: Wyślij %{display_count} wiadomości e-mail
+ one: Wyślij %{display_count} wiadomość e-mail
+ other: Wyślij %{display_count} wiadomości e-mail
+ title: Podgląd warunków powiadomienia o usłudze
+ publish: Publikuj
+ published_on_html: Opublikowano w dniu %{date}
save_draft: Zapisz wersję roboczą
+ title: Warunki korzystania z usługi
title: Administracja
trends:
allow: Zezwól
@@ -1197,6 +1225,7 @@ pl:
set_new_password: Ustaw nowe hasło
setup:
email_below_hint_html: Sprawdź folder ze spamem lub poproś o inny link potwierdzający. Możesz poprawić swój adres e-mail, jeśli jest niepoprawny.
+ email_settings_hint_html: Kliknij link, który wysłaliśmy do %{email} , aby rozpocząć korzystanie z Mastodon. Poczekamy tutaj.
link_not_received: Nie otrzymano linku?
new_confirmation_instructions_sent: Za kilka minut otrzymasz nowy e-mail z linkiem potwierdzającym!
title: Sprawdź swoją skrzynkę odbiorczą
@@ -1205,6 +1234,7 @@ pl:
title: Zaloguj się do %{domain}
sign_up:
manual_review: Rejestracja na %{domain} przechodzi przez ręczne sprawdzanie przez naszych moderatorów. Aby pomóc nam usprawnić ten proces, napisz coś o sobie oraz dlaczego chcesz założyć konto na %{domain}.
+ preamble: Z kontem na tym serwerze Mastodon będziesz mógł obserwować każdą inną osobę w sieci, niezależnie od miejsca przechowywania ich konta.
title: Skonfigurujmy Twoje konto na %{domain}.
status:
account_status: Stan konta
@@ -1435,6 +1465,68 @@ pl:
merge_long: Zachowaj obecne wpisy i dodaj nowe
overwrite: Nadpisz
overwrite_long: Zastąp obecne wpisy nowymi
+ overwrite_preambles:
+ blocking_html:
+ few: Zamierzasz zastąpić swoją listę bloków maksymalnie %{count} kontami z %{filename}.
+ many: Zamierzasz zastąpić swoją listę bloków maksymalnie %{count} kontami z %{filename}.
+ one: Zamierzasz zastąpić swoją listę bloków maksymalnie %{count} kontem z %{filename}.
+ other: Zamierzasz zastąpić swoją listę bloków maksymalnie %{count} kontami z %{filename}.
+ bookmarks_html:
+ few: Zamierzasz zastąpić swoje zakładki maksymalnie %{count} wpisami z %{filename}.
+ many: Zamierzasz zastąpić swoje zakładki maksymalnie %{count} wpisami z %{filename}.
+ one: Zamierzasz zastąpić swoje zakładki maksymalnie %{count} wpisem z %{filename}.
+ other: Zamierzasz zastąpić swoje zakładki maksymalnie %{count} wpisami z %{filename}.
+ domain_blocking_html:
+ few: Zamierzasz zastąpić swoją listę bloków domen maksymalnie %{count} domenami z %{filename}.
+ many: Zamierzasz zastąpić swoją listę bloków domen maksymalnie %{count} domenami z %{filename}.
+ one: Zamierzasz zastąpić swoją listę bloków domen maksymalnie %{count} domeną z %{filename}.
+ other: Zamierzasz zastąpić swoją listę bloków domen maksymalnie %{count} domenami z %{filename}.
+ following_html:
+ few: Zamierzasz zaobserwować maksymalnie %{count} konta z %{filename} i przestać obserwować kogokolwiek innego.
+ many: Zamierzasz zaobserwować maksymalnie %{count} kont z %{filename} i przestać obserwować kogokolwiek innego.
+ one: Zamierzasz zaobserwować maksymalnie %{count} konto z %{filename} i przestać obserwować kogokolwiek innego.
+ other: Zamierzasz zaobserwować maksymalnie %{count} kont z %{filename} i przestać obserwować kogokolwiek innego.
+ lists_html:
+ few: Zamierzasz zastąpić swoje listy maksymalnie %{count} kontami z %{filename}.
+ many: Zamierzasz zastąpić swoje listy maksymalnie %{count} kontami z %{filename}.
+ one: Zamierzasz zastąpić swoje listy maksymalnie %{count} kontem z %{filename}.
+ other: Zamierzasz zastąpić swoje listy maksymalnie %{count} kontami z %{filename}.
+ muting_html:
+ few: Zamierzasz zastąpić swoją listę wyciszonych maksymalnie %{count} kontami z %{filename}.
+ many: Zamierzasz zastąpić swoją listę wyciszonych maksymalnie %{count} kontami z %{filename}.
+ one: Zamierzasz zastąpić swoją listę wyciszonych maksymalnie %{count} kontem z %{filename}.
+ other: Zamierzasz zastąpić swoją listę wyciszonych maksymalnie %{count} kontami z %{filename}.
+ preambles:
+ blocking_html:
+ few: Zamierzasz zablokować maksymalnie %{count} konta z %{filename}.
+ many: Zamierzasz zablokować maksymalnie %{count} kont z %{filename}.
+ one: Zamierzasz zablokować maksymalnie %{count} konto z %{filename}.
+ other: Zamierzasz zablokować maksymalnie %{count} kont z %{filename}.
+ bookmarks_html:
+ few: Zamierzasz dodać maksymalnie %{count} wpisy do twoich zakładek z %{filename}.
+ many: Zamierzasz dodać maksymalnie %{count} wpisów do twoich zakładek z %{filename}.
+ one: Zamierzasz dodać maksymalnie %{count} wpis do twoich zakładek z %{filename}.
+ other: Zamierzasz dodać maksymalnie %{count} wpisów do twoich zakładek z %{filename}.
+ domain_blocking_html:
+ few: Zamierzasz zablokować maksymalnie %{count} domeny z %{filename}.
+ many: Zamierzasz zablokować maksymalnie %{count} domeny z %{filename}.
+ one: Zamierzasz zablokować maksymalnie %{count} domenę z %{filename}.
+ other: Zamierzasz zablokować maksymalnie %{count} domeny z %{filename}.
+ following_html:
+ few: Zamierzasz zaobserwować maksymalnie %{count} konta z %{filename}.
+ many: Zamierzasz zaobserwować maksymalnie %{count} kont z %{filename}.
+ one: Zamierzasz zaobserwować maksymalnie %{count} konto z %{filename}.
+ other: Zamierzasz zaobserwować maksymalnie %{count} kont z %{filename}.
+ lists_html:
+ few: Zamierzasz dodać maksymalnie %{count} konta do twoich list z %{filename}. Jeżeli nie ma list, nowe zostaną utworzone.
+ many: Zamierzasz dodać maksymalnie %{count} kont do twoich list z %{filename}. Jeżeli nie ma list, nowe zostaną utworzone.
+ one: Zamierzasz dodać maksymalnie %{count} konto do twoich list z %{filename}. Jeżeli nie ma list, nowe zostaną utworzone.
+ other: Zamierzasz dodać maksymalnie %{count} kont do twoich list z %{filename}. Jeżeli nie ma list, nowe zostaną utworzone.
+ muting_html:
+ few: Zamierzasz wyciszyć maksymalnie %{count} konta z %{filename}.
+ many: Zamierzasz wyciszyć maksymalnie %{count} kont z %{filename}.
+ one: Zamierzasz wyciszyć maksymalnie %{count} konto z %{filename}.
+ other: Zamierzasz wyciszyć maksymalnie %{count} kont z %{filename}.
preface: Możesz zaimportować pewne dane (np. lista kont, które obserwujesz lub blokujesz) do swojego konta na tym serwerze, korzystając z danych wyeksportowanych z innego serwera.
recent_imports: Ostatnie importy
states:
@@ -1926,6 +2018,15 @@ pl:
further_actions_html: Jeśli to nie Ty, zalecamy %{action} natychmiastowo i włącz uwierzytelnianie dwuetapowe, aby Twoje konto było bezpieczne.
subject: Uzyskano dostęp do twojego konta z nowego adresu IP
title: Nowe logowanie
+ terms_of_service_changed:
+ agreement: Kontynuując używanie %{domain}, zgadzasz się na te warunki. Jeśli nie zgadzasz się ze zaktualizowanymi warunkami, możesz wypowiedzieć umowę z %{domain} w dowolnym momencie, usuwając swoje konto.
+ changelog: 'W skrócie oto co oznacza dla Ciebie ta aktualizacja:'
+ description: 'Otrzymujesz ten e-mail, ponieważ wprowadzamy pewne zmiany w naszym regulaminie usługi w %{domain}. Zachęcamy Cię do pełnego zapoznania się z aktualnymi warunkami:'
+ description_html: Otrzymujesz ten e-mail, ponieważ wprowadzamy pewne zmiany w naszym regulaminie usługi w %{domain}. Zachęcamy do zapoznania się z aktualnymi warunkami w całości tutaj.
+ sign_off: Zespół %{domain}
+ subject: Aktualizacja warunków korzystania z usług
+ subtitle: Warunki korzystania z %{domain} zmieniają się
+ title: Ważna aktualizacja
warning:
appeal: Złóż odwołanie
appeal_description: Jeśli uważasz, że zaszło nieporozumienie, możesz złożyć odwołanie do zespołu %{instance}.
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 7dcf0977f35f58..4015005b2d87b1 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -844,7 +844,7 @@ pt-PT:
no_status_selected: Nenhum estado foi alterado porque nenhum foi selecionado
open: Abrir publicação
original_status: Publicação original
- reblogs: Reblogues
+ reblogs: Impulsos
replied_to_html: Respondeu a %{acct_link}
status_changed: Publicação alterada
status_title: Publicado por @%{name}
@@ -1209,6 +1209,7 @@ pt-PT:
too_fast: Formulário enviado demasiado rapidamente, tenta novamente.
use_security_key: Usar chave de segurança
user_agreement_html: Eu li e concordo com os termos do serviço e política de privacidade
+ user_privacy_agreement_html: Eu li e concordo com a política de privacidade
author_attribution:
example_title: Texto de exemplo
hint_html: Estás a escrever notícias ou artigos de blogue fora do Mastodon? Controla a forma como és creditados quando estes são partilhados no Mastodon.
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index f5be51f9c32df9..45b1be79b75032 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -313,6 +313,11 @@ ar:
name: الوسم
trendable: السماح لهذه الكلمة المفتاحية بالظهور تحت المتداوَلة
usable: السماح للمنشورات باستخدام هذا الوسم محليا
+ terms_of_service:
+ text: شروط الخدمة
+ terms_of_service_generator:
+ domain: النطاق
+ jurisdiction: الاختصاص القانوني
user:
role: الدور
time_zone: النطاق الزمني
diff --git a/config/locales/simple_form.bg.yml b/config/locales/simple_form.bg.yml
index dacd1f63726c7c..6f3681de5bcd9f 100644
--- a/config/locales/simple_form.bg.yml
+++ b/config/locales/simple_form.bg.yml
@@ -3,6 +3,7 @@ bg:
simple_form:
hints:
account:
+ attribution_domains: Едно на ред. Защитава от фалшиви атрибути.
discoverable: Вашите публични публикации и профил може да се представят или препоръчват в различни области на Mastodon и вашия профил може да се предлага на други потребители.
display_name: Вашето пълно име или псевдоним.
fields: Вашата начална страница, местоимения, години, всичко що искате.
diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml
index 515c7fb9e82c78..37ad72a7e47230 100644
--- a/config/locales/simple_form.cs.yml
+++ b/config/locales/simple_form.cs.yml
@@ -3,6 +3,7 @@ cs:
simple_form:
hints:
account:
+ attribution_domains: Jeden na řádek. Chrání před falešným připisování autorství.
discoverable: Vaše veřejné příspěvky a profil mohou být zobrazeny nebo doporučeny v různých oblastech Mastodonu a váš profil může být navrhován ostatním uživatelům.
display_name: Vaše celé jméno nebo přezdívka.
fields: Vaše domovská stránka, zájmena, věk, cokoliv chcete.
@@ -155,6 +156,7 @@ cs:
url: Kam budou události odesílány
labels:
account:
+ attribution_domains: Webové stránky s povolením Vám připsat autorství
discoverable: Zobrazovat profil a příspěvky ve vyhledávacích algoritmech
fields:
name: Označení
diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml
index e06cf7069dd640..4b6cc80a120df0 100644
--- a/config/locales/simple_form.el.yml
+++ b/config/locales/simple_form.el.yml
@@ -3,6 +3,7 @@ el:
simple_form:
hints:
account:
+ attribution_domains: Μία ανά γραμμή. Προστατεύει από ψευδείς ιδιότητες.
discoverable: Οι δημόσιες δημοσιεύσεις και το προφίλ σου μπορεί να εμφανίζονται ή να συνιστώνται σε διάφορους τομείς του Mastodon και το προφίλ σου μπορεί να προτείνεται σε άλλους χρήστες.
display_name: Το πλήρες ή το αστείο σου όνομα.
fields: Η αρχική σου σελίδα, αντωνυμίες, ηλικία, ό,τι θες.
@@ -136,6 +137,7 @@ el:
admin_email: Οι νομικές ανακοινώσεις περιλαμβάνουν αντικρούσεις, δικαστικές αποφάσεις, αιτήματα που έχουν ληφθεί και αιτήματα επιβολής του νόμου.
arbitration_address: Μπορεί να είναι το ίδιο με τη φυσική διεύθυνση παραπάνω, ή “N/A” εάν χρησιμοποιείται email
arbitration_website: Μπορεί να είναι μια φόρμα ιστού, ή “N/A” εάν χρησιμοποιείται email
+ dmca_address: Για τους φορείς των ΗΠΑ, χρησιμοποιήστε τη διεύθυνση που έχει καταχωρηθεί στο DMCA Designated Agent Directory. A P.O. Η λίστα είναι διαθέσιμη κατόπιν απευθείας αιτήματος, Χρησιμοποιήστε το αίτημα απαλλαγής από την άδεια χρήσης του καθορισμένου από το DMCA Agent Post Office Box για να στείλετε email στο Γραφείο Πνευματικών Δικαιωμάτων και περιγράψτε ότι είστε συντονιστής περιεχομένου με βάση το σπίτι, ο οποίος φοβάται την εκδίκηση ή την απόδοση για τις ενέργειές σας και πρέπει να χρησιμοποιήσετε ένα P.. Box για να αφαιρέσετε τη διεύθυνση οικίας σας από τη δημόσια προβολή.
dmca_email: Μπορεί να είναι το ίδιο email που χρησιμοποιείται για “Διεύθυνση email για νομικές ανακοινώσεις” παραπάνω
domain: Μοναδικό αναγνωριστικό της διαδικτυακής υπηρεσίας που παρέχεις.
jurisdiction: Ανέφερε τη χώρα όπου ζει αυτός που πληρώνει τους λογαριασμούς. Εάν πρόκειται για εταιρεία ή άλλη οντότητα, ανέφερε τη χώρα όπου υφίσταται, και την πόλη, περιοχή, έδαφος ή πολιτεία ανάλογα με την περίπτωση.
@@ -154,6 +156,7 @@ el:
url: Πού θα σταλούν τα γεγονότα
labels:
account:
+ attribution_domains: Ιστοσελίδες επιτρέπεται να σας αναφέρουν
discoverable: Παροχή προφίλ και αναρτήσεων σε αλγορίθμους ανακάλυψης
fields:
name: Περιγραφή
diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml
index e39e27f6dd1e11..c3cf3692be9989 100644
--- a/config/locales/simple_form.fa.yml
+++ b/config/locales/simple_form.fa.yml
@@ -245,7 +245,7 @@ fa:
sign_in_token_attempt: کد امنیتی
title: عنوان
type: نوع درونریزی
- username: نام کاربری (لاتین)
+ username: نام کاربری
username_or_email: نام کاربری یا ایمیل
whole_word: تطابق واژهٔ کامل
email_domain_block:
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index d40ca7ebf8fb09..92d306224ad0b9 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -3,6 +3,7 @@ ko:
simple_form:
hints:
account:
+ attribution_domains: 한 줄에 하나씩. 가짜 기여로부터 보호합니다.
discoverable: 내 공개 게시물과 프로필이 마스토돈의 다양한 추천 기능에 나타날 수 있고 프로필이 다른 사용자에게 제안될 수 있습니다
display_name: 진짜 이름 또는 재미난 이름.
fields: 홈페이지, 호칭, 나이, 뭐든지 적고 싶은 것들.
@@ -133,8 +134,12 @@ ko:
changelog: 마크다운 문법을 사용할 수 있습니다.
text: 마크다운 문법을 사용할 수 있습니다.
terms_of_service_generator:
+ admin_email: 법적 고지에는 이의 제기, 법원 명령, 게시 중단 요청, 법 집행 요청이 포함됩니다.
+ arbitration_address: 위의 실제 주소와 같을 수 있으며, 이메일을 사용한다면 "N/A"로 두세요
arbitration_website: 웹 형태를 사용할 수 있습니다. 이메일을 사용한다면 "N/A"로 둘 수 있습니다
dmca_email: 상단의 "법적 통지를 위한 이메일 주소"와 같은 주소를 사용할 수 있습니다
+ domain: 귀하가 제공하는 온라인 서비스의 고유 식별정보입니다.
+ jurisdiction: 요금을 지불하는 사람이 거주하는 국가를 기재하세요. 회사나 기타 법인인 경우 해당 법인이 설립된 국가와 도시, 지역, 영토 또는 주를 적절히 기재하세요.
user:
chosen_languages: 체크하면, 선택 된 언어로 작성된 게시물들만 공개 타임라인에 보여집니다
role: 역할은 사용자가 어떤 권한을 가지게 될 지 결정합니다.
@@ -150,6 +155,7 @@ ko:
url: 이벤트가 어디로 전송될 지
labels:
account:
+ attribution_domains: 나를 기여자로 올릴 수 있도록 허용된 웹사이트들
discoverable: 발견하기 알고리즘에 프로필과 게시물을 추천하기
fields:
name: 라벨
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index d7f3829af2f2e9..efa17c1a9bd12d 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -3,6 +3,7 @@ pl:
simple_form:
hints:
account:
+ attribution_domains: Jedna na linię.
discoverable: Twój profil i publiczne wpisy mogą być promowane lub polecane na Mastodonie i twój profil może być sugerowany innym użytkownikom.
display_name: Twoje imię lub pseudonim.
fields: Co ci się tylko podoba – twoja strona domowa, zaimki, wiek…
@@ -129,6 +130,13 @@ pl:
show_application: Ty zawsze widzisz program użyty do zamieszczenia.
tag:
name: Możesz zmieniać tylko wielkość liter, np. aby były bardziej widoczne
+ terms_of_service:
+ changelog: Może być stworzony przy pomocy składni Markdown.
+ text: Może być stworzony przy pomocy składni Markdown.
+ terms_of_service_generator:
+ admin_email: Zawiadomienia prawne obejmują środki zapobiegawcze, nakazy sądowe, wnioski o popełnienie sprawy oraz wnioski organów ścigania.
+ arbitration_address: Może być taki sam jak adres fizyczny powyżej lub „N/A” jeśli używasz adresu e-mail
+ arbitration_website: Może być formularzem internetowym lub „N/A”, jeśli używasz adresu e-mail
user:
chosen_languages: Jeżeli zaznaczone, tylko wpisy w wybranych językach będą wyświetlane na publicznych osiach czasu
role: Rola kontroluje uprawnienia użytkownika.
@@ -321,6 +329,10 @@ pl:
changelog: Co się zmieniło?
text: Warunki korzystania z usługi
terms_of_service_generator:
+ arbitration_address: Adres fizyczny powiadomień arbitrażowych
+ arbitration_website: Strona internetowa do składania zgłoszeń arbitrażowych
+ dmca_address: Adres fizyczny dla zgłoszeń naruszenia DMCA/praw autorskich
+ dmca_email: Adres e-mail dla zgłoszeń naruszenia DMCA/praw autorskich
domain: Domena
jurisdiction: Jurysdykcja
user:
diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml
index ebf16f839d8a23..1330878c48aa20 100644
--- a/config/locales/simple_form.pt-PT.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -63,7 +63,7 @@ pt-PT:
setting_system_scrollbars_ui: Aplica-se apenas a navegadores de desktop baseados no Safari e Chrome
setting_use_blurhash: Os gradientes são baseados nas cores das imagens escondidas, mas ofuscam quaisquer pormenores
setting_use_pending_items: Ocultar as atualizações da cronologia após um clique em vez de percorrer automaticamente a cronologia
- username: Pode utilizar letras, números e traços inferiores (_)
+ username: Podes utilizar letras, números e traços inferiores (_)
whole_word: Quando a palavra-chave ou expressão-chave é somente alfanumérica, ela só será aplicada se corresponder à palavra completa
domain_allow:
domain: Este domínio será capaz de obter dados desta instância e os dados dele recebidos serão processados e armazenados
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index 0c6be357ced32b..1e42c6568011ec 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -3,6 +3,7 @@ zh-CN:
simple_form:
hints:
account:
+ attribution_domains: 每行一个域名。这样就可以保护作品免受虚假署名。
discoverable: 你的公开嘟文和个人资料可能会在 Mastodon 的多个位置展示，你的个人资料可能会被推荐给其他用户。
display_name: 你的全名或昵称。
fields: 你的主页、人称代词、年龄，以及任何你想要添加的内容。
@@ -46,7 +47,7 @@ zh-CN:
current_username: 请输入当前账号的用户名以确认
digest: 仅在你长时间未登录，且收到了私信时发送
email: 我们会向你发送一封确认邮件
- header: 支持WEBP、PNG、GIF 或 JPG。最大 %{size}。分辨率将被压缩至 %{dimensions}px
+ header: 支持 WEBP、PNG、GIF 或 JPG。最大 %{size}。分辨率将被压缩至 %{dimensions}px
inbox_url: 从你想要使用的中继站的主页上复制 URL
irreversible: 被过滤的嘟文会永久消失，移除过滤规则后也不会恢复
locale: 在用户界面、电子邮件和推送通知中使用的语言
@@ -155,6 +156,7 @@ zh-CN:
url: 事件将被发往的目的地
labels:
account:
+ attribution_domains: 授权展示你的署名的网站
discoverable: 在发现算法中展示你的账号与嘟文
fields:
name: 标签
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 4ac12b67a49280..0697bb0a991c58 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1203,6 +1203,7 @@ sq:
too_fast: Formulari u parashtrua shumë shpejt, riprovoni.
use_security_key: Përdor kyç sigurie
user_agreement_html: I kam lexuar dhe pajtohen me kushtet e shërbimit dhe rregullat e privatësisë
+ user_privacy_agreement_html: I kam lexuar dhe pajtohem me rregullat e privatësisë
author_attribution:
example_title: Tekst shembull
hint_html: Shkruani lajme, apo artikuj blogu jashtë Mastodon-it? Kontrolloni se si ju jepet hakë, kur ndahen me të tjerët në Mastodon.
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 65ec6ef58a7462..7470f88c50ed9c 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1209,6 +1209,7 @@ tr:
too_fast: Form çok hızlı gönderildi, tekrar deneyin.
use_security_key: Güvenlik anahtarını kullan
user_agreement_html: hizmet şartları ve gizlilik politikasını okudum ve kabul ediyorum
+ user_privacy_agreement_html: Gizlilik politikasını okudum ve kabul ettim
author_attribution:
example_title: Örnek metin
hint_html: Mastodon dışında haber veya günlük yazıları mı yazıyorsunuz? Bu yazılar Mastodon'da paylaşıldığında size nasıl atıf yapılacağını denetleyin.
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index c4abba8e111832..801d32b1aba3ee 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1242,6 +1242,7 @@ uk:
too_fast: Форму подано занадто швидко, спробуйте ще раз.
use_security_key: Використовувати ключ безпеки
user_agreement_html: Я прочитав і приймаю умови використання та політику конфіденційності< /a>
+ user_privacy_agreement_html: Мною прочитано і я погоджуюся з політикою приватності
author_attribution:
example_title: Зразок тексту
hint_html: Ви пишете новини чи статті в блозі за межами Mastodon? Контролюйте, як вони підписуються, коли ними діляться на Mastodon.
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index e6da2ee8d31290..a7fbfa3de23138 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1,7 +1,7 @@
---
zh-CN:
about:
- about_mastodon_html: 来自未来的社交网络：无广告、无监视、去中心化、合乎道德！加入 Mastodon，掌控自己的数据！
+ about_mastodon_html: 来自未来的社交网络：无广告、无监视、去中心化、合乎道德！使用 Mastodon 夺回你的数据！
contact_missing: 未设定
contact_unavailable: 未公开
hosted_on: 运行在 %{domain} 上的 Mastodon 实例
@@ -1190,6 +1190,7 @@ zh-CN:
too_fast: 表单提交过快，请重试。
use_security_key: 使用安全密钥
user_agreement_html: 我已阅读并同意 服务条款 与 隐私政策
+ user_privacy_agreement_html: 我已阅读并同意隐私政策
author_attribution:
example_title: 示例文本
hint_html: 你是否在 Mastodon 之外撰写新闻或博客文章？控制它们被分享到 Mastodon 时的署名方式。
@@ -1830,10 +1831,10 @@ zh-CN:
terms_of_service:
title: 服务条款
themes:
- contrast: Mastodon (高对比度)
- default: Mastodon (暗色)
- mastodon-light: Mastodon (亮色)
- system: 自动切换 (使用系统主题)
+ contrast: Mastodon（高对比度）
+ default: Mastodon（暗色主题）
+ mastodon-light: Mastodon（亮色主题）
+ system: 自动切换（使用系统主题）
time:
formats:
default: "%Y年%m月%d日 %H:%M"
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index cf215240e95634..4a3ab2ba238428 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1192,6 +1192,7 @@ zh-TW:
too_fast: 送出表單的速度太快跟不上，請稍後再試。
use_security_key: 使用安全金鑰
user_agreement_html: 我已閱讀並同意 服務條款 與 隱私權政策
+ user_privacy_agreement_html: 我已閱讀並同意 隱私權政策
author_attribution:
example_title: 範例文字
hint_html: 您是否正於 Mastodon 之外撰寫新聞或部落格文章？控制當它們於 Mastodon 上分享時您如何獲得信譽。
diff --git a/config/puma.rb b/config/puma.rb
index ac9ccac2091c73..4fe8f802b9c44a 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -17,6 +17,27 @@
preload_app!
+if ENV['MASTODON_PROMETHEUS_EXPORTER_ENABLED'] == 'true'
+ require 'prometheus_exporter'
+ require 'prometheus_exporter/instrumentation'
+
+ on_worker_boot do
+ # Ruby process metrics (memory, GC, etc)
+ PrometheusExporter::Instrumentation::Process.start(type: 'puma')
+
+ # ActiveRecord metrics (connection pool usage)
+ PrometheusExporter::Instrumentation::ActiveRecord.start(
+ custom_labels: { type: 'puma' }, # optional params
+ config_labels: [:database, :host] # optional params
+ )
+ end
+
+ after_worker_boot do
+ # Puma metrics
+ PrometheusExporter::Instrumentation::Puma.start unless PrometheusExporter::Instrumentation::Puma.started?
+ end
+end
+
on_worker_boot do
ActiveSupport.on_load(:active_record) do
ActiveRecord::Base.establish_connection
diff --git a/config/templates/terms-of-service.md b/config/templates/terms-of-service.md
index cb81a22e84327d..4b11a9897cfcc7 100644
--- a/config/templates/terms-of-service.md
+++ b/config/templates/terms-of-service.md
@@ -58,16 +58,18 @@ attempt to):
or limit the functionality of the Instance, launch a denial of service attack,
or in any other way attempt to interfere with the functioning and availability
of the Instance;
-- Except as may be the result of standard search engine or Internet browser
- usage, use, launch, develop, or distribute any automated system, including
- without limitation, any spider, robot, cheat utility, scraper, offline reader,
- or any data mining or similar data gathering extraction tools to access the
- Instance, or use or launch any unauthorized script or other software;
+- Use, launch, develop, or distribute any automated system, including without
+ limitation, any spider, robot, cheat utility, scraper, offline reader, or any
+ data mining or similar data gathering extraction tools to access the Instance,
+ except in each case as may be the result of standard search engine or Internet
+ browser and local caching or for human review and interaction with Content on
+ the Instance;
+- Use or launch any unauthorized script or other software;
- Interfere with, disable, vandalize or disrupt the Instance or servers or
networks connected to the Instance;
- Hack into, penetrate, disable, or otherwise circumvent the security measures
of the Instance or servers or networks connected to the Instance;
-- or otherwise use the Instance in any way that violates any applicable
+- Otherwise use the Instance in any way that violates any applicable
national, federal, state, local or international law or regulation.
## Intellectual Property
diff --git a/docker-compose.yml b/docker-compose.yml
index 6c4497756211c1..93e5bd4ecd0b2c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,5 @@
# This file is designed for production server deployment, not local development work
-# For a containerized local dev environment, see: https://github.com/mastodon/mastodon/blob/main/README.md#docker
+# For a containerized local dev environment, see: https://github.com/mastodon/mastodon/blob/main/docs/DEVELOPMENT.md#docker
services:
db:
diff --git a/lib/devise/strategies/two_factor_ldap_authenticatable.rb b/lib/devise/strategies/two_factor_ldap_authenticatable.rb
index c8258deb16ddb1..2efd1323a82eb1 100644
--- a/lib/devise/strategies/two_factor_ldap_authenticatable.rb
+++ b/lib/devise/strategies/two_factor_ldap_authenticatable.rb
@@ -23,7 +23,7 @@ def authenticate!
protected
def valid_params?
- params[scope] && params[scope][:password].present?
+ params[scope].is_a?(Hash) && params[scope][:password].present?
end
end
end
diff --git a/lib/devise/strategies/two_factor_pam_authenticatable.rb b/lib/devise/strategies/two_factor_pam_authenticatable.rb
index a9db1b6a29ff96..2164b0323427d1 100644
--- a/lib/devise/strategies/two_factor_pam_authenticatable.rb
+++ b/lib/devise/strategies/two_factor_pam_authenticatable.rb
@@ -22,7 +22,7 @@ def authenticate!
protected
def valid_params?
- params[scope] && params[scope][:password].present?
+ params[scope].is_a?(Hash) && params[scope][:password].present?
end
end
end
diff --git a/spec/controllers/admin/domain_blocks_controller_spec.rb b/spec/controllers/admin/domain_blocks_controller_spec.rb
index 4d48a0d9d3e2b1..f3f08c79405695 100644
--- a/spec/controllers/admin/domain_blocks_controller_spec.rb
+++ b/spec/controllers/admin/domain_blocks_controller_spec.rb
@@ -48,15 +48,11 @@
post :create, params: { domain_block: { domain: 'example.com', severity: 'silence' } }
end
- it 'records a block' do
+ it 'records a block, calls a worker, redirects' do
expect(DomainBlock.exists?(domain: 'example.com', severity: 'silence')).to be true
- end
- it 'calls DomainBlockWorker' do
expect(DomainBlockWorker).to have_received(:perform_async)
- end
- it 'redirects with a success message' do
expect(flash[:notice]).to eq I18n.t('admin.domain_blocks.created_msg')
expect(response).to redirect_to(admin_instances_path(limited: '1'))
end
@@ -68,15 +64,11 @@
post :create, params: { domain_block: { domain: 'example.com', severity: 'silence' } }
end
- it 'does not record a block' do
+ it 'does not record a block or call worker, renders new' do
expect(DomainBlock.exists?(domain: 'example.com', severity: 'silence')).to be false
- end
- it 'does not call DomainBlockWorker' do
expect(DomainBlockWorker).to_not have_received(:perform_async)
- end
- it 'renders new' do
expect(response).to render_template :new
end
end
@@ -87,15 +79,11 @@
post :create, params: { domain_block: { domain: 'example.com', severity: 'suspend', reject_media: true, reject_reports: true } }
end
- it 'does not record a block' do
+ it 'does not record a block or call worker, renders confirm suspension' do
expect(DomainBlock.exists?(domain: 'example.com', severity: 'suspend')).to be false
- end
- it 'does not call DomainBlockWorker' do
expect(DomainBlockWorker).to_not have_received(:perform_async)
- end
- it 'renders confirm_suspension' do
expect(response).to render_template :confirm_suspension
end
end
@@ -105,15 +93,11 @@
post :create, params: { :domain_block => { domain: 'example.com', severity: 'suspend', reject_media: true, reject_reports: true }, 'confirm' => '' }
end
- it 'records a block' do
+ it 'records a block and calls worker and redirects' do
expect(DomainBlock.exists?(domain: 'example.com', severity: 'suspend')).to be true
- end
- it 'calls DomainBlockWorker' do
expect(DomainBlockWorker).to have_received(:perform_async)
- end
- it 'redirects with a success message' do
expect(flash[:notice]).to eq I18n.t('admin.domain_blocks.created_msg')
expect(response).to redirect_to(admin_instances_path(limited: '1'))
end
@@ -130,15 +114,11 @@
post :create, params: { domain_block: { domain: 'example.com', severity: 'suspend', reject_media: true, reject_reports: true } }
end
- it 'does not record a block' do
+ it 'does not record a block or call worker, renders confirm suspension' do
expect(DomainBlock.exists?(domain: 'example.com', severity: 'suspend')).to be false
- end
- it 'does not call DomainBlockWorker' do
expect(DomainBlockWorker).to_not have_received(:perform_async)
- end
- it 'renders confirm_suspension' do
expect(response).to render_template :confirm_suspension
end
end
@@ -148,15 +128,11 @@
post :create, params: { :domain_block => { domain: 'example.com', severity: 'suspend', reject_media: true, reject_reports: true }, 'confirm' => '' }
end
- it 'updates the record' do
+ it 'updates the record and calls worker, redirects' do
expect(DomainBlock.exists?(domain: 'example.com', severity: 'suspend')).to be true
- end
- it 'calls DomainBlockWorker' do
expect(DomainBlockWorker).to have_received(:perform_async)
- end
- it 'redirects with a success message' do
expect(flash[:notice]).to eq I18n.t('admin.domain_blocks.created_msg')
expect(response).to redirect_to(admin_instances_path(limited: '1'))
end
diff --git a/spec/controllers/admin/email_domain_blocks_controller_spec.rb b/spec/controllers/admin/email_domain_blocks_controller_spec.rb
index c7460c21101f25..f274c01281117e 100644
--- a/spec/controllers/admin/email_domain_blocks_controller_spec.rb
+++ b/spec/controllers/admin/email_domain_blocks_controller_spec.rb
@@ -58,11 +58,9 @@
post :create, params: { email_domain_block: { domain: 'example.com' }, save: '' }
end
- it 'blocks the domain' do
+ it 'blocks the domain and redirects to email domain blocks' do
expect(EmailDomainBlock.find_by(domain: 'example.com')).to_not be_nil
- end
- it 'redirects to e-mail domain blocks' do
expect(response).to redirect_to(admin_email_domain_blocks_path)
end
end
diff --git a/spec/controllers/admin/roles_controller_spec.rb b/spec/controllers/admin/roles_controller_spec.rb
index 2c43a0ca870ae5..173a89e5d5d6ef 100644
--- a/spec/controllers/admin/roles_controller_spec.rb
+++ b/spec/controllers/admin/roles_controller_spec.rb
@@ -68,11 +68,9 @@
let(:selected_position) { 1 }
let(:selected_permissions_as_keys) { %w(manage_roles) }
- it 'redirects to roles page' do
+ it 'redirects to roles page and creates role' do
expect(response).to redirect_to(admin_roles_path)
- end
- it 'creates new role' do
expect(UserRole.find_by(name: 'Bar')).to_not be_nil
end
end
@@ -81,11 +79,9 @@
let(:selected_position) { 100 }
let(:selected_permissions_as_keys) { %w(manage_roles) }
- it 'renders new template' do
+ it 'renders new template and does not create role' do
expect(response).to render_template(:new)
- end
- it 'does not create new role' do
expect(UserRole.find_by(name: 'Bar')).to be_nil
end
end
@@ -94,11 +90,9 @@
let(:selected_position) { 1 }
let(:selected_permissions_as_keys) { %w(manage_roles manage_users manage_reports) }
- it 'renders new template' do
+ it 'renders new template and does not create role' do
expect(response).to render_template(:new)
- end
- it 'does not create new role' do
expect(UserRole.find_by(name: 'Bar')).to be_nil
end
end
@@ -109,11 +103,9 @@
let(:selected_position) { 1 }
let(:selected_permissions_as_keys) { %w(manage_roles manage_users manage_reports) }
- it 'redirects to roles page' do
+ it 'redirects to roles page and creates new role' do
expect(response).to redirect_to(admin_roles_path)
- end
- it 'creates new role' do
expect(UserRole.find_by(name: 'Bar')).to_not be_nil
end
end
@@ -166,11 +158,9 @@
end
context 'when user does not have permission to manage roles' do
- it 'returns http forbidden' do
+ it 'returns http forbidden and does not update role' do
expect(response).to have_http_status(403)
- end
- it 'does not update the role' do
expect(role.reload.name).to eq 'Bar'
end
end
@@ -179,11 +169,9 @@
let(:permissions) { UserRole::FLAGS[:manage_roles] }
context 'when role has permissions the user doesn\'t' do
- it 'renders edit template' do
+ it 'renders edit template and does not update role' do
expect(response).to render_template(:edit)
- end
- it 'does not update the role' do
expect(role.reload.name).to eq 'Bar'
end
end
@@ -192,11 +180,9 @@
let(:permissions) { UserRole::FLAGS[:manage_roles] | UserRole::FLAGS[:manage_users] }
context 'when user outranks the role' do
- it 'redirects to roles page' do
+ it 'redirects to roles page and updates role' do
expect(response).to redirect_to(admin_roles_path)
- end
- it 'updates the role' do
expect(role.reload.name).to eq 'Baz'
end
end
@@ -204,11 +190,9 @@
context 'when role outranks user' do
let(:role_position) { current_role.position + 1 }
- it 'returns http forbidden' do
+ it 'returns http forbidden and does not update role' do
expect(response).to have_http_status(403)
- end
- it 'does not update the role' do
expect(role.reload.name).to eq 'Bar'
end
end
diff --git a/spec/controllers/admin/settings/branding_controller_spec.rb b/spec/controllers/admin/settings/branding_controller_spec.rb
index 843021469e5ba7..6b3621bb8a3676 100644
--- a/spec/controllers/admin/settings/branding_controller_spec.rb
+++ b/spec/controllers/admin/settings/branding_controller_spec.rb
@@ -16,7 +16,8 @@
patch :update, params: { form_admin_settings: { new_setting_key: 'New key value' } }
- expect(response).to redirect_to(admin_settings_branding_path)
+ expect(response)
+ .to have_http_status(400)
expect(Setting.new_setting_key).to be_nil
end
end
diff --git a/spec/controllers/admin/users/roles_controller_spec.rb b/spec/controllers/admin/users/roles_controller_spec.rb
index bfc2bb151fa7c5..a7d59181d62dcf 100644
--- a/spec/controllers/admin/users/roles_controller_spec.rb
+++ b/spec/controllers/admin/users/roles_controller_spec.rb
@@ -44,11 +44,9 @@
let(:permissions) { UserRole::FLAGS[:manage_roles] }
let(:position) { 1 }
- it 'updates user role' do
+ it 'updates user role and redirects' do
expect(user.reload.role_id).to eq selected_role&.id
- end
- it 'redirects back to account page' do
expect(response).to redirect_to(admin_account_path(user.account_id))
end
end
@@ -57,11 +55,9 @@
let(:permissions) { UserRole::FLAGS[:administrator] }
let(:position) { 100 }
- it 'does not update user role' do
+ it 'does not update user role and renders edit' do
expect(user.reload.role_id).to eq previous_role&.id
- end
- it 'renders edit form' do
expect(response).to render_template(:show)
end
end
@@ -71,11 +67,9 @@
let(:permissions) { UserRole::FLAGS[:manage_roles] }
let(:position) { 1 }
- it 'does not update user role' do
+ it 'does not update user role and returns http forbidden' do
expect(user.reload.role_id).to eq previous_role&.id
- end
- it 'returns http forbidden' do
expect(response).to have_http_status(403)
end
end
diff --git a/spec/lib/activitypub/linked_data_signature_spec.rb b/spec/lib/activitypub/linked_data_signature_spec.rb
index b1a8dc5c49c39b..8128fdd070b645 100644
--- a/spec/lib/activitypub/linked_data_signature_spec.rb
+++ b/spec/lib/activitypub/linked_data_signature_spec.rb
@@ -13,10 +13,13 @@
{
'@context' => 'https://www.w3.org/ns/activitystreams',
'id' => 'http://example.com/hello-world',
+ 'type' => 'Note',
+ 'content' => 'Hello world',
}
end
- let(:json) { raw_json.merge('signature' => signature) }
+ let(:signed_json) { raw_json.merge('signature' => signature) }
+ let(:json) { signed_json }
describe '#verify_actor!' do
context 'when signature matches' do
@@ -90,6 +93,54 @@
expect(subject.verify_actor!).to be_nil
end
end
+
+ context 'when an attribute has been removed from the document' do
+ let(:signature) { raw_signature.merge('type' => 'RsaSignature2017', 'signatureValue' => sign(sender, raw_signature, raw_json)) }
+ let(:json) { signed_json.without('content') }
+
+ let(:raw_signature) do
+ {
+ 'creator' => 'http://example.com/alice',
+ 'created' => '2017-09-23T20:21:34Z',
+ }
+ end
+
+ it 'returns nil' do
+ expect(subject.verify_actor!).to be_nil
+ end
+ end
+
+ context 'when an attribute has been added to the document' do
+ let(:signature) { raw_signature.merge('type' => 'RsaSignature2017', 'signatureValue' => sign(sender, raw_signature, raw_json)) }
+ let(:json) { signed_json.merge('attributedTo' => 'http://example.com/bob') }
+
+ let(:raw_signature) do
+ {
+ 'creator' => 'http://example.com/alice',
+ 'created' => '2017-09-23T20:21:34Z',
+ }
+ end
+
+ it 'returns nil' do
+ expect(subject.verify_actor!).to be_nil
+ end
+ end
+
+ context 'when an existing attribute has been changed' do
+ let(:signature) { raw_signature.merge('type' => 'RsaSignature2017', 'signatureValue' => sign(sender, raw_signature, raw_json)) }
+ let(:json) { signed_json.merge('content' => 'oops') }
+
+ let(:raw_signature) do
+ {
+ 'creator' => 'http://example.com/alice',
+ 'created' => '2017-09-23T20:21:34Z',
+ }
+ end
+
+ it 'returns nil' do
+ expect(subject.verify_actor!).to be_nil
+ end
+ end
end
describe '#sign!' do
diff --git a/spec/lib/request_spec.rb b/spec/lib/request_spec.rb
index f17cf637b99a31..79c400e098e489 100644
--- a/spec/lib/request_spec.rb
+++ b/spec/lib/request_spec.rb
@@ -60,16 +60,12 @@
expect(a_request(:get, 'http://example.com')).to have_been_made.once
end
- it 'sets headers' do
- expect { |block| subject.perform(&block) }.to yield_control
- expect(a_request(:get, 'http://example.com').with(headers: subject.headers)).to have_been_made
- end
-
- it 'closes underlying connection' do
+ it 'makes a request with expected headers, yields, and closes the underlying connection' do
allow(subject.send(:http_client)).to receive(:close)
expect { |block| subject.perform(&block) }.to yield_control
+ expect(a_request(:get, 'http://example.com').with(headers: subject.headers)).to have_been_made
expect(subject.send(:http_client)).to have_received(:close)
end
@@ -80,6 +76,29 @@
end
end
+ context 'with a redirect and HTTP signatures' do
+ let(:account) { Fabricate(:account) }
+
+ before do
+ stub_request(:get, 'http://example.com').to_return(status: 301, headers: { Location: 'http://redirected.example.com/foo' })
+ stub_request(:get, 'http://redirected.example.com/foo').to_return(body: 'lorem ipsum')
+ end
+
+ it 'makes a request with expected headers and follows redirects' do
+ expect { |block| subject.on_behalf_of(account).perform(&block) }.to yield_control
+
+ # request.headers includes the `Signature` sent for the first request
+ expect(a_request(:get, 'http://example.com').with(headers: subject.headers)).to have_been_made.once
+
+ # request.headers includes the `Signature`, but it has changed
+ expect(a_request(:get, 'http://redirected.example.com/foo').with(headers: subject.headers.merge({ 'Host' => 'redirected.example.com' }))).to_not have_been_made
+
+ # `with(headers: )` matching tests for inclusion, so strip `Signature`
+ # This doesn't actually test that there is a signature, but it tests that the original signature is not passed
+ expect(a_request(:get, 'http://redirected.example.com/foo').with(headers: subject.headers.without('Signature').merge({ 'Host' => 'redirected.example.com' }))).to have_been_made.once
+ end
+ end
+
context 'with private host' do
around do |example|
WebMock.disable!
diff --git a/spec/requests/admin/account_actions_spec.rb b/spec/requests/admin/account_actions_spec.rb
new file mode 100644
index 00000000000000..5bf8f3e9b2aaa7
--- /dev/null
+++ b/spec/requests/admin/account_actions_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Account Actions' do
+ describe 'POST /admin/accounts/:account_id/action' do
+ before { sign_in Fabricate(:admin_user) }
+
+ let(:account) { Fabricate :account }
+
+ it 'gracefully handles invalid nested params' do
+ post admin_account_action_path(account.id, admin_account_action: 'invalid')
+
+ expect(response)
+ .to have_http_status(400)
+ end
+ end
+end
diff --git a/spec/requests/admin/account_moderation_notes_spec.rb b/spec/requests/admin/account_moderation_notes_spec.rb
new file mode 100644
index 00000000000000..857bec1e098a96
--- /dev/null
+++ b/spec/requests/admin/account_moderation_notes_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Account Moderation Notes' do
+ describe 'POST /admin/account_moderation_notes' do
+ before { sign_in Fabricate(:admin_user) }
+
+ it 'gracefully handles invalid nested params' do
+ post admin_account_moderation_notes_path(account_moderation_note: 'invalid')
+
+ expect(response)
+ .to have_http_status(400)
+ end
+ end
+end
diff --git a/spec/requests/admin/accounts_spec.rb b/spec/requests/admin/accounts_spec.rb
new file mode 100644
index 00000000000000..de655f0d36a2d8
--- /dev/null
+++ b/spec/requests/admin/accounts_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Accounts' do
+ describe 'POST /admin/accounts/batch' do
+ before { sign_in Fabricate(:admin_user) }
+
+ it 'gracefully handles invalid nested params' do
+ post batch_admin_accounts_path(form_account_batch: 'invalid')
+
+ expect(response)
+ .to redirect_to(admin_accounts_path)
+ end
+ end
+end
diff --git a/spec/requests/admin/announcements_spec.rb b/spec/requests/admin/announcements_spec.rb
new file mode 100644
index 00000000000000..46d1b6a0965b2d
--- /dev/null
+++ b/spec/requests/admin/announcements_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Announcements' do
+ describe 'POST /admin/announcements' do
+ before { sign_in Fabricate(:admin_user) }
+
+ it 'gracefully handles invalid nested params' do
+ post admin_announcements_path(announcement: 'invalid')
+
+ expect(response)
+ .to have_http_status(400)
+ end
+ end
+end
diff --git a/spec/requests/admin/change_emails_spec.rb b/spec/requests/admin/change_emails_spec.rb
new file mode 100644
index 00000000000000..3df29eb77b450d
--- /dev/null
+++ b/spec/requests/admin/change_emails_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Account Change Email' do
+ describe 'PUT /admin/accounts/:account_id/change_email' do
+ before { sign_in Fabricate(:admin_user) }
+
+ let(:account) { Fabricate :account }
+
+ it 'gracefully handles invalid nested params' do
+ put admin_account_change_email_path(account.id, user: 'invalid')
+
+ expect(response)
+ .to have_http_status(400)
+ end
+ end
+end
diff --git a/spec/requests/admin/custom_emojis_spec.rb b/spec/requests/admin/custom_emojis_spec.rb
new file mode 100644
index 00000000000000..0c142f11f21119
--- /dev/null
+++ b/spec/requests/admin/custom_emojis_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Custom Emojis' do
+ describe 'POST /admin/custom_emojis' do
+ before { sign_in Fabricate(:admin_user) }
+
+ it 'gracefully handles invalid nested params' do
+ post admin_custom_emojis_path(custom_emoji: 'invalid')
+
+ expect(response)
+ .to have_http_status(400)
+ end
+ end
+end
diff --git a/spec/requests/admin/domain_allows_spec.rb b/spec/requests/admin/domain_allows_spec.rb
new file mode 100644
index 00000000000000..0d1f6d02489786
--- /dev/null
+++ b/spec/requests/admin/domain_allows_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Domain Allows' do
+ describe 'POST /admin/domain_allows' do
+ before { sign_in Fabricate(:admin_user) }
+
+ it 'gracefully handles invalid nested params' do
+ post admin_domain_allows_path(domain_allow: 'invalid')
+
+ expect(response)
+ .to have_http_status(400)
+ end
+ end
+end
diff --git a/spec/requests/admin/domain_blocks_spec.rb b/spec/requests/admin/domain_blocks_spec.rb
new file mode 100644
index 00000000000000..3b18a8ece12e55
--- /dev/null
+++ b/spec/requests/admin/domain_blocks_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Domain Blocks' do
+ describe 'POST /admin/domain_blocks/batch' do
+ before { sign_in Fabricate(:admin_user) }
+
+ it 'gracefully handles invalid nested params' do
+ post batch_admin_domain_blocks_path(form_domain_block_batch: 'invalid')
+
+ expect(response)
+ .to redirect_to(admin_instances_path(limited: '1'))
+ end
+ end
+end
diff --git a/spec/requests/admin/email_domain_blocks_spec.rb b/spec/requests/admin/email_domain_blocks_spec.rb
new file mode 100644
index 00000000000000..7bccb3166b441d
--- /dev/null
+++ b/spec/requests/admin/email_domain_blocks_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Email Domain Blocks' do
+ describe 'POST /admin/email_domain_blocks' do
+ before { sign_in Fabricate(:admin_user) }
+
+ it 'gracefully handles invalid nested params' do
+ post admin_email_domain_blocks_path(email_domain_block: 'invalid')
+
+ expect(response)
+ .to have_http_status(400)
+ end
+ end
+
+ describe 'POST /admin/email_domain_blocks/batch' do
+ before { sign_in Fabricate(:admin_user) }
+
+ it 'gracefully handles invalid nested params' do
+ post batch_admin_email_domain_blocks_path(form_email_domain_block_batch: 'invalid')
+
+ expect(response)
+ .to redirect_to(admin_email_domain_blocks_path)
+ end
+ end
+end
diff --git a/spec/requests/admin/export_domain_allows_spec.rb b/spec/requests/admin/export_domain_allows_spec.rb
new file mode 100644
index 00000000000000..761c39984ec197
--- /dev/null
+++ b/spec/requests/admin/export_domain_allows_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Export Domain Allows' do
+ describe 'POST /admin/export_domain_allows/import' do
+ before { sign_in Fabricate(:admin_user) }
+
+ it 'gracefully handles invalid nested params' do
+ post import_admin_export_domain_allows_path(admin_import: 'invalid')
+
+ expect(response)
+ .to redirect_to(admin_instances_path)
+ end
+ end
+end
diff --git a/spec/requests/admin/export_domain_blocks_spec.rb b/spec/requests/admin/export_domain_blocks_spec.rb
new file mode 100644
index 00000000000000..d7fed5287f51b2
--- /dev/null
+++ b/spec/requests/admin/export_domain_blocks_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Export Domain Blocks' do
+ describe 'POST /admin/export_domain_blocks/import' do
+ before { sign_in Fabricate(:admin_user) }
+
+ it 'gracefully handles invalid nested params' do
+ post import_admin_export_domain_blocks_path(admin_import: 'invalid')
+
+ expect(response.body)
+ .to include(I18n.t('admin.export_domain_blocks.no_file'))
+ end
+ end
+end
diff --git a/spec/requests/admin/follow_recommendations_spec.rb b/spec/requests/admin/follow_recommendations_spec.rb
new file mode 100644
index 00000000000000..146c26448cd262
--- /dev/null
+++ b/spec/requests/admin/follow_recommendations_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Follow Recommendations' do
+ describe 'PUT /admin/follow_recommendations' do
+ before { sign_in Fabricate(:admin_user) }
+
+ it 'gracefully handles invalid nested params' do
+ put admin_follow_recommendations_path(form_account_batch: 'invalid')
+
+ expect(response)
+ .to redirect_to(admin_follow_recommendations_path)
+ end
+ end
+end
diff --git a/spec/requests/admin/invites_spec.rb b/spec/requests/admin/invites_spec.rb
new file mode 100644
index 00000000000000..c027fd30cfc717
--- /dev/null
+++ b/spec/requests/admin/invites_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Invites' do
+ describe 'POST /admin/invites' do
+ before { sign_in Fabricate(:admin_user) }
+
+ it 'gracefully handles invalid nested params' do
+ post admin_invites_path(invite: 'invalid')
+
+ expect(response)
+ .to have_http_status(400)
+ end
+ end
+end
diff --git a/spec/requests/admin/ip_blocks_spec.rb b/spec/requests/admin/ip_blocks_spec.rb
new file mode 100644
index 00000000000000..e74961aa3cd813
--- /dev/null
+++ b/spec/requests/admin/ip_blocks_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin IP Blocks' do
+ describe 'POST /admin/ip_blocks' do
+ before { sign_in Fabricate(:admin_user) }
+
+ it 'gracefully handles invalid nested params' do
+ post admin_ip_blocks_path(ip_block: 'invalid')
+
+ expect(response)
+ .to have_http_status(400)
+ end
+ end
+
+ describe 'POST /admin/ip_blocks/batch' do
+ before { sign_in Fabricate(:admin_user) }
+
+ it 'gracefully handles invalid nested params' do
+ post batch_admin_ip_blocks_path(form_ip_block_batch: 'invalid')
+
+ expect(response)
+ .to redirect_to(admin_ip_blocks_path)
+ end
+ end
+end
diff --git a/spec/requests/admin/relays_spec.rb b/spec/requests/admin/relays_spec.rb
new file mode 100644
index 00000000000000..5dcdfe98924ad3
--- /dev/null
+++ b/spec/requests/admin/relays_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Relays' do
+ describe 'POST /admin/relays' do
+ before { sign_in Fabricate(:admin_user) }
+
+ it 'gracefully handles invalid nested params' do
+ post admin_relays_path(relay: 'invalid')
+
+ expect(response)
+ .to have_http_status(400)
+ end
+ end
+end
diff --git a/spec/requests/admin/report_notes_spec.rb b/spec/requests/admin/report_notes_spec.rb
new file mode 100644
index 00000000000000..170648a714f170
--- /dev/null
+++ b/spec/requests/admin/report_notes_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Report Notes' do
+ describe 'POST /admin/report_notes' do
+ before { sign_in Fabricate(:admin_user) }
+
+ it 'gracefully handles invalid nested params' do
+ post admin_report_notes_path(report_note: 'invalid')
+
+ expect(response)
+ .to have_http_status(400)
+ end
+ end
+end
diff --git a/spec/requests/admin/roles_spec.rb b/spec/requests/admin/roles_spec.rb
new file mode 100644
index 00000000000000..785da5a0ffdf5a
--- /dev/null
+++ b/spec/requests/admin/roles_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Roles' do
+ describe 'POST /admin/roles' do
+ before { sign_in Fabricate(:admin_user) }
+
+ it 'gracefully handles invalid nested params' do
+ post admin_roles_path(user_role: 'invalid')
+
+ expect(response)
+ .to have_http_status(400)
+ end
+ end
+end
diff --git a/spec/requests/admin/rules_spec.rb b/spec/requests/admin/rules_spec.rb
new file mode 100644
index 00000000000000..9382b38e59d385
--- /dev/null
+++ b/spec/requests/admin/rules_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Rules' do
+ describe 'POST /admin/rules' do
+ before { sign_in Fabricate(:admin_user) }
+
+ it 'gracefully handles invalid nested params' do
+ post admin_rules_path(rule: 'invalid')
+
+ expect(response)
+ .to have_http_status(400)
+ end
+ end
+end
diff --git a/spec/requests/admin/settings/about_spec.rb b/spec/requests/admin/settings/about_spec.rb
new file mode 100644
index 00000000000000..28be2c252d6263
--- /dev/null
+++ b/spec/requests/admin/settings/about_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Settings About' do
+ describe 'PUT /admin/settings/about' do
+ before { sign_in Fabricate(:admin_user) }
+
+ it 'gracefully handles invalid nested params' do
+ put admin_settings_about_path(form_admin_settings: 'invalid')
+
+ expect(response)
+ .to have_http_status(400)
+ end
+ end
+end
diff --git a/spec/requests/admin/statuses_spec.rb b/spec/requests/admin/statuses_spec.rb
new file mode 100644
index 00000000000000..9fa732e178f7f1
--- /dev/null
+++ b/spec/requests/admin/statuses_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Statuses' do
+ describe 'POST /admin/accounts/:account_id/statuses/batch' do
+ before { sign_in Fabricate(:admin_user) }
+
+ let(:account) { Fabricate :account }
+
+ it 'gracefully handles invalid nested params' do
+ post batch_admin_account_statuses_path(account.id, admin_status_batch_action: 'invalid')
+
+ expect(response)
+ .to redirect_to(admin_account_statuses_path(account.id))
+ end
+ end
+end
diff --git a/spec/requests/admin/tags_spec.rb b/spec/requests/admin/tags_spec.rb
new file mode 100644
index 00000000000000..653c5bd9356bae
--- /dev/null
+++ b/spec/requests/admin/tags_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Tags' do
+ describe 'PUT /admin/tags/:id' do
+ before { sign_in Fabricate(:admin_user) }
+
+ let(:tag) { Fabricate :tag }
+
+ it 'gracefully handles invalid nested params' do
+ put admin_tag_path(tag.id, tag: 'invalid')
+
+ expect(response)
+ .to have_http_status(400)
+ end
+ end
+end
diff --git a/spec/requests/admin/terms_of_service/drafts_spec.rb b/spec/requests/admin/terms_of_service/drafts_spec.rb
new file mode 100644
index 00000000000000..2c3c77193e5a34
--- /dev/null
+++ b/spec/requests/admin/terms_of_service/drafts_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Terms Drafts' do
+ describe 'PUT /admin/terms_of_service/draft' do
+ before { sign_in Fabricate(:admin_user) }
+
+ it 'gracefully handles invalid nested params' do
+ put admin_terms_of_service_draft_path(terms_of_service: 'invalid')
+
+ expect(response)
+ .to have_http_status(400)
+ end
+ end
+end
diff --git a/spec/requests/admin/terms_of_service/generates_spec.rb b/spec/requests/admin/terms_of_service/generates_spec.rb
new file mode 100644
index 00000000000000..b8c51fdf2c76b8
--- /dev/null
+++ b/spec/requests/admin/terms_of_service/generates_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Terms Generates' do
+ describe 'POST /admin/terms_of_service/generates' do
+ before { sign_in Fabricate(:admin_user) }
+
+ it 'gracefully handles invalid nested params' do
+ post admin_terms_of_service_generate_path(terms_of_service_generator: 'invalid')
+
+ expect(response)
+ .to have_http_status(400)
+ end
+ end
+end
diff --git a/spec/requests/admin/trends/links/preview_card_providers_spec.rb b/spec/requests/admin/trends/links/preview_card_providers_spec.rb
new file mode 100644
index 00000000000000..69bf479c68667f
--- /dev/null
+++ b/spec/requests/admin/trends/links/preview_card_providers_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Trends Links Preview Card Providers' do
+ describe 'POST /admin/trends/links/publishers/batch' do
+ before { sign_in Fabricate(:admin_user) }
+
+ it 'gracefully handles invalid nested params' do
+ post batch_admin_trends_links_preview_card_providers_path(trends_preview_card_provider_batch: 'invalid')
+
+ expect(response)
+ .to redirect_to(admin_trends_links_preview_card_providers_path)
+ end
+ end
+end
diff --git a/spec/requests/admin/trends/links_spec.rb b/spec/requests/admin/trends/links_spec.rb
new file mode 100644
index 00000000000000..9fbfd567043e15
--- /dev/null
+++ b/spec/requests/admin/trends/links_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Trends Links' do
+ describe 'POST /admin/trends/links/batch' do
+ before { sign_in Fabricate(:admin_user) }
+
+ it 'gracefully handles invalid nested params' do
+ post batch_admin_trends_links_path(trends_preview_card_batch: 'invalid')
+
+ expect(response)
+ .to redirect_to(admin_trends_links_path)
+ end
+ end
+end
diff --git a/spec/requests/admin/trends/statuses_spec.rb b/spec/requests/admin/trends/statuses_spec.rb
new file mode 100644
index 00000000000000..ceae24ec8f0a68
--- /dev/null
+++ b/spec/requests/admin/trends/statuses_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Trends Statuses' do
+ describe 'POST /admin/trends/statuses/batch' do
+ before { sign_in Fabricate(:admin_user) }
+
+ it 'gracefully handles invalid nested params' do
+ post batch_admin_trends_statuses_path(trends_status_batch: 'invalid')
+
+ expect(response)
+ .to redirect_to(admin_trends_statuses_path)
+ end
+ end
+end
diff --git a/spec/requests/admin/trends/tags_spec.rb b/spec/requests/admin/trends/tags_spec.rb
new file mode 100644
index 00000000000000..e505be7a193075
--- /dev/null
+++ b/spec/requests/admin/trends/tags_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Trends Tags' do
+ describe 'POST /admin/trends/tags/batch' do
+ before { sign_in Fabricate(:admin_user) }
+
+ it 'gracefully handles invalid nested params' do
+ post batch_admin_trends_tags_path(trends_tag_batch: 'invalid')
+
+ expect(response)
+ .to redirect_to(admin_trends_tags_path)
+ end
+ end
+end
diff --git a/spec/requests/admin/users/roles_spec.rb b/spec/requests/admin/users/roles_spec.rb
new file mode 100644
index 00000000000000..b39e3f8bae1317
--- /dev/null
+++ b/spec/requests/admin/users/roles_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Users Roles' do
+ describe 'PUT /admin/users/:user_id/role' do
+ before { sign_in Fabricate(:admin_user) }
+
+ let(:user) { Fabricate :user }
+
+ it 'gracefully handles invalid nested params' do
+ put admin_user_role_path(user.id, user: 'invalid')
+
+ expect(response)
+ .to have_http_status(400)
+ end
+ end
+end
diff --git a/spec/requests/admin/warning_presets_spec.rb b/spec/requests/admin/warning_presets_spec.rb
new file mode 100644
index 00000000000000..6527cec30f370c
--- /dev/null
+++ b/spec/requests/admin/warning_presets_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Warning Presets' do
+ describe 'POST /admin/warning_presets' do
+ before { sign_in Fabricate(:admin_user) }
+
+ it 'gracefully handles invalid nested params' do
+ post admin_warning_presets_path(account_warning_preset: 'invalid')
+
+ expect(response)
+ .to have_http_status(400)
+ end
+ end
+end
diff --git a/spec/requests/admin/webhooks_spec.rb b/spec/requests/admin/webhooks_spec.rb
new file mode 100644
index 00000000000000..fe047abd3c122e
--- /dev/null
+++ b/spec/requests/admin/webhooks_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Webhooks' do
+ describe 'POST /admin/webhooks' do
+ before { sign_in Fabricate(:admin_user) }
+
+ it 'gracefully handles invalid nested params' do
+ post admin_webhooks_path(webhook: 'invalid')
+
+ expect(response)
+ .to have_http_status(400)
+ end
+ end
+end
diff --git a/spec/requests/api/v2/instance_spec.rb b/spec/requests/api/v2/instance_spec.rb
index ce1c999c9a9504..3350d68f7f7d6f 100644
--- a/spec/requests/api/v2/instance_spec.rb
+++ b/spec/requests/api/v2/instance_spec.rb
@@ -59,7 +59,7 @@ def include_configuration_limits
description_limit: MediaAttachment::MAX_DESCRIPTION_LENGTH
),
polls: include(
- max_options: PollValidator::MAX_OPTIONS
+ max_options: PollOptionsValidator::MAX_OPTIONS
)
)
)
diff --git a/spec/requests/auth/challenges_spec.rb b/spec/requests/auth/challenges_spec.rb
index 628bfe499b16ba..87692166575834 100644
--- a/spec/requests/auth/challenges_spec.rb
+++ b/spec/requests/auth/challenges_spec.rb
@@ -33,5 +33,14 @@
.to be_nil
end
end
+
+ context 'with invalid params' do
+ it 'gracefully handles invalid nested params' do
+ post auth_challenge_path(form_challenge: 'invalid')
+
+ expect(response)
+ .to have_http_status(400)
+ end
+ end
end
end
diff --git a/spec/requests/auth/sessions_spec.rb b/spec/requests/auth/sessions_spec.rb
new file mode 100644
index 00000000000000..246c3794cc2362
--- /dev/null
+++ b/spec/requests/auth/sessions_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Auth Sessions' do
+ describe 'POST /auth/sign_in' do
+ # The rack-attack check has issues with the non-nested invalid param used here
+ before { Rack::Attack.enabled = false }
+ after { Rack::Attack.enabled = true }
+
+ it 'gracefully handles invalid nested params' do
+ post user_session_path(user: 'invalid')
+
+ expect(response)
+ .to have_http_status(400)
+ end
+ end
+end
diff --git a/spec/requests/filters/statuses_spec.rb b/spec/requests/filters/statuses_spec.rb
new file mode 100644
index 00000000000000..aa1d049da71b6e
--- /dev/null
+++ b/spec/requests/filters/statuses_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Filters Statuses' do
+ describe 'POST /filters/:filter_id/statuses/batch' do
+ before { sign_in(user) }
+
+ let(:filter) { Fabricate :custom_filter, account: user.account }
+ let(:user) { Fabricate :user }
+
+ it 'gracefully handles invalid nested params' do
+ post batch_filter_statuses_path(filter.id, form_status_filter_batch_action: 'invalid')
+
+ expect(response)
+ .to redirect_to(edit_filter_path(filter))
+ end
+ end
+end
diff --git a/spec/requests/relationships_spec.rb b/spec/requests/relationships_spec.rb
new file mode 100644
index 00000000000000..ee6b321c46a84c
--- /dev/null
+++ b/spec/requests/relationships_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Relationships' do
+ describe 'PUT /relationships' do
+ before { sign_in Fabricate(:user) }
+
+ it 'gracefully handles invalid nested params' do
+ put relationships_path(form_account_batch: 'invalid')
+
+ expect(response)
+ .to redirect_to(relationships_path)
+ end
+ end
+end
diff --git a/spec/requests/settings/applications_spec.rb b/spec/requests/settings/applications_spec.rb
index 8a5b3de895b47f..d2d91f03b1e564 100644
--- a/spec/requests/settings/applications_spec.rb
+++ b/spec/requests/settings/applications_spec.rb
@@ -40,5 +40,23 @@
expect(response)
.to redirect_to(settings_applications_path)
end
+
+ it 'gracefully handles invalid nested params' do
+ post settings_applications_path(doorkeeper_application: 'invalid')
+
+ expect(response)
+ .to have_http_status(400)
+ end
+ end
+
+ describe 'PUT /settings/applications/:id' do
+ let(:application) { Fabricate :application, owner: user }
+
+ it 'gracefully handles invalid nested params' do
+ put settings_application_path(application.id, doorkeeper_application: 'invalid')
+
+ expect(response)
+ .to have_http_status(400)
+ end
end
end
diff --git a/spec/requests/settings/preferences/appearance_spec.rb b/spec/requests/settings/preferences/appearance_spec.rb
new file mode 100644
index 00000000000000..cfdc4dafc992f9
--- /dev/null
+++ b/spec/requests/settings/preferences/appearance_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Settings Preferences Appearance' do
+ describe 'PUT /settings/preferences/appearance' do
+ before { sign_in Fabricate(:user) }
+
+ it 'gracefully handles invalid nested params' do
+ put settings_preferences_appearance_path(user: 'invalid')
+
+ expect(response)
+ .to have_http_status(400)
+ end
+ end
+end
diff --git a/spec/requests/settings/two_factor_authentication/confirmations_spec.rb b/spec/requests/settings/two_factor_authentication/confirmations_spec.rb
new file mode 100644
index 00000000000000..bf443a5e62fe00
--- /dev/null
+++ b/spec/requests/settings/two_factor_authentication/confirmations_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Settings 2FA Confirmations' do
+ describe 'POST /settings/two_factor_authentication/confirmations' do
+ before do
+ sign_in Fabricate(:user, encrypted_password: '') # Empty encrypted password avoids challengable flow
+ post settings_otp_authentication_path # Sets `session[:new_otp_secret]` which is needed for next step
+ end
+
+ it 'gracefully handles invalid nested params' do
+ post settings_two_factor_authentication_confirmation_path(form_two_factor_confirmation: 'invalid')
+
+ expect(response)
+ .to have_http_status(400)
+ end
+ end
+end
diff --git a/spec/requests/settings/verifications_spec.rb b/spec/requests/settings/verifications_spec.rb
new file mode 100644
index 00000000000000..5acfe648367a8b
--- /dev/null
+++ b/spec/requests/settings/verifications_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Settings Verifications' do
+ describe 'PUT /settings/verification' do
+ before { sign_in Fabricate(:user) }
+
+ it 'gracefully handles invalid nested params' do
+ put settings_verification_path(account: 'invalid')
+
+ expect(response)
+ .to have_http_status(400)
+ end
+ end
+end
diff --git a/spec/services/activitypub/process_status_update_service_spec.rb b/spec/services/activitypub/process_status_update_service_spec.rb
index 1a8ea2d1709694..caaca2fe7c6600 100644
--- a/spec/services/activitypub/process_status_update_service_spec.rb
+++ b/spec/services/activitypub/process_status_update_service_spec.rb
@@ -268,7 +268,7 @@
it 'updates tags and featured tags' do
expect { subject.call(status, json, json) }
- .to change { status.tags.reload.pluck(:name) }.from(%w(test foo)).to(%w(foo bar))
+ .to change { status.tags.reload.pluck(:name) }.from(contain_exactly('test', 'foo')).to(contain_exactly('foo', 'bar'))
.and change { status.account.featured_tags.find_by(name: 'test').statuses_count }.by(-1)
.and change { status.account.featured_tags.find_by(name: 'bar').statuses_count }.by(1)
.and change { status.account.featured_tags.find_by(name: 'bar').last_status_at }.from(nil).to(be_present)
diff --git a/spec/system/settings/preferences/appearance_spec.rb b/spec/system/settings/preferences/appearance_spec.rb
index a7d408337a3caa..a1dcb37c9187e7 100644
--- a/spec/system/settings/preferences/appearance_spec.rb
+++ b/spec/system/settings/preferences/appearance_spec.rb
@@ -18,9 +18,12 @@
check confirm_reblog_field
uncheck confirm_delete_field
+ check advanced_layout_field
+
expect { save_changes }
.to change { user.reload.settings['web.reblog_modal'] }.to(true)
- .and(change { user.reload.settings['web.delete_modal'] }.to(false))
+ .and change { user.reload.settings['web.delete_modal'] }.to(false)
+ .and(change { user.reload.settings['web.advanced_layout'] }.to(true))
expect(page)
.to have_title(I18n.t('settings.appearance'))
end
@@ -40,4 +43,8 @@ def confirm_reblog_field
def theme_selection_field
I18n.t('simple_form.labels.defaults.setting_theme')
end
+
+ def advanced_layout_field
+ I18n.t('simple_form.labels.defaults.setting_advanced_layout')
+ end
end
diff --git a/spec/validators/poll_validator_spec.rb b/spec/validators/poll_expiration_validator_spec.rb
similarity index 64%
rename from spec/validators/poll_validator_spec.rb
rename to spec/validators/poll_expiration_validator_spec.rb
index f2a2534898d106..41b8c96211971c 100644
--- a/spec/validators/poll_validator_spec.rb
+++ b/spec/validators/poll_expiration_validator_spec.rb
@@ -2,7 +2,7 @@
require 'rails_helper'
-RSpec.describe PollValidator do
+RSpec.describe PollExpirationValidator do
describe '#validate' do
before do
validator.validate(poll)
@@ -14,16 +14,24 @@
let(:options) { %w(foo bar) }
let(:expires_at) { 1.day.from_now }
- it 'have no errors' do
+ it 'has no errors' do
expect(errors).to_not have_received(:add)
end
- context 'when expires is just 5 min ago' do
+ context 'when the poll expires in 5 min from now' do
let(:expires_at) { 5.minutes.from_now }
- it 'not calls errors add' do
+ it 'has no errors' do
expect(errors).to_not have_received(:add)
end
end
+
+ context 'when the poll expires in the past' do
+ let(:expires_at) { 5.minutes.ago }
+
+ it 'has errors' do
+ expect(errors).to have_received(:add)
+ end
+ end
end
end
diff --git a/spec/validators/poll_options_validator_spec.rb b/spec/validators/poll_options_validator_spec.rb
new file mode 100644
index 00000000000000..9e4ec744db1970
--- /dev/null
+++ b/spec/validators/poll_options_validator_spec.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe PollOptionsValidator do
+ describe '#validate' do
+ before do
+ validator.validate(poll)
+ end
+
+ let(:validator) { described_class.new }
+ let(:poll) { instance_double(Poll, options: options, expires_at: expires_at, errors: errors) }
+ let(:errors) { instance_double(ActiveModel::Errors, add: nil) }
+ let(:options) { %w(foo bar) }
+ let(:expires_at) { 1.day.from_now }
+
+ it 'has no errors' do
+ expect(errors).to_not have_received(:add)
+ end
+
+ context 'when the poll has duplicate options' do
+ let(:options) { %w(foo foo) }
+
+ it 'adds errors' do
+ expect(errors).to have_received(:add)
+ end
+ end
+
+ context 'when the poll has no options' do
+ let(:options) { [] }
+
+ it 'adds errors' do
+ expect(errors).to have_received(:add)
+ end
+ end
+
+ context 'when the poll has too many options' do
+ let(:options) { Array.new(described_class::MAX_OPTIONS + 1) { |i| "option #{i}" } }
+
+ it 'adds errors' do
+ expect(errors).to have_received(:add)
+ end
+ end
+ end
+end
diff --git a/yarn.lock b/yarn.lock
index b4445c75069791..eb97502d9a590e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -55,57 +55,57 @@ __metadata:
languageName: node
linkType: hard
-"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.25.9, @babel/code-frame@npm:^7.26.0":
- version: 7.26.0
- resolution: "@babel/code-frame@npm:7.26.0"
+"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.25.9, @babel/code-frame@npm:^7.26.2":
+ version: 7.26.2
+ resolution: "@babel/code-frame@npm:7.26.2"
dependencies:
"@babel/helper-validator-identifier": "npm:^7.25.9"
js-tokens: "npm:^4.0.0"
picocolors: "npm:^1.0.0"
- checksum: 10c0/46f7e367714be736b52ea3c01b24f47e2102e210fb83021d1c8237d8fc511b9538909e16e2fcdbb5cb6173e0794e28624309a59014e52fcfb7bde908f5284388
+ checksum: 10c0/7d79621a6849183c415486af99b1a20b84737e8c11cd55b6544f688c51ce1fd710e6d869c3dd21232023da272a79b91efb3e83b5bc2dc65c1187c5fcd1b72ea8
languageName: node
linkType: hard
-"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.25.9, @babel/compat-data@npm:^7.26.0":
- version: 7.26.0
- resolution: "@babel/compat-data@npm:7.26.0"
- checksum: 10c0/6325c9151a3c9b0a3a807e854a26255ef66d989bff331475a935af9bb18f160e0fffe6aed550e4e96b63f91efcd874bfbaab2a1f4a2f8d25645d712a0de590fb
+"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.26.5":
+ version: 7.26.5
+ resolution: "@babel/compat-data@npm:7.26.5"
+ checksum: 10c0/9d2b41f0948c3dfc5de44d9f789d2208c2ea1fd7eb896dfbb297fe955e696728d6f363c600cd211e7f58ccbc2d834fe516bb1e4cf883bbabed8a32b038afc1a0
languageName: node
linkType: hard
"@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.22.1, @babel/core@npm:^7.24.4, @babel/core@npm:^7.25.0":
- version: 7.26.0
- resolution: "@babel/core@npm:7.26.0"
+ version: 7.26.7
+ resolution: "@babel/core@npm:7.26.7"
dependencies:
"@ampproject/remapping": "npm:^2.2.0"
- "@babel/code-frame": "npm:^7.26.0"
- "@babel/generator": "npm:^7.26.0"
- "@babel/helper-compilation-targets": "npm:^7.25.9"
+ "@babel/code-frame": "npm:^7.26.2"
+ "@babel/generator": "npm:^7.26.5"
+ "@babel/helper-compilation-targets": "npm:^7.26.5"
"@babel/helper-module-transforms": "npm:^7.26.0"
- "@babel/helpers": "npm:^7.26.0"
- "@babel/parser": "npm:^7.26.0"
+ "@babel/helpers": "npm:^7.26.7"
+ "@babel/parser": "npm:^7.26.7"
"@babel/template": "npm:^7.25.9"
- "@babel/traverse": "npm:^7.25.9"
- "@babel/types": "npm:^7.26.0"
+ "@babel/traverse": "npm:^7.26.7"
+ "@babel/types": "npm:^7.26.7"
convert-source-map: "npm:^2.0.0"
debug: "npm:^4.1.0"
gensync: "npm:^1.0.0-beta.2"
json5: "npm:^2.2.3"
semver: "npm:^6.3.1"
- checksum: 10c0/91de73a7ff5c4049fbc747930aa039300e4d2670c2a91f5aa622f1b4868600fc89b01b6278385fbcd46f9574186fa3d9b376a9e7538e50f8d118ec13cfbcb63e
+ checksum: 10c0/fbd2cd9fc23280bdcaca556e558f715c0a42d940b9913c52582e8e3d24e391d269cb8a9cd6589172593983569021c379e28bba6b19ea2ee08674f6068c210a9d
languageName: node
linkType: hard
-"@babel/generator@npm:^7.25.9, @babel/generator@npm:^7.26.0, @babel/generator@npm:^7.7.2":
- version: 7.26.0
- resolution: "@babel/generator@npm:7.26.0"
+"@babel/generator@npm:^7.26.5, @babel/generator@npm:^7.7.2":
+ version: 7.26.5
+ resolution: "@babel/generator@npm:7.26.5"
dependencies:
- "@babel/parser": "npm:^7.26.0"
- "@babel/types": "npm:^7.26.0"
+ "@babel/parser": "npm:^7.26.5"
+ "@babel/types": "npm:^7.26.5"
"@jridgewell/gen-mapping": "npm:^0.3.5"
"@jridgewell/trace-mapping": "npm:^0.3.25"
jsesc: "npm:^3.0.2"
- checksum: 10c0/b6bb9185f19a97eaf58e04a6d39a13237076678e7ed16b6321dea914535d4bf6a8d7727c9dcb65539845aa0096b326eb67be4bab764bd74bcfd848e2eda68609
+ checksum: 10c0/3be79e0aa03f38858a465d12ee2e468320b9122dc44fc85984713e32f16f4d77ce34a16a1a9505972782590e0b8d847b6f373621f9c6fafa1906d90f31416cb0
languageName: node
linkType: hard
@@ -118,16 +118,6 @@ __metadata:
languageName: node
linkType: hard
-"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.25.9":
- version: 7.25.9
- resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.25.9"
- dependencies:
- "@babel/traverse": "npm:^7.25.9"
- "@babel/types": "npm:^7.25.9"
- checksum: 10c0/a6068bb813e7f72d12b72edeecb99167f60cd7964cacedfb60e01fff5e7bed4a5a7f4f7414de7cf352a1b71487df5f8dab8c2b5230de4ad5aea16adf32e14219
- languageName: node
- linkType: hard
-
"@babel/helper-builder-react-jsx@npm:^7.25.9":
version: 7.25.9
resolution: "@babel/helper-builder-react-jsx@npm:7.25.9"
@@ -138,16 +128,16 @@ __metadata:
languageName: node
linkType: hard
-"@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.25.9":
- version: 7.25.9
- resolution: "@babel/helper-compilation-targets@npm:7.25.9"
+"@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.25.9, @babel/helper-compilation-targets@npm:^7.26.5":
+ version: 7.26.5
+ resolution: "@babel/helper-compilation-targets@npm:7.26.5"
dependencies:
- "@babel/compat-data": "npm:^7.25.9"
+ "@babel/compat-data": "npm:^7.26.5"
"@babel/helper-validator-option": "npm:^7.25.9"
browserslist: "npm:^4.24.0"
lru-cache: "npm:^5.1.1"
semver: "npm:^6.3.1"
- checksum: 10c0/a6b26a1e4222e69ef8e62ee19374308f060b007828bc11c65025ecc9e814aba21ff2175d6d3f8bf53c863edd728ee8f94ba7870f8f90a37d39552ad9933a8aaa
+ checksum: 10c0/9da5c77e5722f1a2fcb3e893049a01d414124522bbf51323bb1a0c9dcd326f15279836450fc36f83c9e8a846f3c40e88be032ed939c5a9840922bed6073edfb4
languageName: node
linkType: hard
@@ -271,16 +261,6 @@ __metadata:
languageName: node
linkType: hard
-"@babel/helper-simple-access@npm:^7.25.9":
- version: 7.25.9
- resolution: "@babel/helper-simple-access@npm:7.25.9"
- dependencies:
- "@babel/traverse": "npm:^7.25.9"
- "@babel/types": "npm:^7.25.9"
- checksum: 10c0/3f1bcdb88ee3883ccf86959869a867f6bbf8c4737cd44fb9f799c38e54f67474590bc66802500ae9fe18161792875b2cfb7ec15673f48ed6c8663f6d09686ca8
- languageName: node
- linkType: hard
-
"@babel/helper-skip-transparent-expression-wrappers@npm:^7.25.9":
version: 7.25.9
resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.25.9"
@@ -323,24 +303,24 @@ __metadata:
languageName: node
linkType: hard
-"@babel/helpers@npm:^7.26.0":
- version: 7.26.0
- resolution: "@babel/helpers@npm:7.26.0"
+"@babel/helpers@npm:^7.26.7":
+ version: 7.26.7
+ resolution: "@babel/helpers@npm:7.26.7"
dependencies:
"@babel/template": "npm:^7.25.9"
- "@babel/types": "npm:^7.26.0"
- checksum: 10c0/343333cced6946fe46617690a1d0789346960910225ce359021a88a60a65bc0d791f0c5d240c0ed46cf8cc63b5fd7df52734ff14e43b9c32feae2b61b1647097
+ "@babel/types": "npm:^7.26.7"
+ checksum: 10c0/37fec398e53a2dbbf24bc2a025c4d571b2556cef18d8116d05d04b153f13ef659cdfbaab96c8eed875e629d39bdf9b3ea5d099ccf80544537de224e2d94f9b11
languageName: node
linkType: hard
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.25.9, @babel/parser@npm:^7.26.0":
- version: 7.26.1
- resolution: "@babel/parser@npm:7.26.1"
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.25.9, @babel/parser@npm:^7.26.5, @babel/parser@npm:^7.26.7":
+ version: 7.26.7
+ resolution: "@babel/parser@npm:7.26.7"
dependencies:
- "@babel/types": "npm:^7.26.0"
+ "@babel/types": "npm:^7.26.7"
bin:
parser: ./bin/babel-parser.js
- checksum: 10c0/dc7d4e6b7eb667fa0784e7e2c3f6f92ca12ad72242f6d4311995310dae55093f02acdb595b69b0dbbf04cb61ad87156ac03186ff32eacfa35149c655bc22c14b
+ checksum: 10c0/dcb08a4f2878ece33caffefe43b71488d753324bae7ca58d64bca3bc4af34dcfa1b58abdf9972516d76af760fceb25bb9294ca33461d56b31c5059ccfe32001f
languageName: node
linkType: hard
@@ -637,14 +617,14 @@ __metadata:
languageName: node
linkType: hard
-"@babel/plugin-transform-block-scoped-functions@npm:^7.25.9":
- version: 7.25.9
- resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.25.9"
+"@babel/plugin-transform-block-scoped-functions@npm:^7.26.5":
+ version: 7.26.5
+ resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.26.5"
dependencies:
- "@babel/helper-plugin-utils": "npm:^7.25.9"
+ "@babel/helper-plugin-utils": "npm:^7.26.5"
peerDependencies:
"@babel/core": ^7.0.0-0
- checksum: 10c0/e92ba0e3d72c038513844d8fca1cc8437dcb35cd42778e97fd03cb8303380b201468611e7ecfdcae3de33473b2679fe2de1552c5f925d112c5693425cf851f10
+ checksum: 10c0/2f3060800ead46b09971dd7bf830d66383b7bc61ced9945633b4ef9bf87787956ea83fcf49b387cecb377812588c6b81681714c760f9cf89ecba45edcbab1192
languageName: node
linkType: hard
@@ -768,15 +748,14 @@ __metadata:
languageName: node
linkType: hard
-"@babel/plugin-transform-exponentiation-operator@npm:^7.25.9":
- version: 7.25.9
- resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.25.9"
+"@babel/plugin-transform-exponentiation-operator@npm:^7.26.3":
+ version: 7.26.3
+ resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.26.3"
dependencies:
- "@babel/helper-builder-binary-assignment-operator-visitor": "npm:^7.25.9"
"@babel/helper-plugin-utils": "npm:^7.25.9"
peerDependencies:
"@babel/core": ^7.0.0-0
- checksum: 10c0/3b42f65bab3fee28c385115ce6bcb6ba544dff187012df408a432c9fb44c980afd898911020c723dc1c9257aaf3d7d0131ad83ba15102bf30ad9a86fc2a8a912
+ checksum: 10c0/cac922e851c6a0831fdd2e3663564966916015aeff7f4485825fc33879cbc3a313ceb859814c9200248e2875d65bb13802a723e5d7d7b40a2e90da82a5a1e15c
languageName: node
linkType: hard
@@ -872,16 +851,15 @@ __metadata:
languageName: node
linkType: hard
-"@babel/plugin-transform-modules-commonjs@npm:^7.25.9":
- version: 7.25.9
- resolution: "@babel/plugin-transform-modules-commonjs@npm:7.25.9"
+"@babel/plugin-transform-modules-commonjs@npm:^7.25.9, @babel/plugin-transform-modules-commonjs@npm:^7.26.3":
+ version: 7.26.3
+ resolution: "@babel/plugin-transform-modules-commonjs@npm:7.26.3"
dependencies:
- "@babel/helper-module-transforms": "npm:^7.25.9"
+ "@babel/helper-module-transforms": "npm:^7.26.0"
"@babel/helper-plugin-utils": "npm:^7.25.9"
- "@babel/helper-simple-access": "npm:^7.25.9"
peerDependencies:
"@babel/core": ^7.0.0-0
- checksum: 10c0/6ce771fb04d4810257fc8900374fece877dacaed74b05eaa16ad9224b390f43795c4d046cbe9ae304e1eb5aad035d37383895e3c64496d647c2128d183916e74
+ checksum: 10c0/82e59708f19f36da29531a64a7a94eabbf6ff46a615e0f5d9b49f3f59e8ef10e2bac607d749091508d3fa655146c9e5647c3ffeca781060cdabedb4c7a33c6f2
languageName: node
linkType: hard
@@ -934,7 +912,7 @@ __metadata:
languageName: node
linkType: hard
-"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.3, @babel/plugin-transform-nullish-coalescing-operator@npm:^7.25.9":
+"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.3, @babel/plugin-transform-nullish-coalescing-operator@npm:^7.26.6":
version: 7.26.6
resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.26.6"
dependencies:
@@ -1219,14 +1197,14 @@ __metadata:
languageName: node
linkType: hard
-"@babel/plugin-transform-typeof-symbol@npm:^7.25.9":
- version: 7.25.9
- resolution: "@babel/plugin-transform-typeof-symbol@npm:7.25.9"
+"@babel/plugin-transform-typeof-symbol@npm:^7.26.7":
+ version: 7.26.7
+ resolution: "@babel/plugin-transform-typeof-symbol@npm:7.26.7"
dependencies:
- "@babel/helper-plugin-utils": "npm:^7.25.9"
+ "@babel/helper-plugin-utils": "npm:^7.26.5"
peerDependencies:
"@babel/core": ^7.0.0-0
- checksum: 10c0/2b19fd88608589d9bc6b607ff17b06791d35c67ef3249f4659283454e6a9984241e3bd4c4eb72bb8b3d860a73223f3874558b861adb7314aa317c1c6a2f0cafb
+ checksum: 10c0/d5640e3457637e6eee1d7205d255602ccca124ed30e4de10ec75ba179d167e0a826ceeab424e119921f5c995dfddf39ef1f2c91efd2dcbf3f0dc1e7931dfd1d1
languageName: node
linkType: hard
@@ -1293,12 +1271,12 @@ __metadata:
linkType: hard
"@babel/preset-env@npm:^7.11.0, @babel/preset-env@npm:^7.12.1, @babel/preset-env@npm:^7.22.4":
- version: 7.26.0
- resolution: "@babel/preset-env@npm:7.26.0"
+ version: 7.26.7
+ resolution: "@babel/preset-env@npm:7.26.7"
dependencies:
- "@babel/compat-data": "npm:^7.26.0"
- "@babel/helper-compilation-targets": "npm:^7.25.9"
- "@babel/helper-plugin-utils": "npm:^7.25.9"
+ "@babel/compat-data": "npm:^7.26.5"
+ "@babel/helper-compilation-targets": "npm:^7.26.5"
+ "@babel/helper-plugin-utils": "npm:^7.26.5"
"@babel/helper-validator-option": "npm:^7.25.9"
"@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.25.9"
"@babel/plugin-bugfix-safari-class-field-initializer-scope": "npm:^7.25.9"
@@ -1312,7 +1290,7 @@ __metadata:
"@babel/plugin-transform-arrow-functions": "npm:^7.25.9"
"@babel/plugin-transform-async-generator-functions": "npm:^7.25.9"
"@babel/plugin-transform-async-to-generator": "npm:^7.25.9"
- "@babel/plugin-transform-block-scoped-functions": "npm:^7.25.9"
+ "@babel/plugin-transform-block-scoped-functions": "npm:^7.26.5"
"@babel/plugin-transform-block-scoping": "npm:^7.25.9"
"@babel/plugin-transform-class-properties": "npm:^7.25.9"
"@babel/plugin-transform-class-static-block": "npm:^7.26.0"
@@ -1323,7 +1301,7 @@ __metadata:
"@babel/plugin-transform-duplicate-keys": "npm:^7.25.9"
"@babel/plugin-transform-duplicate-named-capturing-groups-regex": "npm:^7.25.9"
"@babel/plugin-transform-dynamic-import": "npm:^7.25.9"
- "@babel/plugin-transform-exponentiation-operator": "npm:^7.25.9"
+ "@babel/plugin-transform-exponentiation-operator": "npm:^7.26.3"
"@babel/plugin-transform-export-namespace-from": "npm:^7.25.9"
"@babel/plugin-transform-for-of": "npm:^7.25.9"
"@babel/plugin-transform-function-name": "npm:^7.25.9"
@@ -1332,12 +1310,12 @@ __metadata:
"@babel/plugin-transform-logical-assignment-operators": "npm:^7.25.9"
"@babel/plugin-transform-member-expression-literals": "npm:^7.25.9"
"@babel/plugin-transform-modules-amd": "npm:^7.25.9"
- "@babel/plugin-transform-modules-commonjs": "npm:^7.25.9"
+ "@babel/plugin-transform-modules-commonjs": "npm:^7.26.3"
"@babel/plugin-transform-modules-systemjs": "npm:^7.25.9"
"@babel/plugin-transform-modules-umd": "npm:^7.25.9"
"@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.25.9"
"@babel/plugin-transform-new-target": "npm:^7.25.9"
- "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.25.9"
+ "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.26.6"
"@babel/plugin-transform-numeric-separator": "npm:^7.25.9"
"@babel/plugin-transform-object-rest-spread": "npm:^7.25.9"
"@babel/plugin-transform-object-super": "npm:^7.25.9"
@@ -1354,7 +1332,7 @@ __metadata:
"@babel/plugin-transform-spread": "npm:^7.25.9"
"@babel/plugin-transform-sticky-regex": "npm:^7.25.9"
"@babel/plugin-transform-template-literals": "npm:^7.25.9"
- "@babel/plugin-transform-typeof-symbol": "npm:^7.25.9"
+ "@babel/plugin-transform-typeof-symbol": "npm:^7.26.7"
"@babel/plugin-transform-unicode-escapes": "npm:^7.25.9"
"@babel/plugin-transform-unicode-property-regex": "npm:^7.25.9"
"@babel/plugin-transform-unicode-regex": "npm:^7.25.9"
@@ -1367,7 +1345,7 @@ __metadata:
semver: "npm:^6.3.1"
peerDependencies:
"@babel/core": ^7.0.0-0
- checksum: 10c0/26e19dc407cfa1c5166be638b4c54239d084fe15d8d7e6306d8c6dc7bc1decc51070a8dcf28352c1a2feeefbe52a06d193a12e302327ad5f529583df75fb7a26
+ checksum: 10c0/77d2e46a4f133768c5c8a6b3fec49a7c85c6baec601991e63458921e889ff93911f447723c3a99a6a471ca654ea6dc2aaa7ed690f3e518ee80cea7820ab80ce3
languageName: node
linkType: hard
@@ -1425,11 +1403,11 @@ __metadata:
linkType: hard
"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.3, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
- version: 7.26.0
- resolution: "@babel/runtime@npm:7.26.0"
+ version: 7.26.7
+ resolution: "@babel/runtime@npm:7.26.7"
dependencies:
regenerator-runtime: "npm:^0.14.0"
- checksum: 10c0/12c01357e0345f89f4f7e8c0e81921f2a3e3e101f06e8eaa18a382b517376520cd2fa8c237726eb094dab25532855df28a7baaf1c26342b52782f6936b07c287
+ checksum: 10c0/60199c049f90e5e41c687687430052a370aca60bac7859ff4ee761c5c1739b8ba1604d391d01588c22dc0e93828cbadb8ada742578ad1b1df240746bce98729a
languageName: node
linkType: hard
@@ -1444,28 +1422,28 @@ __metadata:
languageName: node
linkType: hard
-"@babel/traverse@npm:^7.25.0, @babel/traverse@npm:^7.25.9":
- version: 7.25.9
- resolution: "@babel/traverse@npm:7.25.9"
+"@babel/traverse@npm:^7.25.0, @babel/traverse@npm:^7.25.9, @babel/traverse@npm:^7.26.7":
+ version: 7.26.7
+ resolution: "@babel/traverse@npm:7.26.7"
dependencies:
- "@babel/code-frame": "npm:^7.25.9"
- "@babel/generator": "npm:^7.25.9"
- "@babel/parser": "npm:^7.25.9"
+ "@babel/code-frame": "npm:^7.26.2"
+ "@babel/generator": "npm:^7.26.5"
+ "@babel/parser": "npm:^7.26.7"
"@babel/template": "npm:^7.25.9"
- "@babel/types": "npm:^7.25.9"
+ "@babel/types": "npm:^7.26.7"
debug: "npm:^4.3.1"
globals: "npm:^11.1.0"
- checksum: 10c0/e90be586a714da4adb80e6cb6a3c5cfcaa9b28148abdafb065e34cc109676fc3db22cf98cd2b2fff66ffb9b50c0ef882cab0f466b6844be0f6c637b82719bba1
+ checksum: 10c0/b23a36ce40d2e4970741431c45d4f92e3f4c2895c0a421456516b2729bd9e17278846e01ee3d9039b0adf5fc5a071768061c17fcad040e74a5c3e39517449d5b
languageName: node
linkType: hard
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.9, @babel/types@npm:^7.26.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4":
- version: 7.26.0
- resolution: "@babel/types@npm:7.26.0"
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.9, @babel/types@npm:^7.26.5, @babel/types@npm:^7.26.7, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4":
+ version: 7.26.7
+ resolution: "@babel/types@npm:7.26.7"
dependencies:
"@babel/helper-string-parser": "npm:^7.25.9"
"@babel/helper-validator-identifier": "npm:^7.25.9"
- checksum: 10c0/b694f41ad1597127e16024d766c33a641508aad037abd08d0d1f73af753e1119fa03b4a107d04b5f92cc19c095a594660547ae9bead1db2299212d644b0a5cb8
+ checksum: 10c0/7810a2bca97b13c253f07a0863a628d33dbe76ee3c163367f24be93bfaf4c8c0a325f73208abaaa050a6b36059efc2950c2e4b71fb109c0f07fa62221d8473d4
languageName: node
linkType: hard
@@ -2420,9 +2398,9 @@ __metadata:
languageName: node
linkType: hard
-"@formatjs/ts-transformer@npm:3.13.30":
- version: 3.13.30
- resolution: "@formatjs/ts-transformer@npm:3.13.30"
+"@formatjs/ts-transformer@npm:3.13.31":
+ version: 3.13.31
+ resolution: "@formatjs/ts-transformer@npm:3.13.31"
dependencies:
"@formatjs/icu-messageformat-parser": "npm:2.11.0"
"@types/json-stable-stringify": "npm:1"
@@ -2432,11 +2410,11 @@ __metadata:
tslib: "npm:2"
typescript: "npm:5"
peerDependencies:
- ts-jest: ">=27"
+ ts-jest: 27 || 28 || 29
peerDependenciesMeta:
ts-jest:
optional: true
- checksum: 10c0/ef828b477863b8205390ed42d94c4a8d4fcab10d4982e27dc3feaa85c1e2da317b73108f8d3b32f6191d1c5c41eb34d6909a53ba734dfca9146842992268d95c
+ checksum: 10c0/bfd7a41203c2b1691d883b3c306f3ae413b94c4875dec75df2be0e62da22625f673e41ecdc3257be40fe4a5b22a311365c2462d00a98f9bac59f00488543add0
languageName: node
linkType: hard
@@ -3286,8 +3264,8 @@ __metadata:
linkType: hard
"@reduxjs/toolkit@npm:^2.0.1":
- version: 2.5.0
- resolution: "@reduxjs/toolkit@npm:2.5.0"
+ version: 2.5.1
+ resolution: "@reduxjs/toolkit@npm:2.5.1"
dependencies:
immer: "npm:^10.0.3"
redux: "npm:^5.0.1"
@@ -3301,7 +3279,7 @@ __metadata:
optional: true
react-redux:
optional: true
- checksum: 10c0/81748a5a6d2f52a14769b6ed25aea1e77cda81b1db6599c7c3a1d1605696c65c4469f55146c2b2a7a2f8ebafa5ecd4996aa8deecb37aebb5307217ec2fe384ac
+ checksum: 10c0/e25dd4085e5611d21d4e8d47716072e12318ef8171323d40a80c5b8e79e6d514a973718eb44e41f8491355f7a15e488a0e9f88a97c237327de2615a00b470929
languageName: node
linkType: hard
@@ -5341,8 +5319,8 @@ __metadata:
linkType: hard
"babel-plugin-formatjs@npm:^10.5.1":
- version: 10.5.33
- resolution: "babel-plugin-formatjs@npm:10.5.33"
+ version: 10.5.34
+ resolution: "babel-plugin-formatjs@npm:10.5.34"
dependencies:
"@babel/core": "npm:^7.25.0"
"@babel/helper-plugin-utils": "npm:^7.25.0"
@@ -5350,12 +5328,12 @@ __metadata:
"@babel/traverse": "npm:^7.25.0"
"@babel/types": "npm:^7.25.0"
"@formatjs/icu-messageformat-parser": "npm:2.11.0"
- "@formatjs/ts-transformer": "npm:3.13.30"
+ "@formatjs/ts-transformer": "npm:3.13.31"
"@types/babel__core": "npm:^7.20.5"
"@types/babel__helper-plugin-utils": "npm:^7.10.3"
"@types/babel__traverse": "npm:^7.20.6"
tslib: "npm:2"
- checksum: 10c0/57c0477c576fbf717a11f0ca15d3f18990264a36f20d8d7e2b66461ed1e6b6880bb4b7847b7f4289a81b45f36b7ec2687becb2dde5006b53f97953b3cc3bc39b
+ checksum: 10c0/6e6c67db41044427a7f182e7c18a8519e5aca96645de094244b332cb8c82ed498c56a4634e4e4ed1a4ef85c8e996669ef5bddd63ee9c45d6e512cbbf782af2a2
languageName: node
linkType: hard
@@ -14636,24 +14614,24 @@ __metadata:
linkType: hard
"react-intl@npm:^7.0.0":
- version: 7.1.3
- resolution: "react-intl@npm:7.1.3"
+ version: 7.1.5
+ resolution: "react-intl@npm:7.1.5"
dependencies:
"@formatjs/ecma402-abstract": "npm:2.3.2"
"@formatjs/icu-messageformat-parser": "npm:2.11.0"
"@formatjs/intl": "npm:3.1.3"
"@types/hoist-non-react-statics": "npm:3"
- "@types/react": "npm:16 || 17 || 18"
+ "@types/react": "npm:16 || 17 || 18 || 19"
hoist-non-react-statics: "npm:3"
intl-messageformat: "npm:10.7.14"
tslib: "npm:2"
peerDependencies:
- react: ^16.6.0 || 17 || 18
+ react: ^16.6.0 || 17 || 18 || 19
typescript: 5
peerDependenciesMeta:
typescript:
optional: true
- checksum: 10c0/64d635819f4bdd09325ca4f7479c7b0254b45da76cc1cb70c4b51a404bf1cf2976125d4df5874fe34527e84813703ac6ff707e06e0e96616951fae1f20f9d246
+ checksum: 10c0/9d8d5afae16d26466f82fc1c0b8c4afd7559a8faa5b3ef31983a0af540b1b225fa89208b48bf9ec83056c0a27f2972fb86f2717422f788efdc819fb0e0846134
languageName: node
linkType: hard
@@ -14814,8 +14792,8 @@ __metadata:
linkType: hard
"react-select@npm:^5.7.3":
- version: 5.9.0
- resolution: "react-select@npm:5.9.0"
+ version: 5.10.0
+ resolution: "react-select@npm:5.10.0"
dependencies:
"@babel/runtime": "npm:^7.12.0"
"@emotion/cache": "npm:^11.4.0"
@@ -14829,7 +14807,7 @@ __metadata:
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
- checksum: 10c0/f21f18ca41a8c866ab69f9c65253e86dcc5323477bbfc729bf6aa9d897e04e27cfffd13c07f10b70dc554e15ad1d238c1283e05e457bf4ead8526a1dd7fbc8b0
+ checksum: 10c0/64cc73ef43556d0a199420d7d19f9f72e3c5e3a7f6828aef5421ec16cc0e4bc337061a8fa3c03afc5b929a087a4ca866f497e0ef865b03fe014c5cacde5e71dd
languageName: node
linkType: hard
Какво е алтернативен текст?
Алтернативният текст осигурява описания на изображение за хора със зрителни увреждания, връзки с ниска честотна лента или търсещите допълнителен контекст.
Може да подобрите достъпността и разбираемостта за всеки, пишейки ясен, кратък и обективен алтернативен текст.
- Уловете важните елементи
- Обобщете текста в образите
- Употребявайте правилна структура на изречението
- Избягвайте излишна информация
- Съсредоточете се върху тенденциите и ключови констатации в сложни онагледявания (като диаграми и карти)
Co je to alt text?
Alt text poskytuje popis obrázků pro lidi se zrakovými postižením, špatným připojením něbo těm, kteří potřebují více kontextu.
Můžete zlepšit přístupnost a porozumění napsáním jasného, stručného a objektivního alt textu.
- Zachyťte důležité prvky
- Shrňte text v obrázku
- Použijte pravidelnou větnou skladbu
- Vyhněte se nadbytečným informacím
- U komplexních vizualizací (diagramy, mapy...) se zaměřte na trendy a klíčová zjištění
Hvad er alt-tekst?
Alt-tekst leverer billedbeskrivelser til folk med synsnedsættelser, lav båndbredde-forbindelser eller med ønske om ekstra kontekst.
Tilgængelighed og forståelse kan forbedres for alle ved at skrive klar, kortfattet og objektiv alt-tekst.
- Fang vigtige elementer
- Opsummér tekst i billeder
- Brug almindelig sætningsstruktur
- Undgå overflødig information
- Fokusér på tendenser og centrale resultater i kompleks grafik (såsom diagrammer eller kort)
Was ist Alt-Text?
Alt-Text bietet Bildbeschreibungen für Personen mit einer Sehschwäche, einer schlechten Internetverbindung und für alle, die zusätzlichen Kontext möchten.
Du kannst die Zugänglichkeit und die Verständlichkeit für alle verbessern, indem du eine klare, genaue und objektive Bildbeschreibung hinzufügst.
- Erfasse wichtige Elemente
- Fasse Text in Bildern zusammen
- Verwende einen korrekten Satzbau
- Vermeide unwichtige Informationen
- Konzentriere dich bei komplexen Darstellungen (z. B. Diagramme oder Karten) auf Trends und wichtige Erkenntnisse
- Κατέγραψε σημαντικά στοιχεία \\n
- Συνόψισε το κείμενο στις εικόνες \\n
- Χρησιμοποίησε δομή κανονικής πρότασης \\n
- Απέφυγε περιττές πληροφορίες \\n
- Εστίασε στις τάσεις και τα βασικά ευρήματα σε σύνθετα οπτικά στοιχεία (όπως διαγράμματα ή χάρτες)
What is alt text?
Alt text provides image descriptions for people with vision impairments, low-bandwidth connections, or those seeking extra context.
You can improve accessibility and understanding for everyone by writing clear, concise, and objective alt text.
- Capture important elements
- Summarise text in images
- Use regular sentence structure
- Avoid redundant information
- Focus on trends and key findings in complex visuals (like diagrams or maps)
What is alt text?
Alt text provides image descriptions for people with vision impairments, low-bandwidth connections, or those seeking extra context.
You can improve accessibility and understanding for everyone by writing clear, concise, and objective alt text.
- Capture important elements
- Summarize text in images
- Use regular sentence structure
- Avoid redundant information
- Focus on trends and key findings in complex visuals (like diagrams or maps)
Kio estas la alternativa teksto?
La alternativa teksto ofertas priskribojn de la bildoj por individuoj kun vidaj malfacilaĵoj, konektoj kun malalta larĝa bando aŭ kiuj serĉas plian kuntekston.
Vi povas plibonigi alireblecon kaj komprenon por ĉiuj per skribado de klaraj, koncizaj, kaj objektivaj alternativaj tekstoj.
- Kaptu gravajn elementojn.
- Resumu tekston en bildoj.
- Uzu regulan frazstrukturon.
- Evitu redundan informon.
- Fokusu sur tendencoj kaj ĉefaj trovoj en kompleksaj visualoj (kiel diagramoj aŭ mapoj).
¿Qué es el texto alternativo?
El texto alternativo proporciona descripciones de las imágenes para personas con dificultades visuales, conexiones con escaso ancho de banda o que buscan un contexto adicional.
Podés mejorar la accesibilidad y la comprensión para todos escribiendo un texto alternativo claro, conciso y objetivo.
- Captura los elementos importantes.
- Resumí el texto en imágenes.
- Usá una estructura de frases normal.
- Evitá la información redundante.
- Focalizate en las tendencias y conclusiones clave de los elementos visuales complejos (como diagramas o mapas).
¿Qué es el texto alternativo?
El texto alternativo ofrece descripciones de las imágenes para individuos con dificultades visuales, conexiones de bajo ancho de banda o que buscan un contexto adicional.
Puedes mejorar la accesibilidad y la comprensión para todos redactando un texto alternativo claro, breve y objetivo.
- Captura los elementos clave.
- Resume el texto en imágenes.
- Utiliza una estructura de oraciones estándar.
- Evita la información repetitiva.
- Enfócate en las tendencias y conclusiones principales de los elementos visuales complejos (como gráficos o mapas).
¿Qué es el texto alternativo?
El texto alternativo proporciona descripciones de las imágenes para personas con problemas de visión, conexiones con poco ancho de banda o que buscan un contexto adicional.
Puedes mejorar la accesibilidad y la comprensión para todos escribiendo un texto alternativo claro, conciso y objetivo.
- Captura los elementos importantes.
- Resume el texto en imágenes.
- Usa una estructura de frases normal.
- Evita la información redundante.
- Céntrate en las tendencias y conclusiones clave de los elementos visuales complejos (como diagramas o mapas).
Mis on alt-tekst?
Alt-tekst pakub pildi kirjeldust nägemispuudega inimeste jaoks või neile, kel on aeglane internet või neile, kes otsivad lisaselgitust
Saad parandada ligipääsetavust ja mõistmist kõigi jaoks, kirjutades selge, lühida ja objektiivse alt-teksti.
- Lisa tähtsad elemendid
- Tee pildil olevast tekstist kokkuvõte
- Kasuta reeglipärast lausestruktuuri
- Väldi ebaolulist infot
- Keskendu keerukate vaadete puhul (näiteks diagrammid ja kaardid) puhul trendidele ja põhiseostele
متن جایگزین چیست؟
متن جایگزین توضیحات تصویری را برای افراد دارای اختلالات بینایی، اتصالات با پهنای باند کم یا کسانی که به دنبال زمینه اضافی هستند ارائه می دهد.
با نوشتن متن جایگزین واضح، مختصر و عینی می توانید دسترسی و درک را برای همه بهبود بخشید.
- عناصر مهم را ضبط کنید
- متن را در تصاویر خلاصه کنید
- از ساختار جمله منظم استفاده کنید
- از اطلاعات اضافی خودداری کنید
- روی روندها و یافته های کلیدی در تصاویر پیچیده (مانند نمودارها یا نقشه ها) تمرکز کنید.
Mikä vaihtoehtoinen teksti on?
Vaihtoehtoinen teksti tarjoaa kuvauksen kuvista ihmisille, joilla on näkövamma tai matalan kaistanleveyden yhteys tai jotka kaipaavat lisäkontekstia.
Voit parantaa saavutettavuutta ja ymmärrettävyyttä kaikkien näkökulmasta kirjoittamalla selkeän, tiiviin ja objektiivisen vaihtoehtoisen tekstin.
- Ota mukaan tärkeät elementit
- Tiivistä kuvissa oleva teksti
- Käytä tavallisia lauserakenteita
- Vältä turhaa tietoa
- Keskity trendeihin ja keskeisiin tuloksiin monimutkaisissa visuaalisissa esityksissä (kuten kaavioissa tai kartoissa)
Hvat er alt tekstur?
Alt tekstur lýsir myndir fyri fólki, sum síggja illa, ella sum hava ringt net samband ella tey, sum vilja vita meira um samanhangin.
Tú kanst bøta um atkomuna og fatanina hjá øllum við at skriva kláran, stuttan og objektivan alt tekst.
- Fanga týdningarmikil element
- Samanfata tekst í myndum
- Brúka reglubundnan setningsbygnað
- Lat vera við at siga ting upp í saman
- Fokusera á rák og høvuðsúrslit í kompleksum myndum (sosum diagrammir og kort)
Qu'est-ce que le texte alternatif ?
Un texte alternatif fournit une description de l'image aux personnes avec un handicap visuel ou une connexion limitée ou qui souhaitent avoir un contexte supplémentaire.
Vous pouvez améliorer l'accessibilité et la compression de tout le monde en écrivant un texte alternatif clair, concis et objectif.
- Identifiez les éléments importants
- Résumez le texte présent à l'image
- Utilisez une structure de phrase normale
- Évitez les informations redondantes
- Pour les visuels complexes (tels que les diagrammes ou les cartes), indiquez les tendances ou points-clés
Qu'est-ce que le texte alternatif ?
Un texte alternatif fournit une description de l'image aux personnes avec un handicap visuel ou une connexion limitée ou qui souhaitent avoir un contexte supplémentaire.
Vous pouvez améliorer l'accessibilité et la compression de tout le monde en écrivant un texte alternatif clair, concis et objectif.
- Identifiez les éléments importants
- Résumez le texte présent à l'image
- Utilisez une structure de phrase normale
- Évitez les informations redondantes
- Pour les visuels complexes (tels que les diagrammes ou les cartes), indiquez les tendances ou points-clés
Que é o Texto Alternativo?
O Text Alt proporciona a descrición das imaxes para as persoas con deficiencias visuais, conexións a internet de baixa calidade ou para engadir contexto ás mesmas.
Podes mellorar a accesibilidade e a comprensión da publicación ao escribir un texto alternativo claro, conciso e obxectivo.
- Identifica os elementos importantes
- Inclúe o texto que apareza nas imaxes
- Utiliza sintaxe estándar nas frases
- Evita información redundante
- Céntrate nos elementos principais cando sexan imaxes complexas (como diagramas ou mapas)
מהו כיתוב חלופי?
כיתוב חלופי משמש תיאור מילולי של תמונות לסובלים ממגבלות ראיה, חיבורי רשת איטיים, או אלו הצריכים הקשר יותר מפורט לתוכן המולטימדיה המצורף.
ניתן לשפר את הנגישות והבנת התוכן לכולם ע\"י כתיבת תיאור ברור, תמציתי ונטול פניות.
- כיסוי היסודות החשובים
- סיכום המלל שבתמונות
- שימוש במבנה משפטים רגיל
- יש להמנע מחזרה על מידע
- אם העזרים הויזואליים הם דיאגרמות או מפות, התמקדו במגמות וממצאים מרכזיים.
Mi az alternatív szöveg?
Az alternatív szöveg képleírást biztosít a látássérültek, az alacsony sávszélességű kapcsolatokkal rendelkezők, illetve a bővebb kontextust keresők számára.
Az egyértelmű, tömör és objektív alternatív szöveg megírásával mindenki számára akadálymentesebb és könnyebben érthető lesz.
- Rögzítsd a fontos elemeket.
- Foglald össze szövegesen a képeket.
- Használj szabályos mondatszerkezetet.
- Kerüld a felesleges információkat.
- Összetett vizuális ábrákon (például diagramokon vagy térképeken) összpontosíts a trendekre és a legfontosabb megállapításokra.
Hvað er alt-texti?
Hjálpartexti eða ALT-myndatexti inniheldur lýsingu á myndefni fyrir fólk með ýmsar gerðir sjónskerðingar, fyrir tengingar með litla bandbreidd, eða til að gefa nánara samhengi fyrir myndefni.
Þú getur með þessu bætt almennt aðgengi og aukið skilning á efni sem þú birtir með því að skrifa skýran, skorinortan og hlutlægan alt-texta til vara.
- Lýstu mikilvægum atriðum \\n
- Hafðu yfirlit með þeim texta sem sést í myndum
- Notaðu eðlilega setningaskipan
- Forðastu óþarfar upplýsingar
- Leggðu áherslu á aðalatriði í flóknu myndefni (eins og línuritum eða landakortum)
Cos'è il testo alternativo?
Il testo alternativo fornisce descrizioni delle immagini per le persone con disturbi della vista, connessioni a bassa larghezza di banda o per coloro che cercano un contesto aggiuntivo.
È possibile migliorare l'accessibilità e la comprensione per tutti scrivendo un testo alt chiaro, conciso e obiettivo.
- Cattura elementi importanti
- Riassume il testo nelle immagini
- Usa la struttura delle frasi regolari
- Evita le informazioni ridondanti
- Concentrati sulle tendenze e i risultati chiave in immagini complesse (come diagrammi o mappe)
代替テキストとは何ですか？
代替テキストは、視覚障害、低速ネットワーク接続の人や追加コンテンツを求める人に役立つ画像説明です。
明確、簡潔、客観的に記述することでアクセシビリティが向上し、より多くの人に理解されるようになります。
- 要点をとらえる
- 画像内のテキストを要約する
- 平易な文章で説明する
- 情報の重複を避ける
- 複雑な内容 (図や地図など) では傾向やポイントを見つける
Kas yra alternatyvusis tekstas?
Alternatyvusis tekstas pateikia vaizdų aprašymus asmenims su regos sutrikimais, turintiems mažo pralaidumo ryšį arba ieškantiems papildomo konteksto.
Galite pagerinti prieinamumą ir suprantamumą visiems, jei parašysite aiškų, glaustą ir objektyvų alternatyvųjį tekstą.
- Užfiksuokite svarbiausius elementus.
- Apibendrinkite tekstą vaizduose.
- Naudokite įprasta sakinio struktūrą.
- Venkite nereikalingos informacijos.
- Sutelkite dėmesį į tendencijas ir pagrindines išvadas sudėtinguose vaizdiniuose (tokiuose kaip diagramos ar žemėlapiai).
Wat is alt-tekst?
Alt-tekst biedt beschrijvingen van afbeeldingen voor mensen met een visuele beperking, voor verbindingen met lage internetsnelheid of mensen die op zoek zijn naar extra context.
Je kunt de toegankelijkheid en de begrijpelijkheid voor iedereen verbeteren door heldere, beknopte en objectieve alt-teksten te schrijven.
- Leg belangrijke elementen vast
- Tekst in afbeeldingen samenvatten
- Een eenvoudige zinsbouw gebruiken
- Overbodige informatie vermijden
- Voor complexe diagrammen of kaarten alleen op trends en belangrijke bevindingen focussen
O que é texto alternativo?
O texto alternativo fornece descrições de imagens para pessoas com deficiências visuais, conexões de baixa largura de banda ou pessoas que procuram um contexto adicional.
Podes melhorar a acessibilidade e a compreensão para todos escrevendo um texto alternativo claro, conciso e objetivo.
- Capta elementos importantes
- Resume o texto que aparece nas imagens
- Usa uma estrutura de frase regular
- Evita informações redundantes
- Centra-te nas tendências e nas principais conclusões em imagens complexas (como diagramas ou mapas)
Ç’është teksti alternativ?
Teksti alternativ jep përshkrime figurash për persona me mangësi në të parët, lidhje me gjerësi bande të ulët, ose për ata që duan kontekst shtesë.
Mund të përmirësoni përdorimin nga persona me aftësi të kufizuara dhe kuptimin për këto, duke shkruar tekst alternativ të qartë, konciz dhe objektiv.
- Rrokni elementët e rëndësishëm
- Përmblidhni tekst në figura
- Përdorni strukturë të rregullt fjalish
- Shmangni përsëritje informacioni
- Në aspekte pamore të ndërlikuara (fjala vjen, diagrame ose harta) përqendrohuni te prirje dhe gjetje gjërash kyçe
Alternatif metin nedir?
Alternatif metin, görme bozukluğu olan, düşük bant genişliğine sahip bağlantıları olan veya ekstra bağlam arayan kişiler için görsel açıklamaları sağlar.
Net, sade ve nesnel alternatif metin yazarak herkes için erişilebilirliği ve anlaşılabilirliği iyileştirebilirsiniz.
- Önemlileri yakalayın
- Resimlerdeki metni özetleyin
- Düzenli cümle yapısı kullanın
- Gereksiz bilgilerden kaçının
- Karmaşık görsellerde (şemalar veya haritalar gibi) trendlere ve temel bulgulara odaklanın
Що таке альтернативний текст?
Альтернативний текст містить описи зображень для людей з вадами зору, низькошвидкісними з'єднаннями або тих, хто шукає додатковий контекст.
Ви можете покращити доступність і розуміння для всіх, написавши чіткий та лаконічний альтернативний текст.
- Позначайте важливі елементи
- Охоплюйте текст у картинках
- Використовуйте звичайну структуру речень
- Уникайте надлишкової інформації
- Зосередьтеся на тенденціях і ключових висновках у складних візуальних формах (наприклад, діаграмах або картах)
什么是替代文本？
替代文本为视力障碍者、低带宽连接用户或需要额外背景信息的用户提供图像描述。
通过编写清晰、简洁、客观的替代文本，可以提升所有人的可访问性和理解力。
- 捕捉重要元素
- 总结图像中的文本
- 使用常规句子结构
- 避免冗余信息
- 关注复杂视觉内容(如图表或地图)中的趋势和关键信息
何謂 ALT 說明文字？
ALT 說明文字為視覺障礙者、低網路頻寬或尋求額外上下文語境的人們提供圖片描述。
您可以透過撰寫清晰、簡潔及客觀的說明文字以替所有人改善無障礙特性與協助理解。
- 掌握幾個重要元素
- 替圖片提供文字摘要
- 使用常規行文結構
- 避免冗贅資訊
- 聚焦於趨勢與複雜視覺中之關鍵（如圖表或地圖）