-
+
diff --git a/app/assets/javascripts/components/features/compose/components/character_counter.jsx b/app/assets/javascripts/components/features/compose/components/character_counter.jsx
index e6b6753544..fc64f94a57 100644
--- a/app/assets/javascripts/components/features/compose/components/character_counter.jsx
+++ b/app/assets/javascripts/components/features/compose/components/character_counter.jsx
@@ -9,14 +9,17 @@ const CharacterCounter = React.createClass({
mixins: [PureRenderMixin],
+ checkRemainingText (diff) {
+ if (diff <= 0) {
+ return {diff};
+ }
+ return {diff};
+ },
+
render () {
const diff = this.props.max - this.props.text.replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g, "_").length;
- return (
-
- {diff}
-
- );
+ return this.checkRemainingText(diff);
}
});
diff --git a/app/assets/javascripts/components/features/compose/components/compose_form.jsx b/app/assets/javascripts/components/features/compose/components/compose_form.jsx
index c7df22765b..fad77c8e9d 100644
--- a/app/assets/javascripts/components/features/compose/components/compose_form.jsx
+++ b/app/assets/javascripts/components/features/compose/components/compose_form.jsx
@@ -131,6 +131,7 @@ const ComposeForm = React.createClass({
render () {
const { intl, needsPrivacyWarning, mentionedDomains, onPaste } = this.props;
const disabled = this.props.is_submitting;
+ const text = [this.props.spoiler_text, this.props.text].join('');
let publishText = '';
let privacyWarning = '';
@@ -197,8 +198,8 @@ const ComposeForm = React.createClass({
-
-
{accounts}
diff --git a/app/assets/javascripts/components/features/mutes/index.jsx b/app/assets/javascripts/components/features/mutes/index.jsx
index 698b5408ae..b199c1a1bf 100644
--- a/app/assets/javascripts/components/features/mutes/index.jsx
+++ b/app/assets/javascripts/components/features/mutes/index.jsx
@@ -51,7 +51,7 @@ const Mutes = React.createClass({
}
return (
-
diff --git a/app/assets/javascripts/components/features/status/components/detailed_status.jsx b/app/assets/javascripts/components/features/status/components/detailed_status.jsx
index ceafc1a32a..620af36fe7 100644
--- a/app/assets/javascripts/components/features/status/components/detailed_status.jsx
+++ b/app/assets/javascripts/components/features/status/components/detailed_status.jsx
@@ -5,6 +5,7 @@ import DisplayName from '../../../components/display_name';
import StatusContent from '../../../components/status_content';
import MediaGallery from '../../../components/media_gallery';
import VideoPlayer from '../../../components/video_player';
+import AttachmentList from '../../../components/attachment_list';
import { Link } from 'react-router';
import { FormattedDate, FormattedNumber } from 'react-intl';
import CardContainer from '../containers/card_container';
@@ -19,6 +20,7 @@ const DetailedStatus = React.createClass({
status: ImmutablePropTypes.map.isRequired,
onOpenMedia: React.PropTypes.func.isRequired,
onOpenVideo: React.PropTypes.func.isRequired,
+ autoPlayGif: React.PropTypes.bool,
},
mixins: [PureRenderMixin],
@@ -39,12 +41,14 @@ const DetailedStatus = React.createClass({
let applicationLink = '';
if (status.get('media_attachments').size > 0) {
- if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
+ if (status.get('media_attachments').some(item => item.get('type') === 'unknown')) {
+ media =
{ancestors}
-
Je kan HTML gebruiken, zoals
Je kan ook hier HTML gebruiken" + registrations: + open: + title: Open registratie + enabled: Ingeschakeld + disabled: Uitgeschakeld + closed_message: + title: Bericht wanneer registratie is uitgeschakeld + desc_html: "Wordt op de voorpagina weergegeven wanneer registratie van nieuwe accounts is uitgeschakeld
En ook hier kan je HTML gebruiken" diff --git a/config/locales/oc.yml b/config/locales/oc.yml new file mode 100644 index 0000000000..46e32d8d32 --- /dev/null +++ b/config/locales/oc.yml @@ -0,0 +1,337 @@ +--- +oc: + about: + about_mastodon: Mastodon es un malhum social liure e open-source. Una + alternativa decentralizada a las platformas comercialas, aquò evita + qu’una sola companiá monopolize vòstra comunicacion. Causissètz une servidor + que vos fisatz, quina que siague vòstra causida, podètz interagir amb tot lo + mond. Qual que siague pòt aver son instància Mastodon e participar al malhum + social sens cap de problèmas. + about_this: A prepaus d’aquesta instància + apps: Aplicacions + business_email: 'Corrièl professional :' + closed_registrations: Las inscripcions son clavadas pel moment sus aquesta instància. + contact: Contacte + description_headline: Qué es %{domain} ? + domain_count_after: autras instàncias + domain_count_before: Connectat a + features: + api: API dobèrta per las aplicacions e servicis + blocks: Aisinas complètas per blocar e rescondre + characters: 500 caractèrs per publicacion + chronology: Flux d’actualitat cronologic + ethics: 'Ethical design: pas cap de reclama o traçadors' + gifv: Partatge de GIFs e vidèos cortas + privacy: Nivèl de confidencialitat configurable per cada publicacion + public: Fluxes d’actualitat publicsPublic timelines + features_headline: Çò que fa que Mastodon es diferent + get_started: Venètz al malhum + links: Ligams + other_instances: Autras instàncias + source_code: Còdi font + status_count_after: publicacions + status_count_before: a escrich + terms: Tèrmes + user_count_after: utilizaires + user_count_before: Ostal de + accounts: + follow: Sègre + followers: Abonats + following: Abonaments + nothing_here: I a pas res aquí ! + people_followed_by: Lo mond que %{name} sèc + people_who_follow: Lo mond que ségon %{name} + posts: Estatuts + remote_follow: Sègre a distància + unfollow: Quitar de sègre + admin: + accounts: + are_you_sure: Are you sure? + display_name: Display name + domain: Domain + edit: Edit + email: E-mail + feed_url: Feed URL + followers: Followers + follows: Follows + location: + all: All + local: Local + remote: Remote + title: Location + media_attachments: Media attachments + moderation: + all: All + silenced: Silenced + suspended: Suspended + title: Moderation + most_recent_activity: Most recent activity + most_recent_ip: Most recent IP + not_subscribed: Not subscribed + order: + alphabetic: Alphabetic + most_recent: Most recent + title: Order + perform_full_suspension: Perform full suspension + profile_url: Profile URL + public: Public + push_subscription_expires: PuSH subscription expires + reset_password: Reset password + salmon_url: Salmon URL + silence: Silence + statuses: Statuses + title: Accounts + undo_silenced: Undo silence + undo_suspension: Undo suspension + username: Username + web: Web + domain_blocks: + add_new: Add new + created_msg: Domain block is now being processed + destroyed_msg: Domain block has been undone + domain: Domain + new: + create: Create block + hint: The domain block will not prevent creation of account entries in the + database, but will retroactively and automatically apply specific moderation + methods on those accounts. + severity: + desc_html: "Silence will make the account's posts invisible + to anyone who isn't following them. Suspend will remove + all of the account's content, media, and profile data." + silence: Silence + suspend: Suspend + title: New domain block + reject_media: Reject media files + reject_media_hint: Removes locally stored media files and refuses to download + any in the future. Irrelevant for suspensions + severities: + silence: Silence + suspend: Suspend + severity: Severity + show: + affected_accounts: + one: One account in the database affected + other: "%{count} accounts in the database affected" + retroactive: + silence: Unsilence all existing accounts from this domain + suspend: Unsuspend all existing accounts from this domain + title: Undo domain block for %{domain} + undo: Undo + title: Domain Blocks + undo: Undo + pubsubhubbub: + callback_url: Callback URL + confirmed: Confirmed + expires_in: Expires in + last_delivery: Last delivery + title: PubSubHubbub + topic: Topic + reports: + comment: + label: Comentari + none: Pas cap + delete: Suprimir + id: ID + mark_as_resolved: Marcat coma resolgut + report: 'enhalament #%{id}' + reported_account: Compte senhalat + reported_by: Senhalat per + resolved: Resolgut + silence_account: Metre lo compte en silenci + status: Estatut + suspend_account: Suspendre lo compte + target: Cibla + title: Senhalament + unresolved: Pas resolguts + view: Veire + settings: + click_to_edit: Clicatz per modificar + contact_information: + email: Picatz una adreça de corrièl + label: Informacions de contacte + username: Picatz un nom d'utilizaire + registrations: + closed_message: + desc_html: Affiché sur la page d'accueil lorsque les inscriptions sont fermées
Vous + pouvez utiliser des balises HTML + title: Message de fermeture des inscriptions + open: + disabled: Desactivadas + enabled: Activadas + title: Inscripcions + setting: Paramètre + site_description: + desc_html: Affichée sous la forme d'un paragraphe sur la page d'accueil et + utilisée comme balise meta.
Vous pouvez utiliser des balises HTML, en + particulier
Vous + pouvez utiliser des balises HTML + title: Description étendue du site + site_title: Títol del site + title: Paramètres del site + title: Administration + application_mailer: + settings: 'Cambiar las preferéncias de corrièl : %{link}' + signature: Notificacion de Mastodon de %{instance} + view: 'Veire :' + applications: + invalid_url: L’URL donada es invalida + auth: + change_password: Cambiar lo senhal + didnt_get_confirmation: Avètz pas recebut las instruccions de confirmacion ? + forgot_password: Senhal oblidat ? + login: Se connectar + logout: Se desconnectar + register: Se marcar + resend_confirmation: Tornar mandar las instruccions de confirmacion + reset_password: Reïnicializar lo senhal + set_new_password: Picar un nòu senhal + authorize_follow: + error: O planhèm, i a agut una error al moment de cercar lo compte + follow: Sègre + prompt_html: 'Avètz (%{self}) demandat de sègre :' + title: Sègre %{acct} + datetime: + distance_in_words: + about_x_hours: "%{count}oras" + about_x_months: "%{count}meses" + about_x_years: + one: un an + other: "%{count} ans" + almost_x_years: + one: un an + other: "%{count} ans" + half_a_minute: Ara + less_than_x_minutes: "%{count}minutas" + less_than_x_seconds: Ara + over_x_years: + one: un an + other: "%{count} ans" + x_days: "%{count}jorns" + x_minutes: "%{count}minutes" + x_months: "%{count}meses" + x_seconds: "%{count}segondas" + errors: + '404': La pagina que recercatz existís pas. + '410': La pagina que cercatz existís pas mai. + '422': + content: Verificacion de seguretat fracassada. Blocatz los cookies ? + title: Verificacion de seguretat fracassada + exports: + blocks: Blocatz + csv: CSV + follows: Seguètz + mutes: You mute + storage: Mèdias gardats + generic: + changes_saved_msg: Cambiaments ben realizats ! + powered_by: propulsat per %{link} + save_changes: Salvagardar los cambiaments + validation_errors: + one: I a quicòm que truca ! Mercés de corregir l’error çai-jos + other: I a quicòm que truca ! Mercés de corregir las %{count} errors çai-jos + imports: + preface: Podètz importar qualques donadas coma lo mond que seguètz o blocatz a-n + aquesta instància d’un fichièr creat d’una autra instància. + success: Vòstras donadas son ben estadas mandadas e seràn tractadas tre que possible + types: + blocking: Lista de blocatge + following: Lista de mond que seguètz + muting: Muting list + upload: Importar + landing_strip_html: %{name} es un utilizaire de %{domain}. + Podètz lo sègre o interagir amb eles s’avètz un compte ont que siasgue sul fediverse. + Autrament podètz vos marcar aquí. + media_attachments: + validations: + images_and_video: Cannot attach a video to a status that already contains images + too_many: Cannot attach more than 4 files + notification_mailer: + digest: + body: 'Trobatz aquí un resumit de çò qu’avètz mancat dempuèi vòstra darrièra + visita lo %{since}:' + mention: "%{name} vos amencionat dins :" + new_followers_summary: + one: Avètz un nòu abonat ! Ouà ! + other: Avètz %{count} nòus abonats ! Qué crane ! + subject: + one: "Una nòva notificacion dempuèi vòstra darrièra visita \U0001F418" + other: "%{count} nòvas notificacions dempuèi vòstra darrièra visita \U0001F418" + favourite: + body: "%{name} a mes vòstre estatut en favorit :" + subject: "%{name} a mes vòstre estatut en favorit" + follow: + body: "%{name} vos sèc ara !" + subject: "%{name} es a vos sègre ara" + follow_request: + body: "%{name} a demandar a vos sègre" + subject: 'Demanda d’abonament : %{name}' + mention: + body: 'Sètz estat mencionat per %{name} dins :' + subject: Sètz estat mencionat per %{name} + reblog: + body: "%{name} a tornat partejar vòstre estatut :" + subject: "%{name} a tornat partejar vòstre estatut" + pagination: + next: Seguent + prev: Precedent + truncate: "…" + remote_follow: + acct: Picatz vòstre utilizaire@instància per utilizar per sègre aqueste utilizaire + missing_resource: URL de redireccion pas trobada + proceed: Contunhatz per sègre + prompt: 'Sètz per sègre :' + settings: + authorized_apps: Aplicacions autorizadas + back: Tornar a Mastodon + edit_profile: Modificar lo perfil + export: Export donadas + import: Import + preferences: Preferéncias + settings: Paramètres + two_factor_auth: Autentificacion en dos temps + statuses: + open_in_web: Dobrir sul web + over_character_limit: limit de %{max} caractèrs passat + show_more: Ne veire mai + visibilities: + private: Mostrar pas qu’als abonats + public: Public + unlisted: Public, mai pas afichat sul flux d’actualitat public + stream_entries: + click_to_show: Clic per afichar + reblogged: partejat + sensitive_content: Contengut sensible + time: + formats: + default: "%b %d %Y a %H o %M" + two_factor_auth: + code_hint: Enter the code generated by your authenticator app to confirm + description_html: S’activatz l’autentificacion two-factor, vos + caldrà vòstre mobil per vos connectar perque generarà un geton per vos daissar + dintrar. + disable: Desactivar + enable: Activar + enabled_success: Two-factor authentication successfully enabled + generate_recovery_codes: Generate Recovery Codes + instructions_html: "Escanatz aqueste còdi QR amb Google Authenticator + o una aplicacion similària sus vòstre mobil. A partir d’ara, aquesta + aplicacion generarà un geton que vos caldrà picar per vos connectar." + lost_recovery_codes: Recovery codes allow you to regain access to your account + if you lose your phone. If you've lost your recovery codes, you can regenerate + them here. Your old recovery codes will be invalidated. + manual_instructions: 'If you can''t scan the QR code and need to enter it manually, + here is the plain-text secret:' + recovery_codes_regenerated: Recovery codes successfully regenerated + recovery_instructions: If you ever lose access to your phone, you can use one + of the recovery codes below to regain access to your account. Keep the recovery + codes safe, for example by printing them and storing them with other important + documents. + setup: Set up + wrong_code: The entered code was invalid! Are server time and device time correct? + users: + invalid_email: L’adreça de corrièl es invalida + invalid_otp_token: Còdi d’autentificacion en dos temps invalid diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml new file mode 100644 index 0000000000..269a1a99be --- /dev/null +++ b/config/locales/pt-BR.yml @@ -0,0 +1,198 @@ +--- +pt-BR: + about: + about_mastodon: Mastodon é um servidor de rede social grátis, e open-source. Uma alternativa descentralizada ás plataformas comerciais, que evita o risco de uma única empresa monopolizar a sua comunicação. Escolha um servidor que você confie — qualquer um que escolher, você poderá interagir com todo o resto. Qualquer um pode ter uma instância Mastodon e assim participar na rede social federada sem problemas. + about_this: Sobre essa instância + apps: Aplicações + business_email: 'Email comercial:' + closed_registrations: Registros estão fechadas para essa instância. + contact: Contato + description_headline: O que é %{domain}? + domain_count_after: outras instâncias + domain_count_before: Conectado a + features: + api: Aberto para API de aplicações e serviços + blocks: Bloqueos e ferramentas para mudar + characters: 500 caracteres por post + chronology: Timeline são cronologicas + ethics: 'Design ético: sem propaganda, sem tracking' + gifv: GIFV e vídeos curtos + privacy: Granular, privacidade setada por post + public: Timelines públicas + features_headline: O que torna Mastodon diferente + get_started: Comece aqui + links: Links + source_code: Source code + other_instances: Outras instâncias + terms: Termos + user_count_after: usuários + user_count_before: Lugar de + accounts: + follow: Seguir + followers: Seguidores + following: Seguindo + nothing_here: Não há nada aqui! + people_followed_by: Pessoas seguidas por %{name} + people_who_follow: Pessoas que seguem %{name} + posts: Posts + remote_follow: Acesso remoto + unfollow: Unfollow + admin: + accounts: + are_you_sure: Você tem certeza? + display_name: Nome mostrado + domain: Domain + edit: Editar + email: E-mail + feed_url: URL do Feed + followers: Seguidores + follows: Seguindo + location: + all: Todos + local: Local + remote: Remoto + title: Local + media_attachments: Mídia anexadas + moderation: + all: Todos + silenced: Silenciado + suspended: Supenso + title: Moderação + most_recent_activity: Atividade mais recente + most_recent_ip: IP mais recente + not_subscribed: Não inscrito + order: + alphabetic: Alfabética + most_recent: Mais recente + title: Ordem + perform_full_suspension: Fazer suspensão completa + profile_url: URL do perfil + public: Público + push_subscription_expires: PuSH subscription expires + salmon_url: Salmon URL + silence: Silêncio + statuses: Status + title: Contas + undo_silenced: Desfazer silenciar + undo_suspension: Desfazer supensão + username: Usuário + web: Web + domain_blocks: + add_new: Adicionar nova + created_msg: Bloqueio do domínio está sendo processado + destroyed_msg: Bloqueio de domínio está sendo desfeito + domain: Domínio + new: + create: Criar bloqueio + hint: O bloqueio de dominio não vai previnir a criação de entradas no banco de dados, mas irá, retroativamente e automaticamente aplicar métodos de moderação específica nessas contas. + severity: + desc_html: "Silenciar irá fazer com que os posts dessas contas sejam invisíveis para todos que não a seguem. Supender irá remover todos o conteúdo das contas, mídia e dados do perfil." + silence: Silenciar + suspend: Suspender + title: Novo bloqueio de domínio + reject_media: Rejeitar arquivos de mídia + reject_media_hint: Remove localmente arquivos armazenados e rejeita fazer o download de novos no futuro. Irrelevante em suspensões. + severities: + silence: Silenciar + suspend: Suspender + severity: Severidade + show: + affected_accounts: + one: Uma conta no banco de dados afetada + other: "%{count} contas no banco de dados afetada" + retroactive: + silence: Desilenciar todas as contas existentes nesse domínio + suspend: Desuspender todas as contas existentes nesse domínio + title: Desfazer bloqueio de domínio para %{domain} + title: Bloqueio de domínio + undo: Desfazer + pubsubhubbub: + callback_url: URL de Callback + confirmed: Confirmado + expires_in: Expira em + last_delivery: Última entrega + title: PubSubHubbub + topic: Tópico + reports: + comment: + label: Commentário + none: None + delete: Deletar + id: ID + mark_as_resolved: Marque como resolvido + report: 'Report #%{id}' + reported_account: Conta reportada + reported_by: Reportado por + resolved: Resolvido + silence_account: Conta silenciada + status: Status + suspend_account: Conta suspensa + target: Target + title: Reports + unresolved: Unresolved + view: View + settings: + click_to_edit: Clique para editar + contact_information: + email: Entre um endereço de email público + label: Informação de contato + username: Entre com usuário + registrations: + closed_message: + desc_html: Mostrar na página inicial quando registros estão fecados
Você pode usar tags HTML + title: Mensagem de registro fechados + open: + disabled: Desabilitado + enabled: Habilitado + title: Aberto para registro + setting: Preferências + site_description: + desc_html: Mostrar como parágrafo e usado como meta tag.
Vôce pode usar tags HTML, em particular
Você pode usar tags HTML + title: Descrição extendida do site + site_title: Título do site + title: Preferências do site + title: Administração + application_mailer: + settings: 'Mudar preferências de email: %{link}' + signature: notificações Mastodon de %{instance} + view: 'View:' + applications: + invalid_url: URL dada é inválida + auth: + change_password: Mudar senha + didnt_get_confirmation: Não recebeu instruções de confirmação? + forgot_password: Esqueceu a senha? + login: Entrar + register: Registar + resend_confirmation: Reenviar instruções de confirmação + reset_password: Resetar senha + set_new_password: Editar password + generic: + changes_saved_msg: Mudanças guardadas! + powered_by: powered by %{link} + save_changes: Guardar alterações + validation_errors: + one: Algo não está correto. Por favor reveja o erro abaixo + other: Algo não está correto. Por favor reveja os %{count} erros abaixo + notification_mailer: + favourite: + body: 'O seu post foi favoritado por %{name}:' + subject: "%{name} favouritou o seu post" + follow: + body: "%{name} seguiu você!" + subject: "%{name} segue você" + mention: + body: 'Você foi mencionado por %{name} em:' + subject: Foi mencionado por %{name} + reblog: + body: 'O seu post foi reblogado por %{name}:' + subject: "%{name} reblogou o seu post" + pagination: + next: Next + prev: Prev + settings: + edit_profile: Editar perfil + preferences: Preferências diff --git a/config/locales/pt.yml b/config/locales/pt.yml index dc9beae7bc..735bc14ba5 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -1,64 +1,66 @@ --- pt: about: - about_mastodon: Mastodon é um servidor de rede social grátis, e open-source. Uma alternativa descentralizada ás plataformas comerciais, que evita o risco de uma única empresa monopolizar a sua comunicação. Escolha um servidor que você confie — qualquer um que escolher, você poderá interagir com todo o resto. Qualquer um pode ter uma instância Mastodon e assim participar na rede social federada sem problemas. - about_this: Sobre essa instância + about_mastodon: Mastodon é uma rede social grátis e em código aberto. Uma alternativa descentralizada às plataformas comerciais, que evita o risco de uma única empresa monopolizar a tua comunicação. Escolhe um servidor que confies, não importa qual, pois vais poder comunicar com todos os outros. Qualquer um pode criar uma instância Mastodon e participar nesta rede social. + about_this: Sobre esta instância apps: Aplicações business_email: 'Email comercial:' - closed_registrations: Registros estão fechadas para essa instância. - contact: Contato - description_headline: O que é %{domain}? + closed_registrations: Novos registos estão fechados nesta instância. + contact: Contacto + description_headline: O que é o %{domain}? domain_count_after: outras instâncias - domain_count_before: Conectado a + domain_count_before: Ligado a features: - api: Aberto para API de aplicações e serviços - blocks: Bloqueos e ferramentas para mudar + api: API aberta para aplicações e serviços + blocks: Ferramentas para silenciar e bloquear characters: 500 caracteres por post - chronology: Timeline são cronologicas - ethics: 'Design ético: sem propaganda, sem tracking' - gifv: GIFV e vídeos curtos - privacy: Granular, privacidade setada por post + chronology: Timelines cronológicas + ethics: 'Design ético: sem públicidade ou tracking' + gifv: GIFV e pequenos vídeos + privacy: Privacidade granular por post public: Timelines públicas features_headline: O que torna Mastodon diferente - get_started: Comece aqui + get_started: Começar links: Links - source_code: Source code other_instances: Outras instâncias + source_code: Código fonte + status_count_after: publicações + status_count_before: Que fizeram terms: Termos - user_count_after: usuários - user_count_before: Lugar de + user_count_after: utilizadores + user_count_before: Casa para accounts: follow: Seguir followers: Seguidores - following: Seguindo + following: A seguir nothing_here: Não há nada aqui! people_followed_by: Pessoas seguidas por %{name} people_who_follow: Pessoas que seguem %{name} posts: Posts - remote_follow: Acesso remoto - unfollow: Unfollow + remote_follow: Seguir remotamente + unfollow: Deixar de seguir admin: accounts: - are_you_sure: Você tem certeza? - display_name: Nome mostrado - domain: Domain + are_you_sure: Tens a certeza? + display_name: Nome a mostrar + domain: Domínio edit: Editar email: E-mail feed_url: URL do Feed followers: Seguidores - follows: Seguindo + follows: A seguir location: all: Todos local: Local remote: Remoto title: Local - media_attachments: Mídia anexadas + media_attachments: Media anexa moderation: all: Todos - silenced: Silenciado - suspended: Supenso + silenced: Silenciados + suspended: Supensos title: Moderação - most_recent_activity: Atividade mais recente + most_recent_activity: Actividade mais recente most_recent_ip: IP mais recente not_subscribed: Não inscrito order: @@ -69,6 +71,7 @@ pt: profile_url: URL do perfil public: Público push_subscription_expires: PuSH subscription expires + reset_password: Reset palavra-passe salmon_url: Salmon URL silence: Silêncio statuses: Status @@ -78,34 +81,35 @@ pt: username: Usuário web: Web domain_blocks: - add_new: Adicionar nova - created_msg: Bloqueio do domínio está sendo processado - destroyed_msg: Bloqueio de domínio está sendo desfeito + add_new: Adicionar novo + created_msg: Bloqueio do domínio está a ser processado + destroyed_msg: Bloqueio de domínio está a ser removido domain: Domínio new: create: Criar bloqueio - hint: O bloqueio de dominio não vai previnir a criação de entradas no banco de dados, mas irá, retroativamente e automaticamente aplicar métodos de moderação específica nessas contas. + hint: O bloqueio de dominio não vai previnir a criação de entradas na base de dados, mas irá retroativamente e automaticamente aplicar métodos de moderação específica nessas contas. severity: - desc_html: "Silenciar irá fazer com que os posts dessas contas sejam invisíveis para todos que não a seguem. Supender irá remover todos o conteúdo das contas, mídia e dados do perfil." + desc_html: "Silenciar irá fazer com que os posts dessas contas sejam invisíveis para todos que não a seguem. Supender irá eliminar todo o conteúdo guardado dessa conta, mídia e informação de perfil." silence: Silenciar suspend: Suspender title: Novo bloqueio de domínio - reject_media: Rejeitar arquivos de mídia - reject_media_hint: Remove localmente arquivos armazenados e rejeita fazer o download de novos no futuro. Irrelevante em suspensões. + reject_media: Rejeitar ficheiros de mídia + reject_media_hint: Remove localmente arquivos armazenados e rejeita fazer guardar novos no futuro. Irrelevante na suspensão. severities: silence: Silenciar suspend: Suspender severity: Severidade show: affected_accounts: - one: Uma conta no banco de dados afetada - other: "%{count} contas no banco de dados afetada" + one: Uma conta na base de dados afectada + other: "%{count} contas na base de dados afectadas" retroactive: - silence: Desilenciar todas as contas existentes nesse domínio - suspend: Desuspender todas as contas existentes nesse domínio - title: Desfazer bloqueio de domínio para %{domain} + silence: Não silenciar todas as contas existentes nesse domínio + suspend: Não suspender todas as contas existentes nesse domínio + title: Remover o bloqueio de domínio de %{domain} + undo: Anular title: Bloqueio de domínio - undo: Desfazer + undo: Anular pubsubhubbub: callback_url: URL de Callback confirmed: Confirmado @@ -115,84 +119,84 @@ pt: topic: Tópico reports: comment: - label: Commentário - none: None - delete: Deletar + label: Comentário + none: Nenhum + delete: Eliminar id: ID - mark_as_resolved: Marque como resolvido - report: 'Report #%{id}' - reported_account: Conta reportada - reported_by: Reportado por + mark_as_resolved: Marcar como resolvido + report: 'Denúncia #%{id}' + reported_account: Conta denunciada + reported_by: Denúnciada por resolved: Resolvido silence_account: Conta silenciada - status: Status + status: Estado suspend_account: Conta suspensa target: Target - title: Reports - unresolved: Unresolved - view: View + title: Denúncias + unresolved: Por resolver + view: Ver settings: click_to_edit: Clique para editar contact_information: - email: Entre um endereço de email público - label: Informação de contato - username: Entre com usuário + email: Inserir um endereço de email para tornar público + label: Informação de contacto + username: Insira um nome de utilizador registrations: closed_message: - desc_html: Mostrar na página inicial quando registros estão fecados
Você pode usar tags HTML - title: Mensagem de registro fechados + desc_html: Mostrar na página inicial quando registos estão encerrados
Podes usar tags HTML + title: Mensagem de registos encerrados open: disabled: Desabilitado enabled: Habilitado - title: Aberto para registro + title: Aceitar novos registos setting: Preferências site_description: - desc_html: Mostrar como parágrafo e usado como meta tag.
Vôce pode usar tags HTML, em particular
Podes usar tags HTML, em particular
Você pode usar tags HTML - title: Descrição extendida do site + desc_html: Mostrar na página de mais informações
Podes usar tags HTML + title: Página de mais informações site_title: Título do site title: Preferências do site title: Administração application_mailer: - settings: 'Mudar preferências de email: %{link}' - signature: notificações Mastodon de %{instance} - view: 'View:' + settings: 'Alterar preferências de email: %{link}' + signature: notificações Mastodon do %{instance} + view: 'Ver:' applications: - invalid_url: URL dada é inválida + invalid_url: O URL é inválido auth: - change_password: Mudar senha - didnt_get_confirmation: Não recebeu instruções de confirmação? - forgot_password: Esqueceu a senha? + change_password: Alterar palavra-passe + didnt_get_confirmation: Não recebeu o email de confirmação? + forgot_password: Esqueceste a palavra-passe? login: Entrar register: Registar resend_confirmation: Reenviar instruções de confirmação - reset_password: Resetar senha - set_new_password: Editar password + reset_password: Criar nova palavra-passe + set_new_password: Editar palavra-passe generic: - changes_saved_msg: Mudanças guardadas! + changes_saved_msg: Alteraçes guardadas! powered_by: powered by %{link} save_changes: Guardar alterações validation_errors: - one: Algo não está correto. Por favor reveja o erro abaixo - other: Algo não está correto. Por favor reveja os %{count} erros abaixo + one: Algo não está correcto. Por favor vê o erro abaixo + other: Algo não está correto. Por favor vê os %{count} erros abaixo notification_mailer: favourite: - body: 'O seu post foi favoritado por %{name}:' - subject: "%{name} favouritou o seu post" + body: 'O teu post foi adicionado aos favoritos por %{name}:' + subject: "%{name} adicionou o teu post aos favoritos" follow: - body: "%{name} seguiu você!" - subject: "%{name} segue você" + body: "%{name} é teu seguidor!" + subject: "%{name} começou a seguir-te" mention: - body: 'Você foi mencionado por %{name} em:' - subject: Foi mencionado por %{name} + body: 'Foste mencionado por %{name}:' + subject: "%{name} mencionou-te" reblog: - body: 'O seu post foi reblogado por %{name}:' - subject: "%{name} reblogou o seu post" + body: 'O teu post foi partilhado por %{name}:' + subject: "%{name} partilhou o teu post" pagination: - next: Next - prev: Prev + next: Seguinte + prev: Anterior settings: edit_profile: Editar perfil preferences: Preferências diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 8e6a813bbe..3d1869ebdb 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -39,6 +39,126 @@ ru: posts: Посты remote_follow: Подписаться на удаленном узле unfollow: Отписаться + admin: + accounts: + are_you_sure: Вы уверены? + display_name: Отображаемое имя + domain: Домен + edit: Изменить + email: E-mail + feed_url: URL фида + followers: Подписчики + follows: Подписки + location: + all: Все + local: Локальные + remote: Удаленные + title: Размещение + media_attachments: Мультимедийные вложения + moderation: + all: Все + silenced: Заглушенные + suspended: Заблокированные + title: Модерация + most_recent_activity: Последняя активность + most_recent_ip: Последний IP + not_subscribed: Не подписаны + order: + alphabetic: По алфавиту + most_recent: По дате + title: Порядок + perform_full_suspension: Полная блокировка + profile_url: URL профиля + public: Публичный + push_subscription_expires: Подписка PuSH истекает + reset_password: Сбросить пароль + salmon_url: Salmon URL + silence: Глушение + statuses: Статусы + title: Аккаунты + undo_silenced: Снять глушение + undo_suspension: Снять блокировку + username: Имя пользователя + web: WWW + domain_blocks: + add_new: Добавить новую + created_msg: Блокировка домена обрабатывается + destroyed_msg: Блокировка домена снята + domain: Домен + new: + create: Создать блокировку + hint: Блокировка домена не предотвратит создание новых аккаунтов в базе данных, но ретроактивно и автоматически применит указанные методы модерации для этих аккаунтов. + severity: + desc_html: "Глушение сделает статусы аккаунта невидимыми для всех, кроме их подписчиков. Блокировка удалит весь контент аккаунта, включая мультимедийные вложения и данные профиля." + silence: Глушение + suspend: Блокировка + title: Новая доменная блокировка + reject_media: Запретить медиаконтент + reject_media_hint: Удаляет локально хранимый медиаконтент и запрещает его загрузку в будущем. Не имеет значения в случае блокировки. + severities: + silence: Глушение + suspend: Блокировка + severity: Строгость + show: + affected_accounts: + one: Влияет на один аккаунт в базе данных + other: "Влияет на %{count} аккаунтов в базе данных" + retroactive: + silence: Снять глушение со всех существующих аккаунтов этого домена + suspend: Снять блокировку со всех существующих аккаунтов этого домена + title: Снять блокировку с домена %{domain} + undo: Отменить + title: Доменные блокировки + undo: Отемнить + pubsubhubbub: + callback_url: Callback URL + confirmed: Подтверждено + expires_in: Истекает через + last_delivery: Последняя доставка + title: PubSubHubbub + topic: Тема + reports: + comment: + label: Комментарий + none: Нет + delete: Удалить + id: ID + mark_as_resolved: Отметить как разрешенную + report: 'Жалоба #%{id}' + reported_account: Аккаунт нарушителя + reported_by: Отправитель жалобы + resolved: Разрешено + silence_account: Заглушить аккаунт + status: Статус + suspend_account: Блокировать аккаунт + target: Цель + title: Жалобы + unresolved: Неразрешенные + view: Просмотреть + settings: + click_to_edit: Нажмите для изменения + contact_information: + email: Введите публичный e-mail + label: Контактная информация + username: Введите имя пользователя + registrations: + closed_message: + desc_html: Отображается на титульной странице, когда закрыта регистрация
Можно использовать HTML-теги + title: Сообщение о закрытой регистрации + open: + disabled: Закрыта + enabled: Открыта + title: Открыть регистрацию + setting: Настройка + site_description: + desc_html: Отображается в качестве параграфа на титульной странице и используется в качестве мета-тега.
Можно использовать HTML-теги, в особенности
Можно использовать HTML-теги + title: Расширенное описание сайта + site_title: Название сайта + title: Настройки сайта + title: Администрирование application_mailer: settings: 'Изменить настройки e-mail: %{link}' signature: Уведомления Mastodon от %{instance} @@ -74,10 +194,17 @@ ru: x_minutes: "%{count}мин" x_months: "%{count}мес" x_seconds: "%{count}сек" + errors: + '404': Страница, которую Вы искали, не существует. + '410': Страница, которую Вы искали, больше не существует. + '422': + content: Проверка безопасности не удалась. Возможно, Вы блокируете cookies? + title: Проверка безопасности не удалась. exports: - blocks: Вы заблокировали + blocks: Список блокировки csv: CSV follows: Подписки + mutes: Список глушения storage: Ваш медиаконтент generic: changes_saved_msg: Изменения успешно сохранены! @@ -90,10 +217,15 @@ ru: preface: Вы можете загрузить некоторые данные, например, списки людей, на которых Вы подписаны или которых блокируете, в Ваш аккаунт на этом узле из файлов, экспортированных с другого узла. success: Ваши данные были успешно загружены и будут обработаны с должной скоростью types: - blocking: Список блокируемых - following: Список подписок + blocking: Список блокировки + following: Подписки + muting: Список глушения upload: Загрузить landing_strip_html: %{name} - пользователь на %{domain}. Вы можете подписаться на него/нее и общаться с ним/ней, если у Вас есть аккаунт на любом узле общей сети. Если у Вас его нет, вы можете зарегистрироваться здесь. + media_attachments: + validations: + images_and_video: Нельзя добавить видео к статусу с изображениями + too_many: Нельзя добавить более 4 файлов notification_mailer: digest: body: 'Кратко о пропущенном Вами на %{instance} с Вашего последнего захода %{since}:' @@ -156,9 +288,15 @@ ru: description_html: При включении двухфакторной аутентификации, вход потребует от Вас использования Вашего телефона, который сгенерирует входные токены. disable: Отключить enable: Включить + enabled_success: Двухфакторная аутентификация успешно включена + generate_recovery_codes: Сгенерировать коды восстановления instructions_html: "Отсканируйте этот QR-код с помощью Google Authenticator или другого подобного приложения на Вашем телефоне. С этого момента приложение будет генерировать токены, которые будет необходимо ввести для входа." + lost_recovery_codes: Коды восстановления позволяют вернуть доступ к аккаунту в случае утери телефона. Если Вы потеряли Ваши коды восстановления, вы можете заново сгенерировать их здесь. Ваши старые коды восстановления будут аннулированы. manual_instructions: 'Если Вы не можете отсканировать QR-код и хотите ввести его вручную, секрет представлен здесь открытым текстом:' + recovery_codes_regenerated: Коды восстановления успешно сгенерированы + recovery_instructions: В случае утери доступа к Вашему телефону Вы можете использовать один из кодов восстановления, указанных ниже, чтобы вернуть доступ к аккаунту. Держите коды восстановления в безопасности, например, распечатав их и храня с другими важными документами. setup: Настроить + wrong_code: Введенный код неверен! Правильно ли установлены серверное время и время устройства? users: invalid_email: Введенный e-mail неверен invalid_otp_token: Введен неверный код diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index c25407f2b5..5335b0927c 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -28,6 +28,7 @@ en: note: Bio otp_attempt: Two-factor code password: Password + setting_auto_play_gif: Auto-play animated GIFs setting_boost_modal: Show confirmation dialog before boosting setting_default_privacy: Post privacy severity: Severity diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml index b9257ec35f..ee561955e3 100644 --- a/config/locales/simple_form.ja.yml +++ b/config/locales/simple_form.ja.yml @@ -28,6 +28,7 @@ ja: note: プロフィール otp_attempt: 二段階認証コード password: パスワード + setting_auto_play_gif: アニメーションGIFを自動再生する setting_boost_modal: ブーストする前に確認ダイアログを表示する setting_default_privacy: 投稿の公開範囲 severity: 重大性 diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml index 5bc38a87b2..c0539fd636 100644 --- a/config/locales/simple_form.nl.yml +++ b/config/locales/simple_form.nl.yml @@ -6,39 +6,39 @@ nl: avatar: PNG, GIF of JPG. Maximaal 2MB. Wordt teruggeschaald naar 120x120px display_name: Maximaal 30 tekens header: PNG, GIF of JPG. Maximaal 2MB. Wordt teruggeschaald naar 700x335px - locked: Vereist dat je handmatig volgers accepteert en stelt standaard plaatsen berichten privacy in op alleen-volgers - note: Maximaal 160 characters + locked: Vereist dat je handmatig volgers moet accepteren en stelt de privacy van toots standaard in op alleen volgers + note: Maximaal 160 tekens imports: - data: CSV file geëxporteerd van een andere Mastodon server + data: CSV-bestand dat op een andere Mastodon-server werd geëxporteerd labels: defaults: avatar: Avatar - confirm_new_password: Bevestig nieuw wachtwoord - confirm_password: Bevestig wachtwoord - current_password: Huidige wachtwoord + confirm_new_password: Nieuw wachtwoord bevestigen + confirm_password: Wachtwoord bevestigen + current_password: Huidig wachtwoord data: Gegevens display_name: Weergavenaam email: E-mailadres - header: Kop + header: Omslagfoto locale: Taal locked: Maak account besloten new_password: Nieuwe wachtwoord note: Bio - otp_attempt: Twee-factor code + otp_attempt: Tweestaps-aanmeldcode password: Wachtwoord - setting_default_privacy: Berichten privacy - type: Import type + setting_default_privacy: Tootprivacy + type: Importtype username: gebruikersnaam interactions: - must_be_follower: Blokkeermeldingen van niet-volgers - must_be_following: Blokkeer meldingen van mensen die je niet volgt + must_be_follower: Blokkeermeldingen van mensen die jou niet volgen + must_be_following: Blokkeermeldingen van mensen die jij niet volgt notification_emails: - digest: Verstuur samenvattingse-mails - favourite: Verstuur een e-mail wanneer iemand je status als favoriet markeert - follow: Verstuur een e-mail wanneer iemand je volgt - follow_request: Verstuur een e-mail wanneer iemand je wil volgen - mention: Verstuur een e-mail wanneer iemand je vermeld - reblog: Verstuur een e-mail wanneer iemand je status boost + digest: Verstuur periodiek e-mails met een samenvatting + favourite: Verstuur een e-mail wanneer iemand jouw toot als favoriet markeert + follow: Verstuur een e-mail wanneer iemand jou volgt + follow_request: Verstuur een e-mail wanneer iemand jou wilt volgen + mention: Verstuur een e-mail wanneer iemand jou vermeld + reblog: Verstuur een e-mail wanneer iemand jouw toot heeft geboost 'no': 'Nee' required: mark: "*" diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml new file mode 100644 index 0000000000..fb2bec1b48 --- /dev/null +++ b/config/locales/simple_form.oc.yml @@ -0,0 +1,46 @@ +--- +oc: + simple_form: + hints: + defaults: + avatar: PNG, GIF o JPG. Maximum 2 Mo. Serà retalhat en 120x120px + display_name: Maximum 30 caractèrs + header: PNG, GIF o JPG. Maximum 2 Mo. Serà retalhat en 700x335px + locked: Demanda qu’accepetatz manualament lo mond que vos sègon e botarà la visibilitat de vòstras publicacions coma accessiblas a vòstres abonats solament + note: Maximum 160 caractèrs + imports: + data: Fichièr CSV exportat d’una autra instància Mastodon + labels: + defaults: + avatar: Avatar + confirm_new_password: Confirmacion del nòu senhal + confirm_password: Confirmatz lo nòu senhal + current_password: Senhal actual + data: Data + display_name: Escais + email: Corrièl + header: Bandièra + locale: Lenga + locked: Far venir lo compte privat + new_password: Nòu senhal + note: Bio + otp_attempt: Còdi Two-factor + password: Senhal + setting_default_privacy: Confidencialitat de las publicacions + type: Tip d’impòrt + username: Nom d’utilizaire + interactions: + must_be_follower: Blocar las notificacions del mond que vos sègon pas + must_be_following: Blocar las notificacions del mond que seguètz pas + notification_emails: + digest: Enviar un corrièl recapitulatiu + favourite: Enviar un corrièl quand qualqu’un plaça vòstre estatut en favorit + follow: Enviar un corrièl quand qualqu’un vos sèc + follow_request: Enviar un corrièl quand qualqu’un demanda de vos sègre + mention: Enviar un corrièl quand qualqu’un vos menciona + reblog: Enviar un corrièl quand qualqu’un tòrna partejar vòstre estatut + 'no': 'Non' + required: + mark: "*" + text: requesit + 'yes': 'Òc' diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml new file mode 100644 index 0000000000..28f7eeea89 --- /dev/null +++ b/config/locales/simple_form.pt-BR.yml @@ -0,0 +1,30 @@ +--- +pt-BR: + simple_form: + labels: + defaults: + avatar: Avatar + confirm_new_password: Confirme nova senha + confirm_password: Confirme a senha + current_password: Senha atual + display_name: Nome + email: Endereço de email + header: Header + locale: Linguagem + new_password: Nova senha + note: Biografia + password: Senha + username: Usuário + interactions: + must_be_follower: Bloquear notificações de não-seguidores + must_be_following: Bloquear notificações de pessoas que você + notification_emails: + favourite: Enviar email quando alguém favorita um post seu + follow: Enviar email quando alguém seguir você + mention: Enviar email quando alguém mencionar você + reblog: Enviar email quando alguém reblogar um post seu + 'no': 'Não' + required: + mark: "*" + text: necessário + 'yes': 'Sim' diff --git a/config/locales/simple_form.pt.yml b/config/locales/simple_form.pt.yml index e8b5e2d7f0..ba3326b230 100644 --- a/config/locales/simple_form.pt.yml +++ b/config/locales/simple_form.pt.yml @@ -1,28 +1,47 @@ --- pt: simple_form: + hints: + defaults: + avatar: PNG, GIF ou JPG. No máximo 2MB. Vai ser reduzido para 120x120px + display_name: No máximo 30 caracteres + header: PNG, GIF or JPG. No máximo 2MB. Vai ser reduzido para 700x335px + locked: Requer que manualmente aproves seguidores e torna o default dos teus posts para privados (apenas seguidores) + note: No máximo 160 caracteres + imports: + data: Ficheiro CSV exportado de outra instância do Mastodon + sessions: + otp: Insere o código o código de autenticação de dois fatores do teu telefone ou utiliza um código de recuperação de acesso. labels: defaults: - avatar: Avatar - confirm_new_password: Confirme nova senha - confirm_password: Confirme a senha - current_password: Senha atual + avatar: Imagem de Perfil + confirm_new_password: Confirme nova palavra-passe + confirm_password: Confirme a palavra-passe + current_password: Palavra-passe actual + data: Data display_name: Nome email: Endereço de email - header: Header - locale: Linguagem - new_password: Nova senha + header: Cabeçalho + locale: Língua + locked: Tornar conta privada + new_password: Nova palavra-passe note: Biografia - password: Senha - username: Usuário + otp_attempt: Código de autenticação de dois fatores + password: Palavra-passe + setting_boost_modal: Pedir confirmação antes de partilhar um post + setting_default_privacy: Privacidade padrão de posts + severity: Severity + type: Import type + username: Utilizador interactions: must_be_follower: Bloquear notificações de não-seguidores - must_be_following: Bloquear notificações de pessoas que você + must_be_following: Bloquear notificações de pessoas que não segues notification_emails: - favourite: Enviar email quando alguém favorita um post seu - follow: Enviar email quando alguém seguir você - mention: Enviar email quando alguém mencionar você - reblog: Enviar email quando alguém reblogar um post seu + digest: Enviar um email da actividade nesta instância + favourite: Enviar email quando alguém adiciona um post teu aos favoritos + follow: Enviar email quando alguém te segue + mention: Enviar email quando alguém te menciona + reblog: Enviar email quando alguém partilhar um post teu 'no': 'Não' required: mark: "*" diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml index b7d8e4e05f..8f6dfa5731 100644 --- a/config/locales/simple_form.ru.yml +++ b/config/locales/simple_form.ru.yml @@ -26,7 +26,9 @@ ru: note: О Вас otp_attempt: Двухфакторный код password: Пароль + setting_boost_modal: Показывать диалог подтверждения перед продвижением setting_default_privacy: Видимость постов + severity: Строгость type: Тип импорта username: Имя пользователя interactions: diff --git a/config/navigation.rb b/config/navigation.rb index 6e2bcd001f..a3f752e477 100644 --- a/config/navigation.rb +++ b/config/navigation.rb @@ -17,10 +17,11 @@ SimpleNavigation::Configuration.run do |navigation| primary.item :admin, safe_join([fa_icon('cogs fw'), t('admin.title')]), admin_reports_url, if: proc { current_user.admin? } do |admin| admin.item :reports, safe_join([fa_icon('flag fw'), t('admin.reports.title')]), admin_reports_url, highlights_on: %r{/admin/reports} admin.item :accounts, safe_join([fa_icon('users fw'), t('admin.accounts.title')]), admin_accounts_url, highlights_on: %r{/admin/accounts} + admin.item :instances, safe_join([fa_icon('cloud fw'), t('admin.instances.title')]), admin_instances_url, highlights_on: %r{/admin/instances} admin.item :pubsubhubbubs, safe_join([fa_icon('paper-plane-o fw'), t('admin.pubsubhubbub.title')]), admin_pubsubhubbub_index_url admin.item :domain_blocks, safe_join([fa_icon('lock fw'), t('admin.domain_blocks.title')]), admin_domain_blocks_url, highlights_on: %r{/admin/domain_blocks} - admin.item :sidekiq, safe_join([fa_icon('diamond fw'), 'Sidekiq']), sidekiq_url - admin.item :pghero, safe_join([fa_icon('database fw'), 'PgHero']), pghero_url + admin.item :sidekiq, safe_join([fa_icon('diamond fw'), 'Sidekiq']), sidekiq_url, link_html: { target: 'sidekiq' } + admin.item :pghero, safe_join([fa_icon('database fw'), 'PgHero']), pghero_url, link_html: { target: 'pghero' } admin.item :settings, safe_join([fa_icon('cogs fw'), t('admin.settings.title')]), admin_settings_url end diff --git a/config/routes.rb b/config/routes.rb index fd186c3206..bc67016a48 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -16,7 +16,7 @@ Rails.application.routes.draw do end get '.well-known/host-meta', to: 'well_known/host_meta#show', as: :host_meta, defaults: { format: 'xml' } - get '.well-known/webfinger', to: 'well_known/webfinger#show', as: :webfinger, defaults: { format: 'json' } + get '.well-known/webfinger', to: 'well_known/webfinger#show', as: :webfinger devise_for :users, path: 'auth', controllers: { sessions: 'auth/sessions', @@ -37,13 +37,10 @@ Rails.application.routes.draw do get :remote_follow, to: 'remote_follow#new' post :remote_follow, to: 'remote_follow#create' - member do - get :followers - get :following - - post :follow - post :unfollow - end + resources :followers, only: [:index], controller: :follower_accounts + resources :following, only: [:index], controller: :following_accounts + resource :follow, only: [:create], controller: :account_follow + resource :unfollow, only: [:create], controller: :account_unfollow end get '/@:username', to: 'accounts#show', as: :short_account @@ -80,6 +77,7 @@ Rails.application.routes.draw do resources :pubsubhubbub, only: [:index] resources :domain_blocks, only: [:index, :new, :create, :show, :destroy] resources :settings, only: [:index, :update] + resources :instances, only: [:index] resources :reports, only: [:index, :show, :update] do resources :reported_statuses, only: :destroy diff --git a/config/settings.yml b/config/settings.yml index 04213fd0bc..9813963b28 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -15,6 +15,7 @@ defaults: &defaults open_registrations: true closed_registrations_message: '' boost_modal: false + auto_play_gif: true notification_emails: follow: false reblog: false diff --git a/db/migrate/20170418160728_add_indexes_to_reports_for_accounts.rb b/db/migrate/20170418160728_add_indexes_to_reports_for_accounts.rb new file mode 100644 index 0000000000..cd69bb8b14 --- /dev/null +++ b/db/migrate/20170418160728_add_indexes_to_reports_for_accounts.rb @@ -0,0 +1,6 @@ +class AddIndexesToReportsForAccounts < ActiveRecord::Migration[5.0] + def change + add_index :reports, :account_id + add_index :reports, :target_account_id + end +end diff --git a/db/schema.rb b/db/schema.rb index 62ff4207d3..78b419b827 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170414132105) do +ActiveRecord::Schema.define(version: 20170418160728) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -215,6 +215,8 @@ ActiveRecord::Schema.define(version: 20170414132105) do t.datetime "created_at", null: false t.datetime "updated_at", null: false t.integer "action_taken_by_account_id" + t.index ["account_id"], name: "index_reports_on_account_id", using: :btree + t.index ["target_account_id"], name: "index_reports_on_target_account_id", using: :btree end create_table "settings", force: :cascade do |t| diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake index a1947ea0e9..7dd7b5cd13 100644 --- a/lib/tasks/mastodon.rake +++ b/lib/tasks/mastodon.rake @@ -103,6 +103,12 @@ namespace :mastodon do User.where(id: batch.map(&:id)).delete_all end end + + desc 'List all admin users' + task admins: :environment do + puts 'Admin user emails:' + puts User.admins.map(&:email).join("\n") + end end namespace :settings do @@ -145,8 +151,8 @@ namespace :mastodon do Account.unscoped.where(avatar_content_type: 'image/gif').or(Account.unscoped.where(header_content_type: 'image/gif')).find_each do |account| begin - account.avatar.reprocess! - account.header.reprocess! + account.avatar.reprocess! if account.avatar_content_type == 'image/gif' && !account.avatar.exists?(:static) + account.header.reprocess! if account.header_content_type == 'image/gif' && !account.header.exists?(:static) rescue StandardError => e Rails.logger.error "Error while generating static avatars/headers for account #{account.id}: #{e}" next diff --git a/public/mask-icon.svg b/public/mask-icon.svg new file mode 100644 index 0000000000..c352301173 --- /dev/null +++ b/public/mask-icon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/spec/controllers/account_follow_controller_spec.rb b/spec/controllers/account_follow_controller_spec.rb new file mode 100644 index 0000000000..479101c67d --- /dev/null +++ b/spec/controllers/account_follow_controller_spec.rb @@ -0,0 +1,24 @@ +require 'rails_helper' + +describe AccountFollowController do + render_views + let(:user) { Fabricate(:user) } + let(:alice) { Fabricate(:account, username: 'alice') } + + describe 'POST #create' do + before do + sign_in(user) + end + + it 'redirects to account path' do + service = double + allow(FollowService).to receive(:new).and_return(service) + allow(service).to receive(:call) + + post :create, params: { account_username: alice.username } + + expect(service).to have_received(:call).with(user.account, 'alice') + expect(response).to redirect_to(account_path(alice)) + end + end +end diff --git a/spec/controllers/account_unfollow_controller_spec.rb b/spec/controllers/account_unfollow_controller_spec.rb new file mode 100644 index 0000000000..1f28bf4ab8 --- /dev/null +++ b/spec/controllers/account_unfollow_controller_spec.rb @@ -0,0 +1,24 @@ +require 'rails_helper' + +describe AccountUnfollowController do + render_views + let(:user) { Fabricate(:user) } + let(:alice) { Fabricate(:account, username: 'alice') } + + describe 'POST #create' do + before do + sign_in(user) + end + + it 'redirects to account path' do + service = double + allow(UnfollowService).to receive(:new).and_return(service) + allow(service).to receive(:call) + + post :create, params: { account_username: alice.username } + + expect(service).to have_received(:call).with(user.account, alice) + expect(response).to redirect_to(account_path(alice)) + end + end +end diff --git a/spec/controllers/accounts_controller_spec.rb b/spec/controllers/accounts_controller_spec.rb index d2c93c7079..94d10d78f1 100644 --- a/spec/controllers/accounts_controller_spec.rb +++ b/spec/controllers/accounts_controller_spec.rb @@ -44,18 +44,4 @@ RSpec.describe AccountsController, type: :controller do end end end - - describe 'GET #followers' do - it 'returns http success' do - get :followers, params: { username: alice.username } - expect(response).to have_http_status(:success) - end - end - - describe 'GET #following' do - it 'returns http success' do - get :following, params: { username: alice.username } - expect(response).to have_http_status(:success) - end - end end diff --git a/spec/controllers/admin/instances_controller_spec.rb b/spec/controllers/admin/instances_controller_spec.rb new file mode 100644 index 0000000000..c50ea352f7 --- /dev/null +++ b/spec/controllers/admin/instances_controller_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +RSpec.describe Admin::InstancesController, type: :controller do + before do + sign_in Fabricate(:user, admin: true), scope: :user + end + + describe 'GET #index' do + it 'returns http success' do + get :index + + expect(response).to have_http_status(:success) + end + end +end diff --git a/spec/controllers/api/v1/statuses_controller_spec.rb b/spec/controllers/api/v1/statuses_controller_spec.rb index 669956659a..74faed269e 100644 --- a/spec/controllers/api/v1/statuses_controller_spec.rb +++ b/spec/controllers/api/v1/statuses_controller_spec.rb @@ -7,179 +7,289 @@ RSpec.describe Api::V1::StatusesController, type: :controller do let(:app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') } let(:token) { double acceptable?: true, resource_owner_id: user.id, application: app } - before do - allow(controller).to receive(:doorkeeper_token) { token } - end - - describe 'GET #show' do - let(:status) { Fabricate(:status, account: user.account) } - - it 'returns http success' do - get :show, params: { id: status.id } - expect(response).to have_http_status(:success) - end - end - - describe 'GET #context' do - let(:status) { Fabricate(:status, account: user.account) } - + context 'with an oauth token' do before do - Fabricate(:status, account: user.account, thread: status) + allow(controller).to receive(:doorkeeper_token) { token } end - it 'returns http success' do - get :context, params: { id: status.id } - expect(response).to have_http_status(:success) + describe 'GET #show' do + let(:status) { Fabricate(:status, account: user.account) } + + it 'returns http success' do + get :show, params: { id: status.id } + expect(response).to have_http_status(:success) + end + end + + describe 'GET #context' do + let(:status) { Fabricate(:status, account: user.account) } + + before do + Fabricate(:status, account: user.account, thread: status) + end + + it 'returns http success' do + get :context, params: { id: status.id } + expect(response).to have_http_status(:success) + end + end + + describe 'GET #reblogged_by' do + let(:status) { Fabricate(:status, account: user.account) } + + before do + post :reblog, params: { id: status.id } + end + + it 'returns http success' do + get :reblogged_by, params: { id: status.id } + expect(response).to have_http_status(:success) + end + end + + describe 'GET #favourited_by' do + let(:status) { Fabricate(:status, account: user.account) } + + before do + post :favourite, params: { id: status.id } + end + + it 'returns http success' do + get :favourited_by, params: { id: status.id } + expect(response).to have_http_status(:success) + end + end + + describe 'POST #create' do + before do + post :create, params: { status: 'Hello world' } + end + + it 'returns http success' do + expect(response).to have_http_status(:success) + end + end + + describe 'DELETE #destroy' do + let(:status) { Fabricate(:status, account: user.account) } + + before do + post :destroy, params: { id: status.id } + end + + it 'returns http success' do + expect(response).to have_http_status(:success) + end + + it 'removes the status' do + expect(Status.find_by(id: status.id)).to be nil + end + end + + describe 'POST #reblog' do + let(:status) { Fabricate(:status, account: user.account) } + + before do + post :reblog, params: { id: status.id } + end + + it 'returns http success' do + expect(response).to have_http_status(:success) + end + + it 'updates the reblogs count' do + expect(status.reblogs.count).to eq 1 + end + + it 'updates the reblogged attribute' do + expect(user.account.reblogged?(status)).to be true + end + + it 'return json with updated attributes' do + hash_body = body_as_json + + expect(hash_body[:reblog][:id]).to eq status.id + expect(hash_body[:reblog][:reblogs_count]).to eq 1 + expect(hash_body[:reblog][:reblogged]).to be true + end + end + + describe 'POST #unreblog' do + let(:status) { Fabricate(:status, account: user.account) } + + before do + post :reblog, params: { id: status.id } + post :unreblog, params: { id: status.id } + end + + it 'returns http success' do + expect(response).to have_http_status(:success) + end + + it 'updates the reblogs count' do + expect(status.reblogs.count).to eq 0 + end + + it 'updates the reblogged attribute' do + expect(user.account.reblogged?(status)).to be false + end + end + + describe 'POST #favourite' do + let(:status) { Fabricate(:status, account: user.account) } + + before do + post :favourite, params: { id: status.id } + end + + it 'returns http success' do + expect(response).to have_http_status(:success) + end + + it 'updates the favourites count' do + expect(status.favourites.count).to eq 1 + end + + it 'updates the favourited attribute' do + expect(user.account.favourited?(status)).to be true + end + + it 'return json with updated attributes' do + hash_body = body_as_json + + expect(hash_body[:id]).to eq status.id + expect(hash_body[:favourites_count]).to eq 1 + expect(hash_body[:favourited]).to be true + end + end + + describe 'POST #unfavourite' do + let(:status) { Fabricate(:status, account: user.account) } + + before do + post :favourite, params: { id: status.id } + post :unfavourite, params: { id: status.id } + end + + it 'returns http success' do + expect(response).to have_http_status(:success) + end + + it 'updates the favourites count' do + expect(status.favourites.count).to eq 0 + end + + it 'updates the favourited attribute' do + expect(user.account.favourited?(status)).to be false + end end end - describe 'GET #reblogged_by' do - let(:status) { Fabricate(:status, account: user.account) } - + context 'without an oauth token' do before do - post :reblog, params: { id: status.id } + allow(controller).to receive(:doorkeeper_token) { nil } end - it 'returns http success' do - get :reblogged_by, params: { id: status.id } - expect(response).to have_http_status(:success) - end - end + context 'with a private status' do + let(:status) { Fabricate(:status, account: user.account, visibility: :private) } - describe 'GET #favourited_by' do - let(:status) { Fabricate(:status, account: user.account) } + describe 'GET #show' do + it 'returns http unautharized' do + get :show, params: { id: status.id } + expect(response).to have_http_status(:missing) + end + end - before do - post :favourite, params: { id: status.id } + describe 'GET #context' do + before do + Fabricate(:status, account: user.account, thread: status) + end + + it 'returns http unautharized' do + get :context, params: { id: status.id } + expect(response).to have_http_status(:missing) + end + end + + describe 'GET #card' do + it 'returns http unautharized' do + get :card, params: { id: status.id } + expect(response).to have_http_status(:missing) + end + end + + describe 'GET #reblogged_by' do + before do + post :reblog, params: { id: status.id } + end + + it 'returns http unautharized' do + get :reblogged_by, params: { id: status.id } + expect(response).to have_http_status(:missing) + end + end + + describe 'GET #favourited_by' do + before do + post :favourite, params: { id: status.id } + end + + it 'returns http unautharized' do + get :favourited_by, params: { id: status.id } + expect(response).to have_http_status(:missing) + end + end end - it 'returns http success' do - get :favourited_by, params: { id: status.id } - expect(response).to have_http_status(:success) - end - end + context 'with a public status' do + let(:status) { Fabricate(:status, account: user.account, visibility: :public) } - describe 'POST #create' do - before do - post :create, params: { status: 'Hello world' } - end + describe 'GET #show' do + it 'returns http success' do + get :show, params: { id: status.id } + expect(response).to have_http_status(:success) + end + end - it 'returns http success' do - expect(response).to have_http_status(:success) - end - end + describe 'GET #context' do + before do + Fabricate(:status, account: user.account, thread: status) + end - describe 'DELETE #destroy' do - let(:status) { Fabricate(:status, account: user.account) } + it 'returns http success' do + get :context, params: { id: status.id } + expect(response).to have_http_status(:success) + end + end - before do - post :destroy, params: { id: status.id } - end + describe 'GET #card' do + it 'returns http success' do + get :card, params: { id: status.id } + expect(response).to have_http_status(:success) + end + end - it 'returns http success' do - expect(response).to have_http_status(:success) - end + describe 'GET #reblogged_by' do + before do + post :reblog, params: { id: status.id } + end - it 'removes the status' do - expect(Status.find_by(id: status.id)).to be nil - end - end + it 'returns http success' do + get :reblogged_by, params: { id: status.id } + expect(response).to have_http_status(:success) + end + end - describe 'POST #reblog' do - let(:status) { Fabricate(:status, account: user.account) } + describe 'GET #favourited_by' do + before do + post :favourite, params: { id: status.id } + end - before do - post :reblog, params: { id: status.id } - end - - it 'returns http success' do - expect(response).to have_http_status(:success) - end - - it 'updates the reblogs count' do - expect(status.reblogs.count).to eq 1 - end - - it 'updates the reblogged attribute' do - expect(user.account.reblogged?(status)).to be true - end - - it 'return json with updated attributes' do - hash_body = body_as_json - - expect(hash_body[:reblog][:id]).to eq status.id - expect(hash_body[:reblog][:reblogs_count]).to eq 1 - expect(hash_body[:reblog][:reblogged]).to be true - end - end - - describe 'POST #unreblog' do - let(:status) { Fabricate(:status, account: user.account) } - - before do - post :reblog, params: { id: status.id } - post :unreblog, params: { id: status.id } - end - - it 'returns http success' do - expect(response).to have_http_status(:success) - end - - it 'updates the reblogs count' do - expect(status.reblogs.count).to eq 0 - end - - it 'updates the reblogged attribute' do - expect(user.account.reblogged?(status)).to be false - end - end - - describe 'POST #favourite' do - let(:status) { Fabricate(:status, account: user.account) } - - before do - post :favourite, params: { id: status.id } - end - - it 'returns http success' do - expect(response).to have_http_status(:success) - end - - it 'updates the favourites count' do - expect(status.favourites.count).to eq 1 - end - - it 'updates the favourited attribute' do - expect(user.account.favourited?(status)).to be true - end - - it 'return json with updated attributes' do - hash_body = body_as_json - - expect(hash_body[:id]).to eq status.id - expect(hash_body[:favourites_count]).to eq 1 - expect(hash_body[:favourited]).to be true - end - end - - describe 'POST #unfavourite' do - let(:status) { Fabricate(:status, account: user.account) } - - before do - post :favourite, params: { id: status.id } - post :unfavourite, params: { id: status.id } - end - - it 'returns http success' do - expect(response).to have_http_status(:success) - end - - it 'updates the favourites count' do - expect(status.favourites.count).to eq 0 - end - - it 'updates the favourited attribute' do - expect(user.account.favourited?(status)).to be false + it 'returns http success' do + get :favourited_by, params: { id: status.id } + expect(response).to have_http_status(:success) + end + end end end end diff --git a/spec/controllers/auth/registrations_controller_spec.rb b/spec/controllers/auth/registrations_controller_spec.rb index 6b26e66931..c2141766eb 100644 --- a/spec/controllers/auth/registrations_controller_spec.rb +++ b/spec/controllers/auth/registrations_controller_spec.rb @@ -16,9 +16,12 @@ RSpec.describe Auth::RegistrationsController, type: :controller do end describe 'POST #create' do + let(:accept_language) { Rails.application.config.i18n.available_locales.sample.to_s } + before do Setting.open_registrations = true request.env["devise.mapping"] = Devise.mappings[:user] + request.headers["Accept-Language"] = accept_language post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678' } } end @@ -27,7 +30,9 @@ RSpec.describe Auth::RegistrationsController, type: :controller do end it 'creates user' do - expect(User.find_by(email: 'test@example.com')).to_not be_nil + user = User.find_by(email: 'test@example.com') + expect(user).to_not be_nil + expect(user.locale).to eq(accept_language) end end end diff --git a/spec/controllers/follower_accounts_controller_spec.rb b/spec/controllers/follower_accounts_controller_spec.rb new file mode 100644 index 0000000000..82d2b2067c --- /dev/null +++ b/spec/controllers/follower_accounts_controller_spec.rb @@ -0,0 +1,14 @@ +require 'rails_helper' + +describe FollowerAccountsController do + render_views + let(:alice) { Fabricate(:account, username: 'alice') } + + describe 'GET #index' do + it 'returns http success' do + get :index, params: { account_username: alice.username } + + expect(response).to have_http_status(:success) + end + end +end diff --git a/spec/controllers/following_accounts_controller_spec.rb b/spec/controllers/following_accounts_controller_spec.rb new file mode 100644 index 0000000000..5b5a6fe5f2 --- /dev/null +++ b/spec/controllers/following_accounts_controller_spec.rb @@ -0,0 +1,14 @@ +require 'rails_helper' + +describe FollowingAccountsController do + render_views + let(:alice) { Fabricate(:account, username: 'alice') } + + describe 'GET #index' do + it 'returns http success' do + get :index, params: { account_username: alice.username } + + expect(response).to have_http_status(:success) + end + end +end diff --git a/spec/controllers/media_controller_spec.rb b/spec/controllers/media_controller_spec.rb new file mode 100644 index 0000000000..ebf6aa006e --- /dev/null +++ b/spec/controllers/media_controller_spec.rb @@ -0,0 +1,37 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe MediaController do + describe '#show' do + it 'redirects to the file url when attached to a status' do + status = Fabricate(:status) + media_attachment = Fabricate(:media_attachment, status: status) + get :show, params: { id: media_attachment.to_param } + + expect(response).to redirect_to(media_attachment.file.url(:original)) + end + + it 'responds with missing when there is not an attached status' do + media_attachment = Fabricate(:media_attachment, status: nil) + get :show, params: { id: media_attachment.to_param } + + expect(response).to have_http_status(:missing) + end + + it 'raises when shortcode cant be found' do + get :show, params: { id: 'missing' } + + expect(response).to have_http_status(:missing) + end + + it 'raises when not permitted to view' do + status = Fabricate(:status) + media_attachment = Fabricate(:media_attachment, status: status) + allow_any_instance_of(Status).to receive(:permitted?).and_return(false) + get :show, params: { id: media_attachment.to_param } + + expect(response).to have_http_status(:missing) + end + end +end diff --git a/spec/helpers/instance_helper_spec.rb b/spec/helpers/instance_helper_spec.rb new file mode 100644 index 0000000000..c42ed69388 --- /dev/null +++ b/spec/helpers/instance_helper_spec.rb @@ -0,0 +1,33 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe InstanceHelper do + describe 'site_title' do + it 'Uses the Setting.site_title value when it exists' do + Setting.site_title = 'New site title' + + expect(helper.site_title).to eq 'New site title' + end + + it 'returns empty string when Setting.site_title is nil' do + Setting.site_title = nil + + expect(helper.site_title).to eq '' + end + end + + describe 'site_hostname' do + around(:each) do |example| + before = Rails.configuration.x.local_domain + example.run + Rails.configuration.x.local_domain = before + end + + it 'returns the local domain value' do + Rails.configuration.x.local_domain = 'example.com' + + expect(helper.site_hostname).to eq 'example.com' + end + end +end diff --git a/spec/helpers/site_title_helper_spec.rb b/spec/helpers/site_title_helper_spec.rb deleted file mode 100644 index 8cfd9cba1c..0000000000 --- a/spec/helpers/site_title_helper_spec.rb +++ /dev/null @@ -1,15 +0,0 @@ -require "rails_helper" - -describe "site_title" do - it "Uses the Setting.site_title value when it exists" do - Setting.site_title = "New site title" - - expect(helper.site_title).to eq "New site title" - end - - it "returns empty string when Setting.site_title is nil" do - Setting.site_title = nil - - expect(helper.site_title).to eq "" - end -end diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb deleted file mode 100644 index 138d25569a..0000000000 --- a/spec/i18n_spec.rb +++ /dev/null @@ -1,16 +0,0 @@ -# frozen_string_literal: true -require 'i18n/tasks' - -RSpec.describe 'I18n' do - let(:i18n) { I18n::Tasks::BaseTask.new } - let(:missing_keys) { i18n.missing_keys } - let(:unused_keys) { i18n.unused_keys } - - xit 'does not have missing keys' do - expect(missing_keys).to be_empty, "Missing #{missing_keys.leaves.count} i18n keys, run `i18n-tasks missing' to show them" - end - - xit 'does not have unused keys' do - expect(unused_keys).to be_empty, "#{unused_keys.leaves.count} unused i18n keys, run `i18n-tasks unused' to show them" - end -end diff --git a/spec/lib/atom_serializer_spec.rb b/spec/lib/atom_serializer_spec.rb new file mode 100644 index 0000000000..cfca82a284 --- /dev/null +++ b/spec/lib/atom_serializer_spec.rb @@ -0,0 +1,206 @@ +require 'rails_helper' + +RSpec.describe AtomSerializer do + let(:author) { Fabricate(:account, username: 'Sombra', display_name: '1337 haxxor') } + let(:receiver) { Fabricate(:account, username: 'Symmetra') } + + before do + stub_request(:get, "https://cb6e6126.ngrok.io/avatars/original/missing.png").to_return(status: 404) + stub_request(:get, "https://cb6e6126.ngrok.io/headers/original/missing.png").to_return(status: 404) + end + + describe '#author' do + it 'returns dumpable XML with emojis' do + account = Fabricate(:account, display_name: '💩') + xml = AtomSerializer.render(AtomSerializer.new.author(account)) + + expect(xml).to be_a String + expect(xml).to match(/💩<\/poco:displayName>/)
+ end
+
+ it 'returns dumpable XML with invalid characters like \b and \v' do
+ account = Fabricate(:account, display_name: "im l33t\b haxo\b\vr")
+ xml = AtomSerializer.render(AtomSerializer.new.author(account))
+
+ expect(xml).to be_a String
+ expect(xml).to match(/im l33t haxor<\/poco:displayName>/)
+ end
+ end
+
+ describe '#entry' do
+ describe 'with deleted status' do
+ let(:entry) do
+ status = Fabricate(:status, account: author, text: 'boop')
+ entry = status.stream_entry
+ status.destroy
+ entry
+ end
+
+ it 'returns dumpable XML' do
+ xml = AtomSerializer.render(AtomSerializer.new.entry(entry, true))
+ expect(xml).to be_a String
+ expect(xml).to match(/#{TagManager.instance.unique_tag(entry.created_at, entry.activity_id, 'Status')}<\/id>/)
+ end
+
+ it 'triggers delete when processed' do
+ status = double(id: entry.activity_id)
+ service = double
+
+ allow(Status).to receive(:find_by).and_return(status)
+ allow(RemoveStatusService).to receive(:new).and_return(service)
+ allow(service).to receive(:call)
+
+ xml = AtomSerializer.render(AtomSerializer.new.entry(entry, true))
+ ProcessFeedService.new.call(xml, author)
+
+ expect(service).to have_received(:call).with(status)
+ end
+ end
+
+ describe 'with reblog of local user' do
+ it 'returns dumpable XML'
+ it 'creates a reblog'
+ end
+
+ describe 'with reblog of 3rd party user' do
+ it 'returns dumpable XML'
+ it 'creates a reblog with correct author'
+ end
+ end
+
+ describe '#follow_salmon' do
+ let(:xml) do
+ follow = Fabricate(:follow, account: author, target_account: receiver)
+ xml = AtomSerializer.render(AtomSerializer.new.follow_salmon(follow))
+ follow.destroy
+ xml
+ end
+
+ it 'returns dumpable XML' do
+ expect(xml).to be_a String
+ end
+
+ it 'triggers follow when processed' do
+ envelope = OStatus2::Salmon.new.pack(xml, author.keypair)
+ ProcessInteractionService.new.call(envelope, receiver)
+ expect(author.following?(receiver)).to be true
+ end
+ end
+
+ describe '#unfollow_salmon' do
+ let(:xml) do
+ follow = Fabricate(:follow, account: author, target_account: receiver)
+ follow.destroy
+ xml = AtomSerializer.render(AtomSerializer.new.unfollow_salmon(follow))
+ author.follow!(receiver)
+ xml
+ end
+
+ it 'returns dumpable XML' do
+ expect(xml).to be_a String
+ end
+
+ it 'triggers unfollow when processed' do
+ envelope = OStatus2::Salmon.new.pack(xml, author.keypair)
+ ProcessInteractionService.new.call(envelope, receiver)
+ expect(author.following?(receiver)).to be false
+ end
+ end
+
+ describe '#favourite_salmon' do
+ let(:status) { Fabricate(:status, account: receiver, text: 'Everything by design.') }
+
+ let(:xml) do
+ favourite = Fabricate(:favourite, account: author, status: status)
+ xml = AtomSerializer.render(AtomSerializer.new.favourite_salmon(favourite))
+ favourite.destroy
+ xml
+ end
+
+ it 'returns dumpable XML' do
+ expect(xml).to be_a String
+ end
+
+ it 'triggers favourite when processed' do
+ envelope = OStatus2::Salmon.new.pack(xml, author.keypair)
+ ProcessInteractionService.new.call(envelope, receiver)
+ expect(author.favourited?(status)).to be true
+ end
+ end
+
+ describe '#unfavourite_salmon' do
+ let(:status) { Fabricate(:status, account: receiver, text: 'Perfect harmony.') }
+
+ let(:xml) do
+ favourite = Fabricate(:favourite, account: author, status: status)
+ favourite.destroy
+ xml = AtomSerializer.render(AtomSerializer.new.unfavourite_salmon(favourite))
+ Fabricate(:favourite, account: author, status: status)
+ xml
+ end
+
+ it 'returns dumpable XML' do
+ expect(xml).to be_a String
+ end
+
+ it 'triggers unfavourite when processed' do
+ envelope = OStatus2::Salmon.new.pack(xml, author.keypair)
+ ProcessInteractionService.new.call(envelope, receiver)
+ expect(author.favourited?(status)).to be false
+ end
+ end
+
+ describe '#block_salmon' do
+ let(:xml) do
+ block = Fabricate(:block, account: author, target_account: receiver)
+ xml = AtomSerializer.render(AtomSerializer.new.block_salmon(block))
+ block.destroy
+ xml
+ end
+
+ it 'returns dumpable XML' do
+ expect(xml).to be_a String
+ end
+
+ it 'triggers block when processed' do
+ envelope = OStatus2::Salmon.new.pack(xml, author.keypair)
+ ProcessInteractionService.new.call(envelope, receiver)
+ expect(author.blocking?(receiver)).to be true
+ end
+ end
+
+ describe '#unblock_salmon' do
+ let(:xml) do
+ block = Fabricate(:block, account: author, target_account: receiver)
+ block.destroy
+ xml = AtomSerializer.render(AtomSerializer.new.unblock_salmon(block))
+ author.block!(receiver)
+ xml
+ end
+
+ it 'returns dumpable XML' do
+ expect(xml).to be_a String
+ end
+
+ it 'triggers unblock when processed' do
+ envelope = OStatus2::Salmon.new.pack(xml, author.keypair)
+ ProcessInteractionService.new.call(envelope, receiver)
+ expect(author.blocking?(receiver)).to be false
+ end
+ end
+
+ describe '#follow_request_salmon' do
+ it 'returns dumpable XML'
+ it 'triggers follow request when processed'
+ end
+
+ describe '#authorize_follow_request_salmon' do
+ it 'returns dumpable XML'
+ it 'creates follow from follow request when processed'
+ end
+
+ describe '#reject_follow_request_salmon' do
+ it 'returns dumpable XML'
+ it 'deletes follow request when processed'
+ end
+end
diff --git a/spec/lib/formatter_spec.rb b/spec/lib/formatter_spec.rb
index 4b003b8e50..b70231d265 100644
--- a/spec/lib/formatter_spec.rb
+++ b/spec/lib/formatter_spec.rb
@@ -2,7 +2,8 @@ require 'rails_helper'
RSpec.describe Formatter do
let(:account) { Fabricate(:account, username: 'alice') }
- let(:local_status) { Fabricate(:status, text: 'Hello world http://google.com', account: account) }
+ let(:local_text) { 'Hello world http://google.com' }
+ let(:local_status) { Fabricate(:status, text: local_text, account: account) }
let(:remote_status) { Fabricate(:status, text: ' Beep boop', uri: 'beepboop', account: account) }
describe '#format' do
@@ -20,35 +21,81 @@ RSpec.describe Formatter do
expect(subject).to match('http://google.com')
end
+ context 'matches a stand-alone medium URL' do
+ let(:local_text) { 'https://hackernoon.com/the-power-to-build-communities-a-response-to-mark-zuckerberg-3f2cac9148a4' }
+ it 'has valid url' do
+ expect(subject).to include('href="https://hackernoon.com/the-power-to-build-communities-a-response-to-mark-zuckerberg-3f2cac9148a4"')
+ end
+ end
+
+ context 'matches a stand-alone google URL' do
+ let(:local_text) { 'http://google.com' }
+ it 'has valid url' do
+ expect(subject).to include('href="http://google.com"')
+ end
+ end
+
+ context 'matches a URL without trailing period' do
+ let(:local_text) { 'http://www.mcmansionhell.com/post/156408871451/50-states-of-mcmansion-hell-scottsdale-arizona. ' }
+ it 'has valid url' do
+ expect(subject).to include('href="http://www.mcmansionhell.com/post/156408871451/50-states-of-mcmansion-hell-scottsdale-arizona"')
+ end
+ end
+
=begin
- it 'matches a stand-alone medium URL' do
- expect(subject.match('https://hackernoon.com/the-power-to-build-communities-a-response-to-mark-zuckerberg-3f2cac9148a4')[0]).to eq 'https://hackernoon.com/the-power-to-build-communities-a-response-to-mark-zuckerberg-3f2cac9148a4'
- end
-
- it 'matches a stand-alone google URL' do
- expect(subject.match('http://google.com')[0]).to eq 'http://google.com'
- end
-
- it 'matches a URL without trailing period' do
- expect(subject.match('http://www.mcmansionhell.com/post/156408871451/50-states-of-mcmansion-hell-scottsdale-arizona. ')[0]).to eq 'http://www.mcmansionhell.com/post/156408871451/50-states-of-mcmansion-hell-scottsdale-arizona'
- end
-
it 'matches a URL without closing paranthesis' do
expect(subject.match('(http://google.com/)')[0]).to eq 'http://google.com'
end
-
- it 'matches a URL without exclamation point' do
- expect(subject.match('http://www.google.com! ')[0]).to eq 'http://www.google.com'
- end
-
- it 'matches a URL with a query string' do
- expect(subject.match('https://www.ruby-toolbox.com/search?utf8=%E2%9C%93&q=autolink')[0]).to eq 'https://www.ruby-toolbox.com/search?utf8=%E2%9C%93&q=autolink'
- end
-
- it 'matches a URL with parenthesis in it' do
- expect(subject.match('https://en.wikipedia.org/wiki/Diaspora_(software)')[0]).to eq 'https://en.wikipedia.org/wiki/Diaspora_(software)'
- end
=end
+
+ context 'matches a URL without exclamation point' do
+ let(:local_text) { 'http://www.google.com!' }
+ it 'has valid url' do
+ expect(subject).to include('href="http://www.google.com"')
+ end
+ end
+
+ context 'matches a URL without single quote' do
+ let(:local_text) { "http://www.google.com'" }
+ it 'has valid url' do
+ expect(subject).to include('href="http://www.google.com"')
+ end
+ end
+
+ context 'matches a URL without angle brackets' do
+ let(:local_text) { 'http://www.google.com>' }
+ it 'has valid url' do
+ expect(subject).to include('href="http://www.google.com"')
+ end
+ end
+
+ context 'matches a URL with a query string' do
+ let(:local_text) { 'https://www.ruby-toolbox.com/search?utf8=%E2%9C%93&q=autolink' }
+ it 'has valid url' do
+ expect(subject).to include('href="https://www.ruby-toolbox.com/search?utf8=%E2%9C%93&q=autolink"')
+ end
+ end
+
+ context 'matches a URL with parenthesis in it' do
+ let(:local_text) { 'https://en.wikipedia.org/wiki/Diaspora_(software)' }
+ it 'has valid url' do
+ expect(subject).to include('href="https://en.wikipedia.org/wiki/Diaspora_(software)"')
+ end
+ end
+
+ context 'contains html (script tag)' do
+ let(:local_text) { '' }
+ it 'has valid url' do
+ expect(subject).to match ';)
} }
+ it 'has valid url' do
+ expect(subject).to match '
+
);
}
diff --git a/app/assets/javascripts/components/locales/en.jsx b/app/assets/javascripts/components/locales/en.jsx
index 5c12385245..4446bb5f77 100644
--- a/app/assets/javascripts/components/locales/en.jsx
+++ b/app/assets/javascripts/components/locales/en.jsx
@@ -100,7 +100,7 @@ const en = {
"report.placeholder": "Additional comments",
"report.submit": "Submit",
"report.target": "Reporting",
- "search_results.total": "{count} {count, plural, one {result} other {results}}",
+ "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
"search.placeholder": "Search",
"search.status_by": "Status by {name}",
"status.delete": "Delete",
@@ -112,6 +112,7 @@ const en = {
"status.reblog": "Boost",
"status.reblogged_by": "{name} boosted",
"status.reply": "Reply",
+ "status.replyAll": "Reply to thread",
"status.report": "Report @{name}",
"status.sensitive_toggle": "Click to view",
"status.sensitive_warning": "Sensitive content",
diff --git a/app/assets/javascripts/components/locales/fr.jsx b/app/assets/javascripts/components/locales/fr.jsx
index 0a1dd38aef..3a7335964a 100644
--- a/app/assets/javascripts/components/locales/fr.jsx
+++ b/app/assets/javascripts/components/locales/fr.jsx
@@ -81,7 +81,7 @@ const fr = {
"search.placeholder": "Rechercher",
"search.account": "Compte",
"search.hashtag": "Mot-clé",
- "search_results.total": "{count} {count, plural, one {résultat} other {résultats}}",
+ "search_results.total": "{count, number} {count, plural, one {résultat} other {résultats}}",
"search.status_by": "Statuts de {name}",
"upload_button.label": "Joindre un média",
"upload_form.undo": "Annuler",
@@ -99,7 +99,7 @@ const fr = {
"notifications.column_settings.mention": "Mentions :",
"notifications.column_settings.reblog": "Partages :",
"notifications.clear": "Nettoyer",
- "notifications.clear_confirmation": "Voulez-vous vraiment nettoyer toutes vos notifications ?",
+ "notifications.clear_confirmation": "Voulez-vous vraiment supprimer toutes vos notifications ?",
"notifications.settings": "Paramètres de la colonne",
"privacy.public.short": "Public",
"privacy.public.long": "Afficher dans les fils publics",
@@ -123,7 +123,25 @@ const fr = {
"report.heading": "Nouveau signalement",
"report.placeholder": "Commentaires additionnels",
"report.submit": "Envoyer",
- "report.target": "Signalement"
+ "report.target": "Signalement",
+ "onboarding.next": "Suivant",
+ "onboarding.page_one.welcome": "Bienvenue sur Mastodon !",
+ "onboarding.page_one.federation": "Mastodon est un réseau social qui appartient à tou⋅te⋅s.",
+ "onboarding.page_one.handle": "Vous êtes sur {domain}, une des nombreuses instances indépendantes de Mastodon. Votre nom d'utilisateur⋅trice complet est {handle}",
+ "onboarding.page_two.compose": "Écrivez depuis la colonne de composition. Vous pouvez ajouter des images, changer les réglages de confidentialité, et ajouter des avertissements de contenu (Content Warning) grâce aux icônes en dessous.",
+ "onboarding.page_three.search": "Utilisez la barre de recherche pour trouver des utilisateurs⋅trices et regarder des hashtags tels que {illustration} et {introductions}. Pour trouver quelqu'un qui n'est pas sur cette instance, utilisez son nom d'utilisateur⋅trice complet.",
+ "onboarding.page_three.profile": "Modifiez votre profil pour changer votre avatar, votre description ainsi que votre nom. Vous y trouverez également d'autres préférences.",
+ "onboarding.page_four.home": "L'Accueil affiche les posts de tou⋅te⋅s les utilisateurs⋅trices que vous suivez",
+ "onboarding.page_four.notifications": "Les Notifications vous informent lorsque quelqu'un interagit avec vous",
+ "onboarding.page_five.public_timelines": "Le fil public global affiche les posts de tou⋅te⋅s les utilisateurs⋅trices suivi⋅es par les membres de {domain}. Le fil public local est identique mais se limite aux utilisateurs⋅trices de {domain}.",
+ "onboarding.page_six.almost_done": "Nous y sommes presque...",
+ "onboarding.page_six.admin": "L'administrateur⋅trice de votre instance est {admin}",
+ "onboarding.page_six.read_guidelines": "S'il vous plaît, n'oubliez pas de lire les {guidelines} !",
+ "onboarding.page_six.guidelines": "règles de la communauté",
+ "onboarding.page_six.github": "Mastodon est un logiciel libre, gratuit et open-source. Vous pouvez rapporter des bogues, suggérer des fonctionnalités, ou contribuer à son développement sur {github}.",
+ "onboarding.page_six.apps_available": "De nombreuses {apps} sont disponibles pour iOS, Android et autres. Et maintenant... Bon Appetoot!",
+ "onboarding.page_six.various_app": "applications mobiles",
+ "onboarding.skip": "Passer",
};
export default fr;
diff --git a/app/assets/javascripts/components/locales/hr.jsx b/app/assets/javascripts/components/locales/hr.jsx
new file mode 100644
index 0000000000..a7ee2eabda
--- /dev/null
+++ b/app/assets/javascripts/components/locales/hr.jsx
@@ -0,0 +1,124 @@
+/**
+hrvatski jezik
+ */
+const hr = {
+ "account.block": "Blokiraj @{name}",
+ "account.disclaimer": "Ovaj korisnik je sa druge instance. Ovaj broj bi mogao biti veći.",
+ "account.edit_profile": "Uredi profil",
+ "account.follow": "Slijedi",
+ "account.followers": "Sljedbenici",
+ "account.follows_you": "te slijedi",
+ "account.follows": "Slijedi",
+ "account.mention": "Spomeni @{name}",
+ "account.mute": "Utišaj @{name}",
+ "account.posts": "Postovi",
+ "account.report": "Prijavi @{name}",
+ "account.requested": "Čeka pristanak",
+ "account.unblock": "Deblokiraj @{name}",
+ "account.unfollow": "Prestani slijediti",
+ "account.unmute": "Poništi utišavanje @{name}",
+ "boost_modal.combo": "Možeš pritisnuti {combo} kako bi ovo preskočio sljedeći put",
+ "column_back_button.label": "Natrag",
+ "column.blocks": "Blokirani korisnici",
+ "column.community": "Lokalni timeline",
+ "column.favourites": "Favoriti",
+ "column.follow_requests": "Zahtjevi za slijeđenje",
+ "column.home": "Dom",
+ "column.notifications": "Notifikacije",
+ "column.public": "Federalni timeline",
+ "compose_form.placeholder": "Što ti je na umu?",
+ "compose_form.privacy_disclaimer": "Tvoj privatni status će biti dostavljen spomenutim korisnicima na {domains}. Vjeruješ li {domainsCount, plural, one {that server} drugim {those servers}}? Privatnost postova radi samo na Mastodon instancama. Ako {domains} {domainsCount, plural, one {is not a Mastodon instance} other {are not Mastodon instances}}, neće biti indikacije da je tvoj post privatan, i mogao bit biti boosted ili biti učinjen vidljivim na drugi način neželjenim primateljima.",
+ "compose_form.publish": "Toot",
+ "compose_form.sensitive": "Označi media sadržaj kao osjetljiv",
+ "compose_form.spoiler_placeholder": "Upozorenje o sadržaju",
+ "compose_form.spoiler": "Sakrij text iza upozorenja",
+ "emoji_button.label": "Umetni smajlije",
+ "empty_column.community": "Lokalni timeline je prazan. Napiši nešto javno kako bi pokrenuo stvari!",
+ "empty_column.hashtag": "Još ne postoji ništa s ovim hashtagom.",
+ "empty_column.home.public_timeline": "javni timeline",
+ "empty_column.home": "Još ne slijediš nikoga. Posjeti {public} ili koristi tražilicu kako bi počeo i upoznao druge korisnike.",
+ "empty_column.notifications": "Još nemaš notifikacija. Komuniciraj sa drugima kako bi započeo razgovor.",
+ "empty_column.public": "Ovdje nema ništa! Napiši nešto javno, ili ručno slijedi korisnike sa drugih instanci kako bi popunio",
+ "follow_request.authorize": "Authoriziraj",
+ "follow_request.reject": "Odbij",
+ "getting_started.apps": "Dostupne su razne aplikacije",
+ "getting_started.heading": "Počnimo",
+ "getting_started.open_source_notice": "Mastodon je softver otvorenog koda. Možeš pridonijeti ili prijaviti probleme na GitHubu {github}. {apps}.",
+ "home.column_settings.advanced": "Napredno",
+ "home.column_settings.basic": "Osnovno",
+ "home.column_settings.filter_regex": "Filtriraj s regularnim izrazima",
+ "home.column_settings.show_reblogs": "Pokaži boosts",
+ "home.column_settings.show_replies": "Pokaži odgovore",
+ "home.settings": "Postavke Stupca",
+ "lightbox.close": "Zatvori",
+ "loading_indicator.label": "Učitavam...",
+ "media_gallery.toggle_visible": "Preklopi vidljivost",
+ "missing_indicator.label": "Nije nađen",
+ "navigation_bar.blocks": "Blokirani korisnici",
+ "navigation_bar.community_timeline": "Lokalni timeline",
+ "navigation_bar.edit_profile": "Uredi profil",
+ "navigation_bar.favourites": "Favoriti",
+ "navigation_bar.follow_requests": "Zahtjevi za sljeđenje",
+ "navigation_bar.info": "Proširena informacija",
+ "navigation_bar.logout": "Odjavi se",
+ "navigation_bar.preferences": "Postavke",
+ "navigation_bar.public_timeline": "Federalni timeline",
+ "notification.favourite": "{name} je lajkao tvoj status",
+ "notification.follow": "{name} te sada slijedi",
+ "notification.reblog": "{name} je boosted tvoj status",
+ "notifications.clear_confirmation": "Želiš li zaista obrisati sve svoje notifikacije?",
+ "notifications.clear": "Očisti notifikacije",
+ "notifications.column_settings.alert": "Desktop notifikacije",
+ "notifications.column_settings.favourite": "Favoriti:",
+ "notifications.column_settings.follow": "Novi sljedbenici:",
+ "notifications.column_settings.mention": "Spominjanja:",
+ "notifications.column_settings.reblog": "Boosts:",
+ "notifications.column_settings.show": "Prikaži u stupcu",
+ "notifications.column_settings.sound": "Sviraj zvuk",
+ "notifications.settings": "Postavke rubrike",
+ "privacy.change": "Podesi status privatnosti",
+ "privacy.direct.long": "Prikaži samo spomenutim korisnicima",
+ "privacy.direct.short": "Direktno",
+ "privacy.private.long": "Prikaži samo sljedbenicima",
+ "privacy.private.short": "Privatno",
+ "privacy.public.long": "Postaj na javne timeline",
+ "privacy.public.short": "Javno",
+ "privacy.unlisted.long": "Ne prikazuj u javnim timelines",
+ "privacy.unlisted.short": "Unlisted",
+ "reply_indicator.cancel": "Otkaži",
+ "report.heading": "Nova prijava",
+ "report.placeholder": "Dodatni komentari",
+ "report.submit": "Pošalji",
+ "report.target": "Prijavljivanje",
+ "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+ "search.placeholder": "Traži",
+ "search.status_by": "Status od {name}",
+ "status.delete": "Obriši",
+ "status.favourite": "Označi omiljenim",
+ "status.load_more": "Učitaj više",
+ "status.media_hidden": "Sakriven media sadržaj",
+ "status.mention": "Spomeni @{name}",
+ "status.open": "Proširi ovaj status",
+ "status.reblog": "Boost",
+ "status.reblogged_by": "{name} boosted",
+ "status.reply": "Odgovori",
+ "status.report": "Prijavi @{name}",
+ "status.sensitive_toggle": "Klikni da bi vidio",
+ "status.sensitive_warning": "Osjetljiv sadržaj",
+ "status.show_less": "Pokaži manje",
+ "status.show_more": "Pokaži više",
+ "tabs_bar.compose": "Sastavi",
+ "tabs_bar.federated_timeline": "Federalni",
+ "tabs_bar.home": "Dom",
+ "tabs_bar.local_timeline": "Lokalno",
+ "tabs_bar.notifications": "Notifikacije",
+ "upload_area.title": "Povuci & spusti kako bi uploadao",
+ "upload_button.label": "Dodaj media",
+ "upload_form.undo": "Poništi",
+ "upload_progress.label": "Uploadam...",
+ "video_player.toggle_sound": "Toggle zvuk",
+ "video_player.toggle_visible": "Preklopi vidljivost",
+ "video_player.expand": "Proširi video",
+};
+
+export default hr;
diff --git a/app/assets/javascripts/components/locales/index.jsx b/app/assets/javascripts/components/locales/index.jsx
index 7525022b1d..35823748a6 100644
--- a/app/assets/javascripts/components/locales/index.jsx
+++ b/app/assets/javascripts/components/locales/index.jsx
@@ -1,11 +1,15 @@
import en from './en';
import de from './de';
import es from './es';
+import hr from './hr';
import hu from './hu';
+import it from './it';
import fr from './fr';
import nl from './nl';
import no from './no';
+import oc from './oc';
import pt from './pt';
+import pt_br from './pt-br';
import uk from './uk';
import fi from './fi';
import eo from './eo';
@@ -18,11 +22,14 @@ const locales = {
en,
de,
es,
+ hr,
hu,
+ it,
fr,
nl,
no,
pt,
+ 'pt-BR': pt_br,
uk,
fi,
eo,
diff --git a/app/assets/javascripts/components/locales/it.jsx b/app/assets/javascripts/components/locales/it.jsx
new file mode 100644
index 0000000000..04ff1311fc
--- /dev/null
+++ b/app/assets/javascripts/components/locales/it.jsx
@@ -0,0 +1,125 @@
+const it = {
+ "account.block": "Blocca @{name}",
+ "account.disclaimer": "Questo utente si trova su un altro server. Questo numero potrebbe essere maggiore.",
+ "account.edit_profile": "Modifica profilo",
+ "account.follow": "Segui",
+ "account.followers": "Seguaci",
+ "account.follows_you": "Ti segue",
+ "account.follows": "Segue",
+ "account.mention": "Menziona @{name}",
+ "account.mute": "Silenzia @{name}",
+ "account.posts": "Posts",
+ "account.report": "Segnala @{name}",
+ "account.requested": "In attesa di approvazione",
+ "account.unblock": "Sblocca @{name}",
+ "account.unfollow": "Non seguire",
+ "account.unmute": "Non silenziare @{name}",
+ "boost_modal.combo": "Puoi premere {combo} per saltare questo passaggio la prossima volta",
+ "column_back_button.label": "Indietro",
+ "column.blocks": "Utenti bloccati",
+ "column.community": "Timeline locale",
+ "column.favourites": "Apprezzati",
+ "column.follow_requests": "Richieste di amicizia",
+ "column.home": "Home",
+ "column.mutes": "Utenti silenziati",
+ "column.notifications": "Notifiche",
+ "column.public": "Timeline federata",
+ "compose_form.placeholder": "A cosa stai pensando?",
+ "compose_form.privacy_disclaimer": "Il tuo status privato verrà condiviso con gli utenti menzionati su {domains}. Ti fidi di {domainsCount, plural, one {quel server} other {quei server}}? Le impostazioni sulla privacy valgono solo su server Mastodon. Se {domains} {domainsCount, plural, one {non è un server Mastodon} other {non sono server Mastodon}}, non ci saranno indicazioni sulla privacy del tuo status, e potrebbe essere condiviso o reso visibile a destinatari indesiderati.",
+ "compose_form.publish": "Toot",
+ "compose_form.sensitive": "Segnala file come sensibile",
+ "compose_form.spoiler_placeholder": "Content warning",
+ "compose_form.spoiler": "Nascondi testo con avvertimento",
+ "emoji_button.label": "Inserisci emoji",
+ "empty_column.community": "La timeline locale è vuota. Condividi qualcosa pubblicamente per dare inizio alla festa!",
+ "empty_column.hashtag": "Non c'è ancora nessun post con questo hashtag.",
+ "empty_column.home.public_timeline": "la timeline pubblica",
+ "empty_column.home": "Non stai ancora seguendo nessuno. Visita {public} o usa la ricerca per incontrare nuove persone.",
+ "empty_column.notifications": "Non hai ancora nessuna notifica. Interagisci con altri per iniziare conversazioni.",
+ "empty_column.public": "Qui non c'è nulla! Scrivi qualcosa pubblicamente, o aggiungi utenti da altri server per riempire questo spazio.",
+ "follow_request.authorize": "Autorizza",
+ "follow_request.reject": "Rifiuta",
+ "getting_started.apps": "Sono disponibili diverse app",
+ "getting_started.heading": "Come iniziare",
+ "getting_started.open_source_notice": "Mastodon è un software open source. Puoi contribuire o segnalare errori su GitHub all'indirizzo {github}. {apps}.",
+ "home.column_settings.advanced": "Avanzato",
+ "home.column_settings.basic": "Semplice",
+ "home.column_settings.filter_regex": "Filtra con espressioni regolari",
+ "home.column_settings.show_reblogs": "Mostra post condivisi",
+ "home.column_settings.show_replies": "Mostra risposte",
+ "home.settings": "Impostazioni colonna",
+ "lightbox.close": "Chiudi",
+ "loading_indicator.label": "Carico...",
+ "media_gallery.toggle_visible": "Imposta visibilità",
+ "missing_indicator.label": "Non trovato",
+ "navigation_bar.blocks": "Utenti bloccati",
+ "navigation_bar.community_timeline": "Timeline locale",
+ "navigation_bar.edit_profile": "Modifica profilo",
+ "navigation_bar.favourites": "Apprezzati",
+ "navigation_bar.follow_requests": "Richieste di amicizia",
+ "navigation_bar.info": "Informazioni estese",
+ "navigation_bar.logout": "Logout",
+ "navigation_bar.mutes": "Utenti silenziati",
+ "navigation_bar.preferences": "Impostazioni",
+ "navigation_bar.public_timeline": "Timeline federata",
+ "notification.favourite": "{name} ha apprezzato il tuo post",
+ "notification.follow": "{name} ha iniziato a seguirti",
+ "notification.mention": "{name} ti ha menzionato",
+ "notification.reblog": "{name} ha condiviso il tuo post",
+ "notifications.clear_confirmation": "Vuoi davvero cancellare tutte le notifiche?",
+ "notifications.clear": "Cancella notifiche",
+ "notifications.column_settings.alert": "Notifiche desktop",
+ "notifications.column_settings.favourite": "Apprezzati:",
+ "notifications.column_settings.follow": "Nuovi seguaci:",
+ "notifications.column_settings.mention": "Menzioni:",
+ "notifications.column_settings.reblog": "Post condivisi:",
+ "notifications.column_settings.show": "Mostra in colonna",
+ "notifications.column_settings.sound": "Riproduci suono",
+ "notifications.settings": "Impostazioni colonna",
+ "privacy.change": "Modifica privacy post",
+ "privacy.direct.long": "Invia solo a utenti menzionati",
+ "privacy.direct.short": "Diretto",
+ "privacy.private.long": "Invia solo ai seguaci",
+ "privacy.private.short": "Privato",
+ "privacy.public.long": "Invia alla timeline pubblica",
+ "privacy.public.short": "Pubblico",
+ "privacy.unlisted.long": "Non mostrare sulla timeline pubblica",
+ "privacy.unlisted.short": "Non elencato",
+ "reply_indicator.cancel": "Annulla",
+ "report.heading": "Nuova segnalazione",
+ "report.placeholder": "Commenti aggiuntivi",
+ "report.submit": "Invia",
+ "report.target": "Invio la segnalazione",
+ "search_results.total": "{count} {count, plural, one {risultato} other {risultati}}",
+ "search.placeholder": "Cerca",
+ "search.status_by": "Status per {name}",
+ "status.delete": "Elimina",
+ "status.favourite": "Apprezzato",
+ "status.load_more": "Mostra di più",
+ "status.media_hidden": "Allegato nascosto",
+ "status.mention": "Nomina @{name}",
+ "status.open": "Espandi questo post",
+ "status.reblog": "Condividi",
+ "status.reblogged_by": "{name} ha condiviso",
+ "status.reply": "Rispondi",
+ "status.report": "Segnala @{name}",
+ "status.sensitive_toggle": "Clicca per vedere",
+ "status.sensitive_warning": "Materiale sensibile",
+ "status.show_less": "Mostra meno",
+ "status.show_more": "Mostra di più",
+ "tabs_bar.compose": "Scrivi",
+ "tabs_bar.federated_timeline": "Federazione",
+ "tabs_bar.home": "Home",
+ "tabs_bar.local_timeline": "Locale",
+ "tabs_bar.notifications": "Notifiche",
+ "upload_area.title": "Trascina per caricare",
+ "upload_button.label": "Aggiungi file multimediale",
+ "upload_form.undo": "Annulla",
+ "upload_progress.label": "Sto caricando...",
+ "video_player.toggle_sound": "Attiva suono",
+ "video_player.toggle_visible": "Attiva visibilità",
+ "video_player.expand": "Espandi video",
+ "video_player.video_error": "Il video non può essere riprodotto",
+};
+
+export default it;
\ No newline at end of file
diff --git a/app/assets/javascripts/components/locales/ja.jsx b/app/assets/javascripts/components/locales/ja.jsx
index 79defd3256..6126fae07f 100644
--- a/app/assets/javascripts/components/locales/ja.jsx
+++ b/app/assets/javascripts/components/locales/ja.jsx
@@ -1,17 +1,17 @@
const ja = {
- "account.block": "@{name} さんをブロック",
+ "account.block": "ブロック",
"account.disclaimer": "このユーザーは他のインスタンスに所属しているため、数字が正確で無い場合があります。",
"account.edit_profile": "プロフィールを編集",
"account.follow": "フォロー",
"account.followers": "フォロワー",
"account.follows": "フォロー",
"account.follows_you": "フォローされています",
- "account.mention": "@{name} さんに返信",
+ "account.mention": "返信",
"account.mute": "ミュート",
"account.posts": "投稿",
- "account.report": "@{name}を通報する",
+ "account.report": "通報",
"account.requested": "承認待ち",
- "account.unblock": "@{name} さんのブロックを解除",
+ "account.unblock": "ブロック解除",
"account.unfollow": "フォロー解除",
"account.unmute": "ミュート解除",
"boost_modal.combo": "次からは{combo}を押せば、これをスキップできます。",
@@ -76,6 +76,24 @@ const ja = {
"notifications.column_settings.show": "カラムに表示",
"notifications.column_settings.sound": "通知音を再生",
"notifications.settings": "カラム設定",
+ "onboarding.next": "次へ",
+ "onboarding.page_one.welcome": "Mastodonへようこそ！",
+ "onboarding.page_one.federation": "Mastodonは誰でも参加できるSNSです。",
+ "onboarding.page_one.handle": "あなたは今数あるMastodonインスタンスの1つである{domain}にいます。あなたのフルハンドルは{handle}です。",
+ "onboarding.page_two.compose": "フォームから投稿できます。イメージや、公開範囲の設定や、表示時の警告の設定は下部のアイコンから行なえます。",
+ "onboarding.page_three.search": "検索バーで、{illustration}や{introductions}のように特定のハッシュタグの投稿を見たり、ユーザーを探したりできます。",
+ "onboarding.page_three.profile": "「プロフィールを編集」から、あなたの自己紹介や表示名を変更できます。またそこでは他の設定ができます。",
+ "onboarding.page_four.home": "「ホーム」タイムラインではあなたがフォローしている人の投稿を表示します。",
+ "onboarding.page_four.notifications": "「通知」ではあなたへの他の人からの関わりを表示します。",
+ "onboarding.page_five.public_timelines": "連合タイムラインでは{domain}の人がフォローしているMastodon全体での公開投稿を表示します。同じくローカルタイムラインでは{domain}のみの公開投稿を表示します。",
+ "onboarding.page_six.almost_done": "以上です。",
+ "onboarding.page_six.admin": "あなたのインスタンスの管理者は{admin}です。",
+ "onboarding.page_six.read_guidelines": "{guidelines}を読むことを忘れないようにしてください。",
+ "onboarding.page_six.guidelines": "コミュニティガイドライン",
+ "onboarding.page_six.github": "MastodonはOSSです。バグ報告や機能要望あるいは貢献を{github}から行なえます。",
+ "onboarding.page_six.apps_available": "iOS、Androidあるいは他のプラットフォームで使える{apps}があります。",
+ "onboarding.page_six.various_app": "様々なモバイルアプリ",
+ "onboarding.skip": "スキップ",
"privacy.change": "投稿のプライバシーを変更",
"privacy.direct.long": "メンションしたユーザーだけに公開",
"privacy.direct.short": "ダイレクト",
@@ -92,17 +110,18 @@ const ja = {
"report.target": "問題のユーザー",
"search.placeholder": "検索",
"search.status_by": "{name}からの投稿",
- "search_results.total": "{count} {count, plural, one {result} other {results}} 件",
+ "search_results.total": "{count, number} 件の結果",
"status.delete": "削除",
"status.favourite": "お気に入り",
"status.load_more": "もっと見る",
"status.media_hidden": "非表示のメデイア",
- "status.mention": "@{name} さんへの返信",
+ "status.mention": "返信",
"status.open": "詳細を表示",
"status.reblog": "ブースト",
"status.reblogged_by": "{name} さんにブーストされました",
"status.reply": "返信",
- "status.report": "@{name} さんを通報",
+ "status.replyAll": "全員に返信",
+ "status.report": "通報",
"status.sensitive_toggle": "クリックして表示",
"status.sensitive_warning": "不適切なコンテンツ",
"status.show_less": "隠す",
diff --git a/app/assets/javascripts/components/locales/nl.jsx b/app/assets/javascripts/components/locales/nl.jsx
index 8fc3a422fc..310cfafb14 100644
--- a/app/assets/javascripts/components/locales/nl.jsx
+++ b/app/assets/javascripts/components/locales/nl.jsx
@@ -22,47 +22,69 @@ const nl = {
"account.followers": "Volgers",
"account.follows_you": "Volgt jou",
"account.requested": "Wacht op goedkeuring",
+ "account.mute": "@{name} negeren",
+ "account.unmute": "@{name} niet meer negeren",
+ "account.report": "Report @{name}",
"getting_started.heading": "Beginnen",
- "getting_started.about_addressing": "Je kunt mensen volgen als je hun gebruikersnaam en het domein van hun server kent, door het e-mailachtige adres in het zoekscherm in te voeren.",
- "getting_started.about_shortcuts": "Als de gezochte gebruiker op hetzelfde domein zit als jijzelf, is invoeren van de gebruikersnaam genoeg. Dat geldt ook als je mensen in de statussen wilt vermelden.",
+ "getting_started.about_addressing": "Je kunt mensen volgen als je hun gebruikersnaam en het domein van hun server kent. Voer hiervoor het e-mailachtige adres in het zoekveld in.",
+ "getting_started.about_shortcuts": "Als de gezochte gebruiker op hetzelfde domein zit als jijzelf, is invoeren van de gebruikersnaam genoeg. Dat geldt ook als je mensen in toots wilt vermelden.",
"getting_started.open_source_notice": "Mastodon is open-sourcesoftware. Je kunt bijdragen of problemen melden op GitHub via {github}. {apps}.",
- "column.home": "Thuis",
+ "column.home": "Jouw tijdlijn",
"column.community": "Lokale tijdlijn",
- "column.public": "Federatietijdlijn",
+ "column.public": "Globale tijdlijn",
"column.notifications": "Meldingen",
"tabs_bar.compose": "Schrijven",
- "tabs_bar.home": "Thuis",
+ "tabs_bar.home": "Jouw tijdlijn",
"tabs_bar.mentions": "Vermeldingen",
- "tabs_bar.public": "Federatietijdlijn",
+ "tabs_bar.public": "Globale tijdlijn",
"tabs_bar.notifications": "Meldingen",
"compose_form.placeholder": "Waar ben je mee bezig?",
"compose_form.publish": "Toot",
"compose_form.sensitive": "Media als gevoelig markeren",
"compose_form.spoiler": "Tekst achter waarschuwing verbergen",
+ "compose_form.spoiler_placeholder": "Waarschuwingstekst",
"compose_form.private": "Als privé markeren",
- "compose_form.privacy_disclaimer": "Je besloten status wordt afgeleverd aan vermelde gebruikers op {domains}. Vertrouw je {domainsCount, plural, one {that server} andere {those servers}}? Privé plaatsen werkt alleen op Mastodon servers. Als {domains} {domainsCount, plural, een {is not a Mastodon instance} andere {are not Mastodon instances}}, dan wordt er geen indicatie gegeven dat he bericht besloten is, waardoor het kan worden geboost of op andere manier zichtbaar worden voor niet bedoelde lezers.",
+ "compose_form.privacy_disclaimer": "Jouw privétoot wordt afgeleverd aan de vermelde gebruikers op {domains}. Vertrouw jij {domainsCount, plural, one {that server} andere {those servers}}? Het privé plaatsen van toots werkt alleen op Mastodon-servers. Als {domains} {domainsCount, plural, een {is not a Mastodon instance} andere {are not Mastodon instances}}, dan wordt er niet aangegeven dat de toot besloten is, waardoor het kan worden geboost of op een andere manier zichtbaar wordt gemaakt voor mensen waarvoor het niet was bedoeld.",
"compose_form.unlisted": "Niet op openbare tijdlijnen tonen",
"navigation_bar.edit_profile": "Profiel bewerken",
"navigation_bar.preferences": "Voorkeuren",
"navigation_bar.community_timeline": "Lokale tijdlijn",
- "navigation_bar.public_timeline": "Federatietijdlijn",
+ "navigation_bar.public_timeline": "Globale tijdlijn",
+ "navigation_bar.follow_requests": "Volgverzoeken",
+ "navigation_bar.info": "Uitgebreide informatie",
+ "navigation_bar.blocks": "Geblokkeerde gebruikers",
+ "navigation_bar.mutes": "Genegeerde gebruikers",
"navigation_bar.logout": "Afmelden",
"reply_indicator.cancel": "Annuleren",
"search.placeholder": "Zoeken",
"search.account": "Account",
"search.hashtag": "Hashtag",
+ "search_results.total": "{count, number} {count, plural, one {resultaat} other {resultaten}}",
"upload_button.label": "Media toevoegen",
"upload_form.undo": "Ongedaan maken",
- "notification.follow": "{name} volgde jou",
- "notification.favourite": "{name} markeerde je status als favoriet",
- "notification.reblog": "{name} boostte je status",
+ "notification.follow": "{name} volgt jou nu",
+ "notification.favourite": "{name} markeerde jouw toot als favoriet",
+ "notification.reblog": "{name} boostte jouw toot",
"notification.mention": "{name} vermeldde jou",
+ "notifications.clear_confirmation": "Weet je zeker dat je al jouw meldingen wilt verwijderen?",
+ "notifications.clear": "Meldingen verwijderen",
"notifications.column_settings.alert": "Desktopmeldingen",
"notifications.column_settings.show": "In kolom tonen",
"notifications.column_settings.follow": "Nieuwe volgers:",
"notifications.column_settings.favourite": "Favorieten:",
"notifications.column_settings.mention": "Vermeldingen:",
"notifications.column_settings.reblog": "Boosts:",
+ "notifications.column_settings.sound": "Geluid afspelen",
+ "notifications.settings": "Kolom-instellingen",
+ "privacy.change": "Privacy toot aanpassen",
+ "privacy.direct.long": "Toot alleen naar vermelde gebruikers",
+ "privacy.direct.short": "Direct",
+ "privacy.private.long": "Toot alleen naar jouw volgers",
+ "privacy.private.short": "Privé",
+ "privacy.public.long": "Toot naar openbare tijdlijnen",
+ "privacy.public.short": "Openbaar",
+ "privacy.unlisted.long": "Niet op openbare tijdlijnen weergeven",
+ "privacy.unlisted.short": "Minder openbaar",
};
export default nl;
diff --git a/app/assets/javascripts/components/locales/no.jsx b/app/assets/javascripts/components/locales/no.jsx
index 43715fb5ca..7839c3cc0b 100644
--- a/app/assets/javascripts/components/locales/no.jsx
+++ b/app/assets/javascripts/components/locales/no.jsx
@@ -33,7 +33,7 @@ const no = {
"empty_column.community": "Den lokale tidslinjen er tom. Skriv noe offentlig for å få snøballen til å rulle!",
"empty_column.hashtag": "Det er ingenting i denne hashtagen ennå.",
"empty_column.home.public_timeline": "en offentlig tidslinje",
- "empty_column.home": "Du har ikke fulgt noen ennå. Besøk {publlic} eller bruk søk for å komme i gang og møte andre brukere.",
+ "empty_column.home": "Du har ikke fulgt noen ennå. Besøk {publlic} eller bruk søk for å komme i gang og møte andre brukere.",
"empty_column.notifications": "Du har ingen varsler ennå. Kommuniser med andre for å begynne samtalen.",
"empty_column.public": "Det er ingenting her! Skriv noe offentlig, eller følg brukere manuelt fra andre instanser for å fylle den opp",
"follow_request.authorize": "Autorisér",
@@ -87,7 +87,7 @@ const no = {
"report.placeholder": "Tilleggskommentarer",
"report.submit": "Send inn",
"report.target": "Rapporterer",
- "search_results.total": "{count} {count, plural, one {resultat} other {resultater}}",
+ "search_results.total": "{count, number} {count, plural, one {resultat} other {resultater}}",
"search.placeholder": "Søk",
"search.status_by": "Status fra {name}",
"status.delete": "Slett",
diff --git a/app/assets/javascripts/components/locales/oc.jsx b/app/assets/javascripts/components/locales/oc.jsx
new file mode 100644
index 0000000000..bd18b760f9
--- /dev/null
+++ b/app/assets/javascripts/components/locales/oc.jsx
@@ -0,0 +1,128 @@
+const oc = {
+ "column_back_button.label": "Tornar",
+ "lightbox.close": "Tampar",
+ "loading_indicator.label": "Cargament…",
+ "status.mention": "Mencionar",
+ "status.delete": "Escafar",
+ "status.reply": "Respondre",
+ "status.reblog": "Partejar",
+ "status.favourite": "Apondre als favorits",
+ "status.reblogged_by": "{name} a partejat :",
+ "status.sensitive_warning": "Contengut embarrassant",
+ "status.sensitive_toggle": "Clicar per mostrar",
+ "status.show_more": "Desplegar",
+ "status.show_less": "Tornar plegar",
+ "status.open": "Desplegar aqueste estatut",
+ "status.report": "Senhalar @{name}",
+ "status.load_more": "Cargar mai",
+ "status.media_hidden": "Mèdia rescondut",
+ "video_player.toggle_sound": "Activar/Desactivar lo son",
+ "video_player.toggle_visible": "Mostrar/Rescondre la vidèo",
+ "account.mention": "Mencionar",
+ "account.edit_profile": "Modificar lo perfil",
+ "account.unblock": "Desblocar",
+ "account.unfollow": "Quitar de sègre",
+ "account.block": "Blocar",
+ "account.mute": "Rescondre",
+ "account.unmute": "Quitar de rescondre",
+ "account.follow": "Sègre",
+ "account.posts": "Estatuts",
+ "account.follows": "Abonaments",
+ "account.followers": "Abonats",
+ "account.follows_you": "Vos sèc",
+ "account.requested": "Invitacion mandada",
+ "account.report": "Senhalar",
+ "account.disclaimer": "Aqueste compte es sus una autra instància. Los nombres pòdon èsser mai grandes.",
+ "getting_started.heading": "Per començar",
+ "getting_started.about_addressing": "Podètz sègre los estatuts de qualqu'un en picant son identificant e lo domeni de l'instància separat amb un @ coma una adreàa de corrièl dins lo camp de recèrca.",
+ "getting_started.about_shortcuts": "Se aquesta persona emplega la meteissa instància que vos l'identifican basta. Atal foncionan tanben las mencions dins vòstres estatuts.",
+ "getting_started.about_developer": "Per sègre lo desvolopaire d'aqueste projècte : Gargron@mastodon.social",
+ "getting_started.open_source_notice": "Mastodon es un logicial liure. Podètz contribuir e mandar vòstres comentaris e rapòrt de bug via{github} sus GitHub.",
+ "column.home": "Acuèlh",
+ "column.community": "Fil public local",
+ "column.public": "Fil public global",
+ "column.notifications": "Notificacions",
+ "column.blocks": "Utilizaires blocats",
+ "column.favourites": "Favorits",
+ "column.follow_requests": "Demandas d'abonament",
+ "empty_column.notifications": "Avètz pas encara de notificacions. Respondètz a qualqu'un per començar una conversacion.",
+ "empty_column.public": "I a pas res aquí ! Escribètz quicòm de public, o seguètz d'utilizaires d'autras instàncias per garnir lo fil public.",
+ "empty_column.home": "Pel moment segètz pas segun. Visitatz {public} o utilizatz la recèrca per vos connectar a d'autres personas.",
+ "empty_column.home.public_timeline": "lo fil public",
+ "empty_column.community": "Lo fil public local es void. Escribètz quicòm per lo garnir !",
+ "empty_column.hashtag": "I a pas encara de contengut ligat a aqueste hashtag",
+ "tabs_bar.compose": "Compausar",
+ "tabs_bar.home": "Acuèlh",
+ "tabs_bar.mentions": "Mencions",
+ "tabs_bar.public": "Fil public global",
+ "tabs_bar.notifications": "Notifications",
+ "tabs_bar.local_timeline": "Fil public local",
+ "tabs_bar.federated_timeline": "Fil public global",
+ "compose_form.placeholder": "Qué pensatz ?",
+ "compose_form.publish": "Tut",
+ "compose_form.sensitive": "Marcar lo mèdia coma embarrassant",
+ "compose_form.spoiler": "Rescondre lo tèxte darrièr un avertiment",
+ "compose_form.spoiler_placeholder": "Avertiment",
+ "compose_form.private": "Far venir privat",
+ "compose_form.privacy_disclaimer": "Vòstre estatut privat serà enviat a las personas mencionadas sus {domains}. Vos fisatz d'aqueste{domainsCount, plural, one { servidor} other {s servidors}} per divulgar pas vòstre estatut ? Los estatuts privats foncionan pas que sus las instàncias a Mastodons. Se {domains} {domainsCount, plural, one {es pas una instància a Mastodon} other {son pas d'instàncias a Mastodon}}, i aurà pas d'indicacion disent que vòstre estatut es privat e poirà èsser partejat o èsser visible a de mond pas prevists",
+ "compose_form.unlisted": "Mostrar pas dins los fils publics",
+ "emoji_button.label": "Inserir un emoji",
+ "navigation_bar.edit_profile": "Modificar lo perfil",
+ "navigation_bar.preferences": "Preferéncias",
+ "navigation_bar.community_timeline": "Fil public local",
+ "navigation_bar.public_timeline": "Fil public global",
+ "navigation_bar.blocks": "Utilizaires blocats",
+ "navigation_bar.favourites": "Favorits",
+ "navigation_bar.info": "Mai informacions",
+ "navigation_bar.logout": "Desconnexion",
+ "navigation_bar.follow_requests": "Demandas d'abonament",
+ "reply_indicator.cancel": "Anullar",
+ "search.placeholder": "Recercar",
+ "search.account": "Compte",
+ "search.hashtag": "Mot-clau",
+ "search_results.total": "{count, number} {count, plural, one {resultat} other {resultats}}",
+ "search.status_by": "Estatuts de {name}",
+ "upload_button.label": "Apondre un mèdia",
+ "upload_form.undo": "Anullar",
+ "upload_progress.label": "Mandadís…",
+ "upload_area.title": "Lisatz e depausatz per mandar",
+ "notification.follow": "{name} vos sèc.",
+ "notification.favourite": "{name} a apondut a sos favorits :",
+ "notification.reblog": "{name} a partejat vòstre estatut :",
+ "notification.mention": "{name} vos a mencionat :",
+ "notifications.column_settings.alert": "Notificacions localas",
+ "notifications.column_settings.show": "Mostrar dins la colomna",
+ "notifications.column_settings.sound": "Emetre un son",
+ "notifications.column_settings.follow": "Nòus abonats :",
+ "notifications.column_settings.favourite": "Favorits :",
+ "notifications.column_settings.mention": "Mencions :",
+ "notifications.column_settings.reblog": "Partatges :",
+ "notifications.clear": "Levar",
+ "notifications.clear_confirmation": "Volètz vertadièrament levar totas vòstras las notificacions ?",
+ "notifications.settings": "Paramètres de la colomna",
+ "privacy.public.short": "Public",
+ "privacy.public.long": "Mostrar dins los fils publics",
+ "privacy.unlisted.short": "Pas-listat",
+ "privacy.unlisted.long": "Mostrar pas dins los fils publics",
+ "privacy.private.short": "Privat",
+ "privacy.private.long": "Mostrar pas qu'a vòstres abonats",
+ "privacy.direct.short": "Dirècte",
+ "privacy.direct.long": "Mostrar pas qu'a las personas mencionadas",
+ "privacy.change": "Ajustar la confidencialitat del messatge",
+ "media_gallery.toggle_visible": "Modificar la visibilitat",
+ "missing_indicator.label": "Pas trobat",
+ "follow_request.authorize": "Autorizar",
+ "follow_request.reject": "Regetar",
+ "home.settings": "Paramètres de la colomna",
+ "home.column_settings.basic": "Basic",
+ "home.column_settings.show_reblogs": "Mostrar los partatges",
+ "home.column_settings.show_replies": "Mostrar las responsas",
+ "home.column_settings.advanced": "Avançat",
+ "home.column_settings.filter_regex": "Filtrar amb una expression racionala",
+ "report.heading": "Nòu senhalament",
+ "report.placeholder": "Comentaris addicionals",
+ "report.submit": "Mandat",
+ "report.target": "Senhalament"
+};
+
+export default oc;
diff --git a/app/assets/javascripts/components/locales/pt-br.jsx b/app/assets/javascripts/components/locales/pt-br.jsx
new file mode 100644
index 0000000000..91c74bb195
--- /dev/null
+++ b/app/assets/javascripts/components/locales/pt-br.jsx
@@ -0,0 +1,125 @@
+const pt_br = {
+ "account.block": "Bloquear @{name}",
+ "account.disclaimer": "Essa conta está localizado em outra instância. Os nomes podem ser maiores.",
+ "account.edit_profile": "Editar perfil",
+ "account.follow": "Seguir",
+ "account.followers": "Seguidores",
+ "account.follows_you": "É teu seguidor",
+ "account.follows": "Segue",
+ "account.mention": "Mencionar @{name}",
+ "account.mute": "Silenciar @{name}",
+ "account.posts": "Posts",
+ "account.report": "Denunciar @{name}",
+ "account.requested": "A aguardar aprovação",
+ "account.unblock": "Não bloquear @{name}",
+ "account.unfollow": "Deixar de seguir",
+ "account.unmute": "Não silenciar @{name}",
+ "boost_modal.combo": "Pode clicar {combo} para não voltar a ver",
+ "column_back_button.label": "Voltar",
+ "column.blocks": "Utilizadores Bloqueados",
+ "column.community": "Local",
+ "column.favourites": "Favoritos",
+ "column.follow_requests": "Seguidores Pendentes",
+ "column.home": "Home",
+ "column.mutes": "Utilizadores silenciados",
+ "column.notifications": "Notificações",
+ "column.public": "Global",
+ "compose_form.placeholder": "Em que estás a pensar?",
+ "compose_form.privacy_disclaimer": "O teu conteúdo privado vai ser partilhado com os utilizadores do {domains}. Confias {domainsCount, plural, one {neste servidor} other {nestes servidores}}? A privacidade só funciona em instâncias do Mastodon. Se {domains} {domainsCount, plural, one {não é uma instância} other {não são instâncias}}, não existem indicadores da privacidade da tua partilha, e podem ser partilhados com outros.",
+ "compose_form.publish": "Publicar",
+ "compose_form.sensitive": "Marcar media como conteúdo sensível",
+ "compose_form.spoiler_placeholder": "Aviso de conteúdo",
+ "compose_form.spoiler": "Esconder texto com aviso",
+ "emoji_button.label": "Inserir Emoji",
+ "empty_column.community": "Ainda não existem conteúdo local para mostrar!",
+ "empty_column.hashtag": "Ainda não existe qualquer conteúdo com essa hashtag",
+ "empty_column.home.public_timeline": "global",
+ "empty_column.home": "Ainda não segues qualquer utilizador. Visita {public} ou utiliza a pesquisa para procurar outros utilizadores.",
+ "empty_column.notifications": "Não tens notificações. Interage com outros utilizadores para iniciar uma conversa.",
+ "empty_column.public": "Não há nada aqui! Escreve algo publicamente ou segue outros utilizadores para ver aqui os conteúdos públicos.",
+ "follow_request.authorize": "Autorizar",
+ "follow_request.reject": "Rejeitar",
+ "getting_started.apps": "Existem várias aplicações disponíveis",
+ "getting_started.heading": "Primeiros passos",
+ "getting_started.open_source_notice": "Mastodon é software de fonte aberta. Podes contribuir ou repostar problemas no GitHub do projecto: {github}. {apps}.",
+ "home.column_settings.advanced": "Avançado",
+ "home.column_settings.basic": "Básico",
+ "home.column_settings.filter_regex": "Filtrar com uma expressão regular",
+ "home.column_settings.show_reblogs": "Mostrar as partilhas",
+ "home.column_settings.show_replies": "Mostrar as respostas",
+ "home.settings": "Parâmetros da listagem Home",
+ "lightbox.close": "Fechar",
+ "loading_indicator.label": "Carregando...",
+ "media_gallery.toggle_visible": "Esconder/Mostrar",
+ "missing_indicator.label": "Não encontrado",
+ "navigation_bar.blocks": "Utilizadores bloqueados",
+ "navigation_bar.community_timeline": "Local",
+ "navigation_bar.edit_profile": "Editar perfil",
+ "navigation_bar.favourites": "Favoritos",
+ "navigation_bar.follow_requests": "Seguidores pendentes",
+ "navigation_bar.info": "Mais informações",
+ "navigation_bar.logout": "Sair",
+ "navigation_bar.mutes": "Utilizadores silenciados",
+ "navigation_bar.preferences": "Preferências",
+ "navigation_bar.public_timeline": "Global",
+ "notification.favourite": "{name} adicionou o teu post aos favoritos",
+ "notification.follow": "{name} seguiu-te",
+ "notification.mention": "{name} mencionou-te",
+ "notification.reblog": "{name} partilhou o teu post",
+ "notifications.clear_confirmation": "Queres mesmo limpar todas as notificações?",
+ "notifications.clear": "Limpar notificações",
+ "notifications.column_settings.alert": "Notificações no computador",
+ "notifications.column_settings.favourite": "Favoritos:",
+ "notifications.column_settings.follow": "Novos seguidores:",
+ "notifications.column_settings.mention": "Menções:",
+ "notifications.column_settings.reblog": "Partilhas:",
+ "notifications.column_settings.show": "Mostrar nas colunas",
+ "notifications.column_settings.sound": "Reproduzir som",
+ "notifications.settings": "Parâmetros da listagem de Notificações",
+ "privacy.change": "Ajustar a privacidade da mensagem",
+ "privacy.direct.long": "Apenas para utilizadores mencionados",
+ "privacy.direct.short": "Directo",
+ "privacy.private.long": "Apenas para os seguidores",
+ "privacy.private.short": "Privado",
+ "privacy.public.long": "Publicar em todos os feeds",
+ "privacy.public.short": "Público",
+ "privacy.unlisted.long": "Não publicar nos feeds públicos",
+ "privacy.unlisted.short": "Não listar",
+ "reply_indicator.cancel": "Cancelar",
+ "report.heading": "Nova denúncia",
+ "report.placeholder": "Comentários adicionais",
+ "report.submit": "Enviar",
+ "report.target": "Denunciar",
+ "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
+ "search.placeholder": "Pesquisar",
+ "search.status_by": "Post de {name}",
+ "status.delete": "Eliminar",
+ "status.favourite": "Adicionar aos favoritos",
+ "status.load_more": "Carregar mais",
+ "status.media_hidden": "Media escondida",
+ "status.mention": "Mencionar @{name}",
+ "status.open": "Expandir",
+ "status.reblog": "Partilhar",
+ "status.reblogged_by": "{name} partilhou",
+ "status.reply": "Responder",
+ "status.report": "Denúnciar @{name}",
+ "status.sensitive_toggle": "Clique para ver",
+ "status.sensitive_warning": "Conteúdo sensível",
+ "status.show_less": "Mostrar menos",
+ "status.show_more": "Mostrar mais",
+ "tabs_bar.compose": "Criar",
+ "tabs_bar.federated_timeline": "Global",
+ "tabs_bar.home": "Home",
+ "tabs_bar.local_timeline": "Local",
+ "tabs_bar.notifications": "Notificações",
+ "upload_area.title": "Arraste e solte para enviar",
+ "upload_button.label": "Adicionar media",
+ "upload_form.undo": "Anular",
+ "upload_progress.label": "A gravar...",
+ "video_player.toggle_sound": "Ligar/Desligar som",
+ "video_player.toggle_visible": "Ligar/Desligar vídeo",
+ "video_player.expand": "Expandir vídeo",
+ "video_player.video_error": "Não é possível ver o vídeo",
+};
+
+export default pt_br;
diff --git a/app/assets/javascripts/components/locales/pt.jsx b/app/assets/javascripts/components/locales/pt.jsx
index cd345a585b..03095d20dc 100644
--- a/app/assets/javascripts/components/locales/pt.jsx
+++ b/app/assets/javascripts/components/locales/pt.jsx
@@ -1,128 +1,125 @@
const pt = {
- "column_back_button.label": "Voltar",
- "lightbox.close": "Fechar",
- "loading_indicator.label": "Carregando...",
- "status.mention": "Mencionar @{name}",
- "status.delete": "Eliminar",
- "status.reply": "Responder",
- "status.reblog": "Partilhar",
- "status.favourite": "Adicionar aos favoritos",
- "status.reblogged_by": "{name} partilhou",
- "status.sensitive_warning": "Conteúdo sensível",
- "status.sensitive_toggle": "Clique para ver",
- "status.show_more": "Mostrar mais",
- "status.show_less": "Mostrar menos",
- "status.open": "Expandir",
- "status.report": "Reportar @{name}",
- "status.load_more": "Carregar mais",
- "status.media_hidden": "Media escondida",
- "video_player.toggle_sound": "Ligar/Desligar som",
- "video_player.toggle_visible": "Ligar/Desligar vídeo",
- "account.mention": "Mencionar @{name}",
- "account.edit_profile": "Editar perfil",
- "account.unblock": "Não bloquear @{name}",
- "account.unfollow": "Não seguir",
"account.block": "Bloquear @{name}",
- "account.mute": "Mute",
- "account.unmute": "Remover Mute",
+ "account.disclaimer": "Essa conta está localizado em outra instância. Os nomes podem ser maiores.",
+ "account.edit_profile": "Editar perfil",
"account.follow": "Seguir",
- "account.posts": "Posts",
- "account.follows": "Segue",
"account.followers": "Seguidores",
"account.follows_you": "É teu seguidor",
+ "account.follows": "Segue",
+ "account.mention": "Mencionar @{name}",
+ "account.mute": "Silenciar @{name}",
+ "account.posts": "Posts",
+ "account.report": "Denunciar @{name}",
"account.requested": "A aguardar aprovação",
- "account.report": "Denunciar",
- "account.disclaimer": "Essa conta está localizado em outra instância. Os nomes podem ser maiores.",
- "getting_started.heading": "Primeiros passos",
- "getting_started.about_addressing": "Podes seguir pessoas se sabes o nome de usuário deles e o domínio em que estão colocando um endereço similar a e-mail no campo no topo da barra lateral.",
- "getting_started.about_shortcuts": "Se o usuário alvo está no mesmo domínio, só o nome funcionará. A mesma regra se aplica a mencionar pessoas nas postagens.",
- "getting_started.about_developer": "Pode seguir o developer deste projecto em Gargron@mastodon.social",
- "getting_started.open_source_notice": "Mastodon é software de fonte aberta. Podes contribuir ou repostar problemas no GitHub do projecto: {github}. {apps}.",
- "column.home": "Home",
- "column.community": "Local",
- "column.public": "Global",
- "column.notifications": "Notificações",
+ "account.unblock": "Não bloquear @{name}",
+ "account.unfollow": "Deixar de seguir",
+ "account.unmute": "Não silenciar @{name}",
+ "boost_modal.combo": "Pode clicar {combo} para não voltar a ver",
+ "column_back_button.label": "Voltar",
"column.blocks": "Utilizadores Bloqueados",
+ "column.community": "Local",
"column.favourites": "Favoritos",
"column.follow_requests": "Seguidores Pendentes",
- "empty_column.notifications": "Não tens notificações. Interage com outros utilizadores para iniciar uma conversa.",
- "empty_column.public": "Não há nada aqui! Escreve algo publicamente ou segue outros utilizadores para ver aqui os conteúdos públicos.",
- "empty_column.home": "Ainda não segues qualquer utilizador. Visita {public} ou utiliza a pesquisa para procurar outros utilizadores.",
- "empty_column.home.public_timeline": "global",
- "empty_column.community": "Ainda não existem conteúdo local para mostrar!",
- "empty_column.hashtag": "Não existe qualquer conteúdo com essa hashtag",
- "tabs_bar.compose": "Criar",
- "tabs_bar.home": "Home",
- "tabs_bar.mentions": "Menções",
- "tabs_bar.public": "Público",
- "tabs_bar.notifications": "Notificações",
- "tabs_bar.local_timeline": "Local",
- "tabs_bar.federated_timeline": "Global",
+ "column.home": "Home",
+ "column.mutes": "Utilizadores silenciados",
+ "column.notifications": "Notificações",
+ "column.public": "Global",
"compose_form.placeholder": "Em que estás a pensar?",
+ "compose_form.privacy_disclaimer": "O teu conteúdo privado vai ser partilhado com os utilizadores do {domains}. Confias {domainsCount, plural, one {neste servidor} other {nestes servidores}}? A privacidade só funciona em instâncias do Mastodon. Se {domains} {domainsCount, plural, one {não é uma instância} other {não são instâncias}}, não existem indicadores da privacidade da tua partilha, e podem ser partilhados com outros.",
"compose_form.publish": "Publicar",
"compose_form.sensitive": "Marcar media como conteúdo sensível",
+ "compose_form.spoiler_placeholder": "Aviso de conteúdo",
"compose_form.spoiler": "Esconder texto com aviso",
- "compose_form.spoiler_placeholder": "Aviso",
- "compose_form.private": "Tornar privado",
- "compose_form.privacy_disclaimer": "O teu conteúdo privado vai ser partilhado com os utilizadores do {domains}. Confias {domainsCount, plural, one {neste servidor} other {nestes servidores}}? A privacidade só funciona em instâncias do Mastodon. Se {domains} {domainsCount, plural, one {não é uma instância} other {não são instâncias}}, não existem indicadores da privacidade da tua partilha, e podem ser partilhados com outros.",
- "compose_form.unlisted": "Não mostrar na listagem pública",
"emoji_button.label": "Inserir Emoji",
- "navigation_bar.edit_profile": "Editar perfil",
- "navigation_bar.preferences": "Preferências",
- "navigation_bar.community_timeline": "Local",
- "navigation_bar.public_timeline": "Global",
- "navigation_bar.blocks": "Utilizadores bloqueados",
- "navigation_bar.favourites": "Favoritos",
- "navigation_bar.info": "Mais informações",
- "navigation_bar.logout": "Sair",
- "navigation_bar.follow_requests": "Seguidores pendentes",
- "reply_indicator.cancel": "Cancelar",
- "search.placeholder": "Pesquisar",
- "search.account": "Conta",
- "search.hashtag": "Hashtag",
- "search_results.total": "{count} {count, plural, one {resultado} other {resultados}}",
- "search.status_by": "Post de {name}",
- "upload_button.label": "Adicionar media",
- "upload_form.undo": "Anular",
- "upload_progress.label": "A gravar…",
- "upload_area.title": "Arraste e solte para enviar",
- "notification.follow": "{name} seguiu-te",
- "notification.favourite": "{name} adicionou o teu post aos favoritos",
- "notification.reblog": "{name} partilhou o teu post",
- "notification.mention": "{name} mencionou-te",
- "notifications.column_settings.alert": "Notificações no computador",
- "notifications.column_settings.show": "Mostrar nas colunas",
- "notifications.column_settings.sound": "Reproduzir som",
- "notifications.column_settings.follow": "Novos seguidores:",
- "notifications.column_settings.favourite": "Favoritos:",
- "notifications.column_settings.mention": "Menções:",
- "notifications.column_settings.reblog": "Partilhas:",
- "notifications.clear": "Limpar notificações",
- "notifications.clear_confirmation": "Queres mesmo limpar todas as notificações?",
- "notifications.settings": "Parâmetros da lista de Notificações",
- "privacy.public.short": "Público",
- "privacy.public.long": "Publicar em todos os feeds",
- "privacy.unlisted.short": "Não listar",
- "privacy.unlisted.long": "Não publicar nos feeds públicos",
- "privacy.private.short": "Privado",
- "privacy.private.long": "Apenas para os seguidores",
- "privacy.direct.short": "Directo",
- "privacy.direct.long": "Apenas para utilizadores mencionados",
- "privacy.change": "Ajustar a privacidade da mensagem",
- "media_gallery.toggle_visible": "Modificar a visibilidade",
- "missing_indicator.label": "Não encontrado",
+ "empty_column.community": "Ainda não existem conteúdo local para mostrar!",
+ "empty_column.hashtag": "Ainda não existe qualquer conteúdo com essa hashtag",
+ "empty_column.home.public_timeline": "global",
+ "empty_column.home": "Ainda não segues qualquer utilizador. Visita {public} ou utiliza a pesquisa para procurar outros utilizadores.",
+ "empty_column.notifications": "Não tens notificações. Interage com outros utilizadores para iniciar uma conversa.",
+ "empty_column.public": "Não há nada aqui! Escreve algo publicamente ou segue outros utilizadores para ver aqui os conteúdos públicos.",
"follow_request.authorize": "Autorizar",
"follow_request.reject": "Rejeitar",
- "home.settings": "Parâmetros da coluna Home",
+ "getting_started.apps": "Existem várias aplicações disponíveis",
+ "getting_started.heading": "Primeiros passos",
+ "getting_started.open_source_notice": "Mastodon é software de fonte aberta. Podes contribuir ou repostar problemas no GitHub do projecto: {github}. {apps}.",
+ "home.column_settings.advanced": "Avançado",
"home.column_settings.basic": "Básico",
+ "home.column_settings.filter_regex": "Filtrar com uma expressão regular",
"home.column_settings.show_reblogs": "Mostrar as partilhas",
"home.column_settings.show_replies": "Mostrar as respostas",
- "home.column_settings.advanced": "Avançadas",
- "home.column_settings.filter_regex": "Filtrar com uma expressão regular",
- "report.heading": "Nova denuncia",
+ "home.settings": "Parâmetros da listagem Home",
+ "lightbox.close": "Fechar",
+ "loading_indicator.label": "Carregando...",
+ "media_gallery.toggle_visible": "Esconder/Mostrar",
+ "missing_indicator.label": "Não encontrado",
+ "navigation_bar.blocks": "Utilizadores bloqueados",
+ "navigation_bar.community_timeline": "Local",
+ "navigation_bar.edit_profile": "Editar perfil",
+ "navigation_bar.favourites": "Favoritos",
+ "navigation_bar.follow_requests": "Seguidores pendentes",
+ "navigation_bar.info": "Mais informações",
+ "navigation_bar.logout": "Sair",
+ "navigation_bar.mutes": "Utilizadores silenciados",
+ "navigation_bar.preferences": "Preferências",
+ "navigation_bar.public_timeline": "Global",
+ "notification.favourite": "{name} adicionou o teu post aos favoritos",
+ "notification.follow": "{name} seguiu-te",
+ "notification.mention": "{name} mencionou-te",
+ "notification.reblog": "{name} partilhou o teu post",
+ "notifications.clear_confirmation": "Queres mesmo limpar todas as notificações?",
+ "notifications.clear": "Limpar notificações",
+ "notifications.column_settings.alert": "Notificações no computador",
+ "notifications.column_settings.favourite": "Favoritos:",
+ "notifications.column_settings.follow": "Novos seguidores:",
+ "notifications.column_settings.mention": "Menções:",
+ "notifications.column_settings.reblog": "Partilhas:",
+ "notifications.column_settings.show": "Mostrar nas colunas",
+ "notifications.column_settings.sound": "Reproduzir som",
+ "notifications.settings": "Parâmetros da listagem de Notificações",
+ "privacy.change": "Ajustar a privacidade da mensagem",
+ "privacy.direct.long": "Apenas para utilizadores mencionados",
+ "privacy.direct.short": "Directo",
+ "privacy.private.long": "Apenas para os seguidores",
+ "privacy.private.short": "Privado",
+ "privacy.public.long": "Publicar em todos os feeds",
+ "privacy.public.short": "Público",
+ "privacy.unlisted.long": "Não publicar nos feeds públicos",
+ "privacy.unlisted.short": "Não listar",
+ "reply_indicator.cancel": "Cancelar",
+ "report.heading": "Nova denúncia",
"report.placeholder": "Comentários adicionais",
"report.submit": "Enviar",
- "report.target": "Denunciar"
+ "report.target": "Denunciar",
+ "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
+ "search.placeholder": "Pesquisar",
+ "search.status_by": "Post de {name}",
+ "status.delete": "Eliminar",
+ "status.favourite": "Adicionar aos favoritos",
+ "status.load_more": "Carregar mais",
+ "status.media_hidden": "Media escondida",
+ "status.mention": "Mencionar @{name}",
+ "status.open": "Expandir",
+ "status.reblog": "Partilhar",
+ "status.reblogged_by": "{name} partilhou",
+ "status.reply": "Responder",
+ "status.report": "Denúnciar @{name}",
+ "status.sensitive_toggle": "Clique para ver",
+ "status.sensitive_warning": "Conteúdo sensível",
+ "status.show_less": "Mostrar menos",
+ "status.show_more": "Mostrar mais",
+ "tabs_bar.compose": "Criar",
+ "tabs_bar.federated_timeline": "Global",
+ "tabs_bar.home": "Home",
+ "tabs_bar.local_timeline": "Local",
+ "tabs_bar.notifications": "Notificações",
+ "upload_area.title": "Arraste e solte para enviar",
+ "upload_button.label": "Adicionar media",
+ "upload_form.undo": "Anular",
+ "upload_progress.label": "A gravar...",
+ "video_player.toggle_sound": "Ligar/Desligar som",
+ "video_player.toggle_visible": "Ligar/Desligar vídeo",
+ "video_player.expand": "Expandir vídeo",
+ "video_player.video_error": "Não é possível ver o vídeo",
};
export default pt;
diff --git a/app/assets/javascripts/components/locales/ru.jsx b/app/assets/javascripts/components/locales/ru.jsx
index 5d84527b64..afc8c10586 100644
--- a/app/assets/javascripts/components/locales/ru.jsx
+++ b/app/assets/javascripts/components/locales/ru.jsx
@@ -1,127 +1,125 @@
const ru = {
- "column_back_button.label": "Назад",
- "lightbox.close": "Закрыть",
- "loading_indicator.label": "Загрузка...",
- "missing_indicator.label": "Не найдено",
- "status.mention": "Упомянуть @{name}",
- "status.media_hidden": "Медиаконтент скрыт",
- "status.delete": "Удалить",
- "status.reply": "Ответить",
- "status.reblog": "Продвинуть",
- "status.favourite": "Нравится",
- "status.reblogged_by": "{name} продвинул(а)",
- "status.sensitive_warning": "Чувствительный контент",
- "status.sensitive_toggle": "Нажмите для просмотра",
- "status.show_more": "Развернуть",
- "status.show_less": "Свернуть",
- "status.open": "Развернуть статус",
- "status.report": "Пожаловаться",
- "status.load_more": "Показать еще",
- "video_player.toggle_sound": "Вкл./выкл. звук",
- "video_player.toggle_visible": "Показать/скрыть",
+ "account.block": "Блокировать",
"account.disclaimer": "Это пользователь с другого узла. Число может быть больше.",
- "account.mention": "Упомянуть",
"account.edit_profile": "Изменить профиль",
+ "account.follow": "Подписаться",
+ "account.followers": "Подписаны",
+ "account.follows": "Подписки",
+ "account.follows_you": "Подписан(а) на Вас",
+ "account.mention": "Упомянуть",
+ "account.mute": "Заглушить",
+ "account.posts": "Посты",
+ "account.report": "Пожаловаться",
+ "account.requested": "Ожидает подтверждения",
"account.unblock": "Разблокировать",
"account.unfollow": "Отписаться",
- "account.block": "Блокировать",
- "account.mute": "Заглушить",
- "account.report": "Пожаловаться",
"account.unmute": "Снять глушение",
- "account.follow": "Подписаться",
- "account.posts": "Посты",
- "account.follows": "Подписки",
- "account.followers": "Подписаны",
- "account.follows_you": "Подписан(а) на Вас",
- "account.requested": "Ожидает подтверждения",
"boost_modal.combo": "Нажмите {combo}, чтобы пропустить это в следующий раз",
- "getting_started.heading": "Добро пожаловать",
- "getting_started.about_addressing": "Вы можете подписаться на человека, зная имя пользователя и домен, на котором он находится, введя e-mail-подобный адрес в форму поиска.",
- "getting_started.about_shortcuts": "Если пользователь находится на одном с Вами домене, можно использовать только имя. То же правило применимо к упоминанию пользователей в статусах.",
- "getting_started.open_source_notice": "Mastodon - программа с открытым исходным кодом. Вы можете помочь проекту или сообщить о проблемах на GitHub по адресу {github}. {apps}.",
- "getting_started.apps": "Доступны различные приложения.",
- "column.home": "Главная",
- "column.community": "Локальная лента",
- "column.public": "Глобальная лента",
- "column.notifications": "Уведомления",
- "column.favourites": "Понравившееся",
"column.blocks": "Список блокировки",
+ "column.community": "Локальная лента",
+ "column.favourites": "Понравившееся",
"column.follow_requests": "Запросы на подписку",
- "tabs_bar.compose": "Написать",
- "tabs_bar.home": "Главная",
- "tabs_bar.mentions": "Упоминания",
- "tabs_bar.public": "Глобальная лента",
- "tabs_bar.notifications": "Уведомления",
- "tabs_bar.local_timeline": "Локальная",
- "tabs_bar.federated_timeline": "Глобальная",
+ "column.home": "Главная",
+ "column.mutes": "Список глушения",
+ "column.notifications": "Уведомления",
+ "column.public": "Глобальная лента",
+ "column_back_button.label": "Назад",
"compose_form.placeholder": "О чем Вы думаете?",
+ "compose_form.privacy_disclaimer": "Ваш приватный статус будет доставлен упомянутым пользователям на доменах {domains}. Доверяете ли вы {domainsCount, plural, one {этому серверу} other {этим серверам}}? Приватность постов работает только на узлах Mastodon. Если {domains} {domainsCount, plural, one {не является узлом Mastodon} other {не являются узлами Mastodon}}, приватность поста не будет указана, и он может оказаться продвинут или иным образом показан не обозначенным Вами пользователям.",
"compose_form.publish": "Трубить",
"compose_form.sensitive": "Отметить как чувствительный контент",
"compose_form.spoiler": "Скрыть текст за предупреждением",
- "compose_form.private": "Отметить как приватное",
- "compose_form.privacy_disclaimer": "Ваш приватный статус будет доставлен упомянутым пользователям на доменах {domains}. Доверяете ли вы {domainsCount, plural, one {этому серверу} other {этим серверам}}? Приватность постов работает только на узлах Mastodon. Если {domains} {domainsCount, plural, one {не является узлом Mastodon} other {не являются узлами Mastodon}}, приватность поста не будет указана, и он может оказаться продвинут или иным образом показан не обозначенным Вами пользователям.",
- "compose_form.unlisted": "Не отображать в публичных лентах",
- "compose_form.spoiler_placeholder": "Не для всех",
- "navigation_bar.edit_profile": "Изменить профиль",
- "navigation_bar.preferences": "Опции",
- "navigation_bar.community_timeline": "Локальная лента",
- "navigation_bar.public_timeline": "Глобальная лента",
- "navigation_bar.logout": "Выйти",
- "navigation_bar.info": "Об узле",
- "navigation_bar.favourites": "Понравившееся",
+ "compose_form.spoiler_placeholder": "Предупреждение о скрытом тексте",
+ "emoji_button.label": "Вставить эмодзи",
+ "empty_column.community": "Локальная лента пуста. Напишите что-нибудь, чтобы разогреть народ!",
+ "empty_column.hashtag": "Статусов с таким хэштегом еще не существует.",
+ "empty_column.home": "Пока Вы ни на кого не подписаны. Полистайте {public} или используйте поиск, чтобы освоиться и завести новые знакомства.",
+ "empty_column.home.public_timeline": "публичные ленты",
+ "empty_column.notifications": "У Вас еще нет уведомлений. Заведите знакомство с другими пользователями, чтобы начать разговор.",
+ "empty_column.public": "Здесь ничего нет! Опубликуйте что-нибудь или подпишитесь на пользователей с других узлов, чтобы заполнить ленту.",
+ "follow_request.authorize": "Авторизовать",
+ "follow_request.reject": "Отказать",
+ "getting_started.apps": "Доступны различные приложения.",
+ "getting_started.heading": "Добро пожаловать",
+ "getting_started.open_source_notice": "Mastodon - программа с открытым исходным кодом. Вы можете помочь проекту или сообщить о проблемах на GitHub по адресу {github}. {apps}.",
+ "home.column_settings.advanced": "Дополнительные",
+ "home.column_settings.basic": "Основные",
+ "home.column_settings.filter_regex": "Отфильтровать регулярным выражением",
+ "home.column_settings.show_reblogs": "Показывать продвижения",
+ "home.column_settings.show_replies": "Показывать ответы",
+ "home.settings": "Настройки колонки",
+ "lightbox.close": "Закрыть",
+ "loading_indicator.label": "Загрузка...",
+ "media_gallery.toggle_visible": "Показать/скрыть",
+ "missing_indicator.label": "Не найдено",
"navigation_bar.blocks": "Список блокировки",
+ "navigation_bar.community_timeline": "Локальная лента",
+ "navigation_bar.edit_profile": "Изменить профиль",
+ "navigation_bar.favourites": "Понравившееся",
"navigation_bar.follow_requests": "Запросы на подписку",
+ "navigation_bar.info": "Об узле",
+ "navigation_bar.logout": "Выйти",
+ "navigation_bar.mutes": "Список глушения",
+ "navigation_bar.preferences": "Опции",
+ "navigation_bar.public_timeline": "Глобальная лента",
+ "notification.favourite": "{name} понравился Ваш статус",
+ "notification.follow": "{name} подписался(-лась) на Вас",
+ "notification.mention": "{name} упомянул(а) Вас",
+ "notification.reblog": "{name} продвинул(а) Ваш статус",
+ "notifications.clear": "Очистить уведомления",
+ "notifications.clear_confirmation": "Вы уверены, что хотите очистить все уведомления?",
+ "notifications.column_settings.alert": "Десктопные уведомления",
+ "notifications.column_settings.favourite": "Нравится:",
+ "notifications.column_settings.follow": "Новые подписчики:",
+ "notifications.column_settings.mention": "Упоминания:",
+ "notifications.column_settings.reblog": "Продвижения:",
+ "notifications.column_settings.show": "Показывать в колонке",
+ "notifications.column_settings.sound": "Проигрывать звук",
+ "notifications.settings": "Настройки колонки",
+ "privacy.change": "Изменить видимость статуса",
+ "privacy.direct.long": "Показать только упомянутым",
+ "privacy.direct.short": "Направленный",
+ "privacy.private.long": "Показать только подписчикам",
+ "privacy.private.short": "Приватный",
+ "privacy.public.long": "Показать в публичных лентах",
+ "privacy.public.short": "Публичный",
+ "privacy.unlisted.long": "Не показывать в лентах",
+ "privacy.unlisted.short": "Скрытый",
"reply_indicator.cancel": "Отмена",
- "report.target": "Жалуемся на",
"report.heading": "Новая жалоба",
"report.placeholder": "Комментарий",
"report.submit": "Отправить",
+ "report.target": "Жалуемся на",
"search.placeholder": "Поиск",
- "search.account": "Аккаунт",
- "search.hashtag": "Хэштег",
"search.status_by": "Статус от {name}",
+ "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+ "status.delete": "Удалить",
+ "status.favourite": "Нравится",
+ "status.load_more": "Показать еще",
+ "status.media_hidden": "Медиаконтент скрыт",
+ "status.mention": "Упомянуть @{name}",
+ "status.open": "Развернуть статус",
+ "status.reblog": "Продвинуть",
+ "status.reblogged_by": "{name} продвинул(а)",
+ "status.reply": "Ответить",
+ "status.report": "Пожаловаться",
+ "status.sensitive_toggle": "Нажмите для просмотра",
+ "status.sensitive_warning": "Чувствительный контент",
+ "status.show_less": "Свернуть",
+ "status.show_more": "Развернуть",
+ "tabs_bar.compose": "Написать",
+ "tabs_bar.federated_timeline": "Глобальная",
+ "tabs_bar.home": "Главная",
+ "tabs_bar.local_timeline": "Локальная",
+ "tabs_bar.notifications": "Уведомления",
"upload_area.title": "Перетащите сюда, чтобы загрузить",
"upload_button.label": "Добавить медиаконтент",
"upload_form.undo": "Отменить",
"upload_progress.label": "Загрузка...",
- "notification.follow": "{name} подписался(-лась) на Вас",
- "notification.favourite": "{name} понравился Ваш статус",
- "notification.reblog": "{name} продвинул(а) Ваш статус",
- "notification.mention": "{name} упомянул(а) Вас",
- "home.settings": "Настройки колонки",
- "home.column_settings.basic": "Основные",
- "home.column_settings.advanced": "Дополнительные",
- "home.column_settings.filter_regex": "Отфильтровать регулярным выражением",
- "home.column_settings.show_reblogs": "Показывать продвижения",
- "home.column_settings.show_replies": "Показывать ответы",
- "notifications.clear": "Очистить уведомления",
- "notifications.clear_confirmation": "Вы уверены, что хотите очистить все уведомления?",
- "notifications.settings": "Настройки колонки",
- "notifications.column_settings.alert": "Десктопные уведомления",
- "notifications.column_settings.show": "Показывать в колонке",
- "notifications.column_settings.follow": "Новые подписчики:",
- "notifications.column_settings.favourite": "Нравится:",
- "notifications.column_settings.mention": "Упоминания:",
- "notifications.column_settings.reblog": "Продвижения:",
- "notifications.column_settings.sound": "Проигрывать звук",
- "empty_column.notifications": "У Вас еще нет уведомлений. Заведите знакомство с другими пользователями, чтобы начать разговор.",
- "empty_column.hashtag": "Статусов с таким хэштегом еще не существует.",
- "empty_column.community": "Локальная лента пуста. Напишите что-нибудь, чтобы разогреть народ!",
- "empty_column.public": "Здесь ничего нет! Опубликуйте что-нибудь или подпишитесь на пользователей с других узлов, чтобы заполнить ленту.",
- "empty_column.home": "Пока Вы ни на кого не подписаны. Полистайте {public} или используйте поиск, чтобы освоиться и завести новые знакомства.",
- "empty_column.home.public_timeline": "публичные ленты",
- "privacy.public.short": "Публичный",
- "privacy.public.long": "Показать в публичных лентах",
- "privacy.unlisted.short": "Скрытый",
- "privacy.unlisted.long": "Не показывать в лентах",
- "privacy.private.short": "Приватный",
- "privacy.private.long": "Показать только подписчикам",
- "privacy.direct.short": "Направленный",
- "privacy.direct.long": "Показать только упомянутым",
- "emoji_button.label": "Вставить эмодзи",
- "follow_request.authorize": "Авторизовать",
- "follow_request.reject": "Отказать",
- "media_gallery.toggle_visible": "Показать/скрыть",
+ "video_player.expand": "Развернуть видео",
+ "video_player.toggle_sound": "Вкл./выкл. звук",
+ "video_player.toggle_visible": "Показать/скрыть",
+ "video_player.video_error": "Видео не может быть проиграно",
};
export default ru;
diff --git a/app/assets/javascripts/components/locales/zh-cn.jsx b/app/assets/javascripts/components/locales/zh-cn.jsx
new file mode 100644
index 0000000000..bce1b8fc35
--- /dev/null
+++ b/app/assets/javascripts/components/locales/zh-cn.jsx
@@ -0,0 +1,157 @@
+import zh from 'react-intl/locale-data/zh';
+
+const localeData = zh.reduce(function (acc, localeData) {
+ if (localeData.locale === "zh-Hans-CN") {
+ // rename the locale "zh-Hans-CN" as "zh-CN"
+ // (match the code usually used in Accepted-Language header)
+ acc.push(Object.assign({},
+ localeData,
+ {
+ "locale": "zh-CN",
+ "parentLocale": "zh-Hans-CN",
+ }
+ ));
+ }
+ return acc;
+}, []);
+
+export { localeData as localeData };
+
+const zh_cn = {
+ "account.block": "屏蔽 @{name}",
+ "account.disclaimer": "由于这个账户处于另一个服务站，实际数字会比这个更多。",
+ "account.edit_profile": "修改个人资料",
+ "account.follow": "关注",
+ "account.followers": "关注者",
+ "account.follows_you": "关注你",
+ "account.follows": "正关注",
+ "account.mention": "提及 @{name}",
+ "account.mute": "将 @{name} 静音",
+ "account.posts": "嘟文",
+ "account.report": "举报 @{name}",
+ "account.requested": "等候审批",
+ "account.unblock": "解除对 @{name} 的屏蔽",
+ "account.unfollow": "取消关注",
+ "account.unmute": "取消 @{name} 的静音",
+ "boost_modal.combo": "如你想在下次路过时显示，请按{combo}，",
+ "column_back_button.label": "返回",
+ "column.blocks": "屏蔽用户",
+ "column.community": "本站时间轴",
+ // intentional departure from existing "推文" translation for posts:
+ // "推文" refers to "推特", the official translation for Twitter.
+ // Currently using a semi-phonetic translation "嘟", which refers
+ // to train horn sounds, for "toot".
+ "column.favourites": "赞过的嘟文",
+ "column.follow_requests": "关注请求",
+ "column.home": "主页",
+ "column.notifications": "通知",
+ "column.public": "跨站公共时间轴",
+ "compose_form.placeholder": "在想啥？",
+ "compose_form.privacy_disclaimer": "你的私人嘟文，将被发送至你所提及的 {domains} 用户。你是否信任 {domainsCount, plural, one {这个网站} other {这些网站}}？请留意，嘟文隐私设置只适用于各 Mastodon 服务站，如果 {domains} {domainsCount, plural, one {不是 Mastodon 服务站} other {之中有些不是 Mastodon 服务站}}，对方将无法收到这篇嘟文的隐私设置，然后可能被转嘟给不能预知的用户阅读。",
+ "compose_form.private": "标示为“只有关注你的人能看”",
+ // Going "toot-toot!" here below.
+ "compose_form.publish": "嘟嘟！",
+ "compose_form.sensitive": "将媒体文件标示为“敏感内容”",
+ "compose_form.spoiler_placeholder": "敏感内容",
+ "compose_form.spoiler": "将部份文本藏于警告消息之后",
+ "compose_form.unlisted": "请勿在公共时间轴显示",
+ "emoji_button.label": "加入表情符号",
+ "empty_column.community": "本站时间轴暂时未有内容，快贴文来抢头香啊！",
+ "empty_column.hashtag": "这个标签暂时未有内容。",
+ "empty_column.home": "你还没有关注任何用户。快看看{public}，向其他用户搭讪吧。",
+ "empty_column.home.public_timeline": "公共时间轴",
+ "empty_column.home": "你还没有关注任何用户。快看看{public}，向其他用户搭讪吧。",
+ "empty_column.notifications": "你没有任何通知纪录，快向其他用户搭讪吧。",
+ "empty_column.public": "跨站公共时间轴暂时没有内容！快写一些公共的嘟文，或者关注另一些服务站的用户吧！你和本站、友站的交流，将决定这里出现的内容。",
+ "follow_request.authorize": "批准",
+ "follow_request.reject": "拒绝",
+ "getting_started.about_addressing": "只要你知道一位用户的用户名称和域名，你可以用“@用户名称@域名”的格式在搜索栏寻找该用户。",
+ "getting_started.about_shortcuts": "只要该用户是在你现在的服务站开立，你就可以直接输入用户名搜索。在嘟文中提及别的用户也是如此。",
+ "getting_started.apps": "手机或桌面应用程序",
+ "getting_started.heading": "开始使用",
+ "getting_started.open_source_notice": "Mastodon 是一个开放源码的软件。你可以在官方 GitHub ({github}) 贡献或者回报问题。你亦可通过{apps}阅读 Mastodon 上的消息。",
+ "home.column_settings.advanced": "高端",
+ "home.column_settings.basic": "基本",
+ "home.column_settings.filter_regex": "使用正则表达式 (regex) 过滤",
+ "home.column_settings.show_reblogs": "显示被转的嘟文",
+ "home.column_settings.show_replies": "显示回应嘟文",
+ "home.settings": "字段设置",
+ "lightbox.close": "关闭",
+ "loading_indicator.label": "加载中...",
+ "media_gallery.toggle_visible": "打开或关上",
+ "missing_indicator.label": "找不到内容",
+ "navigation_bar.blocks": "被屏蔽的用户",
+ "navigation_bar.community_timeline": "本站时间轴",
+ "navigation_bar.edit_profile": "修改个人资料",
+ "navigation_bar.favourites": "赞的内容",
+ "navigation_bar.follow_requests": "关注请求",
+ "navigation_bar.info": "关于本服务站",
+ "navigation_bar.logout": "注销",
+ // intentional departure from https://github.com/tootsuite/mastodon/blob/f864fee1/config/locales/zh-CN.yml#L126:
+ // clashes for settings/preferences
+ "navigation_bar.preferences": "首选项",
+ "navigation_bar.public_timeline": "跨站公共时间轴",
+ "notification.favourite": "{name} 赞你的嘟文",
+ "notification.follow": "{name} 开始关注你",
+ "notification.mention": "{name} 提及你",
+ "notification.reblog": "{name} 转嘟你的嘟文",
+ "notifications.clear_confirmation": "你确定要清空通知纪录吗？",
+ "notifications.clear": "清空通知纪录",
+ "notifications.column_settings.alert": "显示桌面通知",
+ "notifications.column_settings.favourite": "赞你的嘟文：",
+ "notifications.column_settings.follow": "关注你：",
+ "notifications.column_settings.mention": "提及你：",
+ "notifications.column_settings.reblog": "转你的嘟文：",
+ "notifications.column_settings.show": "在通知栏显示",
+ "notifications.column_settings.sound": "播放音效",
+ "notifications.settings": "字段设置",
+ "privacy.change": "调整隐私设置",
+ "privacy.direct.long": "只有提及的用户能看到",
+ "privacy.direct.short": "私人消息",
+ "privacy.private.long": "只有关注你用户能看到",
+ "privacy.private.short": "关注者",
+ "privacy.public.long": "在公共时间轴显示",
+ "privacy.public.short": "公共",
+ "privacy.unlisted.long": "公开，但不在公共时间轴显示",
+ "privacy.unlisted.short": "公开",
+ "reply_indicator.cancel": "取消",
+ "report.heading": "举报",
+ "report.placeholder": "额外消息",
+ "report.submit": "提交",
+ "report.target": "Reporting",
+ "search_results.total": "{count, number} 项结果",
+ "search.account": "用户",
+ "search.hashtag": "标签",
+ "search.placeholder": "搜索",
+ "search.status_by": "按{name}搜索嘟文",
+ "status.delete": "删除",
+ "status.favourite": "赞",
+ "status.load_more": "加载更多",
+ "status.media_hidden": "隐藏媒体内容",
+ "status.mention": "提及 @{name}",
+ "status.open": "展开嘟文",
+ "status.reblog": "转嘟",
+ "status.reblogged_by": "{name} 转嘟",
+ "status.reply": "回应",
+ "status.report": "举报 @{name}",
+ "status.sensitive_toggle": "点击显示",
+ "status.sensitive_warning": "敏感内容",
+ "status.show_less": "减少显示",
+ "status.show_more": "显示更多",
+ "tabs_bar.compose": "撰写",
+ "tabs_bar.federated_timeline": "跨站",
+ "tabs_bar.home": "主页",
+ "tabs_bar.local_timeline": "本站",
+ "tabs_bar.mentions": "提及",
+ "tabs_bar.notifications": "通知",
+ "tabs_bar.public": "跨站公共时间轴",
+ "upload_area.title": "将文件拖放至此上传",
+ "upload_button.label": "上传媒体文件",
+ "upload_form.undo": "还原",
+ "upload_progress.label": "上传中……",
+ "video_player.expand": "展开影片",
+ "video_player.toggle_sound": "开关音效",
+ "video_player.toggle_visible": "打开或关上",
+};
+
+export default zh_cn;
diff --git a/app/assets/javascripts/components/locales/zh-hk.jsx b/app/assets/javascripts/components/locales/zh-hk.jsx
index 676be3dbc3..3130879fa0 100644
--- a/app/assets/javascripts/components/locales/zh-hk.jsx
+++ b/app/assets/javascripts/components/locales/zh-hk.jsx
@@ -112,7 +112,7 @@ const zh_hk = {
"report.placeholder": "額外訊息",
"report.submit": "提交",
"report.target": "Reporting",
- "search_results.total": "{count} 項結果",
+ "search_results.total": "{count, number} 項結果",
"search.account": "用戶",
"search.hashtag": "標籤",
"search.placeholder": "搜尋",
diff --git a/app/assets/javascripts/components/reducers/timelines.jsx b/app/assets/javascripts/components/reducers/timelines.jsx
index 675a527593..fa98632504 100644
--- a/app/assets/javascripts/components/reducers/timelines.jsx
+++ b/app/assets/javascripts/components/reducers/timelines.jsx
@@ -144,10 +144,11 @@ const normalizeAccountTimeline = (state, accountId, statuses, replace = false) =
return state.updateIn(['accounts_timelines', accountId], Immutable.Map(), map => map
.set('isLoading', false)
.set('loaded', true)
+ .set('next', true)
.update('items', Immutable.List(), list => (replace ? ids : list.unshift(...ids))));
};
-const appendNormalizedAccountTimeline = (state, accountId, statuses) => {
+const appendNormalizedAccountTimeline = (state, accountId, statuses, next) => {
let moreIds = Immutable.List([]);
statuses.forEach((status, i) => {
@@ -157,6 +158,7 @@ const appendNormalizedAccountTimeline = (state, accountId, statuses) => {
return state.updateIn(['accounts_timelines', accountId], Immutable.Map(), map => map
.set('isLoading', false)
+ .set('next', next)
.update('items', list => list.push(...moreIds)));
};
@@ -299,7 +301,7 @@ export default function timelines(state = initialState, action) {
case ACCOUNT_TIMELINE_FETCH_SUCCESS:
return normalizeAccountTimeline(state, action.id, Immutable.fromJS(action.statuses), action.replace);
case ACCOUNT_TIMELINE_EXPAND_SUCCESS:
- return appendNormalizedAccountTimeline(state, action.id, Immutable.fromJS(action.statuses));
+ return appendNormalizedAccountTimeline(state, action.id, Immutable.fromJS(action.statuses), action.next);
case ACCOUNT_BLOCK_SUCCESS:
case ACCOUNT_MUTE_SUCCESS:
return filterTimelines(state, action.relationship, action.statuses);
diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
index e27b88e5f2..6d246ded26 100644
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -14,8 +14,9 @@
.sidebar {
width: 240px;
height: 100%;
- padding: 20px 0;
-
+ padding: 0;
+ overflow-y: auto;
+
.logo {
display: block;
margin: 40px auto;
@@ -27,6 +28,7 @@
list-style: none;
border-radius: 4px 0 0 4px;
overflow: hidden;
+ margin-bottom: 20px;
a {
display: block;
@@ -55,6 +57,7 @@
ul {
background: darken($color1, 4%);
border-radius: 0 0 0 4px;
+ margin: 0;
a {
border: 0;
@@ -115,15 +118,26 @@
.simple_form {
max-width: 400px;
+ .label_input {
+ label.select {
+ width: 50%;
+ }
+ select {
+ width: 50%;
+ float: right;
+ }
+ }
}
@media screen and (max-width: 600px) {
display: block;
overflow-y: auto;
+ -webkit-overflow-scrolling: touch;
.sidebar-wrapper, .content-wrapper {
flex: 0 0 auto;
height: auto;
+ overflow: initial;
}
.sidebar {
diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss
index 84344e94d4..765b43f939 100644
--- a/app/assets/stylesheets/components.scss
+++ b/app/assets/stylesheets/components.scss
@@ -1196,7 +1196,6 @@ a.status__content__spoiler-link {
display: block;
box-sizing: border-box;
width: 100%;
- resize: none;
margin: 0;
color: $color1;
padding: 10px;
@@ -1220,11 +1219,17 @@ a.status__content__spoiler-link {
}
.autosuggest-textarea__textarea {
- height: 100px;
+ min-height: 100px;
background: $color5;
border-radius: 4px 4px 0 0;
padding-bottom: 0;
padding-right: 10px + 22px;
+ resize: none;
+
+ @media screen and (max-width: 600px) {
+ height: 100px !important; // prevent auto-resize textarea
+ resize: vertical;
+ }
}
.autosuggest-textarea__suggestions {
@@ -2050,8 +2055,8 @@ button.icon-button.active i.fa-retweet {
.onboarding-modal__pager {
height: 80vh;
width: 80vw;
- max-width: 500px;
- max-height: 350px;
+ max-width: 520px;
+ max-height: 420px;
position: relative;
& > div {
@@ -2281,6 +2286,7 @@ button.icon-button.active i.fa-retweet {
}
.boost-modal__container {
+ overflow-x: scroll;
padding: 10px;
.status {
@@ -2314,3 +2320,84 @@ button.icon-button.active i.fa-retweet {
top: 0;
left: 0;
}
+
+.media-gallery__gifv__label {
+ display: block;
+ position: absolute;
+ color: $color5;
+ background: rgba($color8, 0.5);
+ bottom: 6px;
+ left: 6px;
+ padding: 2px 6px;
+ border-radius: 2px;
+ font-size: 11px;
+ font-weight: 600;
+ z-index: 1;
+ pointer-events: none;
+ opacity: 0.9;
+ transition: opacity 0.1s ease;
+}
+
+.media-gallery__gifv {
+ &.autoplay {
+ .media-gallery__gifv__label {
+ display: none;
+ }
+ }
+
+ &:hover {
+ .media-gallery__gifv__label {
+ opacity: 1;
+ }
+ }
+}
+
+.attachment-list {
+ display: flex;
+ font-size: 14px;
+ border: 1px solid lighten($color1, 8%);
+ border-radius: 4px;
+ margin-top: 14px;
+ overflow: hidden;
+}
+
+.attachment-list__icon {
+ flex: 0 0 auto;
+ color: lighten($color1, 26%);
+ padding: 8px 18px;
+ cursor: default;
+ border-right: 1px solid lighten($color1, 8%);
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ font-size: 26px;
+
+ .fa {
+ display: block;
+ }
+}
+
+.attachment-list__list {
+ list-style: none;
+ padding: 4px 0;
+ padding-left: 8px;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+
+ li {
+ display: block;
+ padding: 4px 0;
+ }
+
+ a {
+ text-decoration: none;
+ color: lighten($color1, 26%);
+ font-weight: 500;
+
+ &:hover {
+ text-decoration: underline;
+ }
+ }
+}
diff --git a/app/assets/stylesheets/fonts/montserrat.scss b/app/assets/stylesheets/fonts/montserrat.scss
index d25403c3ed..680e846706 100644
--- a/app/assets/stylesheets/fonts/montserrat.scss
+++ b/app/assets/stylesheets/fonts/montserrat.scss
@@ -8,4 +8,3 @@
font-weight: 400;
font-style: normal;
}
-
diff --git a/app/assets/stylesheets/fonts/roboto-mono.scss b/app/assets/stylesheets/fonts/roboto-mono.scss
index 319ecb08ea..52c78fa997 100644
--- a/app/assets/stylesheets/fonts/roboto-mono.scss
+++ b/app/assets/stylesheets/fonts/roboto-mono.scss
@@ -1,113 +1,3 @@
-/*
-@font-face {
- font-family: 'Roboto Mono';
- src: font-url('roboto-mono/robotomono-bold-webfont.eot');
- src: font-url('roboto-mono/robotomono-bold-webfont.eot?#iefix') format('embedded-opentype'),
- font-url('roboto-mono/robotomono-bold-webfont.woff2') format('woff2'),
- font-url('roboto-mono/robotomono-bold-webfont.woff') format('woff'),
- font-url('roboto-mono/robotomono-bold-webfont.ttf') format('truetype'),
- font-url('roboto-mono/robotomono-bold-webfont.svg#roboto_monobold') format('svg');
- font-weight: bold;
- font-style: normal;
-
-}
-
-@font-face {
- font-family: 'Roboto Mono';
- src: font-url('roboto-mono/robotomono-bolditalic-webfont.eot');
- src: font-url('roboto-mono/robotomono-bolditalic-webfont.eot?#iefix') format('embedded-opentype'),
- font-url('roboto-mono/robotomono-bolditalic-webfont.woff2') format('woff2'),
- font-url('roboto-mono/robotomono-bolditalic-webfont.woff') format('woff'),
- font-url('roboto-mono/robotomono-bolditalic-webfont.ttf') format('truetype'),
- font-url('roboto-mono/robotomono-bolditalic-webfont.svg#roboto_monobold_italic') format('svg');
- font-weight: bold;
- font-style: italic;
-
-}
-
-
-
-
-@font-face {
- font-family: 'Roboto Mono';
- src: font-url('roboto-mono/robotomono-italic-webfont.eot');
- src: font-url('roboto-mono/robotomono-italic-webfont.eot?#iefix') format('embedded-opentype'),
- font-url('roboto-mono/robotomono-italic-webfont.woff2') format('woff2'),
- font-url('roboto-mono/robotomono-italic-webfont.woff') format('woff'),
- font-url('roboto-mono/robotomono-italic-webfont.ttf') format('truetype'),
- font-url('roboto-mono/robotomono-italic-webfont.svg#roboto_monoitalic') format('svg');
- font-weight: normal;
- font-style: italic;
-
-}
-
-
-
-
-@font-face {
- font-family: 'Roboto Mono';
- src: font-url('roboto-mono/robotomono-light-webfont.eot');
- src: font-url('roboto-mono/robotomono-light-webfont.eot?#iefix') format('embedded-opentype'),
- font-url('roboto-mono/robotomono-light-webfont.woff2') format('woff2'),
- font-url('roboto-mono/robotomono-light-webfont.woff') format('woff'),
- font-url('roboto-mono/robotomono-light-webfont.ttf') format('truetype'),
- font-url('roboto-mono/robotomono-light-webfont.svg#roboto_monolight') format('svg');
- font-weight: 300;
- font-style: normal;
-
-}
-
-
-
-
-@font-face {
- font-family: 'Roboto Mono';
- src: font-url('roboto-mono/robotomono-lightitalic-webfont.eot');
- src: font-url('roboto-mono/robotomono-lightitalic-webfont.eot?#iefix') format('embedded-opentype'),
- font-url('roboto-mono/robotomono-lightitalic-webfont.woff2') format('woff2'),
- font-url('roboto-mono/robotomono-lightitalic-webfont.woff') format('woff'),
- font-url('roboto-mono/robotomono-lightitalic-webfont.ttf') format('truetype'),
- font-url('roboto-mono/robotomono-lightitalic-webfont.svg#roboto_monolight_italic') format('svg');
- font-weight: 300;
- font-style: italic;
-
-}
-
-
-
-
-@font-face {
- font-family: 'Roboto Mono';
- src: font-url('roboto-mono/robotomono-medium-webfont.eot');
- src: font-url('roboto-mono/robotomono-medium-webfont.eot?#iefix') format('embedded-opentype'),
- font-url('roboto-mono/robotomono-medium-webfont.woff2') format('woff2'),
- font-url('roboto-mono/robotomono-medium-webfont.woff') format('woff'),
- font-url('roboto-mono/robotomono-medium-webfont.ttf') format('truetype'),
- font-url('roboto-mono/robotomono-medium-webfont.svg#roboto_monomedium') format('svg');
- font-weight: 500;
- font-style: normal;
-
-}
-
-
-
-
-@font-face {
- font-family: 'Roboto Mono';
- src: font-url('roboto-mono/robotomono-mediumitalic-webfont.eot');
- src: font-url('roboto-mono/robotomono-mediumitalic-webfont.eot?#iefix') format('embedded-opentype'),
- font-url('roboto-mono/robotomono-mediumitalic-webfont.woff2') format('woff2'),
- font-url('roboto-mono/robotomono-mediumitalic-webfont.woff') format('woff'),
- font-url('roboto-mono/robotomono-mediumitalic-webfont.ttf') format('truetype'),
- font-url('roboto-mono/robotomono-mediumitalic-webfont.svg#roboto_monomedium_italic') format('svg');
- font-weight: 500;
- font-style: italic;
-
-}
-
-
-*/
-
@font-face {
font-family: 'Roboto Mono';
src: font-url('roboto-mono/robotomono-regular-webfont.eot');
@@ -118,37 +8,4 @@
font-url('roboto-mono/robotomono-regular-webfont.svg#roboto_monoregular') format('svg');
font-weight: 400;
font-style: normal;
-
}
-
-
-/*
-
-@font-face {
- font-family: 'Roboto Mono';
- src: font-url('roboto-mono/robotomono-thin-webfont.eot');
- src: font-url('roboto-mono/robotomono-thin-webfont.eot?#iefix') format('embedded-opentype'),
- font-url('roboto-mono/robotomono-thin-webfont.woff2') format('woff2'),
- font-url('roboto-mono/robotomono-thin-webfont.woff') format('woff'),
- font-url('roboto-mono/robotomono-thin-webfont.ttf') format('truetype'),
- font-url('roboto-mono/robotomono-thin-webfont.svg#roboto_monothin') format('svg');
- font-weight: 200;
- font-style: normal;
-
-}
-
-
-
-
-@font-face {
- font-family: 'Roboto Mono';
- src: font-url('roboto-mono/robotomono-thinitalic-webfont.eot');
- src: font-url('roboto-mono/robotomono-thinitalic-webfont.eot?#iefix') format('embedded-opentype'),
- font-url('roboto-mono/robotomono-thinitalic-webfont.woff2') format('woff2'),
- font-url('roboto-mono/robotomono-thinitalic-webfont.woff') format('woff'),
- font-url('roboto-mono/robotomono-thinitalic-webfont.ttf') format('truetype'),
- font-url('roboto-mono/robotomono-thinitalic-webfont.svg#roboto_monothin_italic') format('svg');
- font-weight: 200;
- font-style: italic;
-
-}*/
diff --git a/app/assets/stylesheets/fonts/roboto.scss b/app/assets/stylesheets/fonts/roboto.scss
index 5c0d140439..64d7bf8992 100644
--- a/app/assets/stylesheets/fonts/roboto.scss
+++ b/app/assets/stylesheets/fonts/roboto.scss
@@ -1,16 +1,3 @@
-/*
-@font-face {
- font-family: 'Roboto';
- src: font-url('roboto/roboto-lightitalic-webfont.eot');
- src: font-url('roboto/roboto-lightitalic-webfont.eot?#iefix') format('embedded-opentype'),
- font-url('roboto/roboto-lightitalic-webfont.woff2') format('woff2'),
- font-url('roboto/roboto-lightitalic-webfont.woff') format('woff'),
- font-url('roboto/roboto-lightitalic-webfont.ttf') format('truetype'),
- font-url('roboto/roboto-lightitalic-webfont.svg#roboto-lightitalic-webfont') format('svg');
- font-weight: 300;
- font-style: italic;
-}*/
-
@font-face {
font-family: 'Roboto';
src: font-url('roboto/roboto-italic-webfont.eot');
@@ -47,18 +34,6 @@
font-weight: 500;
font-style: normal;
}
-/*
-@font-face {
- font-family: 'Roboto';
- src: font-url('roboto/roboto-thin-webfont.eot');
- src: font-url('roboto/roboto-thin-webfont.eot?#iefix') format('embedded-opentype'),
- font-url('roboto/roboto-thin-webfont.woff2') format('woff2'),
- font-url('roboto/roboto-thin-webfont.woff') format('woff'),
- font-url('roboto/roboto-thin-webfont.ttf') format('truetype'),
- font-url('roboto/roboto-thin-webfont.svg#roboto-thin-webfont') format('svg');
- font-weight: 100;
- font-style: normal;
-}*/
@font-face {
font-family: 'Roboto';
@@ -71,75 +46,3 @@
font-weight: normal;
font-style: normal;
}
-/*
-@font-face {
- font-family: 'Roboto';
- src: font-url('roboto/roboto-mediumitalic-webfont.eot');
- src: font-url('roboto/roboto-mediumitalic-webfont.eot?#iefix') format('embedded-opentype'),
- font-url('roboto/roboto-mediumitalic-webfont.woff2') format('woff2'),
- font-url('roboto/roboto-mediumitalic-webfont.woff') format('woff'),
- font-url('roboto/roboto-mediumitalic-webfont.ttf') format('truetype'),
- font-url('roboto/roboto-mediumitalic-webfont.svg#roboto-mediumitalic-webfont') format('svg');
- font-weight: 500;
- font-style: italic;
-}
-
-@font-face {
- font-family: 'Roboto';
- src: font-url('roboto/roboto-bolditalic-webfont.eot');
- src: font-url('roboto/roboto-bolditalic-webfont.eot?#iefix') format('embedded-opentype'),
- font-url('roboto/roboto-bolditalic-webfont.woff2') format('woff2'),
- font-url('roboto/roboto-bolditalic-webfont.woff') format('woff'),
- font-url('roboto/roboto-bolditalic-webfont.ttf') format('truetype'),
- font-url('roboto/roboto-bolditalic-webfont.svg#roboto-bolditalic-webfont') format('svg');
- font-weight: bold;
- font-style: italic;
-}
-
-@font-face {
- font-family: 'Roboto';
- src: font-url('roboto/roboto-light-webfont.eot');
- src: font-url('roboto/roboto-light-webfont.eot?#iefix') format('embedded-opentype'),
- font-url('roboto/roboto-light-webfont.woff2') format('woff2'),
- font-url('roboto/roboto-light-webfont.woff') format('woff'),
- font-url('roboto/roboto-light-webfont.ttf') format('truetype'),
- font-url('roboto/roboto-light-webfont.svg#roboto-light-webfont') format('svg');
- font-weight: 300;
- font-style: normal;
-}
-
-@font-face {
- font-family: 'Roboto';
- src: font-url('roboto/roboto-thinitalic-webfont.eot');
- src: font-url('roboto/roboto-thinitalic-webfont.eot?#iefix') format('embedded-opentype'),
- font-url('roboto/roboto-thinitalic-webfont.woff2') format('woff2'),
- font-url('roboto/roboto-thinitalic-webfont.woff') format('woff'),
- font-url('roboto/roboto-thinitalic-webfont.ttf') format('truetype'),
- font-url('roboto/roboto-thinitalic-webfont.svg#roboto-thinitalic-webfont') format('svg');
- font-weight: 100;
- font-style: italic;
-}
-
-@font-face {
- font-family: 'Roboto';
- src: font-url('roboto/roboto-blackitalic-webfont.eot');
- src: font-url('roboto/roboto-blackitalic-webfont.eot?#iefix') format('embedded-opentype'),
- font-url('roboto/roboto-blackitalic-webfont.woff2') format('woff2'),
- font-url('roboto/roboto-blackitalic-webfont.woff') format('woff'),
- font-url('roboto/roboto-blackitalic-webfont.ttf') format('truetype'),
- font-url('roboto/roboto-blackitalic-webfont.svg#roboto-blackitalic-webfont') format('svg');
- font-weight: 900;
- font-style: italic;
-}
-
-@font-face {
- font-family: 'Roboto';
- src: font-url('roboto/roboto-black-webfont.eot');
- src: font-url('roboto/roboto-black-webfont.eot?#iefix') format('embedded-opentype'),
- font-url('roboto/roboto-black-webfont.woff2') format('woff2'),
- font-url('roboto/roboto-black-webfont.woff') format('woff'),
- font-url('roboto/roboto-black-webfont.ttf') format('truetype'),
- font-url('roboto/roboto-black-webfont.svg#roboto-black-webfont') format('svg');
- font-weight: 900;
- font-style: normal;
-}*/
diff --git a/app/assets/stylesheets/forms.scss b/app/assets/stylesheets/forms.scss
index e5e8697a03..c6a8b5b024 100644
--- a/app/assets/stylesheets/forms.scss
+++ b/app/assets/stylesheets/forms.scss
@@ -42,7 +42,7 @@ code {
}
}
- .input.file, .input.select {
+ .input.file, .input.select, .input.radio_buttons {
padding: 15px 0;
margin-bottom: 0;
@@ -59,6 +59,15 @@ code {
margin-bottom: 25px;
}
+ .input.radio_buttons .radio label {
+ margin-bottom: 5px;
+ font-family: inherit;
+ font-size: 14px;
+ color: white;
+ display: block;
+ width: auto;
+ }
+
.input.boolean {
margin-bottom: 5px;
@@ -72,7 +81,8 @@ code {
label.checkbox {
position: relative;
- padding-left: 25px;
+ padding-left: 25px;
+ flex: 1 1 auto;
}
input[type=checkbox] {
@@ -182,6 +192,10 @@ code {
}
}
}
+
+ select {
+ font-size: 16px;
+ }
}
.flash-message {
diff --git a/app/controllers/account_follow_controller.rb b/app/controllers/account_follow_controller.rb
new file mode 100644
index 0000000000..185a355f8f
--- /dev/null
+++ b/app/controllers/account_follow_controller.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class AccountFollowController < ApplicationController
+ include AccountControllerConcern
+
+ before_action :authenticate_user!
+
+ def create
+ FollowService.new.call(current_user.account, @account.acct)
+ redirect_to account_path(@account)
+ end
+end
diff --git a/app/controllers/account_unfollow_controller.rb b/app/controllers/account_unfollow_controller.rb
new file mode 100644
index 0000000000..378ec86dc6
--- /dev/null
+++ b/app/controllers/account_unfollow_controller.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class AccountUnfollowController < ApplicationController
+ include AccountControllerConcern
+
+ before_action :authenticate_user!
+
+ def create
+ UnfollowService.new.call(current_user.account, @account)
+ redirect_to account_path(@account)
+ end
+end
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index d4f157614d..8eda963365 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -1,12 +1,7 @@
# frozen_string_literal: true
class AccountsController < ApplicationController
- layout 'public'
-
- before_action :set_account
- before_action :set_link_headers
- before_action :authenticate_user!, only: [:follow, :unfollow]
- before_action :check_account_suspension
+ include AccountControllerConcern
def show
respond_to do |format|
@@ -24,39 +19,9 @@ class AccountsController < ApplicationController
end
end
- def follow
- FollowService.new.call(current_user.account, @account.acct)
- redirect_to account_path(@account)
- end
-
- def unfollow
- UnfollowService.new.call(current_user.account, @account)
- redirect_to account_path(@account)
- end
-
- def followers
- @followers = @account.followers.order('follows.created_at desc').page(params[:page]).per(12)
- end
-
- def following
- @following = @account.following.order('follows.created_at desc').page(params[:page]).per(12)
- end
-
private
def set_account
@account = Account.find_local!(params[:username])
end
-
- def set_link_headers
- response.headers['Link'] = LinkHeader.new([[webfinger_account_url, [%w(rel lrdd), %w(type application/xrd+xml)]], [account_url(@account, format: 'atom'), [%w(rel alternate), %w(type application/atom+xml)]]])
- end
-
- def webfinger_account_url
- webfinger_url(resource: @account.to_webfinger_s)
- end
-
- def check_account_suspension
- gone if @account.suspended?
- end
end
diff --git a/app/controllers/admin/domain_blocks_controller.rb b/app/controllers/admin/domain_blocks_controller.rb
index 1932dc6a82..d40ec829bf 100644
--- a/app/controllers/admin/domain_blocks_controller.rb
+++ b/app/controllers/admin/domain_blocks_controller.rb
@@ -17,7 +17,7 @@ module Admin
DomainBlockWorker.perform_async(@domain_block.id)
redirect_to admin_domain_blocks_path, notice: I18n.t('admin.domain_blocks.created_msg')
else
- render action: :new
+ render :new
end
end
diff --git a/app/controllers/admin/instances_controller.rb b/app/controllers/admin/instances_controller.rb
new file mode 100644
index 0000000000..b8f170ec28
--- /dev/null
+++ b/app/controllers/admin/instances_controller.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Admin
+ class InstancesController < BaseController
+ def index
+ @instances = ordered_instances.page(params[:page])
+ end
+
+ private
+
+ def ordered_instances
+ Account.remote.by_domain_accounts
+ end
+ end
+end
diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb
index 4a6f9ea7f6..fc63ca5c0c 100644
--- a/app/controllers/admin/reports_controller.rb
+++ b/app/controllers/admin/reports_controller.rb
@@ -49,14 +49,18 @@ module Admin
end
def filtered_reports
- filtering_scope.order('id desc').includes(
+ ReportFilter.new(filter_params).results.order('id desc').includes(
:account,
:target_account
)
end
- def filtering_scope
- params[:resolved].present? ? Report.resolved : Report.unresolved
+ def filter_params
+ params.permit(
+ :account_id,
+ :resolved,
+ :target_account_id
+ )
end
def set_report
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index 2c44e36a77..5724dbaea4 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -13,13 +13,13 @@ class Api::V1::AccountsController < ApiController
def verify_credentials
@account = current_user.account
- render action: :show
+ render :show
end
def update_credentials
current_account.update!(account_params)
@account = current_account
- render action: :show
+ render :show
end
def following
@@ -32,7 +32,7 @@ class Api::V1::AccountsController < ApiController
set_pagination_headers(next_path, prev_path)
- render action: :index
+ render :index
end
def followers
@@ -45,7 +45,7 @@ class Api::V1::AccountsController < ApiController
set_pagination_headers(next_path, prev_path)
- render action: :index
+ render :index
end
def statuses
@@ -65,7 +65,7 @@ class Api::V1::AccountsController < ApiController
def follow
FollowService.new.call(current_user.account, @account.acct)
set_relationship
- render action: :relationship
+ render :relationship
end
def block
@@ -77,31 +77,31 @@ class Api::V1::AccountsController < ApiController
@requested = { @account.id => false }
@muting = { @account.id => current_user.account.muting?(@account.id) }
- render action: :relationship
+ render :relationship
end
def mute
MuteService.new.call(current_user.account, @account)
set_relationship
- render action: :relationship
+ render :relationship
end
def unfollow
UnfollowService.new.call(current_user.account, @account)
set_relationship
- render action: :relationship
+ render :relationship
end
def unblock
UnblockService.new.call(current_user.account, @account)
set_relationship
- render action: :relationship
+ render :relationship
end
def unmute
UnmuteService.new.call(current_user.account, @account)
set_relationship
- render action: :relationship
+ render :relationship
end
def relationships
@@ -118,7 +118,7 @@ class Api::V1::AccountsController < ApiController
def search
@accounts = AccountSearchService.new.call(params[:q], limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:resolve] == 'true', current_account)
- render action: :index
+ render :index
end
private
diff --git a/app/controllers/api/v1/follows_controller.rb b/app/controllers/api/v1/follows_controller.rb
index 7c0f44f038..67d823398a 100644
--- a/app/controllers/api/v1/follows_controller.rb
+++ b/app/controllers/api/v1/follows_controller.rb
@@ -10,7 +10,7 @@ class Api::V1::FollowsController < ApiController
raise ActiveRecord::RecordNotFound if follow_params[:uri].blank?
@account = FollowService.new.call(current_user.account, target_uri).try(:target_account)
- render action: :show
+ render :show
end
private
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index 1976ce330d..5a2e18cc05 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
class Api::V1::StatusesController < ApiController
- before_action -> { doorkeeper_authorize! :read }, except: [:create, :destroy, :reblog, :unreblog, :favourite, :unfavourite]
+ before_action :authorize_if_got_token, except: [:create, :destroy, :reblog, :unreblog, :favourite, :unfavourite]
before_action -> { doorkeeper_authorize! :write }, only: [:create, :destroy, :reblog, :unreblog, :favourite, :unfavourite]
before_action :require_user!, except: [:show, :context, :card, :reblogged_by, :favourited_by]
before_action :set_status, only: [:show, :context, :card, :reblogged_by, :favourited_by]
@@ -40,7 +40,7 @@ class Api::V1::StatusesController < ApiController
set_pagination_headers(next_path, prev_path)
- render action: :accounts
+ render :accounts
end
def favourited_by
@@ -53,7 +53,7 @@ class Api::V1::StatusesController < ApiController
set_pagination_headers(next_path, prev_path)
- render action: :accounts
+ render :accounts
end
def create
@@ -62,7 +62,7 @@ class Api::V1::StatusesController < ApiController
spoiler_text: status_params[:spoiler_text],
visibility: status_params[:visibility],
application: doorkeeper_token.application)
- render action: :show
+ render :show
end
def destroy
@@ -73,31 +73,31 @@ class Api::V1::StatusesController < ApiController
def reblog
@status = ReblogService.new.call(current_user.account, Status.find(params[:id]))
- render action: :show
+ render :show
end
def unreblog
- reblog = Status.where(account_id: current_user.account, reblog_of_id: params[:id]).first!
- @status = reblog.reblog
- @reblogged_map = { @status.id => false }
+ reblog = Status.where(account_id: current_user.account, reblog_of_id: params[:id]).first!
+ @status = reblog.reblog
+ @reblogs_map = { @status.id => false }
RemovalWorker.perform_async(reblog.id)
- render action: :show
+ render :show
end
def favourite
@status = FavouriteService.new.call(current_user.account, Status.find(params[:id])).status.reload
- render action: :show
+ render :show
end
def unfavourite
@status = Status.find(params[:id])
- @favourited_map = { @status.id => false }
+ @favourites_map = { @status.id => false }
UnfavouriteWorker.perform_async(current_user.account_id, @status.id)
- render action: :show
+ render :show
end
private
@@ -114,4 +114,9 @@ class Api::V1::StatusesController < ApiController
def pagination_params(core_params)
params.permit(:limit).merge(core_params)
end
+
+ def authorize_if_got_token
+ request_token = Doorkeeper::OAuth::Token.from_request(request, *Doorkeeper.configuration.access_token_methods)
+ doorkeeper_authorize! :read if request_token
+ end
end
diff --git a/app/controllers/api/v1/timelines_controller.rb b/app/controllers/api/v1/timelines_controller.rb
index e55e7d7181..27dc3d0efd 100644
--- a/app/controllers/api/v1/timelines_controller.rb
+++ b/app/controllers/api/v1/timelines_controller.rb
@@ -17,7 +17,7 @@ class Api::V1::TimelinesController < ApiController
set_pagination_headers(next_path, prev_path)
- render action: :index
+ render :index
end
def public
@@ -31,7 +31,7 @@ class Api::V1::TimelinesController < ApiController
set_pagination_headers(next_path, prev_path)
- render action: :index
+ render :index
end
def tag
@@ -46,7 +46,7 @@ class Api::V1::TimelinesController < ApiController
set_pagination_headers(next_path, prev_path)
- render action: :index
+ render :index
end
private
diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 57604f1dc4..957e3c3152 100644
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -73,7 +73,7 @@ class ApiController < ApplicationController
end
def current_user
- super || current_resource_owner
+ current_resource_owner || super
rescue ActiveRecord::RecordNotFound
nil
end
@@ -100,17 +100,4 @@ class ApiController < ApplicationController
@reblogs_map = Status.reblogs_map(status_ids, current_account)
@favourites_map = Status.favourites_map(status_ids, current_account)
end
-
- def set_counters_maps(statuses) # rubocop:disable Style/AccessorMethodName
- status_ids = statuses.compact.map { |s| s.reblog? ? s.reblog_of_id : s.id }.uniq
- @favourites_counts_map = Favourite.select('status_id, COUNT(id) AS favourites_count').group('status_id').where(status_id: status_ids).map { |f| [f.status_id, f.favourites_count] }.to_h
- @reblogs_counts_map = Status.select('statuses.id, COUNT(reblogs.id) AS reblogs_count').joins('LEFT OUTER JOIN statuses AS reblogs ON statuses.id = reblogs.reblog_of_id').where(id: status_ids).group('statuses.id').map { |r| [r.id, r.reblogs_count] }.to_h
- end
-
- def set_account_counters_maps(accounts) # rubocop:disable Style/AccessorMethodName
- account_ids = accounts.compact.map(&:id).uniq
- @followers_counts_map = Follow.unscoped.select('target_account_id, COUNT(account_id) AS followers_count').group('target_account_id').where(target_account_id: account_ids).map { |f| [f.target_account_id, f.followers_count] }.to_h
- @following_counts_map = Follow.unscoped.select('account_id, COUNT(target_account_id) AS following_count').group('account_id').where(account_id: account_ids).map { |f| [f.account_id, f.following_count] }.to_h
- @statuses_counts_map = Status.unscoped.select('account_id, COUNT(id) AS statuses_count').group('account_id').where(account_id: account_ids).map { |s| [s.account_id, s.statuses_count] }.to_h
- end
end
diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb
index f8050afb5c..dd30be32a4 100644
--- a/app/controllers/auth/registrations_controller.rb
+++ b/app/controllers/auth/registrations_controller.rb
@@ -10,6 +10,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController
def build_resource(hash = nil)
super(hash)
+ resource.locale = I18n.locale
resource.build_account if resource.account.nil?
end
diff --git a/app/controllers/concerns/account_controller_concern.rb b/app/controllers/concerns/account_controller_concern.rb
new file mode 100644
index 0000000000..d36fc8c936
--- /dev/null
+++ b/app/controllers/concerns/account_controller_concern.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module AccountControllerConcern
+ extend ActiveSupport::Concern
+
+ FOLLOW_PER_PAGE = 12
+
+ included do
+ layout 'public'
+ before_action :set_account
+ before_action :set_link_headers
+ before_action :check_account_suspension
+ end
+
+ private
+
+ def set_account
+ @account = Account.find_local!(params[:account_username])
+ end
+
+ def set_link_headers
+ response.headers['Link'] = LinkHeader.new(
+ [
+ webfinger_account_link,
+ atom_account_url_link,
+ ]
+ )
+ end
+
+ def webfinger_account_link
+ [
+ webfinger_account_url,
+ [%w(rel lrdd), %w(type application/xrd+xml)],
+ ]
+ end
+
+ def atom_account_url_link
+ [
+ account_url(@account, format: 'atom'),
+ [%w(rel alternate), %w(type application/atom+xml)],
+ ]
+ end
+
+ def webfinger_account_url
+ webfinger_url(resource: @account.to_webfinger_s)
+ end
+
+ def check_account_suspension
+ gone if @account.suspended?
+ end
+end
diff --git a/app/controllers/follower_accounts_controller.rb b/app/controllers/follower_accounts_controller.rb
new file mode 100644
index 0000000000..165cbf1b56
--- /dev/null
+++ b/app/controllers/follower_accounts_controller.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class FollowerAccountsController < ApplicationController
+ include AccountControllerConcern
+
+ def index
+ @accounts = ordered_accounts.page(params[:page]).per(FOLLOW_PER_PAGE)
+ end
+
+ private
+
+ def ordered_accounts
+ @account.followers.order('follows.created_at desc')
+ end
+end
diff --git a/app/controllers/following_accounts_controller.rb b/app/controllers/following_accounts_controller.rb
new file mode 100644
index 0000000000..faeea144ac
--- /dev/null
+++ b/app/controllers/following_accounts_controller.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class FollowingAccountsController < ApplicationController
+ include AccountControllerConcern
+
+ def index
+ @accounts = ordered_accounts.page(params[:page]).per(FOLLOW_PER_PAGE)
+ end
+
+ private
+
+ def ordered_accounts
+ @account.following.order('follows.created_at desc')
+ end
+end
diff --git a/app/controllers/media_controller.rb b/app/controllers/media_controller.rb
index 488c4f944f..fa1daf012a 100644
--- a/app/controllers/media_controller.rb
+++ b/app/controllers/media_controller.rb
@@ -1,16 +1,19 @@
# frozen_string_literal: true
class MediaController < ApplicationController
- before_action :set_media_attachment
+ before_action :verify_permitted_status
def show
- redirect_to @media_attachment.file.url(:original)
+ redirect_to media_attachment.file.url(:original)
end
private
- def set_media_attachment
- @media_attachment = MediaAttachment.where.not(status_id: nil).find_by!(shortcode: params[:id])
- raise ActiveRecord::RecordNotFound unless @media_attachment.status.permitted?(current_account)
+ def media_attachment
+ MediaAttachment.attached.find_by!(shortcode: params[:id])
+ end
+
+ def verify_permitted_status
+ raise ActiveRecord::RecordNotFound unless media_attachment.status.permitted?(current_account)
end
end
diff --git a/app/controllers/settings/imports_controller.rb b/app/controllers/settings/imports_controller.rb
index cbb5e65da5..0db13d1ca6 100644
--- a/app/controllers/settings/imports_controller.rb
+++ b/app/controllers/settings/imports_controller.rb
@@ -18,7 +18,7 @@ class Settings::ImportsController < ApplicationController
ImportWorker.perform_async(@import.id)
redirect_to settings_import_path, notice: I18n.t('imports.success')
else
- render action: :show
+ render :show
end
end
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index c758e4ef2f..31a2044209 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -23,18 +23,19 @@ class Settings::PreferencesController < ApplicationController
}
current_user.settings['default_privacy'] = user_params[:setting_default_privacy]
- current_user.settings['boost_modal'] = user_params[:setting_boost_modal] == '1'
+ current_user.settings['boost_modal'] = user_params[:setting_boost_modal] == '1'
+ current_user.settings['auto_play_gif'] = user_params[:setting_auto_play_gif] == '1'
- if current_user.update(user_params.except(:notification_emails, :interactions, :setting_default_privacy, :setting_boost_modal))
+ if current_user.update(user_params.except(:notification_emails, :interactions, :setting_default_privacy, :setting_boost_modal, :setting_auto_play_gif))
redirect_to settings_preferences_path, notice: I18n.t('generic.changes_saved_msg')
else
- render action: :show
+ render :show
end
end
private
def user_params
- params.require(:user).permit(:locale, :setting_default_privacy, :setting_boost_modal, notification_emails: [:follow, :follow_request, :reblog, :favourite, :mention, :digest], interactions: [:must_be_follower, :must_be_following])
+ params.require(:user).permit(:locale, :setting_default_privacy, :setting_boost_modal, :setting_auto_play_gif, notification_emails: [:follow, :follow_request, :reblog, :favourite, :mention, :digest], interactions: [:must_be_follower, :must_be_following])
end
end
diff --git a/app/controllers/settings/profiles_controller.rb b/app/controllers/settings/profiles_controller.rb
index 2b74b4e949..0367e35936 100644
--- a/app/controllers/settings/profiles_controller.rb
+++ b/app/controllers/settings/profiles_controller.rb
@@ -17,7 +17,7 @@ class Settings::ProfilesController < ApplicationController
if @account.update(account_params)
redirect_to settings_profile_path, notice: I18n.t('generic.changes_saved_msg')
else
- render action: :show
+ render :show
end
end
diff --git a/app/controllers/settings/two_factor_auths_controller.rb b/app/controllers/settings/two_factor_auths_controller.rb
index bfe3868f3b..a06b2a9f92 100644
--- a/app/controllers/settings/two_factor_auths_controller.rb
+++ b/app/controllers/settings/two_factor_auths_controller.rb
@@ -26,7 +26,7 @@ class Settings::TwoFactorAuthsController < ApplicationController
@confirmation = Form::TwoFactorConfirmation.new
set_qr_code
flash.now[:alert] = I18n.t('two_factor_auth.wrong_code')
- render action: :new
+ render :new
end
end
diff --git a/app/controllers/well_known/webfinger_controller.rb b/app/controllers/well_known/webfinger_controller.rb
index 1a8ef5f90c..4a521d102e 100644
--- a/app/controllers/well_known/webfinger_controller.rb
+++ b/app/controllers/well_known/webfinger_controller.rb
@@ -8,8 +8,13 @@ module WellKnown
@magic_key = pem_to_magic_key(@account.keypair.public_key)
respond_to do |format|
- format.xml { render content_type: 'application/xrd+xml' }
- format.json { render content_type: 'application/jrd+json' }
+ format.any(:json, :html) do
+ render formats: :json, content_type: 'application/jrd+json'
+ end
+
+ format.xml do
+ render content_type: 'application/xrd+xml'
+ end
end
rescue ActiveRecord::RecordNotFound
head 404
diff --git a/app/helpers/admin/filter_helper.rb b/app/helpers/admin/filter_helper.rb
index 591056dd78..5080e63505 100644
--- a/app/helpers/admin/filter_helper.rb
+++ b/app/helpers/admin/filter_helper.rb
@@ -2,7 +2,7 @@
module Admin::FilterHelper
ACCOUNT_FILTERS = %i[local remote by_domain silenced suspended recent].freeze
- REPORT_FILTERS = %i[resolved].freeze
+ REPORT_FILTERS = %i[resolved account_id target_account_id].freeze
FILTERS = ACCOUNT_FILTERS + REPORT_FILTERS
diff --git a/app/helpers/instance_helper.rb b/app/helpers/instance_helper.rb
new file mode 100644
index 0000000000..a1c3c3521f
--- /dev/null
+++ b/app/helpers/instance_helper.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module InstanceHelper
+ def site_title
+ Setting.site_title.to_s
+ end
+
+ def site_hostname
+ Rails.configuration.x.local_domain
+ end
+end
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index cf7b9b3819..a4ca72c971 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -7,17 +7,21 @@ module SettingsHelper
es: 'Español',
eo: 'Esperanto',
fr: 'Français',
- it: 'Italiano',
+ hr: 'Hrvatski',
hu: 'Magyar',
+ it: 'Italiano',
nl: 'Nederlands',
no: 'Norsk',
+ oc: 'Occitan',
pt: 'Português',
+ 'pt-BR': 'Português do Brasil',
fi: 'Suomi',
ru: 'Русский',
uk: 'Українська',
ja: '日本語',
'zh-CN': '简体中文',
'zh-HK': '繁體中文（香港）',
+ 'zh-TW': '繁體中文（臺灣）',
bg: 'Български',
}.freeze
diff --git a/app/helpers/site_title_helper.rb b/app/helpers/site_title_helper.rb
deleted file mode 100644
index d2caa92038..0000000000
--- a/app/helpers/site_title_helper.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module SiteTitleHelper
- def site_title
- Setting.site_title.to_s
- end
-end
diff --git a/app/lib/atom_serializer.rb b/app/lib/atom_serializer.rb
index 4e4031bba5..5aeb7b4f9f 100644
--- a/app/lib/atom_serializer.rb
+++ b/app/lib/atom_serializer.rb
@@ -3,13 +3,11 @@
class AtomSerializer
include RoutingHelper
- INVALID_XML_CHARS = /[^\u0009\u000a\u000d\u0020-\uD7FF\uE000-\uFFFD\u10000-\u10FFFF]/
-
class << self
def render(element)
document = Ox::Document.new(version: '1.0')
document << element
- ('' + Ox.dump(element)).force_encoding('UTF-8')
+ ('' + Ox.dump(element, effort: :tolerant)).force_encoding('UTF-8')
end
end
@@ -319,7 +317,7 @@ class AtomSerializer
end
def sanitize_str(raw_str)
- raw_str.to_s.gsub(INVALID_XML_CHARS, '')
+ raw_str.to_s
end
def add_namespaces(parent)
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index a44e5ed3ed..43893915d4 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -13,10 +13,9 @@ class Formatter
return reformat(status.content) unless status.local?
html = status.text
- html = encode(html)
+ html = encode_and_link_urls(html)
html = simple_format(html, {}, sanitize: false)
html = html.delete("\n")
- html = link_urls(html)
html = link_mentions(html, status.mentions)
html = link_hashtags(html)
@@ -35,8 +34,7 @@ class Formatter
def simplified_format(account)
return reformat(account.note) unless account.local?
- html = encode(account.note)
- html = link_urls(html)
+ html = encode_and_link_urls(account.note)
html = link_accounts(html)
html = link_hashtags(html)
@@ -49,6 +47,26 @@ class Formatter
HTMLEntities.new.encode(html)
end
+ def encode_and_link_urls(html)
+ entities = Twitter::Extractor.extract_urls_with_indices(html, extract_url_without_protocol: false)
+ entities = entities.sort_by { |entity| entity[:indices].first }
+
+ chars = html.to_s.to_char_a
+ html_attrs = {
+ target: '_blank',
+ rel: 'nofollow noopener',
+ }
+ result = ''
+
+ last_index = entities.reduce(0) do |index, entity|
+ indices = entity[:indices]
+ result += encode(chars[index...indices.first].join)
+ result += Twitter::Autolink.send(:link_to_text, entity, link_html(entity[:url]), entity[:url], html_attrs)
+ indices.last
+ end
+ result += encode(chars[last_index..-1].join)
+ end
+
def link_urls(html)
Twitter::Autolink.auto_link_urls(html, url_target: '_blank',
link_attribute_block: lambda { |_, a| a[:rel] << ' noopener' },
diff --git a/app/lib/language_detector.rb b/app/lib/language_detector.rb
new file mode 100644
index 0000000000..b6f81923b5
--- /dev/null
+++ b/app/lib/language_detector.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class LanguageDetector
+ attr_reader :text, :account
+
+ def initialize(text, account = nil)
+ @text = text
+ @account = account
+ end
+
+ def to_iso_s
+ WhatLanguage.new(:all).language_iso(text) || default_locale.to_sym
+ end
+
+ private
+
+ def default_locale
+ account&.user&.locale || I18n.default_locale
+ end
+end
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
index 0d9f10a080..e5dbfeeda9 100644
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -3,4 +3,5 @@
class ApplicationMailer < ActionMailer::Base
default from: ENV.fetch('SMTP_FROM_ADDRESS') { 'notifications@localhost' }
layout 'mailer'
+ helper :instance
end
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 64ca92a3ac..6abf9c9caf 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -4,6 +4,8 @@ class UserMailer < Devise::Mailer
default from: ENV.fetch('SMTP_FROM_ADDRESS') { 'notifications@localhost' }
layout 'mailer'
+ helper :instance
+
def confirmation_instructions(user, token, _opts = {})
@resource = user
@token = token
diff --git a/app/models/account.rb b/app/models/account.rb
index 8ceda7f974..9b4f7e2ca7 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -21,6 +21,8 @@ class Account < ApplicationRecord
validates_attachment_content_type :header, content_type: IMAGE_MIME_TYPES
validates_attachment_size :header, less_than: 2.megabytes
+ before_post_process :set_file_extensions
+
# Local user profile validations
validates :display_name, length: { maximum: 30 }, if: 'local?'
validates :note, length: { maximum: 160 }, if: 'local?'
@@ -55,6 +57,10 @@ class Account < ApplicationRecord
# PuSH subscriptions
has_many :subscriptions, dependent: :destroy
+ # Report relationships
+ has_many :reports
+ has_many :targeted_reports, class_name: 'Report', foreign_key: :target_account_id
+
scope :remote, -> { where.not(domain: nil) }
scope :local, -> { where(domain: nil) }
scope :without_followers, -> { where('(select count(f.id) from follows as f where f.target_account_id = accounts.id) = 0') }
@@ -64,6 +70,7 @@ class Account < ApplicationRecord
scope :suspended, -> { where(suspended: true) }
scope :recent, -> { reorder(id: :desc) }
scope :alphabetic, -> { order(domain: :asc, username: :asc) }
+ scope :by_domain_accounts, -> { group(:domain).select(:domain, 'COUNT(*) AS accounts_count').order('accounts_count desc') }
def follow!(other_account)
active_relationships.where(target_account: other_account).first_or_create!(target_account: other_account)
@@ -108,10 +115,6 @@ class Account < ApplicationRecord
follow_requests.where(target_account: other_account).exists?
end
- def followers_domains
- followers.reorder('').select('DISTINCT accounts.domain').map(&:domain)
- end
-
def local?
domain.nil?
end
@@ -231,18 +234,20 @@ class Account < ApplicationRecord
WITH first_degree AS (
SELECT target_account_id
FROM follows
- WHERE account_id = ?
+ WHERE account_id = :account_id
)
SELECT accounts.*
FROM follows
INNER JOIN accounts ON follows.target_account_id = accounts.id
- WHERE account_id IN (SELECT * FROM first_degree) AND target_account_id NOT IN (SELECT * FROM first_degree) AND target_account_id <> ?
+ WHERE account_id IN (SELECT * FROM first_degree) AND target_account_id NOT IN (SELECT * FROM first_degree) AND target_account_id <> :account_id
GROUP BY target_account_id, accounts.id
ORDER BY count(account_id) DESC
- LIMIT ?
+ LIMIT :limit
SQL
- Account.find_by_sql([sql, account.id, account.id, limit])
+ find_by_sql(
+ [sql, { account_id: account.id, limit: limit }]
+ )
end
def search_for(terms, limit = 10)
@@ -329,4 +334,20 @@ class Account < ApplicationRecord
self.public_key = keypair.public_key.to_pem
end
end
+
+ private
+
+ def set_file_extensions
+ unless avatar.blank?
+ extension = Paperclip::Interpolations.content_type_extension(avatar, :original)
+ basename = Paperclip::Interpolations.basename(avatar, :original)
+ avatar.instance_write :file_name, [basename, extension].delete_if(&:empty?).join('.')
+ end
+
+ unless header.blank?
+ extension = Paperclip::Interpolations.content_type_extension(header, :original)
+ basename = Paperclip::Interpolations.basename(header, :original)
+ header.instance_write :file_name, [basename, extension].delete_if(&:empty?).join('.')
+ end
+ end
end
diff --git a/app/models/block.rb b/app/models/block.rb
index ae456a6b6b..c978b2200a 100644
--- a/app/models/block.rb
+++ b/app/models/block.rb
@@ -7,4 +7,14 @@ class Block < ApplicationRecord
belongs_to :target_account, class_name: 'Account', required: true
validates :account_id, uniqueness: { scope: :target_account_id }
+
+ after_create :remove_blocking_cache
+ after_destroy :remove_blocking_cache
+
+ private
+
+ def remove_blocking_cache
+ Rails.cache.delete("exclude_account_ids_for:#{account_id}")
+ Rails.cache.delete("exclude_account_ids_for:#{target_account_id}")
+ end
end
diff --git a/app/models/favourite.rb b/app/models/favourite.rb
index 41d06e734e..32d54476ba 100644
--- a/app/models/favourite.rb
+++ b/app/models/favourite.rb
@@ -3,14 +3,14 @@
class Favourite < ApplicationRecord
include Paginable
- belongs_to :account, inverse_of: :favourites
- belongs_to :status, inverse_of: :favourites, counter_cache: true
+ belongs_to :account, inverse_of: :favourites, required: true
+ belongs_to :status, inverse_of: :favourites, counter_cache: true, required: true
has_one :notification, as: :activity, dependent: :destroy
validates :status_id, uniqueness: { scope: :account_id }
before_validation do
- self.status = status.reblog if status.reblog?
+ self.status = status.reblog if status&.reblog?
end
end
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index 8181902144..bb16adb5bc 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -3,7 +3,7 @@
class MediaAttachment < ApplicationRecord
self.inheritance_column = nil
- enum type: [:image, :gifv, :video]
+ enum type: [:image, :gifv, :video, :unknown]
IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze
VIDEO_MIME_TYPES = ['video/webm', 'video/mp4'].freeze
@@ -33,6 +33,7 @@ class MediaAttachment < ApplicationRecord
validates :account, presence: true
+ scope :attached, -> { where.not(status_id: nil) }
scope :local, -> { where(remote_url: '') }
default_scope { order('id asc') }
@@ -49,7 +50,7 @@ class MediaAttachment < ApplicationRecord
end
before_create :set_shortcode
- before_post_process :set_type
+ before_post_process :set_type_and_extension
class << self
private
@@ -94,6 +95,8 @@ class MediaAttachment < ApplicationRecord
private
def set_shortcode
+ self.type = :unknown if file.blank? && type.blank?
+
return unless local?
loop do
@@ -102,7 +105,14 @@ class MediaAttachment < ApplicationRecord
end
end
- def set_type
- self.type = VIDEO_MIME_TYPES.include?(file_content_type) ? :video : :image
+ def set_type_and_extension
+ if file.blank?
+ self.type = :unknown
+ else
+ self.type = VIDEO_MIME_TYPES.include?(file_content_type) ? :video : :image
+ extension = Paperclip::Interpolations.content_type_extension(file, :original)
+ basename = Paperclip::Interpolations.basename(file, :original)
+ file.instance_write :file_name, [basename, extension].delete_if(&:empty?).join('.')
+ end
end
end
diff --git a/app/models/mute.rb b/app/models/mute.rb
index a5b334c859..d0de62ed5d 100644
--- a/app/models/mute.rb
+++ b/app/models/mute.rb
@@ -3,9 +3,17 @@
class Mute < ApplicationRecord
include Paginable
- belongs_to :account
- belongs_to :target_account, class_name: 'Account'
+ belongs_to :account, required: true
+ belongs_to :target_account, class_name: 'Account', required: true
- validates :account, :target_account, presence: true
validates :account_id, uniqueness: { scope: :target_account_id }
+
+ after_create :remove_blocking_cache
+ after_destroy :remove_blocking_cache
+
+ private
+
+ def remove_blocking_cache
+ Rails.cache.delete("exclude_account_ids_for:#{account_id}")
+ end
end
diff --git a/app/models/report_filter.rb b/app/models/report_filter.rb
new file mode 100644
index 0000000000..56ab28df7f
--- /dev/null
+++ b/app/models/report_filter.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class ReportFilter
+ attr_reader :params
+
+ def initialize(params)
+ @params = params
+ end
+
+ def results
+ scope = Report.unresolved
+ params.each do |key, value|
+ scope = scope.merge scope_for(key, value)
+ end
+ scope
+ end
+
+ def scope_for(key, value)
+ case key.to_sym
+ when :resolved
+ Report.resolved
+ when :account_id
+ Report.where(account_id: value)
+ when :target_account_id
+ Report.where(target_account_id: value)
+ else
+ raise "Unknown filter: #{key}"
+ end
+ end
+end
diff --git a/app/models/status.rb b/app/models/status.rb
index c0a5d9d1b1..2d27a57d51 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -10,7 +10,7 @@ class Status < ApplicationRecord
belongs_to :application, class_name: 'Doorkeeper::Application'
- belongs_to :account, inverse_of: :statuses, counter_cache: true
+ belongs_to :account, inverse_of: :statuses, counter_cache: true, required: true
belongs_to :in_reply_to_account, foreign_key: 'in_reply_to_account_id', class_name: 'Account'
belongs_to :thread, foreign_key: 'in_reply_to_id', class_name: 'Status', inverse_of: :replies
@@ -26,7 +26,6 @@ class Status < ApplicationRecord
has_one :notification, as: :activity, dependent: :destroy
has_one :preview_card, dependent: :destroy
- validates :account, presence: true
validates :uri, uniqueness: true, unless: 'local?'
validates :text, presence: true, unless: 'reblog?'
validates_with StatusLengthValidator
@@ -43,7 +42,7 @@ class Status < ApplicationRecord
cache_associated :account, :application, :media_attachments, :tags, :stream_entry, mentions: :account, reblog: [:account, :application, :stream_entry, :tags, :media_attachments, mentions: :account], thread: :account
def reply?
- super || !in_reply_to_id.nil?
+ !in_reply_to_id.nil? || super
end
def local?
@@ -184,7 +183,7 @@ class Status < ApplicationRecord
private
def filter_timeline(query, account)
- blocked = Block.where(account: account).pluck(:target_account_id) + Block.where(target_account: account).pluck(:account_id) + Mute.where(account: account).pluck(:target_account_id)
+ blocked = Rails.cache.fetch("exclude_account_ids_for:#{account.id}") { Block.where(account: account).pluck(:target_account_id) + Block.where(target_account: account).pluck(:account_id) + Mute.where(account: account).pluck(:target_account_id) }
query = query.where('statuses.account_id NOT IN (?)', blocked) unless blocked.empty? # Only give us statuses from people we haven't blocked, or muted, or that have blocked us
query = query.where('accounts.silenced = TRUE') if account.silenced? # and if we're hellbanned, only people who are also hellbanned
query
diff --git a/app/models/subscription.rb b/app/models/subscription.rb
index 497cabb095..63553e9fef 100644
--- a/app/models/subscription.rb
+++ b/app/models/subscription.rb
@@ -4,7 +4,7 @@ class Subscription < ApplicationRecord
MIN_EXPIRATION = 3600 * 24 * 7
MAX_EXPIRATION = 3600 * 24 * 30
- belongs_to :account
+ belongs_to :account, required: true
validates :callback_url, presence: true
validates :callback_url, uniqueness: { scope: :account_id }
diff --git a/app/models/user.rb b/app/models/user.rb
index 27a38674e4..cd1f816caf 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -9,14 +9,12 @@ class User < ApplicationRecord
otp_secret_encryption_key: ENV['OTP_SECRET'],
otp_number_of_backup_codes: 10
- belongs_to :account, inverse_of: :user
+ belongs_to :account, inverse_of: :user, required: true
accepts_nested_attributes_for :account
- validates :account, presence: true
validates :locale, inclusion: I18n.available_locales.map(&:to_s), unless: 'locale.nil?'
validates :email, email: true
- scope :prolific, -> { joins('inner join statuses on statuses.account_id = users.account_id').select('users.*, count(statuses.id) as statuses_count').group('users.id').order('statuses_count desc') }
scope :recent, -> { order('id desc') }
scope :admins, -> { where(admin: true) }
scope :confirmed, -> { where.not(confirmed_at: nil) }
@@ -32,4 +30,8 @@ class User < ApplicationRecord
def setting_boost_modal
settings.boost_modal
end
+
+ def setting_auto_play_gif
+ settings.auto_play_gif
+ end
end
diff --git a/app/presenters/instance_presenter.rb b/app/presenters/instance_presenter.rb
index 13c5ece4e0..4188650d53 100644
--- a/app/presenters/instance_presenter.rb
+++ b/app/presenters/instance_presenter.rb
@@ -15,7 +15,7 @@ class InstancePresenter
end
def user_count
- Rails.cache.fetch('user_count') { User.count }
+ Rails.cache.fetch('user_count') { User.confirmed.count }
end
def status_count
diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb
index a9cb85500d..58a23d978e 100644
--- a/app/services/account_search_service.rb
+++ b/app/services/account_search_service.rb
@@ -41,7 +41,7 @@ class AccountSearchService < BaseService
end
def query_username
- @_query_username ||= split_query_string.first
+ @_query_username ||= split_query_string.first || ''
end
def query_domain
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index 1b94dfe0cd..5ab781bfc3 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -1,6 +1,8 @@
# frozen_string_literal: true
class FetchLinkCardService < BaseService
+ USER_AGENT = "#{HTTP::Request::USER_AGENT} (Mastodon; +http://#{Rails.configuration.x.local_domain}/)"
+
def call(status)
# Get first http/https URL that isn't local
url = URI.extract(status.text).reject { |uri| (uri =~ /\Ahttps?:\/\//).nil? || TagManager.instance.local_url?(uri) }.first
@@ -26,7 +28,7 @@ class FetchLinkCardService < BaseService
private
def http_client
- HTTP.timeout(:per_operation, write: 10, connect: 10, read: 10).follow
+ HTTP.headers(user_agent: USER_AGENT).timeout(:per_operation, write: 10, connect: 10, read: 10).follow
end
def meta_property(html, property)
diff --git a/app/services/follow_remote_account_service.rb b/app/services/follow_remote_account_service.rb
index 14bc064d5d..2d7414bc0b 100644
--- a/app/services/follow_remote_account_service.rb
+++ b/app/services/follow_remote_account_service.rb
@@ -10,7 +10,7 @@ class FollowRemoteAccountService < BaseService
# important information from their feed
# @param [String] uri User URI in the form of username@domain
# @return [Account]
- def call(uri)
+ def call(uri, redirected = nil)
username, domain = uri.split('@')
return Account.find_local(username) if TagManager.instance.local_domain?(domain)
@@ -24,8 +24,14 @@ class FollowRemoteAccountService < BaseService
raise Goldfinger::Error, 'Missing resource links' if data.link('http://schemas.google.com/g/2010#updates-from').nil? || data.link('salmon').nil? || data.link('http://webfinger.net/rel/profile-page').nil? || data.link('magic-public-key').nil?
+ # Disallow account hijacking
confirmed_username, confirmed_domain = data.subject.gsub(/\Aacct:/, '').split('@')
+ unless confirmed_username.casecmp(username).zero? && confirmed_domain.casecmp(domain).zero?
+ return call("#{confirmed_username}@#{confirmed_domain}", true) if redirected.nil?
+ raise Goldfinger::Error, 'Requested and returned acct URI do not match'
+ end
+
return Account.find_local(confirmed_username) if TagManager.instance.local_domain?(confirmed_domain)
confirmed_account = Account.find_remote(confirmed_username, confirmed_domain)
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index ec2b90e075..6ce434a13b 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -19,7 +19,7 @@ class PostStatusService < BaseService
sensitive: options[:sensitive],
spoiler_text: options[:spoiler_text] || '',
visibility: options[:visibility],
- language: detect_language(text),
+ language: detect_language_for(text, account),
application: options[:application])
attach_media(status, media)
@@ -36,7 +36,7 @@ class PostStatusService < BaseService
private
def validate_media!(media_ids)
- return if media_ids.nil? || !media_ids.is_a?(Enumerable)
+ return if media_ids.blank? || !media_ids.is_a?(Enumerable)
raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if media_ids.size > 4
@@ -52,8 +52,8 @@ class PostStatusService < BaseService
media.update(status_id: status.id)
end
- def detect_language(text)
- WhatLanguage.new(:all).language_iso(text) || 'en'
+ def detect_language_for(text, account)
+ LanguageDetector.new(text, account).to_iso_s
end
def process_mentions_service
diff --git a/app/views/about/more.html.haml b/app/views/about/more.html.haml
index 418c982472..8f9cd2f6a0 100644
--- a/app/views/about/more.html.haml
+++ b/app/views/about/more.html.haml
@@ -1,11 +1,11 @@
- content_for :page_title do
- #{Rails.configuration.x.local_domain}
+ = site_hostname
.wrapper.thicc
.sidebar-layout
.main
.panel
- %h2= Rails.configuration.x.local_domain
+ %h2= site_hostname
- unless @instance_presenter.site_description.blank?
%p= @instance_presenter.site_description.html_safe
@@ -28,5 +28,5 @@
.panel= @instance_presenter.site_extended_description.html_safe
.sidebar
- = render partial: 'contact', object: @instance_presenter
+ = render 'contact', contact: @instance_presenter
= render 'links'
diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml
index 39686b5316..49ad03557d 100644
--- a/app/views/about/show.html.haml
+++ b/app/views/about/show.html.haml
@@ -2,13 +2,13 @@
= javascript_include_tag 'application_public', integrity: true
- content_for :page_title do
- = Rails.configuration.x.local_domain
+ = site_hostname
- content_for :header_tags do
%meta{ property: 'og:site_name', content: site_title }/
%meta{ property: 'og:type', content: 'website' }/
- %meta{ property: 'og:title', content: Rails.configuration.x.local_domain }/
- %meta{ property: 'og:description', content: strip_tags(@instance_presenter.site_description.blank? ? t('about.about_mastodon') : @instance_presenter.site_description) }/
+ %meta{ property: 'og:title', content: site_hostname }/
+ %meta{ property: 'og:description', content: strip_tags(@instance_presenter.site_description.presence || t('about.about_mastodon')) }/
%meta{ property: 'og:image', content: asset_url('mastodon_small.jpg') }/
%meta{ property: 'og:image:width', content: '400' }/
%meta{ property: 'og:image:height', content: '400' }/
@@ -72,7 +72,7 @@
= t 'about.features.api'
- unless @instance_presenter.site_description.blank?
- %h3= t('about.description_headline', domain: Rails.configuration.x.local_domain)
+ %h3= t('about.description_headline', domain: site_hostname)
%p= @instance_presenter.site_description.html_safe
.actions
diff --git a/app/views/about/terms.en.html.haml b/app/views/about/terms.en.html.haml
index e1766ca163..7e0fb94c21 100644
--- a/app/views/about/terms.en.html.haml
+++ b/app/views/about/terms.en.html.haml
@@ -1,5 +1,5 @@
- content_for :page_title do
- #{Rails.configuration.x.local_domain} Terms of Service and Privacy Policy
+ #{site_hostname} Terms of Service and Privacy Policy
.wrapper
%h2 Privacy Policy
diff --git a/app/views/about/terms.no.html.haml b/app/views/about/terms.no.html.haml
index 32ec57ed19..46f62950df 100644
--- a/app/views/about/terms.no.html.haml
+++ b/app/views/about/terms.no.html.haml
@@ -1,5 +1,5 @@
- content_for :page_title do
- #{Rails.configuration.x.local_domain} Personvern og villkår for bruk av nettstedet
+ #{site_hostname} Personvern og villkår for bruk av nettstedet
.wrapper
%h2 Personvernserklæring
diff --git a/app/views/accounts/_follow_grid.html.haml b/app/views/accounts/_follow_grid.html.haml
new file mode 100644
index 0000000000..322a0ebf4e
--- /dev/null
+++ b/app/views/accounts/_follow_grid.html.haml
@@ -0,0 +1,7 @@
+.accounts-grid
+ - if accounts.empty?
+ = render partial: 'accounts/nothing_here'
+ - else
+ = render partial: 'accounts/grid_card', collection: accounts, as: :account, cached: true
+
+= paginate accounts
diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml
index 6538885a01..ed13ab57ca 100644
--- a/app/views/accounts/_header.html.haml
+++ b/app/views/accounts/_header.html.haml
@@ -2,9 +2,9 @@
- if user_signed_in? && current_account.id != account.id && !current_account.requested?(account)
.controls
- if current_account.following?(account)
- = link_to t('accounts.unfollow'), unfollow_account_path(account), data: { method: :post }, class: 'button'
+ = link_to t('accounts.unfollow'), account_unfollow_path(account), data: { method: :post }, class: 'button'
- else
- = link_to t('accounts.follow'), follow_account_path(account), data: { method: :post }, class: 'button'
+ = link_to t('accounts.follow'), account_follow_path(account), data: { method: :post }, class: 'button'
- elsif !user_signed_in?
.controls
.remote-follow
@@ -24,11 +24,11 @@
= link_to short_account_url(account), class: 'u-url u-uid' do
%span.counter-label= t('accounts.posts')
%span.counter-number= number_with_delimiter account.statuses_count
- .counter{ class: active_nav_class(following_account_url(account)) }
- = link_to following_account_url(account) do
+ .counter{ class: active_nav_class(account_following_index_url(account)) }
+ = link_to account_following_index_url(account) do
%span.counter-label= t('accounts.following')
%span.counter-number= number_with_delimiter account.following_count
- .counter{ class: active_nav_class(followers_account_url(account)) }
- = link_to followers_account_url(account) do
+ .counter{ class: active_nav_class(account_followers_url(account)) }
+ = link_to account_followers_url(account) do
%span.counter-label= t('accounts.followers')
%span.counter-number= number_with_delimiter account.followers_count
diff --git a/app/views/accounts/_og.html.haml b/app/views/accounts/_og.html.haml
new file mode 100644
index 0000000000..b7f019c506
--- /dev/null
+++ b/app/views/accounts/_og.html.haml
@@ -0,0 +1,7 @@
+%meta{ property: 'og:site_name', content: site_title }/
+%meta{ property: 'og:title', content: [yield(:page_title).strip.presence, site_title].compact.join(' - ') }/
+%meta{ property: 'og:description', content: account.note }/
+%meta{ property: 'og:image', content: full_asset_url(account.avatar.url(:original)) }/
+%meta{ property: 'og:image:width', content: '120' }/
+%meta{ property: 'og:image:height', content: '120' }/
+%meta{ property: 'twitter:card', content: 'summary' }/
diff --git a/app/views/accounts/followers.html.haml b/app/views/accounts/followers.html.haml
deleted file mode 100644
index 4b53aef0cc..0000000000
--- a/app/views/accounts/followers.html.haml
+++ /dev/null
@@ -1,12 +0,0 @@
-- content_for :page_title do
- = t('accounts.people_who_follow', name: display_name(@account))
-
-= render 'header', account: @account
-
-.accounts-grid
- - if @followers.empty?
- = render partial: 'nothing_here'
- - else
- = render partial: 'grid_card', collection: @followers, as: :account, cached: true
-
-= paginate @followers
diff --git a/app/views/accounts/following.html.haml b/app/views/accounts/following.html.haml
deleted file mode 100644
index 4711997d9d..0000000000
--- a/app/views/accounts/following.html.haml
+++ /dev/null
@@ -1,12 +0,0 @@
-- content_for :page_title do
- = t('accounts.people_followed_by', name: display_name(@account))
-
-= render 'header', account: @account
-
-.accounts-grid
- - if @following.empty?
- = render partial: 'nothing_here'
- - else
- = render partial: 'grid_card', collection: @following, as: :account, cached: true
-
-= paginate @following
diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml
index 9a70fd16fe..4611155cdd 100644
--- a/app/views/accounts/show.html.haml
+++ b/app/views/accounts/show.html.haml
@@ -5,26 +5,20 @@
%link{ rel: 'salmon', href: api_salmon_url(@account.id) }/
%link{ rel: 'alternate', type: 'application/atom+xml', href: account_url(@account, format: 'atom') }/
- %meta{ property: 'og:site_name', content: site_title }/
%meta{ property: 'og:type', content: 'profile' }/
- %meta{ property: 'og:title', content: "#{@account.username} on #{Rails.configuration.x.local_domain}" }/
- %meta{ property: 'og:description', content: @account.note }/
- %meta{ property: 'og:image', content: full_asset_url(@account.avatar.url(:original)) }/
- %meta{ property: 'og:image:width', content: '120' }/
- %meta{ property: 'og:image:height', content: '120' }/
- %meta{ property: 'twitter:card', content: 'summary' }/
+ = render 'og', account: @account
- if show_landing_strip?
= render partial: 'shared/landing_strip', locals: { account: @account }
.h-feed
- %data.p-name{ value: "#{@account.username} on #{Rails.configuration.x.local_domain}" }/
+ %data.p-name{ value: "#{@account.username} on #{site_hostname}" }/
= render 'header', account: @account
- if @statuses.empty?
.accounts-grid
- = render partial: 'nothing_here'
+ = render 'nothing_here'
- else
.activity-stream
= render partial: 'stream_entries/status', collection: @statuses, as: :status
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml
index 7609868e60..ebf2b5ac1b 100644
--- a/app/views/admin/accounts/show.html.haml
+++ b/app/views/admin/accounts/show.html.haml
@@ -60,6 +60,12 @@
= @account.media_attachments.count
= surround '(', ')' do
= number_to_human_size @account.media_attachments.sum('file_file_size')
+ %tr
+ %th= t('.created_reports')
+ %td= link_to pluralize(@account.reports.count, t('.report')), admin_reports_path(account_id: @account.id)
+ %tr
+ %th= t('.targeted_reports')
+ %td= link_to pluralize(@account.targeted_reports.count, t('.report')), admin_reports_path(target_account_id: @account.id)
- if @account.local?
%div{ style: 'float: right' }
diff --git a/app/views/admin/instances/index.html.haml b/app/views/admin/instances/index.html.haml
new file mode 100644
index 0000000000..b5ad40ac64
--- /dev/null
+++ b/app/views/admin/instances/index.html.haml
@@ -0,0 +1,15 @@
+- content_for :page_title do
+ = t('admin.instances.title')
+
+%table.table
+ %thead
+ %tr
+ %th= t('admin.instances.domain_name')
+ %th= t('admin.instances.account_count')
+ %tbody
+ - @instances.each do |instance|
+ %tr
+ %td= instance.domain
+ %td= instance.accounts_count
+
+= paginate @instances
diff --git a/app/views/api/oembed/show.json.rabl b/app/views/api/oembed/show.json.rabl
index 311c02dadd..11dcec538c 100644
--- a/app/views/api/oembed/show.json.rabl
+++ b/app/views/api/oembed/show.json.rabl
@@ -6,7 +6,7 @@ node(:version) { '1.0' }
node(:title, &:title)
node(:author_name) { |entry| entry.account.display_name.blank? ? entry.account.username : entry.account.display_name }
node(:author_url) { |entry| account_url(entry.account) }
-node(:provider_name) { Rails.configuration.x.local_domain }
+node(:provider_name) { site_hostname }
node(:provider_url) { root_url }
node(:cache_age) { 86_400 }
node(:html) { |entry| "" }
diff --git a/app/views/api/v1/instances/show.rabl b/app/views/api/v1/instances/show.rabl
index 88eb08a9e8..f5598fde38 100644
--- a/app/views/api/v1/instances/show.rabl
+++ b/app/views/api/v1/instances/show.rabl
@@ -1,6 +1,6 @@
object false
-node(:uri) { Rails.configuration.x.local_domain }
+node(:uri) { site_hostname }
node(:title) { Setting.site_title }
node(:description) { Setting.site_description }
node(:email) { Setting.site_contact_email }
diff --git a/app/views/api/v1/statuses/_media.rabl b/app/views/api/v1/statuses/_media.rabl
index 80d80ea05a..2f56c6d07d 100644
--- a/app/views/api/v1/statuses/_media.rabl
+++ b/app/views/api/v1/statuses/_media.rabl
@@ -1,5 +1,5 @@
attributes :id, :remote_url, :type
-node(:url) { |media| media.file.blank? ? media.remote_url : full_asset_url(media.file.url(:original)) }
-node(:preview_url) { |media| media.file.blank? ? media.remote_url : full_asset_url(media.file.url(:small)) }
+node(:url) { |media| full_asset_url(media.file.url(:original)) }
+node(:preview_url) { |media| full_asset_url(media.file.url(:small)) }
node(:text_url) { |media| media.local? ? medium_url(media) : nil }
diff --git a/app/views/authorize_follow/new.html.haml b/app/views/authorize_follow/new.html.haml
index 95601253e6..3b60df0580 100644
--- a/app/views/authorize_follow/new.html.haml
+++ b/app/views/authorize_follow/new.html.haml
@@ -5,7 +5,7 @@
.follow-prompt
%h2= t('authorize_follow.prompt_html', self: current_account.username)
- = render partial: 'card', locals: { account: @account }
+ = render 'card', account: @account
= form_tag authorize_follow_path, method: :post, class: 'simple_form' do
= hidden_field_tag :acct, @account.acct
diff --git a/app/views/follower_accounts/index.html.haml b/app/views/follower_accounts/index.html.haml
new file mode 100644
index 0000000000..4052967dab
--- /dev/null
+++ b/app/views/follower_accounts/index.html.haml
@@ -0,0 +1,9 @@
+- content_for :page_title do
+ = t('accounts.people_who_follow', name: display_name(@account))
+
+- content_for :header_tags do
+ = render 'accounts/og', account: @account
+
+= render 'accounts/header', account: @account
+
+= render 'accounts/follow_grid', accounts: @accounts
diff --git a/app/views/following_accounts/index.html.haml b/app/views/following_accounts/index.html.haml
new file mode 100644
index 0000000000..11e730e048
--- /dev/null
+++ b/app/views/following_accounts/index.html.haml
@@ -0,0 +1,9 @@
+- content_for :page_title do
+ = t('accounts.people_followed_by', name: display_name(@account))
+
+- content_for :header_tags do
+ = render 'accounts/og', account: @account
+
+= render 'accounts/header', account: @account
+
+= render 'accounts/follow_grid', accounts: @accounts
diff --git a/app/views/home/initial_state.json.rabl b/app/views/home/initial_state.json.rabl
index ce7bfbd44c..b599b5cf00 100644
--- a/app/views/home/initial_state.json.rabl
+++ b/app/views/home/initial_state.json.rabl
@@ -5,10 +5,11 @@ node(:meta) do
streaming_api_base_url: @streaming_api_base_url,
access_token: @token,
locale: I18n.locale,
- domain: Rails.configuration.x.local_domain,
+ domain: site_hostname,
me: current_account.id,
admin: @admin.try(:id),
boost_modal: current_account.user.setting_boost_modal,
+ auto_play_gif: current_account.user.setting_auto_play_gif,
}
end
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index a27c3de956..fa5811fd88 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -6,6 +6,7 @@
%meta{'http-equiv' => 'X-UA-Compatible', :content => 'IE=edge'}/
%link{:rel => "apple-touch-icon", :sizes => "180x180", :href => "/apple-touch-icon.png"}/
+ %link{:rel => "mask-icon", :href => "/mask-icon.svg", :color => "#2B90D9"}/
%link{:rel => "manifest", :href => "/manifest.json"}/
%meta{:name => "msapplication-config", :content => "/browserconfig.xml"}/
%meta{:name => "theme-color", :content => "#282c37"}/
diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb
index 21bf444c37..cdb284de83 100644
--- a/app/views/layouts/mailer.text.erb
+++ b/app/views/layouts/mailer.text.erb
@@ -1,5 +1,5 @@
<%= yield %>
---
-<%= t('application_mailer.signature', instance: Rails.configuration.x.local_domain) %>
+<%= t('application_mailer.signature', instance: site_hostname) %>
<%= t('application_mailer.settings', link: settings_preferences_url) %>
diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml
index fdde0a6813..556102f538 100644
--- a/app/views/layouts/public.html.haml
+++ b/app/views/layouts/public.html.haml
@@ -4,7 +4,7 @@
- content_for :content do
.container= yield
.footer
- %span.domain= link_to Rails.configuration.x.local_domain, root_path
+ %span.domain= link_to site_hostname, root_path
%span.powered-by
= t('generic.powered_by', link: link_to('Mastodon', 'https://github.com/tootsuite/mastodon')).html_safe
diff --git a/app/views/notification_mailer/favourite.text.erb b/app/views/notification_mailer/favourite.text.erb
index 99852592f6..795045307f 100644
--- a/app/views/notification_mailer/favourite.text.erb
+++ b/app/views/notification_mailer/favourite.text.erb
@@ -2,4 +2,4 @@
<%= raw t('notification_mailer.favourite.body', name: @account.acct) %>
-<%= render partial: 'status', locals: { status: @status } %>
+<%= render 'status', status: @status %>
diff --git a/app/views/notification_mailer/mention.text.erb b/app/views/notification_mailer/mention.text.erb
index c0d4be1d86..b38c5a4d06 100644
--- a/app/views/notification_mailer/mention.text.erb
+++ b/app/views/notification_mailer/mention.text.erb
@@ -2,4 +2,4 @@
<%= raw t('notification_mailer.mention.body', name: @status.account.acct) %>
-<%= render partial: 'status', locals: { status: @status } %>
+<%= render 'status', status: @status %>
diff --git a/app/views/notification_mailer/reblog.text.erb b/app/views/notification_mailer/reblog.text.erb
index c32b486500..fd85437a7d 100644
--- a/app/views/notification_mailer/reblog.text.erb
+++ b/app/views/notification_mailer/reblog.text.erb
@@ -2,4 +2,4 @@
<%= raw t('notification_mailer.reblog.body', name: @account.acct) %>
-<%= render partial: 'status', locals: { status: @status } %>
+<%= render 'status', status: @status %>
diff --git a/app/views/settings/imports/show.html.haml b/app/views/settings/imports/show.html.haml
index 8502913dcc..991dd4e941 100644
--- a/app/views/settings/imports/show.html.haml
+++ b/app/views/settings/imports/show.html.haml
@@ -4,7 +4,7 @@
%p.hint= t('imports.preface')
= simple_form_for @import, url: settings_import_path do |f|
- = f.input :type, collection: Import.types.keys, wrapper: :with_label, include_blank: false, label_method: lambda { |type| I18n.t("imports.types.#{type}") }
+ = f.input :type, collection: Import.types.keys, wrapper: :with_label, include_blank: false, label_method: lambda { |type| I18n.t("imports.types.#{type}") }, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
= f.input :data, wrapper: :with_label, hint: t('simple_form.hints.imports.data')
.actions
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml
index e819429b62..ce3929629b 100644
--- a/app/views/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@@ -7,7 +7,7 @@
.fields-group
= f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) }
- = f.input :setting_default_privacy, collection: Status.visibilities.keys - ['direct'], wrapper: :with_label, include_blank: false, label_method: lambda { |visibility| I18n.t("statuses.visibilities.#{visibility}") }, required: false
+ = f.input :setting_default_privacy, collection: Status.visibilities.keys - ['direct'], wrapper: :with_label, include_blank: false, label_method: lambda { |visibility| I18n.t("statuses.visibilities.#{visibility}") }, required: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
.fields-group
= f.simple_fields_for :notification_emails, hash_to_object(current_user.settings.notification_emails) do |ff|
@@ -25,5 +25,8 @@
.fields-group
= f.input :setting_boost_modal, as: :boolean, wrapper: :with_label
+ .fields-group
+ = f.input :setting_auto_play_gif, as: :boolean, wrapper: :with_label
+
.actions
= f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/settings/two_factor_auths/create.html.haml b/app/views/settings/two_factor_auths/create.html.haml
index 138a930fd6..aaeebaf2e0 100644
--- a/app/views/settings/two_factor_auths/create.html.haml
+++ b/app/views/settings/two_factor_auths/create.html.haml
@@ -1,4 +1,4 @@
- content_for :page_title do
= t('settings.two_factor_auth')
-= render partial: 'recovery_codes', object: @codes
+= render 'recovery_codes', recovery_codes: @codes
diff --git a/app/views/settings/two_factor_auths/recovery_codes.html.haml b/app/views/settings/two_factor_auths/recovery_codes.html.haml
index 138a930fd6..aaeebaf2e0 100644
--- a/app/views/settings/two_factor_auths/recovery_codes.html.haml
+++ b/app/views/settings/two_factor_auths/recovery_codes.html.haml
@@ -1,4 +1,4 @@
- content_for :page_title do
= t('settings.two_factor_auth')
-= render partial: 'recovery_codes', object: @codes
+= render 'recovery_codes', recovery_codes: @codes
diff --git a/app/views/shared/_landing_strip.html.haml b/app/views/shared/_landing_strip.html.haml
index 3536c5ca8c..02e694418f 100644
--- a/app/views/shared/_landing_strip.html.haml
+++ b/app/views/shared/_landing_strip.html.haml
@@ -1,5 +1,5 @@
.landing-strip
= t('landing_strip_html',
name: content_tag(:span, display_name(account), class: :emojify),
- domain: Rails.configuration.x.local_domain,
+ domain: site_hostname,
sign_up_path: new_user_registration_path)
diff --git a/app/views/stream_entries/_status.html.haml b/app/views/stream_entries/_status.html.haml
index f389a8dfe7..6c763bde26 100644
--- a/app/views/stream_entries/_status.html.haml
+++ b/app/views/stream_entries/_status.html.haml
@@ -26,7 +26,7 @@
%strong.emojify= display_name(status.account)
= t('stream_entries.reblogged')
- = render partial: centered ? 'stream_entries/detailed_status' : 'stream_entries/simple_status', locals: { status: status.proper }
+ = render (centered ? 'stream_entries/detailed_status' : 'stream_entries/simple_status'), status: status.proper
- if include_threads
= render partial: 'stream_entries/status', collection: @descendants, as: :status, locals: { is_successor: true, parent_id: status.id}
diff --git a/app/views/stream_entries/embed.html.haml b/app/views/stream_entries/embed.html.haml
index fd07fdd915..5df82528bd 100644
--- a/app/views/stream_entries/embed.html.haml
+++ b/app/views/stream_entries/embed.html.haml
@@ -1,2 +1,2 @@
.activity-stream.activity-stream-headless
- = render partial: @type, locals: { @type.to_sym => @stream_entry.activity, centered: true }
+ = render @type, @type.to_sym => @stream_entry.activity, centered: true
diff --git a/app/views/stream_entries/show.html.haml b/app/views/stream_entries/show.html.haml
index dea5e9d408..31efa26c42 100644
--- a/app/views/stream_entries/show.html.haml
+++ b/app/views/stream_entries/show.html.haml
@@ -4,7 +4,7 @@
%meta{ property: 'og:site_name', content: site_title }/
%meta{ property: 'og:type', content: 'article' }/
- %meta{ property: 'og:title', content: "#{@account.username} on #{Rails.configuration.x.local_domain}" }/
+ %meta{ property: 'og:title', content: "#{@account.username} on #{site_hostname}" }/
= render 'stream_entries/og_description', activity: @stream_entry.activity
= render 'stream_entries/og_image', activity: @stream_entry.activity, account: @account
diff --git a/app/views/user_mailer/confirmation_instructions.ja.html.erb b/app/views/user_mailer/confirmation_instructions.ja.html.erb
index bbb44b2cca..1232f94b49 100644
--- a/app/views/user_mailer/confirmation_instructions.ja.html.erb
+++ b/app/views/user_mailer/confirmation_instructions.ja.html.erb
@@ -1,5 +1,11 @@
{header}
{children}
diff --git a/app/assets/javascripts/components/features/ui/components/tabs_bar.jsx b/app/assets/javascripts/components/features/ui/components/tabs_bar.jsx
index 6cdb29dbff..68002840fb 100644
--- a/app/assets/javascripts/components/features/ui/components/tabs_bar.jsx
+++ b/app/assets/javascripts/components/features/ui/components/tabs_bar.jsx
@@ -13,7 +13,7 @@ const TabsBar = React.createClass({
ようこそ<%= @resource.email %>さん
-以下のリンクをクリックしてMastodonアカウントのメールアドレスを確認してください
+<%= @instance %>にアカウントが作成されました。
+ +以下のリンクをクリックしてMastodonアカウントのメールアドレスを確認してください。
<%= link_to 'メールアドレスの確認', confirmation_url(@resource, confirmation_token: @token) %>
+ +また、インスタンスの<%= link_to '利用規約', terms_url %>についてもご確認ください。
+ +<%= @instance %> チーム
diff --git a/app/views/user_mailer/confirmation_instructions.ja.text.erb b/app/views/user_mailer/confirmation_instructions.ja.text.erb index ad8abee2dd..99868ba8af 100644 --- a/app/views/user_mailer/confirmation_instructions.ja.text.erb +++ b/app/views/user_mailer/confirmation_instructions.ja.text.erb @@ -1,5 +1,11 @@ ようこそ<%= @resource.email %>さん -以下のリンクをクリックしてMastodonアカウントのメールアドレスを確認してください +<%= @instance %>にアカウントが作成されました。 + +以下のリンクをクリックしてMastodonアカウントのメールアドレスを確認してください。 <%= confirmation_url(@resource, confirmation_token: @token) %> + +また、インスタンスの<%= link_to '利用規約', terms_url %>についてもご確認ください。 + +<%= @instance %> チーム diff --git a/app/views/user_mailer/reset_password_instructions.ja.html.erb b/app/views/user_mailer/reset_password_instructions.ja.html.erb index 156758ef51..d0d7203f4c 100644 --- a/app/views/user_mailer/reset_password_instructions.ja.html.erb +++ b/app/views/user_mailer/reset_password_instructions.ja.html.erb @@ -4,5 +4,5 @@<%= link_to 'パスワードを変更', edit_password_url(@resource, reset_password_token: @token) %>
-このメールに見に覚えのない場合は無視してください。
+このメールに身に覚えのない場合は無視してください。
上記のリンクにアクセスし、変更をしない限りパスワードは変更されません。
diff --git a/app/views/user_mailer/reset_password_instructions.ja.text.erb b/app/views/user_mailer/reset_password_instructions.ja.text.erb index 5fb0eba045..9ed607b581 100644 --- a/app/views/user_mailer/reset_password_instructions.ja.text.erb +++ b/app/views/user_mailer/reset_password_instructions.ja.text.erb @@ -4,5 +4,5 @@ Mastodonアカウントのパスワードの変更がリクエストされまし <%= edit_password_url(@resource, reset_password_token: @token) %> -このメールに見に覚えのない場合は無視してください。 +このメールに身に覚えのない場合は無視してください。 上記のリンクにアクセスし、変更をしない限りパスワードは変更されません。 diff --git a/bin/setup b/bin/setup index e620b4dadb..72b62a0283 100755 --- a/bin/setup +++ b/bin/setup @@ -17,6 +17,7 @@ chdir APP_ROOT do puts '== Installing dependencies ==' system! 'gem install bundler --conservative' system('bundle check') || system!('bundle install') + system!('yarn install') # puts "\n== Copying sample files ==" # unless File.exist?('config/database.yml') diff --git a/config/application.rb b/config/application.rb index fa7098b39e..5b86cddb46 100644 --- a/config/application.rb +++ b/config/application.rb @@ -32,12 +32,15 @@ module Mastodon :es, :fi, :fr, - :it, + :hr, :hu, + :it, :ja, :nl, :no, + :oc, :pt, + :'pt-BR', :ru, :uk, 'zh-CN', diff --git a/config/deploy.rb b/config/deploy.rb index 8ff933e9bf..39c97aeeb6 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -6,6 +6,7 @@ set :branch, 'skylight' set :rbenv_type, :user set :rbenv_ruby, File.read('.ruby-version').strip set :migration_role, :app +set :conditional_migrate, true -append :linked_files, '.env.production' +append :linked_files, '.env.production', 'public/robots.txt' append :linked_dirs, 'vendor/bundle', 'public/system' diff --git a/config/environments/production.rb b/config/environments/production.rb index 80021287a5..a4cdb27323 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -100,8 +100,10 @@ Rails.application.configure do :address => ENV['SMTP_SERVER'], :user_name => ENV['SMTP_LOGIN'], :password => ENV['SMTP_PASSWORD'], + :domain => ENV['SMTP_DOMAIN'] || ENV['LOCAL_DOMAIN'], - :authentication => ENV['SMTP_AUTH_METHOD'] || :plain, + :authentication => ENV['SMTP_AUTH_METHOD'] == 'none' ? nil : ENV['SMTP_AUTH_METHOD'] || :plain, + :openssl_verify_mode => ENV['SMTP_OPENSSL_VERIFY_MODE'], :enable_starttls_auto => ENV['SMTP_ENABLE_STARTTLS_AUTO'] || true, } diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb index 77bc13b3aa..9e2996faa0 100644 --- a/config/initializers/paperclip.rb +++ b/config/initializers/paperclip.rb @@ -4,7 +4,7 @@ Paperclip.options[:read_timeout] = 60 Paperclip.interpolates :filename do |attachment, style| return attachment.original_filename if style == :original - [basename(attachment, style), content_type_extension(attachment, style)].delete_if(&:empty?).join('.') + [basename(attachment, style), extension(attachment, style)].delete_if(&:empty?).join('.') end if ENV['S3_ENABLED'] == 'true' @@ -16,7 +16,7 @@ if ENV['S3_ENABLED'] == 'true' Paperclip::Attachment.default_options[:s3_host_name] = ENV.fetch('S3_HOSTNAME') { "s3-#{ENV.fetch('S3_REGION')}.amazonaws.com" } Paperclip::Attachment.default_options[:path] = '/:class/:attachment/:id_partition/:style/:filename' Paperclip::Attachment.default_options[:s3_headers] = { 'Cache-Control' => 'max-age=315576000' } - Paperclip::Attachment.default_options[:s3_permissions] = 'public-read' + Paperclip::Attachment.default_options[:s3_permissions] = ENV.fetch('S3_PERMISSION') { 'public-read' } Paperclip::Attachment.default_options[:s3_region] = ENV.fetch('S3_REGION') { 'us-east-1' } Paperclip::Attachment.default_options[:s3_credentials] = { @@ -28,6 +28,7 @@ if ENV['S3_ENABLED'] == 'true' unless ENV['S3_ENDPOINT'].blank? Paperclip::Attachment.default_options[:s3_options] = { endpoint: ENV['S3_ENDPOINT'], + signature_version: ENV['S3_SIGNATURE_VERSION'] || 'v4', force_path_style: true, } @@ -39,6 +40,6 @@ if ENV['S3_ENABLED'] == 'true' Paperclip::Attachment.default_options[:s3_host_alias] = ENV['S3_CLOUDFRONT_HOST'] end else - Paperclip::Attachment.default_options[:path] = (ENV['PAPERCLIP_ROOT_PATH'] || ':rails_root/public/system') + '/:class/:attachment/:id_partition/:style/:filename' - Paperclip::Attachment.default_options[:url] = (ENV['PAPERCLIP_ROOT_URL'] || '/system') + '/:class/:attachment/:id_partition/:style/:filename' + Paperclip::Attachment.default_options[:path] = (ENV['PAPERCLIP_ROOT_PATH'] || ':rails_root/public/system') + '/:class/:attachment/:id_partition/:style/:filename' + Paperclip::Attachment.default_options[:url] = (ENV['PAPERCLIP_ROOT_URL'] || '/system') + '/:class/:attachment/:id_partition/:style/:filename' end diff --git a/config/initializers/rack-attack.rb b/config/initializers/rack_attack.rb similarity index 50% rename from config/initializers/rack-attack.rb rename to config/initializers/rack_attack.rb index 70f7846d19..67ec7c919a 100644 --- a/config/initializers/rack-attack.rb +++ b/config/initializers/rack_attack.rb @@ -1,7 +1,24 @@ +# frozen_string_literal: true + class Rack::Attack # Rate limits for the API throttle('api', limit: 300, period: 5.minutes) do |req| - req.ip if req.path.match(/\A\/api\/v/) + req.ip if req.path =~ /\A\/api\/v/ + end + + # Rate limit logins + throttle('login', limit: 5, period: 5.minutes) do |req| + req.ip if req.path == '/auth/sign_in' && req.post? + end + + # Rate limit sign-ups + throttle('register', limit: 5, period: 5.minutes) do |req| + req.ip if req.path == '/auth' && req.post? + end + + # Rate limit forgotten passwords + throttle('reminder', limit: 5, period: 5.minutes) do |req| + req.ip if req.path == '/auth/password' && req.post? end self.throttled_response = lambda do |env| diff --git a/config/locales/de.yml b/config/locales/de.yml index 75ac4e1bba..dcbeea745d 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -1,7 +1,7 @@ --- de: about: - about_mastodon: Mastodon ist ein freier, quelloffener soziales Netzwerkserver. Als dezentralisierte Alternative zu kommerziellen Plattformen verhindert es die Risiken, die entstehen, wenn eine einzelne Firma deine Kommunikation monopolisiert. Jeder kann Mastodon verwenden und ganz einfach am sozialen Netzwerk teilnehmen. + about_mastodon: Mastodon ist ein freier, quelloffener sozialer Netzwerkserver. Als dezentralisierte Alternative zu kommerziellen Plattformen verhindert es die Risiken, die entstehen, wenn eine einzelne Firma deine Kommunikation monopolisiert. Jeder kann Mastodon verwenden und ganz einfach am sozialen Netzwerk teilnehmen. get_started: Erste Schritte source_code: Quellcode terms: AGB diff --git a/config/locales/devise.ja.yml b/config/locales/devise.ja.yml index 4aeb09cd40..c09c15bb46 100644 --- a/config/locales/devise.ja.yml +++ b/config/locales/devise.ja.yml @@ -7,7 +7,7 @@ ja: send_paranoid_instructions: もしあなたのメールアドレスが登録されていれば、まもなくメールアドレスの確認の方法が記載されたメールが送信されます。 failure: already_authenticated: 既にログイン済みです。 - inactive: あなたのアカウントはまだアクティベートされていません。 + inactive: あなたのアカウントはまだ有効化されていません。 invalid: '%{authentication_keys}かパスワードが誤っています' last_attempt: あと1回失敗するとアカウントがロックされます。 locked: アカウントはロックされました。 diff --git a/config/locales/devise.nl.yml b/config/locales/devise.nl.yml index 9057a67759..28e012dfbe 100644 --- a/config/locales/devise.nl.yml +++ b/config/locales/devise.nl.yml @@ -3,57 +3,59 @@ nl: devise: confirmations: confirmed: Je account is bevestigd. - send_instructions: Je ontvangt via e-mail instructies hoe je je account kan bevestigen. - send_paranoid_instructions: Als je e-mailadres bestaat in de database, ontvang je via e-mail instructies hoe je je account kan bevestigen. + send_instructions: Je ontvangt via e-mail instructies hoe je jouw account kan bevestigen. + send_paranoid_instructions: Als jouw e-mailadres in de database staat, ontvang je via e-mail instructies hoe je jouw account kan bevestigen. failure: already_authenticated: Je bent al ingelogd. - inactive: Je account is nog niet geactiveerd. - invalid: Ongeldig e-mail of wachtwoord. - invalid_token: Invalide authenticiteit token. - last_attempt: Je hebt nog een poging over voordat je account wordt geblokkeerd. - locked: Je account is gelocked. - not_found_in_database: Ongeldig e-mail of wachtwoord. - timeout: Je sessie is verlopen, log a.u.b. opnieuw in. - unauthenticated: Je dient in te loggen of je in te schrijven. - unconfirmed: Je dient eerst je account te bevestigen. + inactive: Jouw account is nog niet geactiveerd. + invalid: Ongeldig e-mailadres of wachtwoord. + invalid_token: Ongeldige bevestigingscode. + last_attempt: Je hebt nog één poging over voordat jouw account geblokkeerd wordt. + locked: Jouw account is geblokkeerd. + not_found_in_database: Ongeldig e-mailadres of wachtwoord. + timeout: Jouw sessie is verlopen, log opnieuw in. + unauthenticated: Je dient in te loggen of te registreren. + unconfirmed: Je dient eerst jouw account te bevestigen. mailer: confirmation_instructions: - subject: Bevestiging mailadres + subject: 'Mastodon: E-mail bevestigen voor %{instance}' + password_change: + subject: 'Mastodon: Wachtwoord veranderd' reset_password_instructions: - subject: Wachtwoord resetten + subject: 'Mastodon: Wachtwoord opnieuw instellen' unlock_instructions: - subject: Unlock instructies + subject: 'Mastodon: Instructies om account te deblokkeren' omniauth_callbacks: - failure: Kon je niet aanmelden met je %{kind} account, omdat "%{reason}". - success: Successvol aangemeld met je %{kind} account. + failure: Kon je niet aanmelden met jouw %{kind} account, omdat "%{reason}". + success: Successvol aangemeld met jouw %{kind} account. passwords: - no_token: Je kan deze pagina niet benaderen zonder een "wachtwoord reset e-mail" - send_instructions: Je ontvangt via e-mail instructies hoe je je wachtwoord moet resetten. - send_paranoid_instructions: Als je e-mailadres bestaat in de database, ontvang je via e-mail instructies hoe je je wachtwoord moet resetten. - updated: Je wachtwoord is gewijzigd. Je bent nu ingelogd. - updated_not_active: Je wachtwoord is gewijzigd. + no_token: Je kan deze pagina niet benaderen zonder dat je een e-mail om je wachtwoord opnieuw in te stellen hebt ontvangen. + send_instructions: Je ontvangt via e-mail instructies hoe je jouw wachtwoord opnieuw moet instellen. + send_paranoid_instructions: Als jouw e-mailadres in de database staat, ontvang je via e-mail instructies hoe je jouw wachtwoord opnieuw moet instellen. + updated: Jouw wachtwoord is gewijzigd. Je bent nu ingelogd. + updated_not_active: Jouw wachtwoord is gewijzigd. registrations: - destroyed: Je account is verwijderd, wellicht tot ziens! - signed_up: Je bent ingeschreven. - signed_up_but_inactive: Je bent ingeschreven. Je kon alleen niet automatisch ingelogd worden omdat je account nog niet geactiveerd is. - signed_up_but_locked: Je bent ingeschreven. Je kon alleen niet automatisch ingelogd worden omdat je account geblokkeerd is. - signed_up_but_unconfirmed: Je ontvangt via e-mail instructies hoe je je account kunt activeren. - update_needs_confirmation: Je hebt je e-mailadres succesvol gewijzigd, maar we moeten je nieuwe mailadres nog verifiëren. Controleer je e-mail en klik op de link in de mail om je mailadres te verifiëren. - updated: Je account gegevens zijn opgeslagen. + destroyed: Jouw account is verwijderd. Wellicht tot ziens! + signed_up: Je bent geregistreerd. + signed_up_but_inactive: Je bent geregistreerd. Je kon alleen niet automatisch ingelogd worden omdat jouw account nog niet geactiveerd is. + signed_up_but_locked: Je bent ingeschreven. Je kon alleen niet automatisch ingelogd worden omdat jouw account geblokkeerd is. + signed_up_but_unconfirmed: Je ontvangt via e-mail instructies hoe je jouw account kunt activeren. + update_needs_confirmation: Je hebt je e-mailadres succesvol gewijzigd, maar we moeten je nieuwe mailadres nog bevestigen. Controleer jouw e-mail en klik op de link in de mail om jouw e-mailadres te bevestigen. + updated: Jouw accountgegevens zijn opgeslagen. sessions: signed_in: Je bent succesvol ingelogd. signed_out: Je bent succesvol uitgelogd. unlocks: - send_instructions: Je ontvangt via e-mail instructies hoe je je account kan unlocken. - send_paranoid_instructions: Als je e-mailadres bestaat in de database, ontvang je via e-mail instructies hoe je je account kan unlocken. - unlocked: Je account is ge-unlocked. Je kan nu weer inloggen. + send_instructions: Je ontvangt via e-mail instructies hoe je jouw account kan deblokkeren. + send_paranoid_instructions: Als jouw e-mailadres in de database staat, ontvang je via e-mail instructies hoe je jouw account kan deblokkeren. + unlocked: Jouw account is gedeblokkeerd. Je kan nu weer inloggen. errors: messages: already_confirmed: is reeds bevestigd - confirmation_period_expired: moet worden bevestigd binnen %{period}, probeer het a.u.b. nog een keer + confirmation_period_expired: moet worden bevestigd binnen %{period}, probeer het nog een keer expired: is verlopen, vraag een nieuwe aan not_found: niet gevonden - not_locked: is niet gesloten + not_locked: is niet geblokkeerd not_saved: - one: '1 fout blokkeerde het opslaan van deze %{resource}:' - other: "%{count} fouten blokkeerden het opslaan van deze %{resource}:" + one: '1 fout verhinderde het opslaan van deze %{resource}:' + other: "%{count} fouten verhinderden het opslaan van deze %{resource}:" diff --git a/config/locales/devise.pt-BR.yml b/config/locales/devise.pt-BR.yml new file mode 100644 index 0000000000..c647fabbd8 --- /dev/null +++ b/config/locales/devise.pt-BR.yml @@ -0,0 +1,61 @@ +--- +pt-BR: + devise: + confirmations: + confirmed: O seu endereço de email foi confirmado. + send_instructions: Você irá receber um email com instruções em como confirmar o seu endereço de email dentro de alguns minutos. + send_paranoid_instructions: Se o seu endereço de email já existir na nossa base de dados, irá receber um email com instruções em como confirmá-lo dentro de alguns minutos. + failure: + already_authenticated: A sua sessão já está aberta. + inactive: A sua contra ainda não está ativada. + invalid: "%{authentication_keys} ou password inválidos." + last_attempt: Tem mais uma tentativa antes de a sua conta ser protegida. + locked: A sua conta está protegida + not_found_in_database: "%{authentication_keys} ou password inválidos." + timeout: A sua sessão expirou. Por favore entre de novo para continuar. + unauthenticated: Você precsa de entrar ou registar-se antes de continuar. + unconfirmed: Você tem de confirmar o seu endereço de email antes de continuar. + mailer: + confirmation_instructions: + subject: 'Mastodon: Instruções de confirmação' + password_change: + subject: 'Mastodon: Password nova' + reset_password_instructions: + subject: 'Mastodon: Instruções para editar a password' + unlock_instructions: + subject: 'Mastodon: Instruções para desproteger a sua conta' + omniauth_callbacks: + failure: Could not authenticate you from %{kind} because "%{reason}". + success: Successfully authenticated from %{kind} account. + passwords: + no_token: Você não pode aceder a esta página sem ter vindo de um email para mudar a password. Se este for o case, por favor faça questão de verificar que usou o URL no email. + send_instructions: Irá receber um email com instruções em como mudar a sua password dentro de algns minutos. + send_paranoid_instructions: Se seu endereço de email existe na nossa base de dados, irá receber um link para recuperar a sua password dentro de alguns minutos. + updated: A sua password foi alterada. A sua sessão está aberta. + updated_not_active: A sua password foi alterada. + registrations: + destroyed: Adeus! A sua conta foi cancelada. Esperamos vê-lo em breve. + signed_up: Bem vindo! A sua conta foi registada com sucesso. + signed_up_but_inactive: A sua conta foi registada. No entanto, não abrimos a sua sessão porque a sua conta ainda não foi ativada. + signed_up_but_locked: A sua conta foi registada. No entanto, não abrimos a sua sessão porque a sua conta está protegida. + signed_up_but_unconfirmed: Uma mensagem com um link de confirmação foi enviada para o seu email. Por favor siga o link para ativar a sua conta. + update_needs_confirmation: Você mudou o seu endereço de email ou password, mas é necessário confirmar a mudança. Por favor siga o link que foi enviado para o seu novo endereço de email. + updated: A sua conta foi alterada com sucesso. + sessions: + already_signed_out: Sessão fechada. + signed_in: Sessão iniciada. + signed_out: Sessão fechada. + unlocks: + send_instructions: Irá receber um email com instruções para desproteger a sua conta dentro de alguns minutos. + send_paranoid_instructions: Se a sua conta existe, irá receber um email com instruções a detalhar como a desproteger dentro de alguns minutos. + unlocked: A sua conta foi desprotegida. Por favor inicie sessão para continuar. + errors: + messages: + already_confirmed: já foi confirmado, por favor tente iniciar sessão + confirmation_period_expired: tem de ser confirmado dentro de %{period}, por favor tente outra vez + expired: expirou, por favor tente outra vez + not_found: não encontrado + not_locked: não está protegido + not_saved: + one: '1 erro impediu este %{resource} de ser guardado:' + other: "%{count} erros impediram este %{resource} de ser guardado:" diff --git a/config/locales/devise.pt.yml b/config/locales/devise.pt.yml index 8c049ce8b8..dc87cefdd6 100644 --- a/config/locales/devise.pt.yml +++ b/config/locales/devise.pt.yml @@ -2,60 +2,60 @@ pt: devise: confirmations: - confirmed: O seu endereço de email foi confirmado. - send_instructions: Você irá receber um email com instruções em como confirmar o seu endereço de email dentro de alguns minutos. - send_paranoid_instructions: Se o seu endereço de email já existir na nossa base de dados, irá receber um email com instruções em como confirmá-lo dentro de alguns minutos. + confirmed: O teu endereço de email foi confirmado. + send_instructions: Vais receber um email com as instruções para confirmar o teu endereço de email dentro de alguns minutos. + send_paranoid_instructions: Se o teu endereço de email já existir na nossa base de dados, vais receber um email com as instruções de confirmação dentro de alguns minutos. failure: - already_authenticated: A sua sessão já está aberta. - inactive: A sua contra ainda não está ativada. - invalid: "%{authentication_keys} ou password inválidos." - last_attempt: Tem mais uma tentativa antes de a sua conta ser protegida. - locked: A sua conta está protegida - not_found_in_database: "%{authentication_keys} ou password inválidos." - timeout: A sua sessão expirou. Por favore entre de novo para continuar. - unauthenticated: Você precsa de entrar ou registar-se antes de continuar. - unconfirmed: Você tem de confirmar o seu endereço de email antes de continuar. + already_authenticated: A tua sessão já está aberta. + inactive: A tua conta ainda não está ativada. + invalid: "%{authentication_keys} ou palavra-passe não válida." + last_attempt: Tens mais uma tentativa antes de a tua conta ficar bloqueada. + locked: A tua conta está bloqueada + not_found_in_database: "%{authentication_keys} ou palavra-passe não válida." + timeout: A tua sessão expirou. Por favor, entra de novo para continuares. + unauthenticated: Precisas de entrar na tua conta ou registares-te antes de continuar. + unconfirmed: Tens de confirmar o teu endereço de email antes de continuar. mailer: confirmation_instructions: - subject: 'Mastodon: Instruções de confirmação' + subject: 'Mastodon: Instruções de confirmação %{instance}' password_change: - subject: 'Mastodon: Password nova' + subject: 'Mastodon: Nova palavra-passe' reset_password_instructions: - subject: 'Mastodon: Instruções para editar a password' + subject: 'Mastodon: Instruções para editar a palavra-passe' unlock_instructions: - subject: 'Mastodon: Instruções para desproteger a sua conta' + subject: 'Mastodon: Instruções para desbloquear a tua conta' omniauth_callbacks: - failure: Could not authenticate you from %{kind} because "%{reason}". - success: Successfully authenticated from %{kind} account. + failure: Não foi possível autenticar %{kind} porque "%{reason}". + success: Autenticado com sucesso na conta %{kind}. passwords: - no_token: Você não pode aceder a esta página sem ter vindo de um email para mudar a password. Se este for o case, por favor faça questão de verificar que usou o URL no email. - send_instructions: Irá receber um email com instruções em como mudar a sua password dentro de algns minutos. - send_paranoid_instructions: Se seu endereço de email existe na nossa base de dados, irá receber um link para recuperar a sua password dentro de alguns minutos. - updated: A sua password foi alterada. A sua sessão está aberta. - updated_not_active: A sua password foi alterada. + no_token: Não pode aceder a esta página se não vier através do link enviado por email para alteração da sua palavra-passe. Se usaste esse link para chegar aqui, por favor verifica que o endereço URL actual é o mesmo do que foi enviado no email. + send_instructions: Vais receber um email com instruções para alterar a palavra-passe dentro de algns minutos. + send_paranoid_instructions: Se o teu endereço de email existe na nossa base de dados, vais receber um link para recuperar a palavra-passe dentro de alguns minutos. + updated: A tua palavra-passe foi alterada. Estás agora autenticado na tua conta. + updated_not_active: A tua palavra-passe foi alterada. registrations: - destroyed: Adeus! A sua conta foi cancelada. Esperamos vê-lo em breve. - signed_up: Bem vindo! A sua conta foi registada com sucesso. - signed_up_but_inactive: A sua conta foi registada. No entanto, não abrimos a sua sessão porque a sua conta ainda não foi ativada. - signed_up_but_locked: A sua conta foi registada. No entanto, não abrimos a sua sessão porque a sua conta está protegida. - signed_up_but_unconfirmed: Uma mensagem com um link de confirmação foi enviada para o seu email. Por favor siga o link para ativar a sua conta. - update_needs_confirmation: Você mudou o seu endereço de email ou password, mas é necessário confirmar a mudança. Por favor siga o link que foi enviado para o seu novo endereço de email. - updated: A sua conta foi alterada com sucesso. + destroyed: Adeus! A tua conta foi cancelada. Esperamos ver-te em breve. + signed_up: Bem-vindo! A tua conta foi registada com sucesso. + signed_up_but_inactive: A tua conta foi registada. No entanto ainda não está activa. + signed_up_but_locked: A tua conta foi registada. No entanto está bloqueada. + signed_up_but_unconfirmed: Uma mensagem com um link de confirmação foi enviada para o teu email. Por favor segue esse link para activar a tua conta. + update_needs_confirmation: Alteraste o teu endereço de email ou palavra-passe, mas é necessário confirmar essa alteração. Por favor vai ao teu email e segue link que te enviámos. + updated: A tua conta foi actualizada com sucesso. sessions: - already_signed_out: Sessão fechada. + already_signed_out: Sessão encerrada. signed_in: Sessão iniciada. - signed_out: Sessão fechada. + signed_out: Sessão encerrada. unlocks: - send_instructions: Irá receber um email com instruções para desproteger a sua conta dentro de alguns minutos. - send_paranoid_instructions: Se a sua conta existe, irá receber um email com instruções a detalhar como a desproteger dentro de alguns minutos. - unlocked: A sua conta foi desprotegida. Por favor inicie sessão para continuar. + send_instructions: Vais receber um email com instruções para desbloquear a tua conta dentro de alguns minutos. + send_paranoid_instructions: Se a tua conta existe, vais receber um email com instruções a detalhar como a desbloquear dentro de alguns minutos. + unlocked: A sua conta foi desbloqueada. Por favor inica uma nova sessão para continuar. errors: messages: - already_confirmed: já foi confirmado, por favor tente iniciar sessão - confirmation_period_expired: tem de ser confirmado dentro de %{period}, por favor tente outra vez + already_confirmed: já confirmado, por favor tente iniciar sessão + confirmation_period_expired: tem de ser confirmado durante %{period}, por favor tenta outra vez expired: expirou, por favor tente outra vez not_found: não encontrado - not_locked: não está protegido + not_locked: não estava bloqueada not_saved: one: '1 erro impediu este %{resource} de ser guardado:' other: "%{count} erros impediram este %{resource} de ser guardado:" diff --git a/config/locales/doorkeeper.nl.yml b/config/locales/doorkeeper.nl.yml index 91e62dc0c1..9edbb8c9f1 100644 --- a/config/locales/doorkeeper.nl.yml +++ b/config/locales/doorkeeper.nl.yml @@ -4,7 +4,7 @@ nl: attributes: doorkeeper/application: name: Naam - redirect_uri: Redirect URI + redirect_uri: Redirect-URI scopes: Scopes errors: models: @@ -26,15 +26,15 @@ nl: confirmations: destroy: Weet je het zeker? edit: - title: Bewerk applicatie + title: Applicatie bewerken form: error: Oops! Controleer het formulier op fouten help: native_redirect_uri: Gebruik %{native_redirect_uri} voor lokale tests redirect_uri: 'Gebruik één regel per URI. ' - scopes: Scheid scopes met spaties. Laat leeg om de standaard scopes te gebruiken. + scopes: Scopes met spaties van elkaar scheiden. Laat leeg om de standaardscopes te gebruiken. index: - callback_url: Callback URL + callback_url: Callback-URL name: Naam new: Nieuwe applicatie title: Jouw applicaties @@ -42,8 +42,8 @@ nl: title: Nieuwe applicatie show: actions: Acties - application_id: Applicatie Id - callback_urls: Callback urls + application_id: Applicatie-ID + callback_urls: Callback-URL's scopes: Scopes secret: Secret title: 'Applicatie: %{name}' @@ -58,7 +58,7 @@ nl: prompt: "%{client_name} autoriseren om uw account te gebruiken?" title: Autorisatie vereist show: - title: Autorisatie code + title: Autorisatie-code authorized_applications: buttons: revoke: Intrekken @@ -71,24 +71,24 @@ nl: title: Jouw geautoriseerde applicaties errors: messages: - access_denied: De resource eigenaar of autorisatie-server weigerde het verzoek. - credential_flow_not_configured: Resource Owner Password Credentials flow failed due to Doorkeeper.configure.resource_owner_from_credentials being unconfigured. - invalid_client: Client verificatie is mislukt door onbekende klant, geen client authenticatie opgegeven, of een niet-ondersteunde authenticatie methode. - invalid_grant: De verstrekte autorisatie is ongeldig, verlopen, ingetrokken, komt niet overeen met de redirect uri die is opgegeven, of werd uitgegeven aan een andere klant. - invalid_redirect_uri: De opgegeven redirect uri is niet geldig. - invalid_request: Het verzoek mist een vereiste parameter, bevat een niet-ondersteunde parameter waarde of is anderszins onjuist. - invalid_resource_owner: De verstrekte resource eigenaar gegevens zijn niet geldig of de resource eigenaar kan niet worden gevonden - invalid_scope: De opgevraagde scope is niet geldig, onbekend of onjuist. + access_denied: De resource-eigenaar of autorisatie-server weigerde het verzoek. + credential_flow_not_configured: De wachtwoordgegevens-flow van de resource-eigenaar is mislukt omdat Doorkeeper.configure.resource_owner_from_credentials niet is ingesteld. + invalid_client: Clientverificatie is mislukt door een onbekende client, ontbrekende client-authenticatie of een niet ondersteunde authenticatie-methode. + invalid_grant: De verstrekte autorisatie is ongeldig, verlopen, ingetrokken, komt niet overeen met de redirect-URI die is opgegeven of werd uitgegeven aan een andere client. + invalid_redirect_uri: De opgegeven redirect-URI is ongeldig. + invalid_request: Het verzoek mist een vereiste parameter, bevat een niet ondersteunde parameterwaarde of is anderszins onjuist. + invalid_resource_owner: De verstrekte resource-eigenaargegevens zijn ogeldig of de resource-eigenaar kan niet worden gevonden. + invalid_scope: De opgevraagde scope is ongeldig, onbekend of onjuist. invalid_token: - expired: Het toegangstoken is verlopen - revoked: Het toegangstoken is geweigerd - unknown: Het toegangstoken is ongeldig - resource_owner_authenticator_not_configured: Resource Owner find failed due to Doorkeeper.configure.resource_owner_authenticator being unconfiged. - server_error: De autorisatieserver is een onverwachte voorwaarde tegengekomen die het verzoek verhinderd. + expired: Het toegangssleutel is verlopen + revoked: Het toegangssleutel is geweigerd + unknown: Het toegangssleutel is ongeldig + resource_owner_authenticator_not_configured: Het opzoeken van de resource-eigenaar is mislukt omdat Doorkeeper.configure.resource_owner_authenticator niet is ingesteld. + server_error: De autorisatieserver is is een onverwachte situatie tegengekomen die het verzoek verhinderde. temporarily_unavailable: De autorisatieserver is momenteel niet in staat het verzoek te behandelen als gevolg van een tijdelijke overbelasting of onderhoud aan de server. - unauthorized_client: De client is niet bevoegd om dit verzoek met deze methode uit te voeren. - unsupported_grant_type: Het type autorisatie is niet ondersteund door de autorisatieserver - unsupported_response_type: De autorisatieserver ondersteund dit response type niet + unauthorized_client: De client is niet bevoegd om dit verzoek op deze manier uit te voeren. + unsupported_grant_type: Het type autorisatie wordt niet door de autorisatieserver ondersteund + unsupported_response_type: De autorisatieserver ondersteund dit antwoordtype niet flash: applications: create: @@ -105,10 +105,10 @@ nl: nav: applications: Applicaties home: Home - oauth2_provider: OAuth2 Provider + oauth2_provider: OAuth2-provider application: - title: OAuth autorisatie vereist + title: OAuth-autorisatie vereist scopes: - follow: volg, blokkeer, deblokkeer en stop volgen accounts - read: lees je accountgegevens - write: plaatsen namens jou + follow: volg, blokkeer, deblokkeer en stop het volgen van accounts + read: lees jouw accountgegevens + write: namens jou plaatsen diff --git a/config/locales/doorkeeper.oc.yml b/config/locales/doorkeeper.oc.yml new file mode 100644 index 0000000000..b60c284040 --- /dev/null +++ b/config/locales/doorkeeper.oc.yml @@ -0,0 +1,113 @@ +--- +oc: + activerecord: + attributes: + doorkeeper/application: + name: Nom + redirect_uri: URL de redireccion + errors: + models: + doorkeeper/application: + attributes: + redirect_uri: + fragment_present: pòt pas conténer un tròç. + invalid_uri: deu èstre un URI valid. + relative_uri: deu èstre un URI absolut. + secured_uri: deu èstre un HTTPS/SSL URI. + doorkeeper: + applications: + buttons: + authorize: Autorizar + cancel: Anullar + destroy: Suprimir + edit: Modificar + submit: Mandar + confirmations: + destroy: Sètz segur ? + edit: + title: Modificar l'aplicacion + form: + error: Ops ! Verificatz vòstre formulari + help: + native_redirect_uri: Emplegatz %{native_redirect_uri} per d'ensages locales + redirect_uri: Utilizatz una linha per URI + scopes: Separatz los encastres amb d’espacis. Daissatz void per utilizar l’encastre per defaut. + index: + callback_url: URL de rapèl + name: Nom + new: Nòva aplicacion + title: Vòstra aplicacions + new: + title: Nòva aplicacion + show: + actions: Accions + application_id: Id de l’aplicacion + callback_urls: urls de rapèls + scopes: Encastres + secret: Secret + title: 'Aplicacion: %{name}' + authorizations: + buttons: + authorize: Autorizar + deny: Refusar + error: + title: I a agut un error + new: + able_to: Aquesta aplicacion poirà + prompt: L’aplicacion %{client_name} demanda l’accès al vòstre compte. + title: Cal l’autorizacion + show: + title: Còdi d’autorizacion + authorized_applications: + buttons: + revoke: Revocar + confirmations: + revoke: Ne sètz segur? + index: + application: Aplicacion + created_at: Creada lo + date_format: "%d-%m-%Y %Ho%M %S" + scopes: Encastres + title: Las vòstras aplicacions autorizadas + errors: + messages: + access_denied: Lo proprietari de la ressorça o lo servider d’autorizacion refusèt la demanda. + credential_flow_not_configured: Lo flux de qualificacion del senhal del proprietari de la ressorça capitèt pas pr’amor que Doorkeeper.configure.resource_owner_from_credentials es pas configurat. + invalid_client: L’autorizacion del client capitèt pas pr’amor que lo client es desconegut, l’autorizacion del client es pas enclús, o lo metòde d’autorizacion es pas suportat. + invalid_grant: L’acòrdi d’autorizacion donadat es pas valid, expirat, revocat, una redireccion URI utilizat en la demanda d’autorizacion no correspond, o a estat desliurat a un altre client. + invalid_redirect_uri: L'URL de redireccion es pas valida. + invalid_request: La demanda a un paramètre que li manca, a una valor qu’es pas suportada, o quicòm mal format. + invalid_resource_owner: La qualificacion del proprietari de la ressorça donada es pas valid, o lo proprietari de la ressorça se pòt pas trobar. + invalid_scope: L’encastre demandat es pas valid, o mal format. + invalid_token: + expired: Lo geton d’accès a expirat + revoked: Lo geton d’accès a estat revocat + unknown: Lo geton d’accès es pas valid + resource_owner_authenticator_not_configured: La recèrca del proprietari de la ressorça a pas capitat pr’amor que Doorkeeper.configure.resource_owner_authenticator es pas configurat. + server_error: Lo servider d’autorizacion trobèt una condicion que l’empachèt d’acomplir la demanda. + temporarily_unavailable: Lo servider d’autorizacion pòt actualament pas menar la demanda pr’amor que es temporalament subrecargat o es en mantenença. + unauthorized_client: Lo client es pas autorizat a far aquesta demanda en utlizant aqueste metòde. + unsupported_grant_type: Lo tipe de qualificacion de l’autorizacion es pas suportat pel servider d’autorizacion. + unsupported_response_type: Lo servider d’autorizacion supòrta pas aqueste tipe de responsa. + flash: + applications: + create: + notice: Aplicacion creada. + destroy: + notice: Aplicacion escafada. + update: + notice: Aplicacion mesa a jorn. + authorized_applications: + destroy: + notice: Aplicacion revocada. + layouts: + admin: + nav: + applications: Aplicacions + oauth2_provider: Provesidor OAuth + application: + title: Cal una autorizacion OAuth + scopes: + follow: sègre, blocar, quitar de blocar e quitar de sègre de comptes + read: legissètz las donadas de vòstre compte + write: publicatz per vos diff --git a/config/locales/doorkeeper.pt-BR.yml b/config/locales/doorkeeper.pt-BR.yml new file mode 100644 index 0000000000..85ea3bfccf --- /dev/null +++ b/config/locales/doorkeeper.pt-BR.yml @@ -0,0 +1,112 @@ +--- +pt-BR: + activerecord: + attributes: + doorkeeper/application: + name: Nome + redirect_uri: Redirect URI + errors: + models: + doorkeeper/application: + attributes: + redirect_uri: + fragment_present: não pode conter um fragmento. + invalid_uri: tem de ser um URI válido. + relative_uri: tem de ser um URI absoluto. + secured_uri: tem de ser um HTTPS/SSL URI. + doorkeeper: + applications: + buttons: + authorize: Autorizar + cancel: Cancelar + destroy: Destruir + edit: Editar + submit: Submeter + confirmations: + destroy: Tem a certeza? + edit: + title: Editar aplicação + form: + error: Oops! Verifique que o formulário não tem erros + help: + native_redirect_uri: Use %{native_redirect_uri} para testes locais + redirect_uri: Utilize uma linha por URI + scopes: Separate scopes with spaces. Leave blank to use the default scopes. + index: + callback_url: Callback URL + name: Nome + new: Nova Aplicação + title: As suas aplicações + new: + title: Nova aplicação + show: + actions: Ações + application_id: Id de Aplicação + callback_urls: Callback urls + scopes: Scopes + secret: Segredo + title: 'Aplicação: %{name}' + authorizations: + buttons: + authorize: Autorize + deny: Não autorize + error: + title: Ocorreu um erro + new: + able_to: Vai poder + prompt: Aplicação %{client_name} requisita acesso à sua conta + title: Autorização é necessária + show: + title: Código de autorização + authorized_applications: + buttons: + revoke: Revogar + confirmations: + revoke: Tem a certeza? + index: + application: Aplicação + created_at: Criada em + date_format: "%Y-%m-%d %H:%M:%S" + title: As suas aplicações autorizadas + errors: + messages: + access_denied: The resource owner or authorization server denied the request. + credential_flow_not_configured: Resource Owner Password Credentials flow failed due to Doorkeeper.configure.resource_owner_from_credentials being unconfigured. + invalid_client: Client authentication failed due to unknown client, no client authentication included, or unsupported authentication method. + invalid_grant: The provided authorization grant is invalid, expired, revoked, does not match the redirection URI used in the authorization request, or was issued to another client. + invalid_redirect_uri: The redirect uri included is not valid. + invalid_request: The request is missing a required parameter, includes an unsupported parameter value, or is otherwise malformed. + invalid_resource_owner: The provided resource owner credentials are not valid, or resource owner cannot be found + invalid_scope: The requested scope is invalid, unknown, or malformed. + invalid_token: + expired: O token de acesso expirou + revoked: O token de acesso foi revogado + unknown: O token de acesso é inválido + resource_owner_authenticator_not_configured: Resource Owner find failed due to Doorkeeper.configure.resource_owner_authenticator being unconfiged. + server_error: The authorization server encountered an unexpected condition which prevented it from fulfilling the request. + temporarily_unavailable: The authorization server is currently unable to handle the request due to a temporary overloading or maintenance of the server. + unauthorized_client: The client is not authorized to perform this request using this method. + unsupported_grant_type: The authorization grant type is not supported by the authorization server. + unsupported_response_type: The authorization server does not support this response type. + flash: + applications: + create: + notice: Aplicação criada. + destroy: + notice: Aplicação eliminada. + update: + notice: Aplicação alterada. + authorized_applications: + destroy: + notice: Aplicação revogada. + layouts: + admin: + nav: + applications: Aplicações + oauth2_provider: OAuth2 Provider + application: + title: Autorização OAuth necessária + scopes: + follow: siga, bloqueie, desbloqueie, e deixe de seguir contas + read: tenha acesso aos dados da sua conta + write: públique por si diff --git a/config/locales/doorkeeper.pt.yml b/config/locales/doorkeeper.pt.yml index 2709856e85..87e01ba940 100644 --- a/config/locales/doorkeeper.pt.yml +++ b/config/locales/doorkeeper.pt.yml @@ -23,20 +23,20 @@ pt: edit: Editar submit: Submeter confirmations: - destroy: Tem a certeza? + destroy: Tens a certeza? edit: title: Editar aplicação form: - error: Oops! Verifique que o formulário não tem erros + error: Oops! Verifica que o formulário não tem erros help: - native_redirect_uri: Use %{native_redirect_uri} para testes locais - redirect_uri: Utilize uma linha por URI + native_redirect_uri: Usa %{native_redirect_uri} para testes locais + redirect_uri: Utiliza uma linha por URI scopes: Separate scopes with spaces. Leave blank to use the default scopes. index: callback_url: Callback URL name: Nome new: Nova Aplicação - title: As suas aplicações + title: As tuas aplicações new: title: Nova aplicação show: @@ -54,7 +54,7 @@ pt: title: Ocorreu um erro new: able_to: Vai poder - prompt: Aplicação %{client_name} requisita acesso à sua conta + prompt: Aplicação %{client_name} pede acesso à tua conta title: Autorização é necessária show: title: Código de autorização @@ -62,12 +62,12 @@ pt: buttons: revoke: Revogar confirmations: - revoke: Tem a certeza? + revoke: Tens a certeza? index: application: Aplicação created_at: Criada em date_format: "%Y-%m-%d %H:%M:%S" - title: As suas aplicações autorizadas + title: As tuas aplicações autorizadas errors: messages: access_denied: The resource owner or authorization server denied the request. @@ -107,6 +107,6 @@ pt: application: title: Autorização OAuth necessária scopes: - follow: siga, bloqueie, desbloqueie, e deixe de seguir contas - read: tenha acesso aos dados da sua conta - write: públique por si \ No newline at end of file + follow: siga, bloqueie, desbloqueie, e deixa de seguir contas + read: tenha acesso aos dados da tua conta + write: públique por ti diff --git a/config/locales/en.yml b/config/locales/en.yml index 039dabf871..c7b6a17d68 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -73,6 +73,10 @@ en: push_subscription_expires: PuSH subscription expires reset_password: Reset password salmon_url: Salmon URL + show: + created_reports: Reports created by this account + report: report + targeted_reports: Reports made about this account silence: Silence statuses: Statuses title: Accounts @@ -110,6 +114,10 @@ en: undo: Undo title: Domain Blocks undo: Undo + instances: + account_count: Known accounts + domain_name: Domain + title: Known Instances pubsubhubbub: callback_url: Callback URL confirmed: Confirmed diff --git a/config/locales/fr.yml b/config/locales/fr.yml index ec38b411af..bd67b4409d 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -71,16 +71,19 @@ fr: profile_url: URL du profil public: Public push_subscription_expires: Expiration de l'abonnement PuSH + reset_password: Réinitialiser le mot de passe salmon_url: URL Salmon silence: Rendre muet statuses: Statuts title: Comptes - undo_silenced: Annuler la mu + undo_silenced: Annuler le silence undo_suspension: Annuler la suspension username: Nom d'utilisateur web: Web domain_blocks: add_new: Ajouter + created_msg: Le blocage de domaine est désormais activé + destroyed_msg: Le blocage de domaine a été désactivé domain: Domaine new: create: Créer le blocage @@ -90,8 +93,23 @@ fr: silence: Muet suspend: Suspendre title: Nouveau blocage de domaine + reject_media: Fichiers média rejetés + reject_media_hint: Supprime localement les fichiers média stockés et refuse d'en télécharger ultérieurement. Ne concerne pas les suspensions. + severities: + silence: Rendre muet + suspend: Suspendre severity: Séverité + show: + affected_accounts: + one: Un compte affecté dans la base de données + other: "%{count} comptes affectés dans la base de données" + retroactive: + silence: Annuler le silence sur tous les comptes existants pour ce domaine + suspend: Annuler la suspension sur tous les comptes existants pour ce domaine + title: Annuler le blocage de domaine pour %{domain} + undo: Annuler title: Blocage de domaines + undo: Annuler pubsubhubbub: callback_url: URL de rappel confirmed: Confirmé @@ -105,7 +123,7 @@ fr: none: Aucun delete: Supprimer id: ID - mark_as_resolved: Marqué comme résolu + mark_as_resolved: Marquer comme résolu report: 'Signalement #%{id}' reported_account: Compte signalé reported_by: Signalé par @@ -192,6 +210,7 @@ fr: blocks: Vous bloquez csv: CSV follows: Vous suivez + mutes: Vous faites taire storage: Médias stockés generic: changes_saved_msg: Les modifications ont été enregistrées avec succès ! @@ -199,15 +218,20 @@ fr: save_changes: Enregistrer les modifications validation_errors: one: Quelque chose ne va pas ! Vérifiez l’erreur ci-dessous. - other: Quelques choses ne vont pas ! Vérifiez les erreurs ci-dessous. + other: Certaines choses ne vont pas ! Vérifiez les erreurs ci-dessous. imports: - preface: Vous pouvez importer certaines données comme les personnes que vous suivez ou bloquez sur votre compte sur cette instance à partir de fichiers crées sur une autre instance. - success: Vos données ont été importées avec succès et seront traités en temps et en heure + preface: Vous pouvez importer certaines données comme les personnes que vous suivez ou bloquez sur votre compte sur cette instance à partir de fichiers créés sur une autre instance. + success: Vos données ont été importées avec succès et seront traitées en temps et en heure types: blocking: Liste d'utilisateurs⋅trices bloqué⋅es following: Liste d'utilisateurs⋅trices suivi⋅es + muting: Liste d'utilisateurs⋅trices que vous faites taire upload: Importer landing_strip_html: %{name} utilise %{domain}. Vous pouvez le/la suivre et interagir si vous possédez un compte quelque part dans le "fediverse". Si ce n'est pas le cas, vous pouvez en créer un ici. + media_attachments: + validations: + images_and_video: Impossible de joindre une vidéo à un statut contenant déjà des images + too_many: Impossible de joindre plus de 4 fichiers notification_mailer: digest: body: 'Voici ce que vous avez raté sur ${instance} depuis votre dernière visite (%{}) :' @@ -253,23 +277,32 @@ fr: statuses: open_in_web: Ouvrir sur le web over_character_limit: limite de caractères dépassée de %{max} caractères - show_more: Montrer plus + show_more: Afficher plus visibilities: private: Abonné⋅es uniquement public: Public unlisted: Public sans être affiché sur le fil public stream_entries: - click_to_show: Clic pour afficher + click_to_show: Cliquer pour afficher reblogged: partagé sensitive_content: Contenu sensible time: formats: default: "%d %b %Y, %H:%M" two_factor_auth: + code_hint: Entrez le code généré par votre application pour confirmer description_html: Si vous activez l'identification à deux facteurs, vous devrez être en possession de votre téléphone afin de générer un code de connexion. disable: Désactiver enable: Activer + enabled_success: Identification à deux facteurs activée avec succès + generate_recovery_codes: Générer les codes de récupération instructions_html: "Scannez ce QR code grâce à Google Authenticator, Authy ou une application similaire sur votre téléphone. Désormais, cette application générera des jetons que vous devrez saisir à chaque connexion." + lost_recovery_codes: Les codes de récupération vous permettent de retrouver les accès à votre comptre si vous perdez votre téléphone. Si vous perdez vos codes de récupération, vous pouvez les générer à nouveau ici. Vos anciens codes de récupération seront invalidés. + manual_instructions: "Si vous ne pouvez pas scanner ce QR code et devez l'entrer manuellement, voici le secret en clair :" + recovery_codes_regenerated: Codes de récupération régénérés avec succès + recovery_instructions: Si vous perdez l'accès à votre téléphone, vous pouvez utiliser un des codes de récupération ci-dessous pour récupérer l'accès à votre compte. Conservez les codes de récupération en toute sécurité, par exemple, en les imprimant et en les stockant avec vos autres documents importants. + setup: Installer + wrong_code: Les codes entrés sont incorrects ! L'heure du serveur et celle de votre appareil sont-elles correctes ? users: invalid_email: L'adresse courriel est invalide invalid_otp_token: Le code d'authentification à deux facteurs est invalide diff --git a/config/locales/ja.yml b/config/locales/ja.yml index c9885b5f65..47b86b38ec 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -73,6 +73,10 @@ ja: push_subscription_expires: PuSH購読期限切れ reset_password: パスワード再設定 salmon_url: Salmon URL + show: + created_reports: このアカウントで作られたレポート + report: レポート + targeted_reports: このアカウントについてのレポート silence: サイレンス statuses: トゥート数 title: アカウント @@ -94,13 +98,15 @@ ja: suspend: 停止 title: 新規ドメインブロック reject_media: メディアファイルを拒否 - reject_media_hint: ローカルに保村されたメディアファイルを削除し、今後のダウンロードを拒否します。停止とは無関係です。 + reject_media_hint: ローカルに保存されたメディアファイルを削除し、今後のダウンロードを拒否します。停止とは無関係です。 severities: silence: サイレンス suspend: 停止 severity: 深刻度 show: - affected_accounts: "データベース中の%{count}個のアカウントに影響します" + affected_accounts: + one: "データベース中の一つのアカウントに影響します" + other: "データベース中の%{count}個のアカウントに影響します" retroactive: silence: このドメインからの存在するすべてのアカウントのサイレンスを戻す suspend: このドメインからの存在するすべてのアカウントの停止を戻す @@ -108,6 +114,10 @@ ja: undo: 元に戻す title: ドメインブロック undo: 元に戻す + instances: + account_count: 既知のアカウント数 + domain_name: ドメイン名 + title: 既知のインスタンス pubsubhubbub: callback_url: コールバックURL confirmed: 確認済み @@ -272,9 +282,9 @@ ja: over_character_limit: 上限は %{max}文字までです show_more: もっと見る visibilities: - private: Private - フォロワーだけに見せる - public: Public - 全体に公開する - unlisted: Unlisted - トゥートは公開するが、公開タイムラインには表示しない + private: 非公開 - フォロワーだけに公開 + public: 公開 - 公開タイムラインに投稿する + unlisted: 未収載 - トゥートは公開するが、公開タイムラインには表示しない stream_entries: click_to_show: クリックして表示 reblogged: ブーストされました @@ -288,12 +298,12 @@ ja: disable: 無効 enable: 有効 enabled_success: 二段階認証が有効になりました - generate_recovery_codes: 復元コードを生成 + generate_recovery_codes: リカバリーコードを生成 instructions_html: "Google Authenticatorか、もしくはほかのTOTPアプリでこのQRコードをスキャンしてください。これ以降、ログインするときはそのアプリで生成されるコードが必要になります。" - lost_recovery_codes: リカバリコードを使用すると携帯電話を紛失した場合でもアカウントにアクセスできるようになります。 リカバリーコードを紛失した場合もここで再生成することができますが、古いリカバリコードは無効になります。 + lost_recovery_codes: リカバリーコードを使用すると携帯電話を紛失した場合でもアカウントにアクセスできるようになります。 リカバリーコードを紛失した場合もここで再生成することができますが、古いリカバリーコードは無効になります。 manual_instructions: 'QRコードがスキャンできず、手動での登録を希望の場合はこのシークレットコードを利用してください。:' recovery_codes_regenerated: リカバリーコードが再生成されました。 - recovery_instructions: 携帯電話を紛失した場合、以下の内どれかのリカバリコードを使用してアカウントへアクセスすることができます。 リカバリコードは印刷して安全に保管してください。 + recovery_instructions: 携帯電話を紛失した場合、以下の内どれかのリカバリーコードを使用してアカウントへアクセスすることができます。 リカバリーコードは印刷して安全に保管してください。 setup: 初期設定 wrong_code: コードが間違っています。サーバー上の時間とデバイス上の時間が一致していることを確認してください。 users: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 577b324549..8471743a50 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -1,34 +1,34 @@ --- nl: about: - about_mastodon: Mastodon is een vrij, gratis en open-source sociaal netwerk. Een gedecentraliseerd alternatief voor commerciële platforms, het voorkomt de risico's van een enkel bedrijf dat jouw communicatie monopoliseert. Kies een server die je vertrouwt — welke je ook kiest, je kunt met iedere ander communiceren. Iedereen kan een eigen Mastodon-server draaien en naadloos deelnemen in het sociale netwerk. + about_mastodon: Mastodon is een vrij, gratis en open-source sociaal netwerk. Een gedecentraliseerd alternatief voor commerciële platforms. Het voorkomt de risico's van een enkel bedrijf dat jouw communicatie monopoliseert. Kies een server die je vertrouwt — welke je ook kiest, je kunt met elke andere server communiceren. Iedereen kan een eigen Mastodon-server draaien en naadloos deelnemen in het sociale netwerk. about_this: Over deze server apps: Apps - business_email: 'Zakelijk e-mailadres:' + business_email: 'E-mailadres:' closed_registrations: Registreren op deze server is momenteel uitgeschakeld. contact: Contact description_headline: Wat is %{domain}? domain_count_after: andere servers domain_count_before: Verbonden met features: - api: Open API voor apps en services - blocks: Rijke blokkeer- en dempingshulpmiddelen + api: Open API voor apps en diensten + blocks: Uitgebreide blokkeer- en negeerhulpmiddelen characters: 500 tekens per bericht chronology: Tijdlijnen zijn chronologisch - ethics: 'Ethisch design: geen ads, geen spionage' + ethics: 'Ethisch design: geen advertenties, geen spionage' gifv: GIFV-sets en korte video's - privacy: Granulaire privacyinstellingen per bericht + privacy: Nauwkeurige privacyinstellingen per toot (bericht) public: Openbare tijdlijnen features_headline: Wat maakt Mastodon anders get_started: Beginnen links: Links other_instances: Andere servers - source_code: Source code - status_count_after: statussen - status_count_before: Wie schreef + source_code: Broncode + status_count_after: toots + status_count_before: Zij schreven terms: Voorwaarden user_count_after: gebruikers - user_count_before: Thuis naar + user_count_before: Thuisbasis van accounts: follow: Volgen followers: Volgers @@ -37,7 +37,7 @@ nl: people_followed_by: Mensen die %{name} volgt people_who_follow: Mensen die %{name} volgen posts: Berichten - remote_follow: Externe volg + remote_follow: Extern volgen unfollow: Ontvolgen application_mailer: settings: 'E-mailvoorkeuren wijzigen: %{link}' @@ -58,7 +58,7 @@ nl: authorize_follow: error: Helaas, er is een fout opgetreden bij het opzoeken van de externe account follow: Volgen - prompt_html: 'Je (%{self}) hebt volgen aangevraagd:' + prompt_html: 'Je (%{self}) hebt toestemming gevraagd om iemand te mogen volgen:' title: Volg %{acct} datetime: distance_in_words: @@ -66,84 +66,86 @@ nl: about_x_months: "%{count}ma" about_x_years: "%{count}j" almost_x_years: "%{count}j" - half_a_minute: Net + half_a_minute: Zojuist less_than_x_minutes: "%{count}m" - less_than_x_seconds: Net + less_than_x_seconds: Zojuist over_x_years: "%{count}j" x_days: "%{count}d" x_minutes: "%{count}m" x_months: "%{count}ma" x_seconds: "%{count}s" exports: - blocks: Je blokkeert + blocks: Jij blokkeert csv: CSV - follows: Je volgt + follows: Jij volgt + mutes: Jij negeert storage: Mediaopslag generic: changes_saved_msg: Wijzigingen succesvol opgeslagen! powered_by: mogelijk gemaakt door %{link} - save_changes: Wijziginen opslaan + save_changes: Wijzigingen opslaan validation_errors: one: Er is iets niet helemaal goed! Bekijk onderstaande fout other: Er is iets niet helemaal goed! Bekijk onderstaande %{count} fouten imports: - preface: Je kunt bepaalde gegevens, zoals de mensen die je volgt of blokkeert, importeren voor je account op deze server, als ze zijn geëxporteerd op een andere server. - success: Je gegevens zijn succesvol geüpload en worden binnenkort verwerkt + preface: Je kunt bepaalde gegevens, zoals de mensen die jij volgt of hebt geblokkeerd, naar jouw account op deze server importeren. Je moet deze gegevens wel eerst op de oorspronkelijke server exporteren. + success: Jouw gegevens zijn succesvol geüpload en worden binnenkort verwerkt types: blocking: Blokkeerlijst following: Volglijst + muting: Negeerlijst upload: Uploaden - landing_strip_html: %{name} is een gebruiker op %{domain}. Je kunt deze volgen of ermee interacteren als je ergens in deze fediverse een account hebt. Als je dat niet hebt, kun je je hier aanmelden. + landing_strip_html: %{name} is een gebruiker op %{domain}. Je kunt deze volgen en ermee communiceren als je ergens in deze fediverse een account hebt. Als je dat niet hebt, kun je je hier aanmelden. notification_mailer: digest: - body: 'Hier is een korte samenvatting van wat je hebt gemist op %{instance} sinds je laatste bezoek op %{since}:' - mention: "%{name} vermeldde je in:" + body: 'Hier is een korte samenvatting van wat je hebt gemist op %{instance} sinds jouw laatste bezoek op %{since}:' + mention: "%{name} vermeldde jou in:" new_followers_summary: - one: Je hebt een nieuwe volger! Hoera! - other: Je hebt %{count} nieuwe volgers! Prachtig! + one: Jij hebt een nieuwe volger! Hoera! + other: Jij hebt %{count} nieuwe volgers! Prachtig! subject: - one: "1 nieuwe melding sinds je laatste bezoek \U0001F418" - other: "%{count} nieuwe meldingen sinds je laatste bezoek \U0001F418" + one: "1 nieuwe melding sinds jouw laatste bezoek \U0001F418" + other: "%{count} nieuwe meldingen sinds jouw laatste bezoek \U0001F418" favourite: - body: 'Je status werd door %{name} als favoriet gemarkeerd:' - subject: "%{name} markeerde je status als favoriet" + body: 'Jouw toot werd door %{name} als favoriet gemarkeerd:' + subject: "%{name} markeerde jouw toot als favoriet" follow: - body: "%{name} volgt je nu!" - subject: "%{name} volgt je nu" + body: "%{name} volgt jou nu!" + subject: "%{name} volgt jou nu" follow_request: - body: "%{name} wil je graag volgen" + body: "%{name} wil jou graag volgen" subject: 'Volgen in afwachting: %{name}' mention: - body: 'Je bent door %{name} vermeld in:' - subject: Je bent vermeld door %{name} + body: 'Jij bent door %{name} vermeld in:' + subject: Jij bent vermeld door %{name} reblog: - body: 'Je status werd geboost door %{name}:' - subject: "%{name} booste je status" + body: 'Jouw toot werd door %{name} geboost:' + subject: "%{name} booste jouw toot" pagination: next: Volgende prev: Vorige remote_follow: - acct: Geef je gebruikersnaam@domein op waarvandaan je wilt volgen - missing_resource: Kon vereiste doorverwijzings-URL voor je account niet vinden + acct: Geef jouw account@domein.tld op waarvandaan je wilt volgen + missing_resource: Kon vereiste doorverwijzings-URL voor jouw account niet vinden proceed: Ga door om te volgen - prompt: 'Je gaat volgen:' + prompt: 'Jij gaat volgen:' settings: authorized_apps: Geautoriseerde back: Terug naar Mastodon edit_profile: Profiel bewerken - export: Gegevensexport + export: Export import: Import preferences: Voorkeuren settings: Instellingen - two_factor_auth: Twee-factorauthenticatie + two_factor_auth: Tweestapsverificatie statuses: open_in_web: Openen in web - over_character_limit: Tekenlimiet van %{max} overschreden + over_character_limit: Limiet van %{max} tekens overschreden show_more: Toon meer visibilities: private: Alleen aan volgers tonen public: Openbaar - unlisted: Openbaar, maar niet tonen op openbare tijdlijn + unlisted: Openbaar, maar niet op de openbare tijdlijn tonen stream_entries: click_to_show: Klik om te tonen reblogged: boostte @@ -152,10 +154,59 @@ nl: formats: default: "%b %d, %J, %U:%M" two_factor_auth: - description_html: Als je twee-factorauthenticatie instelt, kun je alleen aanmelden als je je mobiele telefoon bij je hebt, waarmee je de in te voeren tokens genereert. + description_html: Na het instellen van tweestapsverificatie, kun jij je alleen aanmelden als je jouw mobiele telefoon bij je hebt. Hiermee genereer je namelijk de in te voeren aanmeldcode. disable: Uitschakelen enable: Inschakelen - instructions_html: "Scan deze QR-code in Google Authenticator of een soortgelijke app op je mobiele telefoon. Van nu af aan creëert deze app tokens die je bij aanmelden moet invoeren." + instructions_html: "Scan deze QR-code in Google Authenticator of een soortgelijke app op jouw mobiele telefoon. Van nu af aan genereert deze app aanmeldcodes die je bij het aanmelden moet invoeren." users: - invalid_email: Het e-mailadres is ongeldig - invalid_otp_token: Ongeldige twee-factorcode + invalid_email: E-mailadres is ongeldig + invalid_otp_token: Ongeldige tweestaps-aanmeldcode + errors: + 404: De pagina waarnaar jij op zoek bent bestaat niet. + 410: De pagina waarnaar jij op zoek bent bestaat niet meer. + 422: + title: Veiligheidsverificatie mislukt + content: Veiligheidsverificatie mislukt. Blokkeer je toevallig cookies? + admin.reports: + title: Gerapporteerde toots + status: Toot + unresolved: Onopgelost + resolved: Opgelost + id: ID + target: Target + reported_by: Gerapporteerd door + comment: + label: Opmerking + none: Geen + view: Weergeven + report: 'Gerapporteerde toot #%{id}' + delete: Verwijderen + reported_account: Gerapporteerde account + reported_by: Gerapporteerd door + silence_account: Account stilzwijgen + suspend_account: Account blokkeren + mark_as_resolved: Markeer als opgelost + admin: + settings: + title: Server-instellingen + setting: Instelling + click_to_edit: Klik om te bewerken + contact_information: + label: Contactgegevens + username: Vul een gebruikersnaam in + email: Vul een openbaar gebruikt e-mailadres in + site_title: Naam Mastodon-server + site_description: + title: Omschrijving Mastodon-server + desc_html: "Dit wordt als een alinea op de voorpagina getoond en gebruikt als meta-tag in de paginabron.Je kan HTML gebruiken, zoals
<a> en <em>."
+ site_description_extended:
+ title: Uitgebreide omschrijving Mastodon-server
+ desc_html: "Wordt op de uitgebreide informatiepagina weergegevenJe kan ook hier HTML gebruiken" + registrations: + open: + title: Open registratie + enabled: Ingeschakeld + disabled: Uitgeschakeld + closed_message: + title: Bericht wanneer registratie is uitgeschakeld + desc_html: "Wordt op de voorpagina weergegeven wanneer registratie van nieuwe accounts is uitgeschakeld
En ook hier kan je HTML gebruiken" diff --git a/config/locales/oc.yml b/config/locales/oc.yml new file mode 100644 index 0000000000..46e32d8d32 --- /dev/null +++ b/config/locales/oc.yml @@ -0,0 +1,337 @@ +--- +oc: + about: + about_mastodon: Mastodon es un malhum social liure e open-source. Una + alternativa decentralizada a las platformas comercialas, aquò evita + qu’una sola companiá monopolize vòstra comunicacion. Causissètz une servidor + que vos fisatz, quina que siague vòstra causida, podètz interagir amb tot lo + mond. Qual que siague pòt aver son instància Mastodon e participar al malhum + social sens cap de problèmas. + about_this: A prepaus d’aquesta instància + apps: Aplicacions + business_email: 'Corrièl professional :' + closed_registrations: Las inscripcions son clavadas pel moment sus aquesta instància. + contact: Contacte + description_headline: Qué es %{domain} ? + domain_count_after: autras instàncias + domain_count_before: Connectat a + features: + api: API dobèrta per las aplicacions e servicis + blocks: Aisinas complètas per blocar e rescondre + characters: 500 caractèrs per publicacion + chronology: Flux d’actualitat cronologic + ethics: 'Ethical design: pas cap de reclama o traçadors' + gifv: Partatge de GIFs e vidèos cortas + privacy: Nivèl de confidencialitat configurable per cada publicacion + public: Fluxes d’actualitat publicsPublic timelines + features_headline: Çò que fa que Mastodon es diferent + get_started: Venètz al malhum + links: Ligams + other_instances: Autras instàncias + source_code: Còdi font + status_count_after: publicacions + status_count_before: a escrich + terms: Tèrmes + user_count_after: utilizaires + user_count_before: Ostal de + accounts: + follow: Sègre + followers: Abonats + following: Abonaments + nothing_here: I a pas res aquí ! + people_followed_by: Lo mond que %{name} sèc + people_who_follow: Lo mond que ségon %{name} + posts: Estatuts + remote_follow: Sègre a distància + unfollow: Quitar de sègre + admin: + accounts: + are_you_sure: Are you sure? + display_name: Display name + domain: Domain + edit: Edit + email: E-mail + feed_url: Feed URL + followers: Followers + follows: Follows + location: + all: All + local: Local + remote: Remote + title: Location + media_attachments: Media attachments + moderation: + all: All + silenced: Silenced + suspended: Suspended + title: Moderation + most_recent_activity: Most recent activity + most_recent_ip: Most recent IP + not_subscribed: Not subscribed + order: + alphabetic: Alphabetic + most_recent: Most recent + title: Order + perform_full_suspension: Perform full suspension + profile_url: Profile URL + public: Public + push_subscription_expires: PuSH subscription expires + reset_password: Reset password + salmon_url: Salmon URL + silence: Silence + statuses: Statuses + title: Accounts + undo_silenced: Undo silence + undo_suspension: Undo suspension + username: Username + web: Web + domain_blocks: + add_new: Add new + created_msg: Domain block is now being processed + destroyed_msg: Domain block has been undone + domain: Domain + new: + create: Create block + hint: The domain block will not prevent creation of account entries in the + database, but will retroactively and automatically apply specific moderation + methods on those accounts. + severity: + desc_html: "Silence will make the account's posts invisible + to anyone who isn't following them. Suspend will remove + all of the account's content, media, and profile data." + silence: Silence + suspend: Suspend + title: New domain block + reject_media: Reject media files + reject_media_hint: Removes locally stored media files and refuses to download + any in the future. Irrelevant for suspensions + severities: + silence: Silence + suspend: Suspend + severity: Severity + show: + affected_accounts: + one: One account in the database affected + other: "%{count} accounts in the database affected" + retroactive: + silence: Unsilence all existing accounts from this domain + suspend: Unsuspend all existing accounts from this domain + title: Undo domain block for %{domain} + undo: Undo + title: Domain Blocks + undo: Undo + pubsubhubbub: + callback_url: Callback URL + confirmed: Confirmed + expires_in: Expires in + last_delivery: Last delivery + title: PubSubHubbub + topic: Topic + reports: + comment: + label: Comentari + none: Pas cap + delete: Suprimir + id: ID + mark_as_resolved: Marcat coma resolgut + report: 'enhalament #%{id}' + reported_account: Compte senhalat + reported_by: Senhalat per + resolved: Resolgut + silence_account: Metre lo compte en silenci + status: Estatut + suspend_account: Suspendre lo compte + target: Cibla + title: Senhalament + unresolved: Pas resolguts + view: Veire + settings: + click_to_edit: Clicatz per modificar + contact_information: + email: Picatz una adreça de corrièl + label: Informacions de contacte + username: Picatz un nom d'utilizaire + registrations: + closed_message: + desc_html: Affiché sur la page d'accueil lorsque les inscriptions sont fermées
Vous + pouvez utiliser des balises HTML + title: Message de fermeture des inscriptions + open: + disabled: Desactivadas + enabled: Activadas + title: Inscripcions + setting: Paramètre + site_description: + desc_html: Affichée sous la forme d'un paragraphe sur la page d'accueil et + utilisée comme balise meta.
Vous pouvez utiliser des balises HTML, en + particulier
<a> et <em>.
+ title: Descripcion del site
+ site_description_extended:
+ desc_html: Affichée sur la page d'informations complémentaires du siteVous + pouvez utiliser des balises HTML + title: Description étendue du site + site_title: Títol del site + title: Paramètres del site + title: Administration + application_mailer: + settings: 'Cambiar las preferéncias de corrièl : %{link}' + signature: Notificacion de Mastodon de %{instance} + view: 'Veire :' + applications: + invalid_url: L’URL donada es invalida + auth: + change_password: Cambiar lo senhal + didnt_get_confirmation: Avètz pas recebut las instruccions de confirmacion ? + forgot_password: Senhal oblidat ? + login: Se connectar + logout: Se desconnectar + register: Se marcar + resend_confirmation: Tornar mandar las instruccions de confirmacion + reset_password: Reïnicializar lo senhal + set_new_password: Picar un nòu senhal + authorize_follow: + error: O planhèm, i a agut una error al moment de cercar lo compte + follow: Sègre + prompt_html: 'Avètz (%{self}) demandat de sègre :' + title: Sègre %{acct} + datetime: + distance_in_words: + about_x_hours: "%{count}oras" + about_x_months: "%{count}meses" + about_x_years: + one: un an + other: "%{count} ans" + almost_x_years: + one: un an + other: "%{count} ans" + half_a_minute: Ara + less_than_x_minutes: "%{count}minutas" + less_than_x_seconds: Ara + over_x_years: + one: un an + other: "%{count} ans" + x_days: "%{count}jorns" + x_minutes: "%{count}minutes" + x_months: "%{count}meses" + x_seconds: "%{count}segondas" + errors: + '404': La pagina que recercatz existís pas. + '410': La pagina que cercatz existís pas mai. + '422': + content: Verificacion de seguretat fracassada. Blocatz los cookies ? + title: Verificacion de seguretat fracassada + exports: + blocks: Blocatz + csv: CSV + follows: Seguètz + mutes: You mute + storage: Mèdias gardats + generic: + changes_saved_msg: Cambiaments ben realizats ! + powered_by: propulsat per %{link} + save_changes: Salvagardar los cambiaments + validation_errors: + one: I a quicòm que truca ! Mercés de corregir l’error çai-jos + other: I a quicòm que truca ! Mercés de corregir las %{count} errors çai-jos + imports: + preface: Podètz importar qualques donadas coma lo mond que seguètz o blocatz a-n + aquesta instància d’un fichièr creat d’una autra instància. + success: Vòstras donadas son ben estadas mandadas e seràn tractadas tre que possible + types: + blocking: Lista de blocatge + following: Lista de mond que seguètz + muting: Muting list + upload: Importar + landing_strip_html: %{name} es un utilizaire de %{domain}. + Podètz lo sègre o interagir amb eles s’avètz un compte ont que siasgue sul fediverse. + Autrament podètz vos marcar aquí. + media_attachments: + validations: + images_and_video: Cannot attach a video to a status that already contains images + too_many: Cannot attach more than 4 files + notification_mailer: + digest: + body: 'Trobatz aquí un resumit de çò qu’avètz mancat dempuèi vòstra darrièra + visita lo %{since}:' + mention: "%{name} vos amencionat dins :" + new_followers_summary: + one: Avètz un nòu abonat ! Ouà ! + other: Avètz %{count} nòus abonats ! Qué crane ! + subject: + one: "Una nòva notificacion dempuèi vòstra darrièra visita \U0001F418" + other: "%{count} nòvas notificacions dempuèi vòstra darrièra visita \U0001F418" + favourite: + body: "%{name} a mes vòstre estatut en favorit :" + subject: "%{name} a mes vòstre estatut en favorit" + follow: + body: "%{name} vos sèc ara !" + subject: "%{name} es a vos sègre ara" + follow_request: + body: "%{name} a demandar a vos sègre" + subject: 'Demanda d’abonament : %{name}' + mention: + body: 'Sètz estat mencionat per %{name} dins :' + subject: Sètz estat mencionat per %{name} + reblog: + body: "%{name} a tornat partejar vòstre estatut :" + subject: "%{name} a tornat partejar vòstre estatut" + pagination: + next: Seguent + prev: Precedent + truncate: "…" + remote_follow: + acct: Picatz vòstre utilizaire@instància per utilizar per sègre aqueste utilizaire + missing_resource: URL de redireccion pas trobada + proceed: Contunhatz per sègre + prompt: 'Sètz per sègre :' + settings: + authorized_apps: Aplicacions autorizadas + back: Tornar a Mastodon + edit_profile: Modificar lo perfil + export: Export donadas + import: Import + preferences: Preferéncias + settings: Paramètres + two_factor_auth: Autentificacion en dos temps + statuses: + open_in_web: Dobrir sul web + over_character_limit: limit de %{max} caractèrs passat + show_more: Ne veire mai + visibilities: + private: Mostrar pas qu’als abonats + public: Public + unlisted: Public, mai pas afichat sul flux d’actualitat public + stream_entries: + click_to_show: Clic per afichar + reblogged: partejat + sensitive_content: Contengut sensible + time: + formats: + default: "%b %d %Y a %H o %M" + two_factor_auth: + code_hint: Enter the code generated by your authenticator app to confirm + description_html: S’activatz l’autentificacion two-factor, vos + caldrà vòstre mobil per vos connectar perque generarà un geton per vos daissar + dintrar. + disable: Desactivar + enable: Activar + enabled_success: Two-factor authentication successfully enabled + generate_recovery_codes: Generate Recovery Codes + instructions_html: "Escanatz aqueste còdi QR amb Google Authenticator + o una aplicacion similària sus vòstre mobil. A partir d’ara, aquesta + aplicacion generarà un geton que vos caldrà picar per vos connectar." + lost_recovery_codes: Recovery codes allow you to regain access to your account + if you lose your phone. If you've lost your recovery codes, you can regenerate + them here. Your old recovery codes will be invalidated. + manual_instructions: 'If you can''t scan the QR code and need to enter it manually, + here is the plain-text secret:' + recovery_codes_regenerated: Recovery codes successfully regenerated + recovery_instructions: If you ever lose access to your phone, you can use one + of the recovery codes below to regain access to your account. Keep the recovery + codes safe, for example by printing them and storing them with other important + documents. + setup: Set up + wrong_code: The entered code was invalid! Are server time and device time correct? + users: + invalid_email: L’adreça de corrièl es invalida + invalid_otp_token: Còdi d’autentificacion en dos temps invalid diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml new file mode 100644 index 0000000000..269a1a99be --- /dev/null +++ b/config/locales/pt-BR.yml @@ -0,0 +1,198 @@ +--- +pt-BR: + about: + about_mastodon: Mastodon é um servidor de rede social grátis, e open-source. Uma alternativa descentralizada ás plataformas comerciais, que evita o risco de uma única empresa monopolizar a sua comunicação. Escolha um servidor que você confie — qualquer um que escolher, você poderá interagir com todo o resto. Qualquer um pode ter uma instância Mastodon e assim participar na rede social federada sem problemas. + about_this: Sobre essa instância + apps: Aplicações + business_email: 'Email comercial:' + closed_registrations: Registros estão fechadas para essa instância. + contact: Contato + description_headline: O que é %{domain}? + domain_count_after: outras instâncias + domain_count_before: Conectado a + features: + api: Aberto para API de aplicações e serviços + blocks: Bloqueos e ferramentas para mudar + characters: 500 caracteres por post + chronology: Timeline são cronologicas + ethics: 'Design ético: sem propaganda, sem tracking' + gifv: GIFV e vídeos curtos + privacy: Granular, privacidade setada por post + public: Timelines públicas + features_headline: O que torna Mastodon diferente + get_started: Comece aqui + links: Links + source_code: Source code + other_instances: Outras instâncias + terms: Termos + user_count_after: usuários + user_count_before: Lugar de + accounts: + follow: Seguir + followers: Seguidores + following: Seguindo + nothing_here: Não há nada aqui! + people_followed_by: Pessoas seguidas por %{name} + people_who_follow: Pessoas que seguem %{name} + posts: Posts + remote_follow: Acesso remoto + unfollow: Unfollow + admin: + accounts: + are_you_sure: Você tem certeza? + display_name: Nome mostrado + domain: Domain + edit: Editar + email: E-mail + feed_url: URL do Feed + followers: Seguidores + follows: Seguindo + location: + all: Todos + local: Local + remote: Remoto + title: Local + media_attachments: Mídia anexadas + moderation: + all: Todos + silenced: Silenciado + suspended: Supenso + title: Moderação + most_recent_activity: Atividade mais recente + most_recent_ip: IP mais recente + not_subscribed: Não inscrito + order: + alphabetic: Alfabética + most_recent: Mais recente + title: Ordem + perform_full_suspension: Fazer suspensão completa + profile_url: URL do perfil + public: Público + push_subscription_expires: PuSH subscription expires + salmon_url: Salmon URL + silence: Silêncio + statuses: Status + title: Contas + undo_silenced: Desfazer silenciar + undo_suspension: Desfazer supensão + username: Usuário + web: Web + domain_blocks: + add_new: Adicionar nova + created_msg: Bloqueio do domínio está sendo processado + destroyed_msg: Bloqueio de domínio está sendo desfeito + domain: Domínio + new: + create: Criar bloqueio + hint: O bloqueio de dominio não vai previnir a criação de entradas no banco de dados, mas irá, retroativamente e automaticamente aplicar métodos de moderação específica nessas contas. + severity: + desc_html: "Silenciar irá fazer com que os posts dessas contas sejam invisíveis para todos que não a seguem. Supender irá remover todos o conteúdo das contas, mídia e dados do perfil." + silence: Silenciar + suspend: Suspender + title: Novo bloqueio de domínio + reject_media: Rejeitar arquivos de mídia + reject_media_hint: Remove localmente arquivos armazenados e rejeita fazer o download de novos no futuro. Irrelevante em suspensões. + severities: + silence: Silenciar + suspend: Suspender + severity: Severidade + show: + affected_accounts: + one: Uma conta no banco de dados afetada + other: "%{count} contas no banco de dados afetada" + retroactive: + silence: Desilenciar todas as contas existentes nesse domínio + suspend: Desuspender todas as contas existentes nesse domínio + title: Desfazer bloqueio de domínio para %{domain} + title: Bloqueio de domínio + undo: Desfazer + pubsubhubbub: + callback_url: URL de Callback + confirmed: Confirmado + expires_in: Expira em + last_delivery: Última entrega + title: PubSubHubbub + topic: Tópico + reports: + comment: + label: Commentário + none: None + delete: Deletar + id: ID + mark_as_resolved: Marque como resolvido + report: 'Report #%{id}' + reported_account: Conta reportada + reported_by: Reportado por + resolved: Resolvido + silence_account: Conta silenciada + status: Status + suspend_account: Conta suspensa + target: Target + title: Reports + unresolved: Unresolved + view: View + settings: + click_to_edit: Clique para editar + contact_information: + email: Entre um endereço de email público + label: Informação de contato + username: Entre com usuário + registrations: + closed_message: + desc_html: Mostrar na página inicial quando registros estão fecados
Você pode usar tags HTML + title: Mensagem de registro fechados + open: + disabled: Desabilitado + enabled: Habilitado + title: Aberto para registro + setting: Preferências + site_description: + desc_html: Mostrar como parágrafo e usado como meta tag.
Vôce pode usar tags HTML, em particular
<a> e <em>.
+ title: Descrição do site
+ site_description_extended:
+ desc_html: Mostrar na página de informação extendiada Você pode usar tags HTML + title: Descrição extendida do site + site_title: Título do site + title: Preferências do site + title: Administração + application_mailer: + settings: 'Mudar preferências de email: %{link}' + signature: notificações Mastodon de %{instance} + view: 'View:' + applications: + invalid_url: URL dada é inválida + auth: + change_password: Mudar senha + didnt_get_confirmation: Não recebeu instruções de confirmação? + forgot_password: Esqueceu a senha? + login: Entrar + register: Registar + resend_confirmation: Reenviar instruções de confirmação + reset_password: Resetar senha + set_new_password: Editar password + generic: + changes_saved_msg: Mudanças guardadas! + powered_by: powered by %{link} + save_changes: Guardar alterações + validation_errors: + one: Algo não está correto. Por favor reveja o erro abaixo + other: Algo não está correto. Por favor reveja os %{count} erros abaixo + notification_mailer: + favourite: + body: 'O seu post foi favoritado por %{name}:' + subject: "%{name} favouritou o seu post" + follow: + body: "%{name} seguiu você!" + subject: "%{name} segue você" + mention: + body: 'Você foi mencionado por %{name} em:' + subject: Foi mencionado por %{name} + reblog: + body: 'O seu post foi reblogado por %{name}:' + subject: "%{name} reblogou o seu post" + pagination: + next: Next + prev: Prev + settings: + edit_profile: Editar perfil + preferences: Preferências diff --git a/config/locales/pt.yml b/config/locales/pt.yml index dc9beae7bc..735bc14ba5 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -1,64 +1,66 @@ --- pt: about: - about_mastodon: Mastodon é um servidor de rede social grátis, e open-source. Uma alternativa descentralizada ás plataformas comerciais, que evita o risco de uma única empresa monopolizar a sua comunicação. Escolha um servidor que você confie — qualquer um que escolher, você poderá interagir com todo o resto. Qualquer um pode ter uma instância Mastodon e assim participar na rede social federada sem problemas. - about_this: Sobre essa instância + about_mastodon: Mastodon é uma rede social grátis e em código aberto. Uma alternativa descentralizada às plataformas comerciais, que evita o risco de uma única empresa monopolizar a tua comunicação. Escolhe um servidor que confies, não importa qual, pois vais poder comunicar com todos os outros. Qualquer um pode criar uma instância Mastodon e participar nesta rede social. + about_this: Sobre esta instância apps: Aplicações business_email: 'Email comercial:' - closed_registrations: Registros estão fechadas para essa instância. - contact: Contato - description_headline: O que é %{domain}? + closed_registrations: Novos registos estão fechados nesta instância. + contact: Contacto + description_headline: O que é o %{domain}? domain_count_after: outras instâncias - domain_count_before: Conectado a + domain_count_before: Ligado a features: - api: Aberto para API de aplicações e serviços - blocks: Bloqueos e ferramentas para mudar + api: API aberta para aplicações e serviços + blocks: Ferramentas para silenciar e bloquear characters: 500 caracteres por post - chronology: Timeline são cronologicas - ethics: 'Design ético: sem propaganda, sem tracking' - gifv: GIFV e vídeos curtos - privacy: Granular, privacidade setada por post + chronology: Timelines cronológicas + ethics: 'Design ético: sem públicidade ou tracking' + gifv: GIFV e pequenos vídeos + privacy: Privacidade granular por post public: Timelines públicas features_headline: O que torna Mastodon diferente - get_started: Comece aqui + get_started: Começar links: Links - source_code: Source code other_instances: Outras instâncias + source_code: Código fonte + status_count_after: publicações + status_count_before: Que fizeram terms: Termos - user_count_after: usuários - user_count_before: Lugar de + user_count_after: utilizadores + user_count_before: Casa para accounts: follow: Seguir followers: Seguidores - following: Seguindo + following: A seguir nothing_here: Não há nada aqui! people_followed_by: Pessoas seguidas por %{name} people_who_follow: Pessoas que seguem %{name} posts: Posts - remote_follow: Acesso remoto - unfollow: Unfollow + remote_follow: Seguir remotamente + unfollow: Deixar de seguir admin: accounts: - are_you_sure: Você tem certeza? - display_name: Nome mostrado - domain: Domain + are_you_sure: Tens a certeza? + display_name: Nome a mostrar + domain: Domínio edit: Editar email: E-mail feed_url: URL do Feed followers: Seguidores - follows: Seguindo + follows: A seguir location: all: Todos local: Local remote: Remoto title: Local - media_attachments: Mídia anexadas + media_attachments: Media anexa moderation: all: Todos - silenced: Silenciado - suspended: Supenso + silenced: Silenciados + suspended: Supensos title: Moderação - most_recent_activity: Atividade mais recente + most_recent_activity: Actividade mais recente most_recent_ip: IP mais recente not_subscribed: Não inscrito order: @@ -69,6 +71,7 @@ pt: profile_url: URL do perfil public: Público push_subscription_expires: PuSH subscription expires + reset_password: Reset palavra-passe salmon_url: Salmon URL silence: Silêncio statuses: Status @@ -78,34 +81,35 @@ pt: username: Usuário web: Web domain_blocks: - add_new: Adicionar nova - created_msg: Bloqueio do domínio está sendo processado - destroyed_msg: Bloqueio de domínio está sendo desfeito + add_new: Adicionar novo + created_msg: Bloqueio do domínio está a ser processado + destroyed_msg: Bloqueio de domínio está a ser removido domain: Domínio new: create: Criar bloqueio - hint: O bloqueio de dominio não vai previnir a criação de entradas no banco de dados, mas irá, retroativamente e automaticamente aplicar métodos de moderação específica nessas contas. + hint: O bloqueio de dominio não vai previnir a criação de entradas na base de dados, mas irá retroativamente e automaticamente aplicar métodos de moderação específica nessas contas. severity: - desc_html: "Silenciar irá fazer com que os posts dessas contas sejam invisíveis para todos que não a seguem. Supender irá remover todos o conteúdo das contas, mídia e dados do perfil." + desc_html: "Silenciar irá fazer com que os posts dessas contas sejam invisíveis para todos que não a seguem. Supender irá eliminar todo o conteúdo guardado dessa conta, mídia e informação de perfil." silence: Silenciar suspend: Suspender title: Novo bloqueio de domínio - reject_media: Rejeitar arquivos de mídia - reject_media_hint: Remove localmente arquivos armazenados e rejeita fazer o download de novos no futuro. Irrelevante em suspensões. + reject_media: Rejeitar ficheiros de mídia + reject_media_hint: Remove localmente arquivos armazenados e rejeita fazer guardar novos no futuro. Irrelevante na suspensão. severities: silence: Silenciar suspend: Suspender severity: Severidade show: affected_accounts: - one: Uma conta no banco de dados afetada - other: "%{count} contas no banco de dados afetada" + one: Uma conta na base de dados afectada + other: "%{count} contas na base de dados afectadas" retroactive: - silence: Desilenciar todas as contas existentes nesse domínio - suspend: Desuspender todas as contas existentes nesse domínio - title: Desfazer bloqueio de domínio para %{domain} + silence: Não silenciar todas as contas existentes nesse domínio + suspend: Não suspender todas as contas existentes nesse domínio + title: Remover o bloqueio de domínio de %{domain} + undo: Anular title: Bloqueio de domínio - undo: Desfazer + undo: Anular pubsubhubbub: callback_url: URL de Callback confirmed: Confirmado @@ -115,84 +119,84 @@ pt: topic: Tópico reports: comment: - label: Commentário - none: None - delete: Deletar + label: Comentário + none: Nenhum + delete: Eliminar id: ID - mark_as_resolved: Marque como resolvido - report: 'Report #%{id}' - reported_account: Conta reportada - reported_by: Reportado por + mark_as_resolved: Marcar como resolvido + report: 'Denúncia #%{id}' + reported_account: Conta denunciada + reported_by: Denúnciada por resolved: Resolvido silence_account: Conta silenciada - status: Status + status: Estado suspend_account: Conta suspensa target: Target - title: Reports - unresolved: Unresolved - view: View + title: Denúncias + unresolved: Por resolver + view: Ver settings: click_to_edit: Clique para editar contact_information: - email: Entre um endereço de email público - label: Informação de contato - username: Entre com usuário + email: Inserir um endereço de email para tornar público + label: Informação de contacto + username: Insira um nome de utilizador registrations: closed_message: - desc_html: Mostrar na página inicial quando registros estão fecados
Você pode usar tags HTML - title: Mensagem de registro fechados + desc_html: Mostrar na página inicial quando registos estão encerrados
Podes usar tags HTML + title: Mensagem de registos encerrados open: disabled: Desabilitado enabled: Habilitado - title: Aberto para registro + title: Aceitar novos registos setting: Preferências site_description: - desc_html: Mostrar como parágrafo e usado como meta tag.
Vôce pode usar tags HTML, em particular
<a> e <em>.
+ desc_html: Mostrar como parágrafo na página inicial e usado como meta tag.Podes usar tags HTML, em particular
<a> e <em>.
title: Descrição do site
site_description_extended:
- desc_html: Mostrar na página de informação extendiada Você pode usar tags HTML - title: Descrição extendida do site + desc_html: Mostrar na página de mais informações
Podes usar tags HTML + title: Página de mais informações site_title: Título do site title: Preferências do site title: Administração application_mailer: - settings: 'Mudar preferências de email: %{link}' - signature: notificações Mastodon de %{instance} - view: 'View:' + settings: 'Alterar preferências de email: %{link}' + signature: notificações Mastodon do %{instance} + view: 'Ver:' applications: - invalid_url: URL dada é inválida + invalid_url: O URL é inválido auth: - change_password: Mudar senha - didnt_get_confirmation: Não recebeu instruções de confirmação? - forgot_password: Esqueceu a senha? + change_password: Alterar palavra-passe + didnt_get_confirmation: Não recebeu o email de confirmação? + forgot_password: Esqueceste a palavra-passe? login: Entrar register: Registar resend_confirmation: Reenviar instruções de confirmação - reset_password: Resetar senha - set_new_password: Editar password + reset_password: Criar nova palavra-passe + set_new_password: Editar palavra-passe generic: - changes_saved_msg: Mudanças guardadas! + changes_saved_msg: Alteraçes guardadas! powered_by: powered by %{link} save_changes: Guardar alterações validation_errors: - one: Algo não está correto. Por favor reveja o erro abaixo - other: Algo não está correto. Por favor reveja os %{count} erros abaixo + one: Algo não está correcto. Por favor vê o erro abaixo + other: Algo não está correto. Por favor vê os %{count} erros abaixo notification_mailer: favourite: - body: 'O seu post foi favoritado por %{name}:' - subject: "%{name} favouritou o seu post" + body: 'O teu post foi adicionado aos favoritos por %{name}:' + subject: "%{name} adicionou o teu post aos favoritos" follow: - body: "%{name} seguiu você!" - subject: "%{name} segue você" + body: "%{name} é teu seguidor!" + subject: "%{name} começou a seguir-te" mention: - body: 'Você foi mencionado por %{name} em:' - subject: Foi mencionado por %{name} + body: 'Foste mencionado por %{name}:' + subject: "%{name} mencionou-te" reblog: - body: 'O seu post foi reblogado por %{name}:' - subject: "%{name} reblogou o seu post" + body: 'O teu post foi partilhado por %{name}:' + subject: "%{name} partilhou o teu post" pagination: - next: Next - prev: Prev + next: Seguinte + prev: Anterior settings: edit_profile: Editar perfil preferences: Preferências diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 8e6a813bbe..3d1869ebdb 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -39,6 +39,126 @@ ru: posts: Посты remote_follow: Подписаться на удаленном узле unfollow: Отписаться + admin: + accounts: + are_you_sure: Вы уверены? + display_name: Отображаемое имя + domain: Домен + edit: Изменить + email: E-mail + feed_url: URL фида + followers: Подписчики + follows: Подписки + location: + all: Все + local: Локальные + remote: Удаленные + title: Размещение + media_attachments: Мультимедийные вложения + moderation: + all: Все + silenced: Заглушенные + suspended: Заблокированные + title: Модерация + most_recent_activity: Последняя активность + most_recent_ip: Последний IP + not_subscribed: Не подписаны + order: + alphabetic: По алфавиту + most_recent: По дате + title: Порядок + perform_full_suspension: Полная блокировка + profile_url: URL профиля + public: Публичный + push_subscription_expires: Подписка PuSH истекает + reset_password: Сбросить пароль + salmon_url: Salmon URL + silence: Глушение + statuses: Статусы + title: Аккаунты + undo_silenced: Снять глушение + undo_suspension: Снять блокировку + username: Имя пользователя + web: WWW + domain_blocks: + add_new: Добавить новую + created_msg: Блокировка домена обрабатывается + destroyed_msg: Блокировка домена снята + domain: Домен + new: + create: Создать блокировку + hint: Блокировка домена не предотвратит создание новых аккаунтов в базе данных, но ретроактивно и автоматически применит указанные методы модерации для этих аккаунтов. + severity: + desc_html: "Глушение сделает статусы аккаунта невидимыми для всех, кроме их подписчиков. Блокировка удалит весь контент аккаунта, включая мультимедийные вложения и данные профиля." + silence: Глушение + suspend: Блокировка + title: Новая доменная блокировка + reject_media: Запретить медиаконтент + reject_media_hint: Удаляет локально хранимый медиаконтент и запрещает его загрузку в будущем. Не имеет значения в случае блокировки. + severities: + silence: Глушение + suspend: Блокировка + severity: Строгость + show: + affected_accounts: + one: Влияет на один аккаунт в базе данных + other: "Влияет на %{count} аккаунтов в базе данных" + retroactive: + silence: Снять глушение со всех существующих аккаунтов этого домена + suspend: Снять блокировку со всех существующих аккаунтов этого домена + title: Снять блокировку с домена %{domain} + undo: Отменить + title: Доменные блокировки + undo: Отемнить + pubsubhubbub: + callback_url: Callback URL + confirmed: Подтверждено + expires_in: Истекает через + last_delivery: Последняя доставка + title: PubSubHubbub + topic: Тема + reports: + comment: + label: Комментарий + none: Нет + delete: Удалить + id: ID + mark_as_resolved: Отметить как разрешенную + report: 'Жалоба #%{id}' + reported_account: Аккаунт нарушителя + reported_by: Отправитель жалобы + resolved: Разрешено + silence_account: Заглушить аккаунт + status: Статус + suspend_account: Блокировать аккаунт + target: Цель + title: Жалобы + unresolved: Неразрешенные + view: Просмотреть + settings: + click_to_edit: Нажмите для изменения + contact_information: + email: Введите публичный e-mail + label: Контактная информация + username: Введите имя пользователя + registrations: + closed_message: + desc_html: Отображается на титульной странице, когда закрыта регистрация
Можно использовать HTML-теги + title: Сообщение о закрытой регистрации + open: + disabled: Закрыта + enabled: Открыта + title: Открыть регистрацию + setting: Настройка + site_description: + desc_html: Отображается в качестве параграфа на титульной странице и используется в качестве мета-тега.
Можно использовать HTML-теги, в особенности
<a> и <em>.
+ title: Описание сайта
+ site_description_extended:
+ desc_html: Отображается на странице дополнительной информацииМожно использовать HTML-теги + title: Расширенное описание сайта + site_title: Название сайта + title: Настройки сайта + title: Администрирование application_mailer: settings: 'Изменить настройки e-mail: %{link}' signature: Уведомления Mastodon от %{instance} @@ -74,10 +194,17 @@ ru: x_minutes: "%{count}мин" x_months: "%{count}мес" x_seconds: "%{count}сек" + errors: + '404': Страница, которую Вы искали, не существует. + '410': Страница, которую Вы искали, больше не существует. + '422': + content: Проверка безопасности не удалась. Возможно, Вы блокируете cookies? + title: Проверка безопасности не удалась. exports: - blocks: Вы заблокировали + blocks: Список блокировки csv: CSV follows: Подписки + mutes: Список глушения storage: Ваш медиаконтент generic: changes_saved_msg: Изменения успешно сохранены! @@ -90,10 +217,15 @@ ru: preface: Вы можете загрузить некоторые данные, например, списки людей, на которых Вы подписаны или которых блокируете, в Ваш аккаунт на этом узле из файлов, экспортированных с другого узла. success: Ваши данные были успешно загружены и будут обработаны с должной скоростью types: - blocking: Список блокируемых - following: Список подписок + blocking: Список блокировки + following: Подписки + muting: Список глушения upload: Загрузить landing_strip_html: %{name} - пользователь на %{domain}. Вы можете подписаться на него/нее и общаться с ним/ней, если у Вас есть аккаунт на любом узле общей сети. Если у Вас его нет, вы можете зарегистрироваться здесь. + media_attachments: + validations: + images_and_video: Нельзя добавить видео к статусу с изображениями + too_many: Нельзя добавить более 4 файлов notification_mailer: digest: body: 'Кратко о пропущенном Вами на %{instance} с Вашего последнего захода %{since}:' @@ -156,9 +288,15 @@ ru: description_html: При включении двухфакторной аутентификации, вход потребует от Вас использования Вашего телефона, который сгенерирует входные токены. disable: Отключить enable: Включить + enabled_success: Двухфакторная аутентификация успешно включена + generate_recovery_codes: Сгенерировать коды восстановления instructions_html: "Отсканируйте этот QR-код с помощью Google Authenticator или другого подобного приложения на Вашем телефоне. С этого момента приложение будет генерировать токены, которые будет необходимо ввести для входа." + lost_recovery_codes: Коды восстановления позволяют вернуть доступ к аккаунту в случае утери телефона. Если Вы потеряли Ваши коды восстановления, вы можете заново сгенерировать их здесь. Ваши старые коды восстановления будут аннулированы. manual_instructions: 'Если Вы не можете отсканировать QR-код и хотите ввести его вручную, секрет представлен здесь открытым текстом:' + recovery_codes_regenerated: Коды восстановления успешно сгенерированы + recovery_instructions: В случае утери доступа к Вашему телефону Вы можете использовать один из кодов восстановления, указанных ниже, чтобы вернуть доступ к аккаунту. Держите коды восстановления в безопасности, например, распечатав их и храня с другими важными документами. setup: Настроить + wrong_code: Введенный код неверен! Правильно ли установлены серверное время и время устройства? users: invalid_email: Введенный e-mail неверен invalid_otp_token: Введен неверный код diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index c25407f2b5..5335b0927c 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -28,6 +28,7 @@ en: note: Bio otp_attempt: Two-factor code password: Password + setting_auto_play_gif: Auto-play animated GIFs setting_boost_modal: Show confirmation dialog before boosting setting_default_privacy: Post privacy severity: Severity diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml index b9257ec35f..ee561955e3 100644 --- a/config/locales/simple_form.ja.yml +++ b/config/locales/simple_form.ja.yml @@ -28,6 +28,7 @@ ja: note: プロフィール otp_attempt: 二段階認証コード password: パスワード + setting_auto_play_gif: アニメーションGIFを自動再生する setting_boost_modal: ブーストする前に確認ダイアログを表示する setting_default_privacy: 投稿の公開範囲 severity: 重大性 diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml index 5bc38a87b2..c0539fd636 100644 --- a/config/locales/simple_form.nl.yml +++ b/config/locales/simple_form.nl.yml @@ -6,39 +6,39 @@ nl: avatar: PNG, GIF of JPG. Maximaal 2MB. Wordt teruggeschaald naar 120x120px display_name: Maximaal 30 tekens header: PNG, GIF of JPG. Maximaal 2MB. Wordt teruggeschaald naar 700x335px - locked: Vereist dat je handmatig volgers accepteert en stelt standaard plaatsen berichten privacy in op alleen-volgers - note: Maximaal 160 characters + locked: Vereist dat je handmatig volgers moet accepteren en stelt de privacy van toots standaard in op alleen volgers + note: Maximaal 160 tekens imports: - data: CSV file geëxporteerd van een andere Mastodon server + data: CSV-bestand dat op een andere Mastodon-server werd geëxporteerd labels: defaults: avatar: Avatar - confirm_new_password: Bevestig nieuw wachtwoord - confirm_password: Bevestig wachtwoord - current_password: Huidige wachtwoord + confirm_new_password: Nieuw wachtwoord bevestigen + confirm_password: Wachtwoord bevestigen + current_password: Huidig wachtwoord data: Gegevens display_name: Weergavenaam email: E-mailadres - header: Kop + header: Omslagfoto locale: Taal locked: Maak account besloten new_password: Nieuwe wachtwoord note: Bio - otp_attempt: Twee-factor code + otp_attempt: Tweestaps-aanmeldcode password: Wachtwoord - setting_default_privacy: Berichten privacy - type: Import type + setting_default_privacy: Tootprivacy + type: Importtype username: gebruikersnaam interactions: - must_be_follower: Blokkeermeldingen van niet-volgers - must_be_following: Blokkeer meldingen van mensen die je niet volgt + must_be_follower: Blokkeermeldingen van mensen die jou niet volgen + must_be_following: Blokkeermeldingen van mensen die jij niet volgt notification_emails: - digest: Verstuur samenvattingse-mails - favourite: Verstuur een e-mail wanneer iemand je status als favoriet markeert - follow: Verstuur een e-mail wanneer iemand je volgt - follow_request: Verstuur een e-mail wanneer iemand je wil volgen - mention: Verstuur een e-mail wanneer iemand je vermeld - reblog: Verstuur een e-mail wanneer iemand je status boost + digest: Verstuur periodiek e-mails met een samenvatting + favourite: Verstuur een e-mail wanneer iemand jouw toot als favoriet markeert + follow: Verstuur een e-mail wanneer iemand jou volgt + follow_request: Verstuur een e-mail wanneer iemand jou wilt volgen + mention: Verstuur een e-mail wanneer iemand jou vermeld + reblog: Verstuur een e-mail wanneer iemand jouw toot heeft geboost 'no': 'Nee' required: mark: "*" diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml new file mode 100644 index 0000000000..fb2bec1b48 --- /dev/null +++ b/config/locales/simple_form.oc.yml @@ -0,0 +1,46 @@ +--- +oc: + simple_form: + hints: + defaults: + avatar: PNG, GIF o JPG. Maximum 2 Mo. Serà retalhat en 120x120px + display_name: Maximum 30 caractèrs + header: PNG, GIF o JPG. Maximum 2 Mo. Serà retalhat en 700x335px + locked: Demanda qu’accepetatz manualament lo mond que vos sègon e botarà la visibilitat de vòstras publicacions coma accessiblas a vòstres abonats solament + note: Maximum 160 caractèrs + imports: + data: Fichièr CSV exportat d’una autra instància Mastodon + labels: + defaults: + avatar: Avatar + confirm_new_password: Confirmacion del nòu senhal + confirm_password: Confirmatz lo nòu senhal + current_password: Senhal actual + data: Data + display_name: Escais + email: Corrièl + header: Bandièra + locale: Lenga + locked: Far venir lo compte privat + new_password: Nòu senhal + note: Bio + otp_attempt: Còdi Two-factor + password: Senhal + setting_default_privacy: Confidencialitat de las publicacions + type: Tip d’impòrt + username: Nom d’utilizaire + interactions: + must_be_follower: Blocar las notificacions del mond que vos sègon pas + must_be_following: Blocar las notificacions del mond que seguètz pas + notification_emails: + digest: Enviar un corrièl recapitulatiu + favourite: Enviar un corrièl quand qualqu’un plaça vòstre estatut en favorit + follow: Enviar un corrièl quand qualqu’un vos sèc + follow_request: Enviar un corrièl quand qualqu’un demanda de vos sègre + mention: Enviar un corrièl quand qualqu’un vos menciona + reblog: Enviar un corrièl quand qualqu’un tòrna partejar vòstre estatut + 'no': 'Non' + required: + mark: "*" + text: requesit + 'yes': 'Òc' diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml new file mode 100644 index 0000000000..28f7eeea89 --- /dev/null +++ b/config/locales/simple_form.pt-BR.yml @@ -0,0 +1,30 @@ +--- +pt-BR: + simple_form: + labels: + defaults: + avatar: Avatar + confirm_new_password: Confirme nova senha + confirm_password: Confirme a senha + current_password: Senha atual + display_name: Nome + email: Endereço de email + header: Header + locale: Linguagem + new_password: Nova senha + note: Biografia + password: Senha + username: Usuário + interactions: + must_be_follower: Bloquear notificações de não-seguidores + must_be_following: Bloquear notificações de pessoas que você + notification_emails: + favourite: Enviar email quando alguém favorita um post seu + follow: Enviar email quando alguém seguir você + mention: Enviar email quando alguém mencionar você + reblog: Enviar email quando alguém reblogar um post seu + 'no': 'Não' + required: + mark: "*" + text: necessário + 'yes': 'Sim' diff --git a/config/locales/simple_form.pt.yml b/config/locales/simple_form.pt.yml index e8b5e2d7f0..ba3326b230 100644 --- a/config/locales/simple_form.pt.yml +++ b/config/locales/simple_form.pt.yml @@ -1,28 +1,47 @@ --- pt: simple_form: + hints: + defaults: + avatar: PNG, GIF ou JPG. No máximo 2MB. Vai ser reduzido para 120x120px + display_name: No máximo 30 caracteres + header: PNG, GIF or JPG. No máximo 2MB. Vai ser reduzido para 700x335px + locked: Requer que manualmente aproves seguidores e torna o default dos teus posts para privados (apenas seguidores) + note: No máximo 160 caracteres + imports: + data: Ficheiro CSV exportado de outra instância do Mastodon + sessions: + otp: Insere o código o código de autenticação de dois fatores do teu telefone ou utiliza um código de recuperação de acesso. labels: defaults: - avatar: Avatar - confirm_new_password: Confirme nova senha - confirm_password: Confirme a senha - current_password: Senha atual + avatar: Imagem de Perfil + confirm_new_password: Confirme nova palavra-passe + confirm_password: Confirme a palavra-passe + current_password: Palavra-passe actual + data: Data display_name: Nome email: Endereço de email - header: Header - locale: Linguagem - new_password: Nova senha + header: Cabeçalho + locale: Língua + locked: Tornar conta privada + new_password: Nova palavra-passe note: Biografia - password: Senha - username: Usuário + otp_attempt: Código de autenticação de dois fatores + password: Palavra-passe + setting_boost_modal: Pedir confirmação antes de partilhar um post + setting_default_privacy: Privacidade padrão de posts + severity: Severity + type: Import type + username: Utilizador interactions: must_be_follower: Bloquear notificações de não-seguidores - must_be_following: Bloquear notificações de pessoas que você + must_be_following: Bloquear notificações de pessoas que não segues notification_emails: - favourite: Enviar email quando alguém favorita um post seu - follow: Enviar email quando alguém seguir você - mention: Enviar email quando alguém mencionar você - reblog: Enviar email quando alguém reblogar um post seu + digest: Enviar um email da actividade nesta instância + favourite: Enviar email quando alguém adiciona um post teu aos favoritos + follow: Enviar email quando alguém te segue + mention: Enviar email quando alguém te menciona + reblog: Enviar email quando alguém partilhar um post teu 'no': 'Não' required: mark: "*" diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml index b7d8e4e05f..8f6dfa5731 100644 --- a/config/locales/simple_form.ru.yml +++ b/config/locales/simple_form.ru.yml @@ -26,7 +26,9 @@ ru: note: О Вас otp_attempt: Двухфакторный код password: Пароль + setting_boost_modal: Показывать диалог подтверждения перед продвижением setting_default_privacy: Видимость постов + severity: Строгость type: Тип импорта username: Имя пользователя interactions: diff --git a/config/navigation.rb b/config/navigation.rb index 6e2bcd001f..a3f752e477 100644 --- a/config/navigation.rb +++ b/config/navigation.rb @@ -17,10 +17,11 @@ SimpleNavigation::Configuration.run do |navigation| primary.item :admin, safe_join([fa_icon('cogs fw'), t('admin.title')]), admin_reports_url, if: proc { current_user.admin? } do |admin| admin.item :reports, safe_join([fa_icon('flag fw'), t('admin.reports.title')]), admin_reports_url, highlights_on: %r{/admin/reports} admin.item :accounts, safe_join([fa_icon('users fw'), t('admin.accounts.title')]), admin_accounts_url, highlights_on: %r{/admin/accounts} + admin.item :instances, safe_join([fa_icon('cloud fw'), t('admin.instances.title')]), admin_instances_url, highlights_on: %r{/admin/instances} admin.item :pubsubhubbubs, safe_join([fa_icon('paper-plane-o fw'), t('admin.pubsubhubbub.title')]), admin_pubsubhubbub_index_url admin.item :domain_blocks, safe_join([fa_icon('lock fw'), t('admin.domain_blocks.title')]), admin_domain_blocks_url, highlights_on: %r{/admin/domain_blocks} - admin.item :sidekiq, safe_join([fa_icon('diamond fw'), 'Sidekiq']), sidekiq_url - admin.item :pghero, safe_join([fa_icon('database fw'), 'PgHero']), pghero_url + admin.item :sidekiq, safe_join([fa_icon('diamond fw'), 'Sidekiq']), sidekiq_url, link_html: { target: 'sidekiq' } + admin.item :pghero, safe_join([fa_icon('database fw'), 'PgHero']), pghero_url, link_html: { target: 'pghero' } admin.item :settings, safe_join([fa_icon('cogs fw'), t('admin.settings.title')]), admin_settings_url end diff --git a/config/routes.rb b/config/routes.rb index fd186c3206..bc67016a48 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -16,7 +16,7 @@ Rails.application.routes.draw do end get '.well-known/host-meta', to: 'well_known/host_meta#show', as: :host_meta, defaults: { format: 'xml' } - get '.well-known/webfinger', to: 'well_known/webfinger#show', as: :webfinger, defaults: { format: 'json' } + get '.well-known/webfinger', to: 'well_known/webfinger#show', as: :webfinger devise_for :users, path: 'auth', controllers: { sessions: 'auth/sessions', @@ -37,13 +37,10 @@ Rails.application.routes.draw do get :remote_follow, to: 'remote_follow#new' post :remote_follow, to: 'remote_follow#create' - member do - get :followers - get :following - - post :follow - post :unfollow - end + resources :followers, only: [:index], controller: :follower_accounts + resources :following, only: [:index], controller: :following_accounts + resource :follow, only: [:create], controller: :account_follow + resource :unfollow, only: [:create], controller: :account_unfollow end get '/@:username', to: 'accounts#show', as: :short_account @@ -80,6 +77,7 @@ Rails.application.routes.draw do resources :pubsubhubbub, only: [:index] resources :domain_blocks, only: [:index, :new, :create, :show, :destroy] resources :settings, only: [:index, :update] + resources :instances, only: [:index] resources :reports, only: [:index, :show, :update] do resources :reported_statuses, only: :destroy diff --git a/config/settings.yml b/config/settings.yml index 04213fd0bc..9813963b28 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -15,6 +15,7 @@ defaults: &defaults open_registrations: true closed_registrations_message: '' boost_modal: false + auto_play_gif: true notification_emails: follow: false reblog: false diff --git a/db/migrate/20170418160728_add_indexes_to_reports_for_accounts.rb b/db/migrate/20170418160728_add_indexes_to_reports_for_accounts.rb new file mode 100644 index 0000000000..cd69bb8b14 --- /dev/null +++ b/db/migrate/20170418160728_add_indexes_to_reports_for_accounts.rb @@ -0,0 +1,6 @@ +class AddIndexesToReportsForAccounts < ActiveRecord::Migration[5.0] + def change + add_index :reports, :account_id + add_index :reports, :target_account_id + end +end diff --git a/db/schema.rb b/db/schema.rb index 62ff4207d3..78b419b827 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170414132105) do +ActiveRecord::Schema.define(version: 20170418160728) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -215,6 +215,8 @@ ActiveRecord::Schema.define(version: 20170414132105) do t.datetime "created_at", null: false t.datetime "updated_at", null: false t.integer "action_taken_by_account_id" + t.index ["account_id"], name: "index_reports_on_account_id", using: :btree + t.index ["target_account_id"], name: "index_reports_on_target_account_id", using: :btree end create_table "settings", force: :cascade do |t| diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake index a1947ea0e9..7dd7b5cd13 100644 --- a/lib/tasks/mastodon.rake +++ b/lib/tasks/mastodon.rake @@ -103,6 +103,12 @@ namespace :mastodon do User.where(id: batch.map(&:id)).delete_all end end + + desc 'List all admin users' + task admins: :environment do + puts 'Admin user emails:' + puts User.admins.map(&:email).join("\n") + end end namespace :settings do @@ -145,8 +151,8 @@ namespace :mastodon do Account.unscoped.where(avatar_content_type: 'image/gif').or(Account.unscoped.where(header_content_type: 'image/gif')).find_each do |account| begin - account.avatar.reprocess! - account.header.reprocess! + account.avatar.reprocess! if account.avatar_content_type == 'image/gif' && !account.avatar.exists?(:static) + account.header.reprocess! if account.header_content_type == 'image/gif' && !account.header.exists?(:static) rescue StandardError => e Rails.logger.error "Error while generating static avatars/headers for account #{account.id}: #{e}" next diff --git a/public/mask-icon.svg b/public/mask-icon.svg new file mode 100644 index 0000000000..c352301173 --- /dev/null +++ b/public/mask-icon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/spec/controllers/account_follow_controller_spec.rb b/spec/controllers/account_follow_controller_spec.rb new file mode 100644 index 0000000000..479101c67d --- /dev/null +++ b/spec/controllers/account_follow_controller_spec.rb @@ -0,0 +1,24 @@ +require 'rails_helper' + +describe AccountFollowController do + render_views + let(:user) { Fabricate(:user) } + let(:alice) { Fabricate(:account, username: 'alice') } + + describe 'POST #create' do + before do + sign_in(user) + end + + it 'redirects to account path' do + service = double + allow(FollowService).to receive(:new).and_return(service) + allow(service).to receive(:call) + + post :create, params: { account_username: alice.username } + + expect(service).to have_received(:call).with(user.account, 'alice') + expect(response).to redirect_to(account_path(alice)) + end + end +end diff --git a/spec/controllers/account_unfollow_controller_spec.rb b/spec/controllers/account_unfollow_controller_spec.rb new file mode 100644 index 0000000000..1f28bf4ab8 --- /dev/null +++ b/spec/controllers/account_unfollow_controller_spec.rb @@ -0,0 +1,24 @@ +require 'rails_helper' + +describe AccountUnfollowController do + render_views + let(:user) { Fabricate(:user) } + let(:alice) { Fabricate(:account, username: 'alice') } + + describe 'POST #create' do + before do + sign_in(user) + end + + it 'redirects to account path' do + service = double + allow(UnfollowService).to receive(:new).and_return(service) + allow(service).to receive(:call) + + post :create, params: { account_username: alice.username } + + expect(service).to have_received(:call).with(user.account, alice) + expect(response).to redirect_to(account_path(alice)) + end + end +end diff --git a/spec/controllers/accounts_controller_spec.rb b/spec/controllers/accounts_controller_spec.rb index d2c93c7079..94d10d78f1 100644 --- a/spec/controllers/accounts_controller_spec.rb +++ b/spec/controllers/accounts_controller_spec.rb @@ -44,18 +44,4 @@ RSpec.describe AccountsController, type: :controller do end end end - - describe 'GET #followers' do - it 'returns http success' do - get :followers, params: { username: alice.username } - expect(response).to have_http_status(:success) - end - end - - describe 'GET #following' do - it 'returns http success' do - get :following, params: { username: alice.username } - expect(response).to have_http_status(:success) - end - end end diff --git a/spec/controllers/admin/instances_controller_spec.rb b/spec/controllers/admin/instances_controller_spec.rb new file mode 100644 index 0000000000..c50ea352f7 --- /dev/null +++ b/spec/controllers/admin/instances_controller_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +RSpec.describe Admin::InstancesController, type: :controller do + before do + sign_in Fabricate(:user, admin: true), scope: :user + end + + describe 'GET #index' do + it 'returns http success' do + get :index + + expect(response).to have_http_status(:success) + end + end +end diff --git a/spec/controllers/api/v1/statuses_controller_spec.rb b/spec/controllers/api/v1/statuses_controller_spec.rb index 669956659a..74faed269e 100644 --- a/spec/controllers/api/v1/statuses_controller_spec.rb +++ b/spec/controllers/api/v1/statuses_controller_spec.rb @@ -7,179 +7,289 @@ RSpec.describe Api::V1::StatusesController, type: :controller do let(:app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') } let(:token) { double acceptable?: true, resource_owner_id: user.id, application: app } - before do - allow(controller).to receive(:doorkeeper_token) { token } - end - - describe 'GET #show' do - let(:status) { Fabricate(:status, account: user.account) } - - it 'returns http success' do - get :show, params: { id: status.id } - expect(response).to have_http_status(:success) - end - end - - describe 'GET #context' do - let(:status) { Fabricate(:status, account: user.account) } - + context 'with an oauth token' do before do - Fabricate(:status, account: user.account, thread: status) + allow(controller).to receive(:doorkeeper_token) { token } end - it 'returns http success' do - get :context, params: { id: status.id } - expect(response).to have_http_status(:success) + describe 'GET #show' do + let(:status) { Fabricate(:status, account: user.account) } + + it 'returns http success' do + get :show, params: { id: status.id } + expect(response).to have_http_status(:success) + end + end + + describe 'GET #context' do + let(:status) { Fabricate(:status, account: user.account) } + + before do + Fabricate(:status, account: user.account, thread: status) + end + + it 'returns http success' do + get :context, params: { id: status.id } + expect(response).to have_http_status(:success) + end + end + + describe 'GET #reblogged_by' do + let(:status) { Fabricate(:status, account: user.account) } + + before do + post :reblog, params: { id: status.id } + end + + it 'returns http success' do + get :reblogged_by, params: { id: status.id } + expect(response).to have_http_status(:success) + end + end + + describe 'GET #favourited_by' do + let(:status) { Fabricate(:status, account: user.account) } + + before do + post :favourite, params: { id: status.id } + end + + it 'returns http success' do + get :favourited_by, params: { id: status.id } + expect(response).to have_http_status(:success) + end + end + + describe 'POST #create' do + before do + post :create, params: { status: 'Hello world' } + end + + it 'returns http success' do + expect(response).to have_http_status(:success) + end + end + + describe 'DELETE #destroy' do + let(:status) { Fabricate(:status, account: user.account) } + + before do + post :destroy, params: { id: status.id } + end + + it 'returns http success' do + expect(response).to have_http_status(:success) + end + + it 'removes the status' do + expect(Status.find_by(id: status.id)).to be nil + end + end + + describe 'POST #reblog' do + let(:status) { Fabricate(:status, account: user.account) } + + before do + post :reblog, params: { id: status.id } + end + + it 'returns http success' do + expect(response).to have_http_status(:success) + end + + it 'updates the reblogs count' do + expect(status.reblogs.count).to eq 1 + end + + it 'updates the reblogged attribute' do + expect(user.account.reblogged?(status)).to be true + end + + it 'return json with updated attributes' do + hash_body = body_as_json + + expect(hash_body[:reblog][:id]).to eq status.id + expect(hash_body[:reblog][:reblogs_count]).to eq 1 + expect(hash_body[:reblog][:reblogged]).to be true + end + end + + describe 'POST #unreblog' do + let(:status) { Fabricate(:status, account: user.account) } + + before do + post :reblog, params: { id: status.id } + post :unreblog, params: { id: status.id } + end + + it 'returns http success' do + expect(response).to have_http_status(:success) + end + + it 'updates the reblogs count' do + expect(status.reblogs.count).to eq 0 + end + + it 'updates the reblogged attribute' do + expect(user.account.reblogged?(status)).to be false + end + end + + describe 'POST #favourite' do + let(:status) { Fabricate(:status, account: user.account) } + + before do + post :favourite, params: { id: status.id } + end + + it 'returns http success' do + expect(response).to have_http_status(:success) + end + + it 'updates the favourites count' do + expect(status.favourites.count).to eq 1 + end + + it 'updates the favourited attribute' do + expect(user.account.favourited?(status)).to be true + end + + it 'return json with updated attributes' do + hash_body = body_as_json + + expect(hash_body[:id]).to eq status.id + expect(hash_body[:favourites_count]).to eq 1 + expect(hash_body[:favourited]).to be true + end + end + + describe 'POST #unfavourite' do + let(:status) { Fabricate(:status, account: user.account) } + + before do + post :favourite, params: { id: status.id } + post :unfavourite, params: { id: status.id } + end + + it 'returns http success' do + expect(response).to have_http_status(:success) + end + + it 'updates the favourites count' do + expect(status.favourites.count).to eq 0 + end + + it 'updates the favourited attribute' do + expect(user.account.favourited?(status)).to be false + end end end - describe 'GET #reblogged_by' do - let(:status) { Fabricate(:status, account: user.account) } - + context 'without an oauth token' do before do - post :reblog, params: { id: status.id } + allow(controller).to receive(:doorkeeper_token) { nil } end - it 'returns http success' do - get :reblogged_by, params: { id: status.id } - expect(response).to have_http_status(:success) - end - end + context 'with a private status' do + let(:status) { Fabricate(:status, account: user.account, visibility: :private) } - describe 'GET #favourited_by' do - let(:status) { Fabricate(:status, account: user.account) } + describe 'GET #show' do + it 'returns http unautharized' do + get :show, params: { id: status.id } + expect(response).to have_http_status(:missing) + end + end - before do - post :favourite, params: { id: status.id } + describe 'GET #context' do + before do + Fabricate(:status, account: user.account, thread: status) + end + + it 'returns http unautharized' do + get :context, params: { id: status.id } + expect(response).to have_http_status(:missing) + end + end + + describe 'GET #card' do + it 'returns http unautharized' do + get :card, params: { id: status.id } + expect(response).to have_http_status(:missing) + end + end + + describe 'GET #reblogged_by' do + before do + post :reblog, params: { id: status.id } + end + + it 'returns http unautharized' do + get :reblogged_by, params: { id: status.id } + expect(response).to have_http_status(:missing) + end + end + + describe 'GET #favourited_by' do + before do + post :favourite, params: { id: status.id } + end + + it 'returns http unautharized' do + get :favourited_by, params: { id: status.id } + expect(response).to have_http_status(:missing) + end + end end - it 'returns http success' do - get :favourited_by, params: { id: status.id } - expect(response).to have_http_status(:success) - end - end + context 'with a public status' do + let(:status) { Fabricate(:status, account: user.account, visibility: :public) } - describe 'POST #create' do - before do - post :create, params: { status: 'Hello world' } - end + describe 'GET #show' do + it 'returns http success' do + get :show, params: { id: status.id } + expect(response).to have_http_status(:success) + end + end - it 'returns http success' do - expect(response).to have_http_status(:success) - end - end + describe 'GET #context' do + before do + Fabricate(:status, account: user.account, thread: status) + end - describe 'DELETE #destroy' do - let(:status) { Fabricate(:status, account: user.account) } + it 'returns http success' do + get :context, params: { id: status.id } + expect(response).to have_http_status(:success) + end + end - before do - post :destroy, params: { id: status.id } - end + describe 'GET #card' do + it 'returns http success' do + get :card, params: { id: status.id } + expect(response).to have_http_status(:success) + end + end - it 'returns http success' do - expect(response).to have_http_status(:success) - end + describe 'GET #reblogged_by' do + before do + post :reblog, params: { id: status.id } + end - it 'removes the status' do - expect(Status.find_by(id: status.id)).to be nil - end - end + it 'returns http success' do + get :reblogged_by, params: { id: status.id } + expect(response).to have_http_status(:success) + end + end - describe 'POST #reblog' do - let(:status) { Fabricate(:status, account: user.account) } + describe 'GET #favourited_by' do + before do + post :favourite, params: { id: status.id } + end - before do - post :reblog, params: { id: status.id } - end - - it 'returns http success' do - expect(response).to have_http_status(:success) - end - - it 'updates the reblogs count' do - expect(status.reblogs.count).to eq 1 - end - - it 'updates the reblogged attribute' do - expect(user.account.reblogged?(status)).to be true - end - - it 'return json with updated attributes' do - hash_body = body_as_json - - expect(hash_body[:reblog][:id]).to eq status.id - expect(hash_body[:reblog][:reblogs_count]).to eq 1 - expect(hash_body[:reblog][:reblogged]).to be true - end - end - - describe 'POST #unreblog' do - let(:status) { Fabricate(:status, account: user.account) } - - before do - post :reblog, params: { id: status.id } - post :unreblog, params: { id: status.id } - end - - it 'returns http success' do - expect(response).to have_http_status(:success) - end - - it 'updates the reblogs count' do - expect(status.reblogs.count).to eq 0 - end - - it 'updates the reblogged attribute' do - expect(user.account.reblogged?(status)).to be false - end - end - - describe 'POST #favourite' do - let(:status) { Fabricate(:status, account: user.account) } - - before do - post :favourite, params: { id: status.id } - end - - it 'returns http success' do - expect(response).to have_http_status(:success) - end - - it 'updates the favourites count' do - expect(status.favourites.count).to eq 1 - end - - it 'updates the favourited attribute' do - expect(user.account.favourited?(status)).to be true - end - - it 'return json with updated attributes' do - hash_body = body_as_json - - expect(hash_body[:id]).to eq status.id - expect(hash_body[:favourites_count]).to eq 1 - expect(hash_body[:favourited]).to be true - end - end - - describe 'POST #unfavourite' do - let(:status) { Fabricate(:status, account: user.account) } - - before do - post :favourite, params: { id: status.id } - post :unfavourite, params: { id: status.id } - end - - it 'returns http success' do - expect(response).to have_http_status(:success) - end - - it 'updates the favourites count' do - expect(status.favourites.count).to eq 0 - end - - it 'updates the favourited attribute' do - expect(user.account.favourited?(status)).to be false + it 'returns http success' do + get :favourited_by, params: { id: status.id } + expect(response).to have_http_status(:success) + end + end end end end diff --git a/spec/controllers/auth/registrations_controller_spec.rb b/spec/controllers/auth/registrations_controller_spec.rb index 6b26e66931..c2141766eb 100644 --- a/spec/controllers/auth/registrations_controller_spec.rb +++ b/spec/controllers/auth/registrations_controller_spec.rb @@ -16,9 +16,12 @@ RSpec.describe Auth::RegistrationsController, type: :controller do end describe 'POST #create' do + let(:accept_language) { Rails.application.config.i18n.available_locales.sample.to_s } + before do Setting.open_registrations = true request.env["devise.mapping"] = Devise.mappings[:user] + request.headers["Accept-Language"] = accept_language post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678' } } end @@ -27,7 +30,9 @@ RSpec.describe Auth::RegistrationsController, type: :controller do end it 'creates user' do - expect(User.find_by(email: 'test@example.com')).to_not be_nil + user = User.find_by(email: 'test@example.com') + expect(user).to_not be_nil + expect(user.locale).to eq(accept_language) end end end diff --git a/spec/controllers/follower_accounts_controller_spec.rb b/spec/controllers/follower_accounts_controller_spec.rb new file mode 100644 index 0000000000..82d2b2067c --- /dev/null +++ b/spec/controllers/follower_accounts_controller_spec.rb @@ -0,0 +1,14 @@ +require 'rails_helper' + +describe FollowerAccountsController do + render_views + let(:alice) { Fabricate(:account, username: 'alice') } + + describe 'GET #index' do + it 'returns http success' do + get :index, params: { account_username: alice.username } + + expect(response).to have_http_status(:success) + end + end +end diff --git a/spec/controllers/following_accounts_controller_spec.rb b/spec/controllers/following_accounts_controller_spec.rb new file mode 100644 index 0000000000..5b5a6fe5f2 --- /dev/null +++ b/spec/controllers/following_accounts_controller_spec.rb @@ -0,0 +1,14 @@ +require 'rails_helper' + +describe FollowingAccountsController do + render_views + let(:alice) { Fabricate(:account, username: 'alice') } + + describe 'GET #index' do + it 'returns http success' do + get :index, params: { account_username: alice.username } + + expect(response).to have_http_status(:success) + end + end +end diff --git a/spec/controllers/media_controller_spec.rb b/spec/controllers/media_controller_spec.rb new file mode 100644 index 0000000000..ebf6aa006e --- /dev/null +++ b/spec/controllers/media_controller_spec.rb @@ -0,0 +1,37 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe MediaController do + describe '#show' do + it 'redirects to the file url when attached to a status' do + status = Fabricate(:status) + media_attachment = Fabricate(:media_attachment, status: status) + get :show, params: { id: media_attachment.to_param } + + expect(response).to redirect_to(media_attachment.file.url(:original)) + end + + it 'responds with missing when there is not an attached status' do + media_attachment = Fabricate(:media_attachment, status: nil) + get :show, params: { id: media_attachment.to_param } + + expect(response).to have_http_status(:missing) + end + + it 'raises when shortcode cant be found' do + get :show, params: { id: 'missing' } + + expect(response).to have_http_status(:missing) + end + + it 'raises when not permitted to view' do + status = Fabricate(:status) + media_attachment = Fabricate(:media_attachment, status: status) + allow_any_instance_of(Status).to receive(:permitted?).and_return(false) + get :show, params: { id: media_attachment.to_param } + + expect(response).to have_http_status(:missing) + end + end +end diff --git a/spec/helpers/instance_helper_spec.rb b/spec/helpers/instance_helper_spec.rb new file mode 100644 index 0000000000..c42ed69388 --- /dev/null +++ b/spec/helpers/instance_helper_spec.rb @@ -0,0 +1,33 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe InstanceHelper do + describe 'site_title' do + it 'Uses the Setting.site_title value when it exists' do + Setting.site_title = 'New site title' + + expect(helper.site_title).to eq 'New site title' + end + + it 'returns empty string when Setting.site_title is nil' do + Setting.site_title = nil + + expect(helper.site_title).to eq '' + end + end + + describe 'site_hostname' do + around(:each) do |example| + before = Rails.configuration.x.local_domain + example.run + Rails.configuration.x.local_domain = before + end + + it 'returns the local domain value' do + Rails.configuration.x.local_domain = 'example.com' + + expect(helper.site_hostname).to eq 'example.com' + end + end +end diff --git a/spec/helpers/site_title_helper_spec.rb b/spec/helpers/site_title_helper_spec.rb deleted file mode 100644 index 8cfd9cba1c..0000000000 --- a/spec/helpers/site_title_helper_spec.rb +++ /dev/null @@ -1,15 +0,0 @@ -require "rails_helper" - -describe "site_title" do - it "Uses the Setting.site_title value when it exists" do - Setting.site_title = "New site title" - - expect(helper.site_title).to eq "New site title" - end - - it "returns empty string when Setting.site_title is nil" do - Setting.site_title = nil - - expect(helper.site_title).to eq "" - end -end diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb deleted file mode 100644 index 138d25569a..0000000000 --- a/spec/i18n_spec.rb +++ /dev/null @@ -1,16 +0,0 @@ -# frozen_string_literal: true -require 'i18n/tasks' - -RSpec.describe 'I18n' do - let(:i18n) { I18n::Tasks::BaseTask.new } - let(:missing_keys) { i18n.missing_keys } - let(:unused_keys) { i18n.unused_keys } - - xit 'does not have missing keys' do - expect(missing_keys).to be_empty, "Missing #{missing_keys.leaves.count} i18n keys, run `i18n-tasks missing' to show them" - end - - xit 'does not have unused keys' do - expect(unused_keys).to be_empty, "#{unused_keys.leaves.count} unused i18n keys, run `i18n-tasks unused' to show them" - end -end diff --git a/spec/lib/atom_serializer_spec.rb b/spec/lib/atom_serializer_spec.rb new file mode 100644 index 0000000000..cfca82a284 --- /dev/null +++ b/spec/lib/atom_serializer_spec.rb @@ -0,0 +1,206 @@ +require 'rails_helper' + +RSpec.describe AtomSerializer do + let(:author) { Fabricate(:account, username: 'Sombra', display_name: '1337 haxxor') } + let(:receiver) { Fabricate(:account, username: 'Symmetra') } + + before do + stub_request(:get, "https://cb6e6126.ngrok.io/avatars/original/missing.png").to_return(status: 404) + stub_request(:get, "https://cb6e6126.ngrok.io/headers/original/missing.png").to_return(status: 404) + end + + describe '#author' do + it 'returns dumpable XML with emojis' do + account = Fabricate(:account, display_name: '💩') + xml = AtomSerializer.render(AtomSerializer.new.author(account)) + + expect(xml).to be_a String + expect(xml).to match(/
<script>alert("Hello")</script>
' + end + end + + context 'contains html (xss attack)' do + let(:local_text) { %q{<img src="javascript:alert('XSS');">
' + end + end end describe '#reformat' do diff --git a/spec/lib/language_detector_spec.rb b/spec/lib/language_detector_spec.rb new file mode 100644 index 0000000000..2e68ec63bc --- /dev/null +++ b/spec/lib/language_detector_spec.rb @@ -0,0 +1,70 @@ +# frozen_string_literal: true +require 'rails_helper' + +describe LanguageDetector do + describe 'to_iso_s' do + it 'detects english language' do + string = 'Hello and welcome to mastodon' + result = described_class.new(string).to_iso_s + + expect(result).to eq :en + end + + it 'detects spanish language' do + string = 'Obtener un Hola y bienvenidos a Mastodon' + result = described_class.new(string).to_iso_s + + expect(result).to eq :es + end + + describe 'when language can\'t be detected' do + it 'confirm language engine cant detect' do + result = WhatLanguage.new(:all).language_iso('') + expect(result).to be_nil + end + + describe 'with an account' do + it 'uses the account locale when present' do + user = double(:user, locale: 'fr') + account = double(:account, user: user) + result = described_class.new('', account).to_iso_s + + expect(result).to eq :fr + end + + it 'uses default locale when account is present but has no locale' do + user = double(:user, locale: nil) + account = double(:accunt, user: user) + result = described_class.new('', account).to_iso_s + + expect(result).to eq :en + end + end + + describe 'with an `en` default locale' do + it 'uses the default locale' do + string = '' + result = described_class.new(string).to_iso_s + + expect(result).to eq :en + end + end + + describe 'with a non-`en` default locale' do + around(:each) do |example| + before = I18n.default_locale + I18n.default_locale = :ja + example.run + I18n.default_locale = before + end + + it 'uses the default locale' do + string = '' + result = described_class.new(string).to_iso_s + + expect(result).to eq :ja + end + end + end + end +end diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb index 46c1ff63c0..3edbc32534 100644 --- a/spec/models/account_spec.rb +++ b/spec/models/account_spec.rb @@ -245,6 +245,23 @@ RSpec.describe Account, type: :model do end end + describe '.triadic_closures' do + it 'finds accounts you dont follow which are followed by accounts you do follow' do + me = Fabricate(:account) + friend = Fabricate(:account) + friends_friend = Fabricate(:account) + me.follow!(friend) + friend.follow!(friends_friend) + + both_follow = Fabricate(:account) + me.follow!(both_follow) + friend.follow!(both_follow) + + results = Account.triadic_closures(me) + expect(results).to eq [friends_friend] + end + end + describe '.find_local' do before do Fabricate(:account, username: 'Alice') @@ -393,6 +410,20 @@ RSpec.describe Account, type: :model do end end + describe 'by_domain_accounts' do + it 'returns accounts grouped by domain sorted by accounts' do + 2.times { Fabricate(:account, domain: 'example.com') } + Fabricate(:account, domain: 'example2.com') + + results = Account.by_domain_accounts + expect(results.length).to eq 2 + expect(results.first.domain).to eq 'example.com' + expect(results.first.accounts_count).to eq 2 + expect(results.last.domain).to eq 'example2.com' + expect(results.last.accounts_count).to eq 1 + end + end + describe 'local' do it 'returns an array of accounts who do not have a domain' do account_1 = Fabricate(:account, domain: nil) diff --git a/spec/models/report_filter_spec.rb b/spec/models/report_filter_spec.rb new file mode 100644 index 0000000000..fc0b7d7b50 --- /dev/null +++ b/spec/models/report_filter_spec.rb @@ -0,0 +1,31 @@ +require 'rails_helper' + +describe ReportFilter do + describe 'with empty params' do + it 'defaults to unresolved reports list' do + filter = ReportFilter.new({}) + + expect(filter.results).to eq Report.unresolved + end + end + + describe 'with invalid params' do + it 'raises with key error' do + filter = ReportFilter.new(wrong: true) + + expect { filter.results }.to raise_error(/wrong/) + end + end + + describe 'with valid params' do + it 'combines filters on Report' do + filter = ReportFilter.new(account_id: '123', resolved: true) + + allow(Report).to receive(:where).and_return(Report.none) + allow(Report).to receive(:resolved).and_return(Report.none) + filter.results + expect(Report).to have_received(:where).with(account_id: '123') + expect(Report).to have_received(:resolved) + end + end +end diff --git a/spec/requests/link_headers_spec.rb b/spec/requests/link_headers_spec.rb new file mode 100644 index 0000000000..3947806ccc --- /dev/null +++ b/spec/requests/link_headers_spec.rb @@ -0,0 +1,33 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe 'Link headers' do + describe 'on the account show page' do + let(:account) { Fabricate(:account, username: 'test') } + + before do + get short_account_path(username: account) + end + + it 'contains webfinger url in link header' do + link_header = link_header_with_type('application/xrd+xml') + + expect(link_header.href).to match 'http://www.example.com/.well-known/webfinger?resource=acct%3Atest%40cb6e6126.ngrok.io' + expect(link_header.attr_pairs.first).to eq %w[rel lrdd] + end + + it 'contains atom url in link header' do + link_header = link_header_with_type('application/atom+xml') + + expect(link_header.href).to eq 'http://www.example.com/users/test.atom' + expect(link_header.attr_pairs.first).to eq %w[rel alternate] + end + + def link_header_with_type(type) + response.headers['Link'].links.find do |link| + link.attr_pairs.any? { |pair| pair == ['type', type] } + end + end + end +end diff --git a/spec/requests/webfinger_request_spec.rb b/spec/requests/webfinger_request_spec.rb index b5690d22f5..a17d6cc22e 100644 --- a/spec/requests/webfinger_request_spec.rb +++ b/spec/requests/webfinger_request_spec.rb @@ -1,33 +1,48 @@ -require "rails_helper" +require 'rails_helper' -describe "The webfinger route" do +describe 'The webfinger route' do let(:alice) { Fabricate(:account, username: 'alice') } - describe "requested without accepts headers" do - it "returns a json response" do - get webfinger_url, params: { resource: alice.to_webfinger_s } + describe 'requested with standard accepts headers' do + it 'returns a json response' do + get webfinger_url(resource: alice.to_webfinger_s) expect(response).to have_http_status(:success) - expect(response.content_type).to eq "application/jrd+json" + expect(response.content_type).to eq 'application/jrd+json' end end - describe "requested with html in accepts headers" do - it "returns a json response" do - headers = { 'HTTP_ACCEPT' => 'text/html' } - get webfinger_url, params: { resource: alice.to_webfinger_s }, headers: headers - - expect(response).to have_http_status(:success) - expect(response.content_type).to eq "application/jrd+json" - end - end - - describe "requested with xml format" do - it "returns an xml response" do + describe 'asking for xml format' do + it 'returns an xml response for xml format' do get webfinger_url(resource: alice.to_webfinger_s, format: :xml) expect(response).to have_http_status(:success) - expect(response.content_type).to eq "application/xrd+xml" + expect(response.content_type).to eq 'application/xrd+xml' + end + + it 'returns an xml response for xml accept header' do + headers = { 'HTTP_ACCEPT' => 'application/xrd+xml' } + get webfinger_url(resource: alice.to_webfinger_s), headers: headers + + expect(response).to have_http_status(:success) + expect(response.content_type).to eq 'application/xrd+xml' + end + end + + describe 'asking for json format' do + it 'returns a json response for json format' do + get webfinger_url(resource: alice.to_webfinger_s, format: :json) + + expect(response).to have_http_status(:success) + expect(response.content_type).to eq 'application/jrd+json' + end + + it 'returns a json response for json accept header' do + headers = { 'HTTP_ACCEPT' => 'application/jrd+json' } + get webfinger_url(resource: alice.to_webfinger_s), headers: headers + + expect(response).to have_http_status(:success) + expect(response.content_type).to eq 'application/jrd+json' end end end diff --git a/spec/routing/accounts_routing_spec.rb b/spec/routing/accounts_routing_spec.rb new file mode 100644 index 0000000000..d04cb27f04 --- /dev/null +++ b/spec/routing/accounts_routing_spec.rb @@ -0,0 +1,31 @@ +require 'rails_helper' + +describe 'Routes under accounts/' do + describe 'the route for accounts who are followers of an account' do + it 'routes to the followers action with the right username' do + expect(get('/users/name/followers')). + to route_to('follower_accounts#index', account_username: 'name') + end + end + + describe 'the route for accounts who are followed by an account' do + it 'routes to the following action with the right username' do + expect(get('/users/name/following')). + to route_to('following_accounts#index', account_username: 'name') + end + end + + describe 'the route for following an account' do + it 'routes to the follow create action with the right username' do + expect(post('/users/name/follow')). + to route_to('account_follow#create', account_username: 'name') + end + end + + describe 'the route for unfollowing an account' do + it 'routes to the unfollow create action with the right username' do + expect(post('/users/name/unfollow')). + to route_to('account_unfollow#create', account_username: 'name') + end + end +end diff --git a/spec/routing/well_known_routes_spec.rb b/spec/routing/well_known_routes_spec.rb index 9540c3de34..2e25605c2e 100644 --- a/spec/routing/well_known_routes_spec.rb +++ b/spec/routing/well_known_routes_spec.rb @@ -10,6 +10,6 @@ end describe 'the webfinger route' do it 'routes to correct place with json format' do expect(get('/.well-known/webfinger')). - to route_to('well_known/webfinger#show', format: 'json') + to route_to('well_known/webfinger#show') end end diff --git a/spec/services/account_search_service_spec.rb b/spec/services/account_search_service_spec.rb index fa421c4436..7236238335 100644 --- a/spec/services/account_search_service_spec.rb +++ b/spec/services/account_search_service_spec.rb @@ -25,6 +25,18 @@ describe AccountSearchService do end describe 'searching local and remote users' do + describe "when only '@'" do + before do + allow(Account).to receive(:find_remote) + allow(Account).to receive(:search_for) + subject.call('@', 10) + end + + it 'uses find_remote with empty query to look for local accounts' do + expect(Account).to have_received(:find_remote).with('', nil) + end + end + describe 'when no domain' do before do allow(Account).to receive(:find_remote) diff --git a/spec/services/follow_remote_account_service_spec.rb b/spec/services/follow_remote_account_service_spec.rb index 27df76457e..a8d4a7c6b2 100644 --- a/spec/services/follow_remote_account_service_spec.rb +++ b/spec/services/follow_remote_account_service_spec.rb @@ -3,10 +3,35 @@ require 'rails_helper' RSpec.describe FollowRemoteAccountService do subject { FollowRemoteAccountService.new } - it 'returns nil if no such user can be resolved via webfinger' - it 'returns nil if the domain does not have webfinger' - it 'returns nil if remote user does not offer a hub URL' - it 'returns an already existing remote account' - it 'returns a new remote account' - it 'fills the remote account with profile information' + before do + stub_request(:get, "https://quitter.no/.well-known/host-meta").to_return(request_fixture('.host-meta.txt')) + stub_request(:get, "https://example.com/.well-known/host-meta").to_return(status: 404) + stub_request(:get, "https://quitter.no/.well-known/webfinger?resource=acct:gargron@quitter.no").to_return(request_fixture('webfinger.txt')) + stub_request(:get, "https://quitter.no/.well-known/webfinger?resource=acct:catsrgr8@quitter.no").to_return(status: 404) + stub_request(:get, "https://quitter.no/api/statuses/user_timeline/7477.atom").to_return(request_fixture('feed.txt')) + stub_request(:get, "https://quitter.no/avatar/7477-300-20160211190340.png").to_return(request_fixture('avatar.txt')) + end + + it 'raises error if no such user can be resolved via webfinger' do + expect { subject.call('catsrgr8@quitter.no') }.to raise_error Goldfinger::Error + end + + it 'raises error if the domain does not have webfinger' do + expect { subject.call('catsrgr8@example.com') }.to raise_error Goldfinger::Error + end + + it 'returns an already existing remote account' do + old_account = Fabricate(:account, username: 'gargron', domain: 'quitter.no') + returned_account = subject.call('gargron@quitter.no') + + expect(old_account.id).to eq returned_account.id + end + + it 'returns a new remote account' do + account = subject.call('gargron@quitter.no') + + expect(account.username).to eq 'gargron' + expect(account.domain).to eq 'quitter.no' + expect(account.remote_url).to eq 'https://quitter.no/api/statuses/user_timeline/7477.atom' + end end diff --git a/spec/services/post_status_service_spec.rb b/spec/services/post_status_service_spec.rb index 0e39cd969a..c9d80257ff 100644 --- a/spec/services/post_status_service_spec.rb +++ b/spec/services/post_status_service_spec.rb @@ -64,6 +64,18 @@ RSpec.describe PostStatusService do expect(status.application).to eq application end + it 'creates a status with a language set' do + detector = double(to_iso_s: :en) + allow(LanguageDetector).to receive(:new).and_return(detector) + + account = Fabricate(:account) + text = 'test status text' + + subject.call(account, text) + + expect(LanguageDetector).to have_received(:new).with(text, account) + end + it 'processes mentions' do mention_service = double(:process_mentions_service) allow(mention_service).to receive(:call) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index aa180a387e..2bc462121b 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -21,10 +21,6 @@ RSpec.configure do |config| end end - config.before :each do - stub_request(:post, 'https://fcm.googleapis.com/fcm/send').to_return(status: 200, body: '') - end - config.after :suite do FileUtils.rm_rf(Dir["#{Rails.root}/spec/test_files/"]) end diff --git a/storybook/config.js b/storybook/config.js index 4a111a8b9c..976b83af08 100644 --- a/storybook/config.js +++ b/storybook/config.js @@ -14,10 +14,10 @@ window.storiesOf = storiesOf; window.action = action; window.React = React; +let req = require.context('./stories/', true, /.story.jsx$/); + function loadStories () { - require('./stories/loading_indicator.story.jsx'); - require('./stories/button.story.jsx'); - require('./stories/autosuggest_textarea.story.jsx'); + req.keys().forEach((filename) => req(filename)) } configure(loadStories, module); diff --git a/storybook/stories/character_counter.story.jsx b/storybook/stories/character_counter.story.jsx new file mode 100644 index 0000000000..931d8a0374 --- /dev/null +++ b/storybook/stories/character_counter.story.jsx @@ -0,0 +1,20 @@ +import { storiesOf } from '@kadira/storybook'; +import CharacterCounter from '../../app/assets/javascripts/components/features/compose/components/character_counter'; + +storiesOf('CharacterCounter', module) + .add('no text', () => { + const text = ''; + return