1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00

Compare commits

...

7 commits

Author SHA1 Message Date
Adam Niedzielski
9a957f3d0a
Merge af680ea880 into a50c8e951f 2024-07-31 14:39:20 +01:00
Claire
a50c8e951f
Fix issue with grouped notifications UI due to recent API change (#31224) 2024-07-31 13:23:08 +00:00
Claire
2c1e75727d
Change filtered notification banner design to take up less space (#31222) 2024-07-31 12:36:08 +00:00
Adam Niedzielski
af680ea880
Fix typecheck 2024-07-30 16:50:38 +02:00
Adam Niedzielski
51e10176c4
Fix jslint 2024-07-30 16:30:49 +02:00
Adam Niedzielski
fa836c0dc2
Fix locale 2024-07-30 16:30:34 +02:00
Adam Niedzielski
e955a580fa
Add a way for the user to select which languages they understand
Closes #29989
2024-07-30 14:52:01 +02:00
89 changed files with 53 additions and 118 deletions

View file

@ -19,6 +19,6 @@ class Settings::Preferences::BaseController < Settings::BaseController
end
def user_params
params.require(:user).permit(:locale, :time_zone, chosen_languages: [], settings_attributes: UserSettings.keys)
params.require(:user).permit(:locale, :time_zone, spoken_languages: [], chosen_languages: [], settings_attributes: UserSettings.keys)
end
end

View file

@ -60,7 +60,7 @@ export interface BaseNotificationGroupJSON {
interface NotificationGroupWithStatusJSON extends BaseNotificationGroupJSON {
type: NotificationWithStatusType;
status: ApiStatusJSON;
status_id: string;
}
interface NotificationWithStatusJSON extends BaseNotificationJSON {

View file

@ -13,7 +13,7 @@ import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react'
import { Icon } from 'mastodon/components/icon';
import PollContainer from 'mastodon/containers/poll_container';
import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
import { autoPlayGif, languages as preloadedLanguages } from 'mastodon/initial_state';
import { autoPlayGif, spokenLanguages, languages as preloadedLanguages } from 'mastodon/initial_state';
const MAX_HEIGHT = 706; // 22px * 32 (+ 2px padding at the top)
@ -237,6 +237,10 @@ class StatusContent extends PureComponent {
this.node = c;
};
spokenByUser() {
return spokenLanguages.includes(this.props.status.get('language'));
}
render () {
const { status, intl, statusContent } = this.props;
@ -244,7 +248,7 @@ class StatusContent extends PureComponent {
const renderReadMore = this.props.onClick && status.get('collapsed');
const contentLocale = intl.locale.replace(/[_-].*/, '');
const targetLanguages = this.props.languages?.get(status.get('language') || 'und');
const renderTranslate = this.props.onTranslate && this.props.identity.signedIn && ['public', 'unlisted'].includes(status.get('visibility')) && status.get('search_index').trim().length > 0 && targetLanguages?.includes(contentLocale);
const renderTranslate = this.props.onTranslate && this.props.identity.signedIn && !this.spokenByUser() && ['public', 'unlisted'].includes(status.get('visibility')) && status.get('search_index').trim().length > 0 && targetLanguages?.includes(contentLocale);
const content = { __html: statusContent ?? getStatusContent(status) };
const spoilerContent = { __html: status.getIn(['translation', 'spoilerHtml']) || status.get('spoilerHtml') };

View file

@ -13,7 +13,7 @@ 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 'mastodon/components/icon';
import { languages as preloadedLanguages } from 'mastodon/initial_state';
import { spokenLanguages, languages as preloadedLanguages } from 'mastodon/initial_state';
const messages = defineMessages({
changeLanguage: { id: 'compose.language.change', defaultMessage: 'Change language' },
@ -84,6 +84,9 @@ class LanguageDropdownMenu extends PureComponent {
const { languages, value, frequentlyUsedLanguages } = this.props;
const { searchValue } = this.state;
// first show spoken languages and then frequently used
const orderedLanguages = spokenLanguages.concat(frequentlyUsedLanguages.filter((item) => spokenLanguages.indexOf(item) < 0));
if (searchValue === '') {
return [...languages].sort((a, b) => {
// Push current selection to the top of the list
@ -93,10 +96,8 @@ class LanguageDropdownMenu extends PureComponent {
} 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]);
const indexOfA = orderedLanguages.indexOf(a[0]);
const indexOfB = orderedLanguages.indexOf(b[0]);
return ((indexOfA > -1 ? indexOfA : Infinity) - (indexOfB > -1 ? indexOfB : Infinity));
}

View file

@ -49,22 +49,15 @@ export const FilteredNotificationsBanner: React.FC = () => {
<span>
<FormattedMessage
id='filtered_notifications_banner.pending_requests'
defaultMessage='Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know'
defaultMessage='From {count, plural, =0 {no one} one {one person} other {# people}} you may know'
values={{ count: policy.summary.pending_requests_count }}
/>
</span>
</div>
<div className='filtered-notifications-banner__badge'>
<div className='filtered-notifications-banner__badge__badge'>
{toCappedNumber(policy.summary.pending_notifications_count)}
</div>
<FormattedMessage
id='filtered_notifications_banner.mentions'
defaultMessage='{count, plural, one {mention} other {mentions}}'
values={{ count: policy.summary.pending_notifications_count }}
/>
</div>
</Link>
);
};

View file

@ -43,6 +43,7 @@
* @property {boolean=} use_pending_items
* @property {string} version
* @property {string} sso_redirect
* @property {string[]} spoken_languages
*/
/**
@ -118,6 +119,7 @@ export const criticalUpdatesPending = initialState?.critical_updates_pending;
// @ts-expect-error
export const statusPageUrl = getMeta('status_page_url');
export const sso_redirect = getMeta('sso_redirect');
export const spokenLanguages = getMeta('spoken_languages');
/**
* @returns {string | undefined}

View file

@ -300,8 +300,7 @@
"filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
"filter_modal.select_filter.title": "Filter this post",
"filter_modal.title.status": "Filter a post",
"filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentions}}",
"filtered_notifications_banner.pending_requests": "Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know",
"filtered_notifications_banner.pending_requests": "From {count, plural, =0 {no one} one {one person} other {# people}} you may know",
"filtered_notifications_banner.title": "Filtered notifications",
"firehose.all": "All",
"firehose.local": "This server",

View file

@ -124,9 +124,9 @@ export function createNotificationGroupFromJSON(
case 'mention':
case 'poll':
case 'update': {
const { status, ...groupWithoutStatus } = group;
const { status_id: statusId, ...groupWithoutStatus } = group;
return {
statusId: status.id,
statusId,
sampleAccountIds,
...groupWithoutStatus,
};

View file

@ -10170,20 +10170,6 @@ noscript {
}
}
&__badge {
display: flex;
align-items: center;
border-radius: 999px;
background: var(--background-border-color);
color: $darker-text-color;
padding: 4px;
padding-inline-end: 8px;
gap: 6px;
font-weight: 500;
font-size: 11px;
line-height: 16px;
word-break: keep-all;
&__badge {
background: $ui-button-background-color;
color: $white;
@ -10191,7 +10177,6 @@ noscript {
padding: 2px 8px;
}
}
}
.notification-request {
display: flex;

View file

@ -40,6 +40,7 @@
# settings :text
# time_zone :string
# otp_secret :string
# spoken_languages :string default([]), not null, is an Array
#
class User < ApplicationRecord
@ -134,6 +135,7 @@ class User < ApplicationRecord
normalizes :locale, with: ->(locale) { I18n.available_locales.exclude?(locale.to_sym) ? nil : locale }
normalizes :time_zone, with: ->(time_zone) { ActiveSupport::TimeZone[time_zone].nil? ? nil : time_zone }
normalizes :chosen_languages, with: ->(chosen_languages) { chosen_languages.compact_blank.presence }
normalizes :spoken_languages, with: ->(spoken_languages) { spoken_languages.compact_blank }
has_many :session_activations, dependent: :destroy

View file

@ -29,6 +29,7 @@ class InitialStateSerializer < ActiveModel::Serializer
store[:use_blurhash] = object_account_user.setting_use_blurhash
store[:use_pending_items] = object_account_user.setting_use_pending_items
store[:show_trends] = Setting.trends && object_account_user.setting_trends
store[:spoken_languages] = object_account_user.spoken_languages
else
store[:auto_play_gif] = Setting.auto_play_gif
store[:display_media] = Setting.display_media

View file

@ -44,7 +44,7 @@
label: I18n.t('simple_form.labels.defaults.setting_default_sensitive'),
wrapper: :with_label
%h4= t 'preferences.public_timelines'
%h4= t 'preferences.languages'
.fields-group
= f.input :chosen_languages,
@ -57,5 +57,16 @@
required: false,
wrapper: :with_block_label
.fields-group
= f.input :spoken_languages,
as: :check_boxes,
collection_wrapper_tag: 'ul',
collection: filterable_languages,
include_blank: false,
item_wrapper_tag: 'li',
label_method: ->(locale) { native_locale_name(locale) },
required: false,
wrapper: :with_block_label
.actions
= f.button :button, t('generic.save_changes'), type: :submit

View file

@ -142,7 +142,6 @@ af:
preferences:
other: Ander
posting_defaults: Standaardplasings
public_timelines: Openbare tydlyne
privacy_policy:
title: Privaatheidsbeleid
rss:

View file

@ -1325,7 +1325,6 @@ an:
preferences:
other: Atros
posting_defaults: Configuración per defecto de publicacions
public_timelines: Linias de tiempo publicas
privacy_policy:
title: Politica de Privacidat
reactions:

View file

@ -1633,7 +1633,6 @@ ar:
preferences:
other: إعدادات أخرى
posting_defaults: التفضيلات الافتراضية للنشر
public_timelines: الخيوط الزمنية العامة
privacy:
hint_html: "<strong>قم بتخصيص الطريقة التي تريد بها أن يُكتَشَف ملفك الشخصي ومنشوراتك.</strong> يمكن لمجموعة متنوعة من الميزات في Mastodon أن تساعدك في الوصول إلى جمهور أوسع عند تفعيلها. خذ بعض الوقت لمراجعة هذه الإعدادات للتأكد من أنها تناسب حالة الاستخدام الخاصة بك."
privacy: الخصوصية

View file

@ -723,7 +723,6 @@ ast:
preferences:
other: Otres preferencies
posting_defaults: Configuración predeterminada del espublizamientu d'artículos
public_timelines: Llinies de tiempu públiques
privacy:
hint_html: "<strong>Personaliza cómo quies que s'atope esti perfil y los sos artículos.</strong> Hai una variedá de funciones de Mastodon que puen ayudate a algamar audiencies más grandes cuando s'activen. Dedica un momentu pa revisar estes opciones y asegurate de que s'axusten al to casu."
privacy: Privacidá

View file

@ -1591,7 +1591,6 @@ be:
preferences:
other: Іншае
posting_defaults: Публікаваць па змаўчанні
public_timelines: Публічныя стужкі
privacy:
hint_html: "<strong>Наладзьце тое, якім чынам ваш профіль і вашы паведамленні могуць быць знойдзеныя.</strong> Розныя функцыі ў Mastodon могуць дапамагчы вам ахапіць шырэйшую аўдыторыю. Удзяліце час гэтым наладам, каб пераканацца, што яны падыходзяць вам."
privacy: Прыватнасць

View file

@ -1561,7 +1561,6 @@ bg:
preferences:
other: Друго
posting_defaults: По подразбиране за публикации
public_timelines: Публични хронологии
privacy:
hint_html: "<strong>Персонализирайте как искате профилът ви и публикациите ви да се намират.</strong> Разнообразие от функции в Mastodon може да ви помогнат да достигнете по-широка публика, когато е включено. Отделете малко време, за да прегледате тези настройки, за да се уверите, че отговарят на вашия случай на употреба."
privacy: Поверителност

View file

@ -1561,7 +1561,6 @@ ca:
preferences:
other: Altre
posting_defaults: Valors per defecte de publicació
public_timelines: Línies de temps públiques
privacy:
hint_html: "<strong>Personalitza com vols que siguin trobats el teu perfil i els teus tuts.</strong> Una varietat de característiques de Mastodon et poden ajudar a arribar a una major audiència quan les actives. Dedica una estona a revisar aquests ajustaments per assegurar que son els que necessites."
privacy: Privacitat

View file

@ -866,7 +866,6 @@ ckb:
preferences:
other: هی تر
posting_defaults: بڵاوکردنی بنەڕەتەکان
public_timelines: هێڵی کاتی گشتی
reactions:
errors:
limit_reached: سنووری کاردانه وه ی جیاواز گه یشت

View file

@ -846,7 +846,6 @@ co:
preferences:
other: Altre
posting_defaults: Paramettri predefiniti
public_timelines: Linee pubbliche
reactions:
errors:
limit_reached: Limita di reazzione sfarente tocca

View file

@ -1592,7 +1592,6 @@ cs:
preferences:
other: Ostatní
posting_defaults: Výchozí možnosti psaní
public_timelines: Veřejné časové osy
privacy:
hint_html: "<strong>Nastavte si, jak chcete, aby šlo váš profil a vaše příspěvky nalézt.</strong> Řada funkcí v Mastodonu vám může po zapnutí pomoci získat širší publikum. Věnujte chvíli kontrole těchto nastavení, aby vyhovovala vašim potřebám."
privacy: Soukromí

View file

@ -1646,7 +1646,6 @@ cy:
preferences:
other: Arall
posting_defaults: Rhagosodiadau postio
public_timelines: Ffrydiau cyhoeddus
privacy:
hint_html: "<strong>Cyfaddaswch sut rydych chi am i'ch proffil a'ch postiadau gael eu canfod.</strong> Gall amrywiaeth o nodweddion yn Mastodon eich helpu i gyrraedd cynulleidfa ehangach pan fyddwch wedi'ch eu galluogi. Cymerwch eiliad i adolygu'r gosodiadau hyn i sicrhau eu bod yn cyd-fynd â'ch pwrpas defnydd."
privacy: Preifatrwydd

View file

@ -1560,7 +1560,6 @@ da:
preferences:
other: Andet
posting_defaults: Standarder for indlæg
public_timelines: Offentlige tidslinjer
privacy:
hint_html: "<strong>Tilpas hvordan din profil og dine indlæg kan findes.</strong> En række funktioner i Mastodon kan hjælpe dig med at nå ud til et bredere publikum, hvis du aktiverer dem. Tjek indstillingerne herunder for at sikre, at de passer til dit brugsscenarie."
privacy: Privatliv

View file

@ -1561,7 +1561,6 @@ de:
preferences:
other: Erweitert
posting_defaults: Standardeinstellungen für Beiträge
public_timelines: Öffentliche Timelines
privacy:
hint_html: "<strong>Bestimme, wie dein Profil und deine Beiträge gefunden werden sollen.</strong> Eine Vielzahl von Funktionen in Mastodon können dir helfen, eine größere Reichweite zu erlangen, wenn sie aktiviert sind. Nimm dir einen Moment Zeit, um diese Einstellungen zu überprüfen und sicherzustellen, dass sie für deinen Anwendungsfall geeignet sind."
privacy: Datenschutz

View file

@ -1421,7 +1421,6 @@ el:
preferences:
other: Άλλες
posting_defaults: Προεπιλογές ανάρτησης
public_timelines: Δημόσιες ροές
privacy_policy:
title: Πολιτική Απορρήτου
reactions:

View file

@ -1545,7 +1545,6 @@ en-GB:
preferences:
other: Other
posting_defaults: Posting defaults
public_timelines: Public timelines
privacy:
hint_html: "<strong>Customise how you want your profile and your posts to be found.</strong> A variety of features in Mastodon can help you reach a wider audience when enabled. Take a moment to review these settings to make sure they fit your use case."
privacy: Privacy

View file

@ -1560,9 +1560,9 @@ en:
too_few_options: must have more than one item
too_many_options: can't contain more than %{max} items
preferences:
languages: Languages
other: Other
posting_defaults: Posting defaults
public_timelines: Public timelines
privacy:
hint_html: "<strong>Customize how you want your profile and your posts to be found.</strong> A variety of features in Mastodon can help you reach a wider audience when enabled. Take a moment to review these settings to make sure they fit your use case."
privacy: Privacy

View file

@ -1466,7 +1466,6 @@ eo:
preferences:
other: Aliaj aferoj
posting_defaults: Afiŝaj defaŭltoj
public_timelines: Publikaj templinioj
privacy:
hint_html: "<strong>Agordu kiel vi volas ke via profilo kaj viaj afiŝoj estu trovitaj.</strong> Diversaj funkcioj en Mastodon povas helpi vin atingi pli larĝan publikon kiam ĝi estas ebligita. Prenu momenton por revizii ĉi tiujn agordojn por certigi, ke ili taŭgas por via uzokazo."
privacy: Privateco

View file

@ -1561,7 +1561,6 @@ es-AR:
preferences:
other: Otras opciones
posting_defaults: Configuración predeterminada de mensajes
public_timelines: Líneas temporales públicas
privacy:
hint_html: "<strong>Personalizá cómo querés que sean encontrados tu perfil y tus mensajes.</strong> Una variedad de funciones en Mastodon pueden ayudarte a alcanzar una mayor audiencia al estar activada. Tomate un momento para revisar esta configuración para asegurarte de que se ajusta a tu caso."
privacy: Privacidad

View file

@ -1545,7 +1545,6 @@ es-MX:
preferences:
other: Otros
posting_defaults: Configuración por defecto de publicaciones
public_timelines: Líneas de tiempo públicas
privacy:
hint_html: "<strong>Personaliza cómo te gustaría que tu perfil y tus publicaciones sean encontradas.</strong> En Mastodon tienes a tu disposición distintas características que pueden ayudarte a llegar a una audiencia más amplia cuando se encuentran activadas. Toma un momento para revisar estos ajustes para asegurarte si cumplen tus necesidades."
privacy: Privacidad

View file

@ -1545,7 +1545,6 @@ es:
preferences:
other: Otros
posting_defaults: Configuración por defecto de publicaciones
public_timelines: Líneas de tiempo públicas
privacy:
hint_html: "<strong>Personaliza el descubrimiento de tu perfil y tus publicaciones.</strong> En Mastodon tienes distintas características que te ayudarán a alcanzar una mayor audiencia si las activas. Tómate un momento para revisar estas configuraciones y asegurarte de que cumplen tus necesidades."
privacy: Privacidad

View file

@ -1540,7 +1540,6 @@ et:
preferences:
other: Muu
posting_defaults: Postitamise vaikesätted
public_timelines: Avalikud ajajooned
privacy:
hint_html: "<strong>Kohanda, kuidas peaks su postitused ja profiil leitav olema.</strong> Mastodonis olevad paljud oskused võimaldavad jõuda sul rohkemate inimesteni, kui need lubada. Võta üks hetk, et vaadata need üle, et veenduda, kas sinu puhul need sobivad."
privacy: Privaatsus

View file

@ -1541,7 +1541,6 @@ eu:
preferences:
other: Denetarik
posting_defaults: Bidalketarako lehenetsitakoak
public_timelines: Denbora-lerro publikoak
privacy:
hint_html: "<strong>Pertsonalizatu nola nahi duzun zure profila eta argitalpenak aurkitzea.</strong> Mastodonen hainbat ezaugarri gaituta daudenean lagungarri izan dakizkizuke publiko zabalago batera iristeko. Hartu une bat ezarpen horiek berrikusteko, zure erabilerara egokitzen direla ziurtatzeko."
privacy: Pribatutasuna

View file

@ -1309,7 +1309,6 @@ fa:
preferences:
other: سایر تنظیمات
posting_defaults: تنظیمات پیش‌فرض انتشار
public_timelines: خط زمانی‌های عمومی
privacy:
hint_html: "<strong>شخصی‌سازی چگونگی پیدا شدن فرسته‌ها و نمایه‌تان.</strong> ویژگی‌های متعدّدی در ماستودون می‌توانند هنگام به کار افتادن در رسیدن به مخاطبینی گسترده‌تر یاریتان کنند. کمی وقت برای بازبینی این تنظیمات گذاشته تا مطمئن شوید برایتان مناسبند."
privacy: محرمانگی

View file

@ -1561,7 +1561,6 @@ fi:
preferences:
other: Muut
posting_defaults: Julkaisun oletusasetukset
public_timelines: Julkiset aikajanat
privacy:
hint_html: "<strong>Määritä, kuinka haluat profiilisi ja julkaisujesi löytyvän.</strong> Mastodonissa on monia ominaisuuksia, joiden käyttöönotto voi auttaa sinua tavoittamaan laajemman yleisön. Käytä hetki tarkistaaksesi, sopivatko nämä asetukset käyttöösi."
privacy: Yksityisyys

View file

@ -1561,7 +1561,6 @@ fo:
preferences:
other: Annað
posting_defaults: Postingarstillingar
public_timelines: Almennar tíðarlinjur
privacy:
hint_html: "<strong>Tillaga hvussu tú vilt hava tín vanga og tínar postar at blíva funnar</strong> Eitt úrval av tættum í Mastodon kunnu hjálpa tær at røkka einum størri skara, tá teir eru settir til. Brúka eina løtu at eftirhyggja hesar stillingar fyri at fáa vissu um at tær eru hóskandi fyri teg."
privacy: Privatlív

View file

@ -1536,7 +1536,6 @@ fr-CA:
preferences:
other: Autre
posting_defaults: Paramètres de publication par défaut
public_timelines: Fils publics
privacy:
hint_html: "<strong>Personnalisez la façon dont votre profil et vos messages peuvent être découverts.</strong> Mastodon peut vous aider à atteindre un public plus large lorsque certains paramètres sont activés. Prenez le temps de les examiner pour vous assurer quils sont configurés comme vous le souhaitez."
privacy: Confidentialité

View file

@ -1536,7 +1536,6 @@ fr:
preferences:
other: Autre
posting_defaults: Paramètres de publication par défaut
public_timelines: Fils publics
privacy:
hint_html: "<strong>Personnalisez la façon dont votre profil et vos messages peuvent être découverts.</strong> Mastodon peut vous aider à atteindre un public plus large lorsque certains paramètres sont activés. Prenez le temps de les examiner pour vous assurer quils sont configurés comme vous le souhaitez."
privacy: Confidentialité

View file

@ -1545,7 +1545,6 @@ fy:
preferences:
other: Oars
posting_defaults: Standertynstellingen foar berjochten
public_timelines: Iepenbiere tiidlinen
privacy:
hint_html: "<strong>Hoe wolle jo dat jo profyl en berjochten fûn wurde kinne?</strong> In ferskaat oan funksjes yn Mastodon kinne jo helpe om een grutter publyk te berikken as se ynskeakele binne. Nim de tiid om dizze ynstellingen te besjen, om der wis fan te wêzen dat se oan jo winsken foldogge."
privacy: Privacy

View file

@ -1623,7 +1623,6 @@ ga:
preferences:
other: Eile
posting_defaults: Réamhshocruithe á bpostáil
public_timelines: Amlínte poiblí
privacy:
hint_html: "<strong>Saincheap conas is mian leat do phróifíl agus do phostálacha a fháil.</strong> Is féidir le gnéithe éagsúla i Mastodon cabhrú leat teacht ar lucht féachana níos leithne nuair atá tú cumasaithe. Tóg nóiméad chun athbhreithniú a dhéanamh ar na socruithe seo chun a chinntiú go n-oireann siad do do chás úsáide."
privacy: Príobháideacht

View file

@ -1588,7 +1588,6 @@ gd:
preferences:
other: Eile
posting_defaults: Bun-roghainnean a phostaidh
public_timelines: Loidhnichean-ama poblach
privacy:
hint_html: "<strong>Gnàthaich an dòigh air an dèid a phròifil s na postaichean agad a lorg.</strong> Tha grunn ghleusan aig Mastodon a chuidicheas ach an ruig thu èisteachd nas fharsainge nuair a bhios iad an comas. Thoir sùil air na roghainnean seo a dhèanamh cinnteach gum freagair iad ri d fheumalachdan."
privacy: Prìobhaideachd

View file

@ -1561,7 +1561,6 @@ gl:
preferences:
other: Outro
posting_defaults: Valores por defecto
public_timelines: Cronoloxías públicas
privacy:
hint_html: "<strong>Personaliza o xeito no que queres que se atope o teu perfil e publicacións.</strong> Mastodon ten variedade de ferramentas para axudarche a acadar unha audiencia maior. Dedica un minuto a revisalas e confirma que se axustan ao teu caso persoal."
privacy: Privacidade

View file

@ -1597,7 +1597,6 @@ he:
preferences:
other: שונות
posting_defaults: ברירות מחדל להודעות
public_timelines: פידים פומביים
privacy:
hint_html: "<strong>ניתן להתאים את הצורה שבה תירצו שיראו את פרופיל המשתמש וההודעות שלכם.</strong> מגוון אפשרויות במסטודון יכולות לעזור לכם להיחשף לקהל רחב יותר כאשר תפעילו אותן. הקדישו רגע לבדוק את ההגדרות הללו כדי לוודא שהן מתאימות לכם."
privacy: פרטיות

View file

@ -1561,7 +1561,6 @@ hu:
preferences:
other: Egyéb
posting_defaults: Bejegyzések alapértelmezései
public_timelines: Nyilvános idővonalak
privacy:
hint_html: "<strong>Testreszabható a profil és a bejegyzések megjelenése.</strong> A Mastodon számos funkciója segíthet szélesebb közönség elérésében, ha engedélyezve van. Szánj egy percet a beállítások áttekintésére, hogy megbizonyosodj arról, hogy ezek megfelelnek a te felhasználási esetednek."
privacy: Adatvédelem

View file

@ -703,7 +703,6 @@ hy:
preferences:
other: Այլ
posting_defaults: Կանխադիր կարգաւորումներ
public_timelines: Հանրային հոսք
privacy:
search: Որոնել
privacy_policy:

View file

@ -1545,7 +1545,6 @@ ia:
preferences:
other: Alteres
posting_defaults: Parametros de publication predefinite
public_timelines: Chronologias public
privacy:
hint_html: "<strong>Personalisa como tu vole que tu profilo e tu messages es trovate.</strong> Un varietate de functiones in Mastodon pote adjutar te a attinger un plus grande publico quando activate. Prende un momento pro revider iste parametros pro assecurar te que illos se adapta a tu besonios."
privacy: Confidentialitate

View file

@ -1300,7 +1300,6 @@ id:
preferences:
other: Lainnya
posting_defaults: Kiriman bawaan
public_timelines: Linimasa publik
privacy_policy:
title: Kebijakan Privasi
reactions:

View file

@ -1537,7 +1537,6 @@ ie:
preferences:
other: Altri
posting_defaults: Predefinitiones por postar
public_timelines: Public témpor-lineas
privacy:
hint_html: "<strong>Customisa qualmen tu vole que tui profil e tui postas posse esser trovat.</strong> Mastodon have un varietá de manieres por auxiliar te atinger un auditorie plu grand quande activisat. Prende un moment por reviser ti parametres por far cert que ili concorda tui casu de usation."
privacy: Privatie

View file

@ -1510,7 +1510,6 @@ io:
preferences:
other: Altra
posting_defaults: Originala postoopcioni
public_timelines: Publika tempolinei
privacy:
privacy: Privateso
reach: Atingo

View file

@ -1565,7 +1565,6 @@ is:
preferences:
other: Annað
posting_defaults: Sjálfgefin gildi við gerð færslna
public_timelines: Opinberar tímalínur
privacy:
hint_html: "<strong>Sérsníddu hvernig þú vilt að finna megi notandasnið þitt og færslur.</strong> Ýmsir eiginleikar í Mastodon geta hjálpað þér að ná til breiðari áheyrendahóps, séu þeir virkjaðir. Taktu þér tíma til að yfirfara þessar stillingar svo að þær henti þér."
privacy: Gagnaleynd

View file

@ -1563,7 +1563,6 @@ it:
preferences:
other: Altro
posting_defaults: Predefinite di pubblicazione
public_timelines: Timeline pubbliche
privacy:
hint_html: "<strong>Personalizza il modo in cui vuoi che il tuo profilo e i tuoi post vengano trovati.</strong> Una varietà di funzionalità in Mastodon possono aiutarti a raggiungere un pubblico più ampio se abilitato. Prenditi un momento per rivedere queste impostazioni per assicurarti che si adattino al tuo caso d'uso."
privacy: Privacy

View file

@ -1516,7 +1516,6 @@ ja:
preferences:
other: その他
posting_defaults: デフォルトの投稿設定
public_timelines: 公開タイムライン
privacy:
hint_html: "<strong>プロフィールの見えかたや、ほかのユーザーからの見つかりやすさを設定します。</strong>Mastodonには自分のアカウントのことをより多くの人に知ってもらうためのさまざまな機能があり、有効・無効をそれぞれ切り換えられます。使いかたや好みに合わせて調節しましょう。"
privacy: プライバシー

View file

@ -565,7 +565,6 @@ kk:
preferences:
other: Басқа
posting_defaults: Пост жазу негіздері
public_timelines: Ашық таймлайндар
reactions:
errors:
limit_reached: Түрлі реакциялар лимиті толды

View file

@ -1520,7 +1520,6 @@ ko:
preferences:
other: 기타
posting_defaults: 게시물 기본설정
public_timelines: 공개 타임라인
privacy:
hint_html: "<strong>내 프로필과 게시물이 어떻게 발견될지를 제어합니다.</strong> 활성화 하면 마스토돈의 다양한 기능들이 내가 더 많은 사람에게 도달할 수 있도록 도와줍니다. 이 설정이 내 용도에 맞는지 잠시 검토하세요."
privacy: 개인정보

View file

@ -1322,7 +1322,6 @@ ku:
preferences:
other: Yên din
posting_defaults: Berdestên şandiyê
public_timelines: Demnameya gelemperî
privacy_policy:
title: Politîka taybetiyê
reactions:

View file

@ -1537,7 +1537,6 @@ lad:
preferences:
other: Otros
posting_defaults: Konfigurasyon predeterminada de publikasyones
public_timelines: Linyas de tiempo publikas
privacy:
hint_html: "<strong>Personaliza el diskuvrimyento de tu profil y tus publikasyones.</strong> En Mastodon tyenes distinktas funksyones ke te ayudaran a alkansar una audiensya mas ancha si las aktivas. Reviza estas opsyones por un momento para estar siguro ke kaven tus nesesidades."
privacy: Privasita

View file

@ -1004,7 +1004,6 @@ lt:
preferences:
other: Kita
posting_defaults: Skelbimo numatytosios nuostatos
public_timelines: Viešieji laiko skalės
privacy:
hint_html: "<strong>Tikrink, kaip nori, kad tavo profilis ir įrašai būtų randami.</strong> Įjungus įvairias Mastodon funkcijas, jos gali padėti pasiekti platesnę auditoriją. Akimirką peržiūrėk šiuos nustatymus, kad įsitikintum, jog jie atitinka tavo naudojimo būdą."
privacy: Privatumas

View file

@ -1553,7 +1553,6 @@ lv:
preferences:
other: Citi
posting_defaults: Publicēšanas noklusējuma iestatījumi
public_timelines: Publiskās ziņu lentas
privacy:
hint_html: "<strong>Pielāgo, kā vēlies atrast savu profilu un ziņas.</strong> Dažādas Mastodon funkcijas var palīdzēt sasniegt plašāku auditoriju, ja tās ir iespējotas. Velti laiku, lai pārskatītu šos iestatījumus, lai pārliecinātos, ka tie atbilst tavam lietošanas gadījumam."
privacy: Privātums

View file

@ -1480,7 +1480,6 @@ ms:
preferences:
other: Lain-lain
posting_defaults: Penyiaran lalai
public_timelines: Garis masa awam
privacy:
hint_html: "<strong>Sesuaikan cara anda mahu profil anda dan pos anda ditemui.</strong> Pelbagai ciri dalam Mastodon boleh membantu anda menjangkau khalayak yang lebih luas apabila didayakan. Luangkan sedikit masa untuk menyemak tetapan ini untuk memastikan ia sesuai dengan kes penggunaan anda."
privacy: Privasi

View file

@ -1483,7 +1483,6 @@ my:
preferences:
other: အခြား
posting_defaults: ပို့စ်တင်ရာတွင် သတ်မှတ်ချက်များ
public_timelines: အများမြင်စာမျက်နှာ
privacy:
hint_html: "<strong>သင့်ပရိုဖိုင်နှင့် သင့်ပို့စ်များကို ရှာဖွေလိုသည့်ပုံစံကို စိတ်ကြိုက်ပြင်ဆင်ပါ။</strong> Mastodon ရှိ အင်္ဂါရပ်များစွာကို ဖွင့်ထားသည့်အခါ ပိုမိုကျယ်ပြန့်သော ပရိသတ်ထံ သင်ရောက်ရှိစေရန် ကူညီပေးနိုင်ပါသည်။ သင့်အသုံးပြုမှုကိစ္စနှင့် ကိုက်ညီကြောင်း သေချာစေရန်အတွက် ဤသတ်မှတ်ချက်များကို ပြန်လည်သုံးသပ်သင့်ပါသည်။"
privacy: ကိုယ်ရေးအချက်အလက်

View file

@ -1561,7 +1561,6 @@ nl:
preferences:
other: Overig
posting_defaults: Standaardinstellingen voor berichten
public_timelines: Openbare tijdlijnen
privacy:
hint_html: "<strong>Hoe wil je dat jouw profiel en berichten kunnen worden gevonden?</strong> Een verscheidenheid aan functies in Mastodon kunnen je helpen om een groter publiek te bereiken als ze zijn ingeschakeld. Neem rustig de tijd om deze instellingen te bekijken, om er zo zeker van te zijn dat ze aan jouw wensen voldoen."
privacy: Privacy

View file

@ -1542,7 +1542,6 @@ nn:
preferences:
other: Anna
posting_defaults: Innleggsstandarder
public_timelines: Offentlege tidsliner
privacy:
hint_html: "<strong>Tilpass korleis du vil at andre skal finna profilen og innlegga dine.</strong> Mastodon har fleire funksjonar du kan ta i bruk for å få kontakt med eit større publikum. Sjå gjerne gjennom innstillingane slik at du er sikker på at dei passar til deg og din bruk."
privacy: Personvern

View file

@ -1530,7 +1530,6 @@
preferences:
other: Annet
posting_defaults: Innleggsstandarder
public_timelines: Offentlige tidslinjer
privacy:
hint_html: "<strong>Tilpass hvordan du vil at din profil og dine innlegg skal bli funnet.</strong> En rekke funksjoner i Mastodon kan hjelpe deg med å nå et bredere publikum når det er aktivert. Ta deg et øyeblikk til å vurdere disse innstillingene for å forsikre deg om at de passer deg og ditt bruk."
privacy: Personvern

View file

@ -749,7 +749,6 @@ oc:
preferences:
other: Autre
posting_defaults: Valors per defaut de las publicacions
public_timelines: Fluxes dactualitats publics
privacy_policy:
title: Politica de confidencialitat
reactions:

View file

@ -1613,7 +1613,6 @@ pl:
preferences:
other: Pozostałe
posting_defaults: Domyślne ustawienia wpisów
public_timelines: Publiczne osie czasu
privacy:
hint_html: "<strong>Dostosuj tryb odnajdowania twojego profilu i wpisów.</strong> Funkcje Mastodona mogą pomóc ci zwiększać twoją publiczność przejrzyj te ustawienia i dostosuj je do swojego sposobu użytkowania."
privacy: Prywatność

View file

@ -1540,7 +1540,6 @@ pt-BR:
preferences:
other: Outro
posting_defaults: Padrões de publicação
public_timelines: Linhas públicas
privacy:
hint_html: "<strong>Personalize como você quer que seu perfil e suas publicações sejam encontrados.</strong> Uma variedade de funcionalidades no Mastodon pode ajudar a alcançar um público mais amplo quando habilitado. Reserve um momento para revisar estas configurações para garantir que atendem ao seu caso de uso."
privacy: Privacidade

View file

@ -1561,7 +1561,6 @@ pt-PT:
preferences:
other: Outro
posting_defaults: Padrões de publicação
public_timelines: Cronologias públicas
privacy:
hint_html: "<strong>Defina como quer que o seu perfil e as suas publicações sejam encontrados.</strong> Várias funcionalidades no Mastodon podem ajudar a alcançar um público mais amplo quando ativadas. Tire um momento para rever estas definições para garantir que se aplicam ao seu caso de uso."
privacy: Privacidade

View file

@ -643,7 +643,6 @@ ro:
preferences:
other: Altele
posting_defaults: Valori prestabilite de postare
public_timelines: Fluxuri publice
reactions:
errors:
limit_reached: S-a atins limita diferitelor reacţii

View file

@ -1581,7 +1581,6 @@ ru:
preferences:
other: Остальное
posting_defaults: Настройки отправки по умолчанию
public_timelines: Публичные ленты
privacy:
hint_html: "<strong>Настройте, как вы хотите, чтобы ваш профиль и ваши сообщения были найдены.</strong> Различные функции в Mastodon могут помочь вам охватить более широкую аудиторию, если они включены. Уделите время изучению этих настроек, чтобы убедиться, что они подходят для вашего случая использования."
privacy: Конфиденциальность

View file

@ -1013,7 +1013,6 @@ sc:
preferences:
other: Àteru
posting_defaults: Valores predefinidos de publicatzione
public_timelines: Lìnias de tempos pùblicas
privacy:
privacy: Riservadesa
search: Chirca

View file

@ -1312,7 +1312,6 @@ sco:
preferences:
other: Ither
posting_defaults: Postin defauts
public_timelines: Public timelines
privacy_policy:
title: Privacy Policy
reactions:

View file

@ -1176,7 +1176,6 @@ si:
preferences:
other: වෙනත්
posting_defaults: සැමවිට පළ කරන ආකාරය
public_timelines: ප්‍රසිද්ධ කාලරේඛා
privacy:
search: සොයන්න
privacy_policy:

View file

@ -131,6 +131,7 @@ en:
user:
chosen_languages: When checked, only posts in selected languages will be displayed in public timelines
role: The role controls which permissions the user has
spoken_languages: Mastodon will not suggest to translate statuses in the languages that you speak
user_role:
color: Color to be used for the role throughout the UI, as RGB in hex format
highlighted: This makes the role publicly visible
@ -181,7 +182,7 @@ en:
autofollow: Invite to follow your account
avatar: Profile picture
bot: This is an automated account
chosen_languages: Filter languages
chosen_languages: Filter languages in public timelines
confirm_new_password: Confirm new password
confirm_password: Confirm password
context: Filter contexts
@ -228,6 +229,7 @@ en:
setting_use_pending_items: Slow mode
severity: Severity
sign_in_token_attempt: Security code
spoken_languages: Languages that you can speak
title: Title
type: Import type
username: Username

View file

@ -1171,7 +1171,6 @@ sk:
preferences:
other: Ostatné
posting_defaults: Východiskové nastavenia príspevkov
public_timelines: Verejné časové osi
privacy:
privacy: Súkromie
search: Vyhľadávanie

View file

@ -1594,7 +1594,6 @@ sl:
preferences:
other: Ostalo
posting_defaults: Privzete nastavitev objavljanja
public_timelines: Javne časovnice
privacy:
hint_html: "<strong>Prilagodite, kako lahko drugi najdejo vaš profil in vaše objave.</strong> V Mastodonu obstaja več zmožnosti, ki vam pomagajo doseči širše občinstvo, če so omogočene. Vzemite si čas in preverite, ali te nastavitve ustrezajo vašemu namenu uporabe."
privacy: Zasebnost

View file

@ -1553,7 +1553,6 @@ sq:
preferences:
other: Tjetër
posting_defaults: Parazgjedhje postimesh
public_timelines: Rrjedha kohore publike
privacy:
hint_html: "<strong>Përshtatni mënyrën se si dëshironi të gjenden prej të tjerëve profili dhe postimet tuaja.</strong> Një larmi veçorish të Mastodon-it mund tju ndihmojnë të shtriheni në një publik më të gjerë, kur aktivizohen. Ndaluni një çast ti shqyrtoni këto rregullime, për tu siguruar se i përshtaten rastit tuaj."
privacy: Privatësi

View file

@ -1566,7 +1566,6 @@ sr-Latn:
preferences:
other: Ostalo
posting_defaults: Podrazumevana podešavanja objavljivanja
public_timelines: Javne vremenske linije
privacy:
hint_html: "<strong>Prilagodite način na koji želite da vaš profil i vaše objave budu pronađeni.</strong> Različite funkcije u Mastodon-u mogu vam pomoći da dosegnete širu publiku kada su omogućene. Odvojite malo vremena da pregledate ova podešavanja kako biste bili sigurni da odgovaraju vašem slučaju upotrebe."
privacy: Privatnost

View file

@ -1566,7 +1566,6 @@ sr:
preferences:
other: Остало
posting_defaults: Подразумевана подешавања објављивања
public_timelines: Јавне временске линије
privacy:
hint_html: "<strong>Прилагодите начин на који желите да ваш профил и ваше објаве буду пронађени.</strong> Различите функције у Mastodon-у могу вам помоћи да досегнете ширу публику када су омогућене. Одвојите мало времена да прегледате ова подешавања како бисте били сигурни да одговарају вашем случају употребе."
privacy: Приватност

View file

@ -1550,7 +1550,6 @@ sv:
preferences:
other: Annat
posting_defaults: Standardinställningar för inlägg
public_timelines: Publika tidslinjer
privacy:
hint_html: "<strong>Anpassa hur du vill att din profil och dina inlägg ska hittas.</strong> En mängd funktioner i Mastodon kan hjälpa dig att nå en bredare publik när den är aktiverad. Ta en stund att granska dessa inställningar för att se att de passar ditt användningsfall."
privacy: Integritet

View file

@ -1519,7 +1519,6 @@ th:
preferences:
other: อื่น ๆ
posting_defaults: ค่าเริ่มต้นการโพสต์
public_timelines: เส้นเวลาสาธารณะ
privacy:
hint_html: "<strong>ปรับแต่งวิธีที่คุณต้องการให้พบโปรไฟล์ของคุณและโพสต์ของคุณ</strong> คุณลักษณะที่หลากหลายใน Mastodon สามารถช่วยให้คุณเข้าถึงผู้ชมที่กว้างขึ้นเมื่อเปิดใช้งาน ใช้เวลาสักครู่เพื่อตรวจทานการตั้งค่าเหล่านี้เพื่อให้แน่ใจว่าการตั้งค่าเหมาะสมกับกรณีการใช้งานของคุณ"
privacy: ความเป็นส่วนตัว

View file

@ -1545,7 +1545,6 @@ tr:
preferences:
other: Diğer
posting_defaults: Gönderi varsayılanları
public_timelines: Genel zaman çizelgeleri
privacy:
hint_html: "<strong>Profilinizin ve gönderilerinizin nasıl bulunmasını istediğinizi yapılandırın.</strong> Mastodon'daki çeşitli özellik etkinleştirildiklerinde çok daha geniş bir izleyici kitlesine ulaşmanıza yardımcı olabilir. Durumunuza uyup uymadığını anlamak için bu ayarlara bir göz atın."
privacy: Gizlilik

View file

@ -1597,7 +1597,6 @@ uk:
preferences:
other: Інше
posting_defaults: Усталені налаштування дописів
public_timelines: Глобальні стрічки
privacy:
hint_html: "<strong>Налаштуйте, як ви хочете, щоб знаходили ваш профіль і ваші дописи.</strong> Різноманітні функції Mastodon можуть допомогти вам охопити ширшу аудиторію, якщо їх увімкнути. Перегляньте ці налаштування, щоб переконатися, що вони підходять для вашого випадку користування."
privacy: Приватність

View file

@ -1535,7 +1535,6 @@ vi:
preferences:
other: Khác
posting_defaults: Mặc định cho tút
public_timelines: Bảng tin
privacy:
hint_html: "<strong>Tùy chỉnh cách mọi người tìm thấy hồ sơ và các tút của bạn.</strong> Nhiều tính năng trong Mastodon có thể giúp bạn tiếp cận nhiều đối tượng hơn khi được bật. Hãy xem lại các cài đặt này để đảm bảo chúng phù hợp với bạn."
privacy: Riêng tư

View file

@ -1535,7 +1535,6 @@ zh-CN:
preferences:
other: 其他
posting_defaults: 发布默认值
public_timelines: 公共时间轴
privacy:
hint_html: "<strong>自定义您希望如何找到您的个人资料和嘟文。</strong>启用Mastodon中的各种功能可以帮助您扩大受众范围。请花点时间查看这些设置确保它们适合您的使用情况。"
privacy: 隐私

View file

@ -1511,7 +1511,6 @@ zh-HK:
preferences:
other: 其他
posting_defaults: 發佈預設值
public_timelines: 公共時間軸
privacy:
hint_html: "<strong>自訂個人檔案和帖文被他人找到的方式。</strong>啟用 Mastodon 一系列的功能助你觸及更多受眾。花點時間查閱這些設定並確保它符合你的用法。"
privacy: 私隱

View file

@ -1537,7 +1537,6 @@ zh-TW:
preferences:
other: 其他
posting_defaults: 嘟文預設值
public_timelines: 公開時間軸
privacy:
hint_html: "<strong>自訂您希望如何使您的個人檔案及嘟文被發現。</strong>藉由啟用一系列 Mastodon 功能以幫助您觸及更廣的受眾。煩請花些時間確認您是否欲啟用這些設定。"
privacy: 隱私權

View file

@ -0,0 +1,7 @@
# frozen_string_literal: true
class AddSpokenLanguagesToUsers < ActiveRecord::Migration[7.1]
def change
add_column :users, :spoken_languages, :string, array: true, null: false, default: []
end
end

View file

@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema[7.1].define(version: 2024_07_24_181224) do
ActiveRecord::Schema[7.1].define(version: 2024_07_29_134058) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@ -1205,6 +1205,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_07_24_181224) do
t.text "settings"
t.string "time_zone"
t.string "otp_secret"
t.string "spoken_languages", default: [], null: false, array: true
t.index ["account_id"], name: "index_users_on_account_id"
t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
t.index ["created_by_application_id"], name: "index_users_on_created_by_application_id", where: "(created_by_application_id IS NOT NULL)"