From a3baae0b99618e4fc0dbfaca6fd99d504d874f92 Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Fri, 17 Jan 2025 09:18:55 +0100 Subject: [PATCH] API for updating attribution domains (#32730) --- .../api/v1/accounts/credentials_controller.rb | 1 + .../settings/verifications_controller.rb | 4 +- .../concerns/account/attribution_domains.rb | 16 +------ .../rest/credential_account_serializer.rb | 1 + app/validators/domain_validator.rb | 13 ++++-- app/validators/lines_validator.rb | 9 ---- .../settings/verifications/show.html.haml | 2 +- config/locales/activerecord.be.yml | 1 - config/locales/activerecord.bg.yml | 1 - config/locales/activerecord.ca.yml | 1 - config/locales/activerecord.cy.yml | 1 - config/locales/activerecord.da.yml | 1 - config/locales/activerecord.de.yml | 1 - config/locales/activerecord.el.yml | 1 - config/locales/activerecord.en-GB.yml | 1 - config/locales/activerecord.en.yml | 1 - config/locales/activerecord.eo.yml | 1 - config/locales/activerecord.es-AR.yml | 1 - config/locales/activerecord.es-MX.yml | 1 - config/locales/activerecord.es.yml | 1 - config/locales/activerecord.et.yml | 1 - config/locales/activerecord.fa.yml | 1 - config/locales/activerecord.fi.yml | 1 - config/locales/activerecord.fo.yml | 1 - config/locales/activerecord.fr-CA.yml | 1 - config/locales/activerecord.fr.yml | 1 - config/locales/activerecord.fy.yml | 1 - config/locales/activerecord.ga.yml | 1 - config/locales/activerecord.gd.yml | 1 - config/locales/activerecord.gl.yml | 1 - config/locales/activerecord.he.yml | 1 - config/locales/activerecord.hu.yml | 1 - config/locales/activerecord.ia.yml | 1 - config/locales/activerecord.io.yml | 1 - config/locales/activerecord.is.yml | 1 - config/locales/activerecord.it.yml | 1 - config/locales/activerecord.ja.yml | 1 - config/locales/activerecord.ko.yml | 1 - config/locales/activerecord.lt.yml | 1 - config/locales/activerecord.lv.yml | 1 - config/locales/activerecord.ml.yml | 1 - config/locales/activerecord.nl.yml | 1 - config/locales/activerecord.nn.yml | 1 - config/locales/activerecord.pl.yml | 1 - config/locales/activerecord.pt-BR.yml | 1 - config/locales/activerecord.ro.yml | 1 - config/locales/activerecord.ru.yml | 1 - config/locales/activerecord.sq.yml | 1 - config/locales/activerecord.sv.yml | 1 - config/locales/activerecord.th.yml | 1 - config/locales/activerecord.tr.yml | 1 - config/locales/activerecord.uk.yml | 1 - config/locales/activerecord.vi.yml | 1 - config/locales/activerecord.zh-CN.yml | 1 - config/locales/activerecord.zh-TW.yml | 1 - config/locales/simple_form.bg.yml | 4 +- config/locales/simple_form.ca.yml | 4 +- config/locales/simple_form.cs.yml | 4 +- config/locales/simple_form.cy.yml | 4 +- config/locales/simple_form.da.yml | 4 +- config/locales/simple_form.de.yml | 4 +- config/locales/simple_form.el.yml | 4 +- config/locales/simple_form.en-GB.yml | 4 +- config/locales/simple_form.en.yml | 4 +- config/locales/simple_form.eo.yml | 4 +- config/locales/simple_form.es-AR.yml | 4 +- config/locales/simple_form.es-MX.yml | 4 +- config/locales/simple_form.es.yml | 4 +- config/locales/simple_form.et.yml | 4 +- config/locales/simple_form.fa.yml | 4 +- config/locales/simple_form.fi.yml | 4 +- config/locales/simple_form.fo.yml | 4 +- config/locales/simple_form.fr-CA.yml | 4 +- config/locales/simple_form.fr.yml | 4 +- config/locales/simple_form.fy.yml | 4 +- config/locales/simple_form.ga.yml | 4 +- config/locales/simple_form.gd.yml | 4 +- config/locales/simple_form.gl.yml | 4 +- config/locales/simple_form.he.yml | 4 +- config/locales/simple_form.hu.yml | 4 +- config/locales/simple_form.ia.yml | 4 +- config/locales/simple_form.is.yml | 4 +- config/locales/simple_form.it.yml | 4 +- config/locales/simple_form.ja.yml | 4 +- config/locales/simple_form.ko.yml | 4 +- config/locales/simple_form.lt.yml | 4 +- config/locales/simple_form.lv.yml | 4 +- config/locales/simple_form.nl.yml | 4 +- config/locales/simple_form.nn.yml | 4 +- config/locales/simple_form.pl.yml | 4 +- config/locales/simple_form.pt-BR.yml | 4 +- config/locales/simple_form.pt-PT.yml | 4 +- config/locales/simple_form.ro.yml | 2 +- config/locales/simple_form.ru.yml | 4 +- config/locales/simple_form.sq.yml | 4 +- config/locales/simple_form.sv.yml | 4 +- config/locales/simple_form.th.yml | 4 +- config/locales/simple_form.tok.yml | 2 +- config/locales/simple_form.tr.yml | 4 +- config/locales/simple_form.uk.yml | 4 +- config/locales/simple_form.vi.yml | 4 +- config/locales/simple_form.zh-CN.yml | 4 +- config/locales/simple_form.zh-TW.yml | 4 +- lib/mastodon/version.rb | 2 +- spec/models/account_spec.rb | 37 ++++----------- .../api/v1/accounts/credentials_spec.rb | 4 +- spec/system/settings/verifications_spec.rb | 21 +++++++-- spec/validators/lines_validator_spec.rb | 46 ------------------- 108 files changed, 141 insertions(+), 251 deletions(-) delete mode 100644 app/validators/lines_validator.rb delete mode 100644 spec/validators/lines_validator_spec.rb diff --git a/app/controllers/api/v1/accounts/credentials_controller.rb b/app/controllers/api/v1/accounts/credentials_controller.rb index a378425183..1b64eb4ef2 100644 --- a/app/controllers/api/v1/accounts/credentials_controller.rb +++ b/app/controllers/api/v1/accounts/credentials_controller.rb @@ -33,6 +33,7 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController :discoverable, :hide_collections, :indexable, + attribution_domains: [], fields_attributes: [:name, :value] ) end diff --git a/app/controllers/settings/verifications_controller.rb b/app/controllers/settings/verifications_controller.rb index 4e0663253c..9cc60ba2e8 100644 --- a/app/controllers/settings/verifications_controller.rb +++ b/app/controllers/settings/verifications_controller.rb @@ -18,7 +18,9 @@ class Settings::VerificationsController < Settings::BaseController private def account_params - params.require(:account).permit(:attribution_domains_as_text) + params.require(:account).permit(:attribution_domains).tap do |params| + params[:attribution_domains] = params[:attribution_domains].split if params[:attribution_domains] + end end def set_account diff --git a/app/models/concerns/account/attribution_domains.rb b/app/models/concerns/account/attribution_domains.rb index 163c2291fe..5f4d9afabf 100644 --- a/app/models/concerns/account/attribution_domains.rb +++ b/app/models/concerns/account/attribution_domains.rb @@ -4,21 +4,9 @@ module Account::AttributionDomains extend ActiveSupport::Concern included do - validates :attribution_domains_as_text, domain: { multiline: true }, lines: { maximum: 100 }, if: -> { local? && will_save_change_to_attribution_domains? } - end + normalizes :attribution_domains, with: ->(arr) { arr.filter_map { |str| str.to_s.strip.delete_prefix('http://').delete_prefix('https://').delete_prefix('*.').presence }.uniq } - def attribution_domains_as_text - self[:attribution_domains].join("\n") - end - - def attribution_domains_as_text=(str) - self[:attribution_domains] = str.split.filter_map do |line| - line - .strip - .delete_prefix('http://') - .delete_prefix('https://') - .delete_prefix('*.') - end + validates :attribution_domains, domain: true, length: { maximum: 100 }, if: -> { local? && will_save_change_to_attribution_domains? } end def can_be_attributed_from?(domain) diff --git a/app/serializers/rest/credential_account_serializer.rb b/app/serializers/rest/credential_account_serializer.rb index 77ccf8c869..ff6ef7ac49 100644 --- a/app/serializers/rest/credential_account_serializer.rb +++ b/app/serializers/rest/credential_account_serializer.rb @@ -18,6 +18,7 @@ class REST::CredentialAccountSerializer < REST::AccountSerializer hide_collections: object.hide_collections, discoverable: object.discoverable, indexable: object.indexable, + attribution_domains: object.attribution_domains, } end diff --git a/app/validators/domain_validator.rb b/app/validators/domain_validator.rb index f975dc8ff2..4b2ae82099 100644 --- a/app/validators/domain_validator.rb +++ b/app/validators/domain_validator.rb @@ -9,18 +9,21 @@ class DomainValidator < ActiveModel::EachValidator def validate_each(record, attribute, value) return if value.blank? - (options[:multiline] ? value.split : [value]).each do |domain| - _, domain = domain.split('@') if options[:acct] + Array.wrap(value).each do |domain| + if options[:acct] + _, domain = domain.split('@') + next if domain.blank? + end - next if domain.blank? - - record.errors.add(attribute, options[:multiline] ? :invalid_domain_on_line : :invalid, value: domain) unless compliant?(domain) + record.errors.add(attribute, value.is_a?(Enumerable) ? :invalid_domain_on_line : :invalid, value: domain) unless compliant?(domain) end end private def compliant?(value) + return false if value.blank? + uri = Addressable::URI.new uri.host = value uri.normalized_host.size < MAX_DOMAIN_LENGTH && uri.normalized_host.split('.').all? { |label| label.size.between?(MIN_LABEL_LENGTH, MAX_LABEL_LENGTH) && label =~ ALLOWED_CHARACTERS_RE } diff --git a/app/validators/lines_validator.rb b/app/validators/lines_validator.rb deleted file mode 100644 index 27a108bb2c..0000000000 --- a/app/validators/lines_validator.rb +++ /dev/null @@ -1,9 +0,0 @@ -# frozen_string_literal: true - -class LinesValidator < ActiveModel::EachValidator - def validate_each(record, attribute, value) - return if value.blank? - - record.errors.add(attribute, :too_many_lines, limit: options[:maximum]) if options[:maximum].present? && value.split.size > options[:maximum] - end -end diff --git a/app/views/settings/verifications/show.html.haml b/app/views/settings/verifications/show.html.haml index a93ffcebed..c569843793 100644 --- a/app/views/settings/verifications/show.html.haml +++ b/app/views/settings/verifications/show.html.haml @@ -65,7 +65,7 @@ %p.lead= t('author_attribution.then_instructions') .fields-group - = f.input :attribution_domains_as_text, as: :text, wrapper: :with_block_label, input_html: { placeholder: "example1.com\nexample2.com\nexample3.com", rows: 4, autocapitalize: 'none', autocorrect: 'off' } + = f.input :attribution_domains, as: :text, wrapper: :with_block_label, input_html: { value: @account.attribution_domains.join("\n"), placeholder: "example1.com\nexample2.com\nexample3.com", rows: 4, autocapitalize: 'none', autocorrect: 'off' } .actions = f.button :button, t('generic.save_changes'), type: :submit diff --git a/config/locales/activerecord.be.yml b/config/locales/activerecord.be.yml index c235ae088d..0c77b78b0d 100644 --- a/config/locales/activerecord.be.yml +++ b/config/locales/activerecord.be.yml @@ -16,7 +16,6 @@ be: text: Прычына errors: messages: - too_many_lines: перавышана абмежаванне ў %{limit} радкоў models: account: attributes: diff --git a/config/locales/activerecord.bg.yml b/config/locales/activerecord.bg.yml index 68c7369033..1a3f71a9cd 100644 --- a/config/locales/activerecord.bg.yml +++ b/config/locales/activerecord.bg.yml @@ -20,7 +20,6 @@ bg: invalid: не е действително име на домейн messages: invalid_domain_on_line: "%{value} не е действително име на домейн" - too_many_lines: е над ограничение от %{limit} реда models: account: attributes: diff --git a/config/locales/activerecord.ca.yml b/config/locales/activerecord.ca.yml index 09b6366b55..23b1d43544 100644 --- a/config/locales/activerecord.ca.yml +++ b/config/locales/activerecord.ca.yml @@ -20,7 +20,6 @@ ca: invalid: no és un nom de domini vàlid messages: invalid_domain_on_line: "%{value} no és un nom de domini vàlid" - too_many_lines: sobrepassa el límit de %{limit} línies models: account: attributes: diff --git a/config/locales/activerecord.cy.yml b/config/locales/activerecord.cy.yml index 9bc9b3b2bc..526d3f646f 100644 --- a/config/locales/activerecord.cy.yml +++ b/config/locales/activerecord.cy.yml @@ -20,7 +20,6 @@ cy: invalid: "- nid yw'n enw parth dilys" messages: invalid_domain_on_line: Nid yw %{value} yn enw parth dilys - too_many_lines: "- dros y terfyn o %{limit} llinell" models: account: attributes: diff --git a/config/locales/activerecord.da.yml b/config/locales/activerecord.da.yml index e611442a1b..0c1eb5e6dd 100644 --- a/config/locales/activerecord.da.yml +++ b/config/locales/activerecord.da.yml @@ -20,7 +20,6 @@ da: invalid: er ikke et gyldigt domænenavn messages: invalid_domain_on_line: "%{value} er ikke et gyldigt domænenavn" - too_many_lines: overstiger grænsen på %{limit} linjer models: account: attributes: diff --git a/config/locales/activerecord.de.yml b/config/locales/activerecord.de.yml index 99d50d49e4..b20e6a65f8 100644 --- a/config/locales/activerecord.de.yml +++ b/config/locales/activerecord.de.yml @@ -20,7 +20,6 @@ de: invalid: ist kein gültiger Domain-Name messages: invalid_domain_on_line: "%{value} ist kein gültiger Domain-Name" - too_many_lines: übersteigt das Limit von %{limit} Zeilen models: account: attributes: diff --git a/config/locales/activerecord.el.yml b/config/locales/activerecord.el.yml index 2b1210e337..a6108ec0ca 100644 --- a/config/locales/activerecord.el.yml +++ b/config/locales/activerecord.el.yml @@ -20,7 +20,6 @@ el: invalid: δεν είναι έγκυρο όνομα τομέα messages: invalid_domain_on_line: το %{value} δεν είναι έγκυρο όνομα τομέα - too_many_lines: υπερβαίνει το όριο των %{limit} γραμμών models: account: attributes: diff --git a/config/locales/activerecord.en-GB.yml b/config/locales/activerecord.en-GB.yml index 72edf5e02f..23bf90e4c8 100644 --- a/config/locales/activerecord.en-GB.yml +++ b/config/locales/activerecord.en-GB.yml @@ -20,7 +20,6 @@ en-GB: invalid: is not a valid domain name messages: invalid_domain_on_line: "%{value} is not a valid domain name" - too_many_lines: is over the limit of %{limit} lines models: account: attributes: diff --git a/config/locales/activerecord.en.yml b/config/locales/activerecord.en.yml index 57404d2648..f10a9011b3 100644 --- a/config/locales/activerecord.en.yml +++ b/config/locales/activerecord.en.yml @@ -20,7 +20,6 @@ en: invalid: is not a valid domain name messages: invalid_domain_on_line: "%{value} is not a valid domain name" - too_many_lines: is over the limit of %{limit} lines models: account: attributes: diff --git a/config/locales/activerecord.eo.yml b/config/locales/activerecord.eo.yml index f5e291be8f..fcf5bb3160 100644 --- a/config/locales/activerecord.eo.yml +++ b/config/locales/activerecord.eo.yml @@ -20,7 +20,6 @@ eo: invalid: ne estas valida domajna nomo messages: invalid_domain_on_line: "%{value} ne estas valida domajna nomo" - too_many_lines: superas la limon de %{limit} linioj models: account: attributes: diff --git a/config/locales/activerecord.es-AR.yml b/config/locales/activerecord.es-AR.yml index bc88933734..5a74092458 100644 --- a/config/locales/activerecord.es-AR.yml +++ b/config/locales/activerecord.es-AR.yml @@ -20,7 +20,6 @@ es-AR: invalid: no es un nombre de dominio válido messages: invalid_domain_on_line: "%{value} no es un nombre de dominio válido" - too_many_lines: está por encima del límite de %{limit} líneas models: account: attributes: diff --git a/config/locales/activerecord.es-MX.yml b/config/locales/activerecord.es-MX.yml index c2d27a65b8..4f080eca8c 100644 --- a/config/locales/activerecord.es-MX.yml +++ b/config/locales/activerecord.es-MX.yml @@ -20,7 +20,6 @@ es-MX: invalid: no es un nombre de dominio válido messages: invalid_domain_on_line: "%{value} no es un nombre de dominio válido" - too_many_lines: excede el límite de %{limit} líneas models: account: attributes: diff --git a/config/locales/activerecord.es.yml b/config/locales/activerecord.es.yml index d7b25a9042..60d52ad8f2 100644 --- a/config/locales/activerecord.es.yml +++ b/config/locales/activerecord.es.yml @@ -20,7 +20,6 @@ es: invalid: no es un nombre de dominio válido messages: invalid_domain_on_line: "%{value} no es un nombre de dominio válido" - too_many_lines: excede el límite de %{limit} líneas models: account: attributes: diff --git a/config/locales/activerecord.et.yml b/config/locales/activerecord.et.yml index 520e97ffb4..308a97cb3e 100644 --- a/config/locales/activerecord.et.yml +++ b/config/locales/activerecord.et.yml @@ -20,7 +20,6 @@ et: invalid: pole kehtiv domeeninimi messages: invalid_domain_on_line: "%{value} ei ole kehtiv domeeninimi" - too_many_lines: on üle limiidi %{limit} rida models: account: attributes: diff --git a/config/locales/activerecord.fa.yml b/config/locales/activerecord.fa.yml index eb1033d75c..c59890da9d 100644 --- a/config/locales/activerecord.fa.yml +++ b/config/locales/activerecord.fa.yml @@ -20,7 +20,6 @@ fa: invalid: نام دامنهٔ معتبری نیست messages: invalid_domain_on_line: "%{value} نام دامنهٔ معتبری نیست" - too_many_lines: بیش از کران %{limit} خط است models: account: attributes: diff --git a/config/locales/activerecord.fi.yml b/config/locales/activerecord.fi.yml index bf98beb6a3..619f2cd584 100644 --- a/config/locales/activerecord.fi.yml +++ b/config/locales/activerecord.fi.yml @@ -20,7 +20,6 @@ fi: invalid: ei ole kelvollinen verkkotunnus messages: invalid_domain_on_line: "%{value} ei ole kelvollinen verkkotunnus" - too_many_lines: ylittää %{limit} rivin rajan models: account: attributes: diff --git a/config/locales/activerecord.fo.yml b/config/locales/activerecord.fo.yml index c419173ef0..054a828755 100644 --- a/config/locales/activerecord.fo.yml +++ b/config/locales/activerecord.fo.yml @@ -20,7 +20,6 @@ fo: invalid: er ikki eitt virkið økisnavn messages: invalid_domain_on_line: "%{value} er ikki eitt virkið økisnavn" - too_many_lines: er longri enn markið á %{limit} reglur models: account: attributes: diff --git a/config/locales/activerecord.fr-CA.yml b/config/locales/activerecord.fr-CA.yml index 41ac187b94..97aee2304c 100644 --- a/config/locales/activerecord.fr-CA.yml +++ b/config/locales/activerecord.fr-CA.yml @@ -20,7 +20,6 @@ fr-CA: invalid: n'est pas un nom de domaine valide messages: invalid_domain_on_line: "%{value} n'est pas un nom de domaine valide" - too_many_lines: dépasse la limite de %{limit} lignes models: account: attributes: diff --git a/config/locales/activerecord.fr.yml b/config/locales/activerecord.fr.yml index e6d5bc1add..85dbaf293b 100644 --- a/config/locales/activerecord.fr.yml +++ b/config/locales/activerecord.fr.yml @@ -20,7 +20,6 @@ fr: invalid: n'est pas un nom de domaine valide messages: invalid_domain_on_line: "%{value} n'est pas un nom de domaine valide" - too_many_lines: dépasse la limite de %{limit} lignes models: account: attributes: diff --git a/config/locales/activerecord.fy.yml b/config/locales/activerecord.fy.yml index fb95d40868..80727feef8 100644 --- a/config/locales/activerecord.fy.yml +++ b/config/locales/activerecord.fy.yml @@ -20,7 +20,6 @@ fy: invalid: is in ûnjildige domeinnamme messages: invalid_domain_on_line: "%{value} is in ûnjildige domeinnamme" - too_many_lines: giet oer de limyt fan %{limit} rigels models: account: attributes: diff --git a/config/locales/activerecord.ga.yml b/config/locales/activerecord.ga.yml index c02c537076..c0b86482ce 100644 --- a/config/locales/activerecord.ga.yml +++ b/config/locales/activerecord.ga.yml @@ -20,7 +20,6 @@ ga: invalid: nach ainm fearainn bailí é messages: invalid_domain_on_line: Ní ainm fearainn bailí é %{value} - too_many_lines: thar an teorainn de %{limit} línte models: account: attributes: diff --git a/config/locales/activerecord.gd.yml b/config/locales/activerecord.gd.yml index 26848e2584..bcda4a6a31 100644 --- a/config/locales/activerecord.gd.yml +++ b/config/locales/activerecord.gd.yml @@ -20,7 +20,6 @@ gd: invalid: "– chan eil seo ’na ainm àrainne dligheach" messages: invalid_domain_on_line: Chan eil %{value} ’na ainm àrainne dligheach - too_many_lines: "– tha seo thar crìoch de %{limit} nan loidhnichean" models: account: attributes: diff --git a/config/locales/activerecord.gl.yml b/config/locales/activerecord.gl.yml index 8fdff40282..92cbcc5fb4 100644 --- a/config/locales/activerecord.gl.yml +++ b/config/locales/activerecord.gl.yml @@ -20,7 +20,6 @@ gl: invalid: non é un nome de dominio válido messages: invalid_domain_on_line: "%{value} non é un nome de dominio válido" - too_many_lines: superou o límite de %{limit} liñas models: account: attributes: diff --git a/config/locales/activerecord.he.yml b/config/locales/activerecord.he.yml index b63b41c74e..57f5e4bcbb 100644 --- a/config/locales/activerecord.he.yml +++ b/config/locales/activerecord.he.yml @@ -20,7 +20,6 @@ he: invalid: אינו שם מתחם קביל messages: invalid_domain_on_line: "%{value} אינו שם מתחם קביל" - too_many_lines: מעבר למגבלה של %{limit} שורות models: account: attributes: diff --git a/config/locales/activerecord.hu.yml b/config/locales/activerecord.hu.yml index b26d1afbe3..b0ac003e9d 100644 --- a/config/locales/activerecord.hu.yml +++ b/config/locales/activerecord.hu.yml @@ -20,7 +20,6 @@ hu: invalid: nem egy érvényes domain név messages: invalid_domain_on_line: "%{value} nem egy érvényes domain név" - too_many_lines: túllépi a(z) %{limit} soros korlátot models: account: attributes: diff --git a/config/locales/activerecord.ia.yml b/config/locales/activerecord.ia.yml index 35b28a19aa..b4cc349c08 100644 --- a/config/locales/activerecord.ia.yml +++ b/config/locales/activerecord.ia.yml @@ -20,7 +20,6 @@ ia: invalid: non es un nomine de dominio valide messages: invalid_domain_on_line: "%{value} non es un nomine de dominio valide" - too_many_lines: il es ultra le limite de %{limit} lineas models: account: attributes: diff --git a/config/locales/activerecord.io.yml b/config/locales/activerecord.io.yml index 2b0d509198..8663c67218 100644 --- a/config/locales/activerecord.io.yml +++ b/config/locales/activerecord.io.yml @@ -20,7 +20,6 @@ io: invalid: ne esas valida domennomo messages: invalid_domain_on_line: "%{value} ne esas valida domennomo" - too_many_lines: esas plu kam la limito qua esas %{limit} linei models: account: attributes: diff --git a/config/locales/activerecord.is.yml b/config/locales/activerecord.is.yml index 966d8fa9e8..2f4801ac9c 100644 --- a/config/locales/activerecord.is.yml +++ b/config/locales/activerecord.is.yml @@ -20,7 +20,6 @@ is: invalid: er ekki leyfilegt nafn á léni messages: invalid_domain_on_line: "%{value} er ekki leyfilegt nafn á léni" - too_many_lines: er yfir takmörkum á %{limit} línum models: account: attributes: diff --git a/config/locales/activerecord.it.yml b/config/locales/activerecord.it.yml index 6db643408c..2b408f548e 100644 --- a/config/locales/activerecord.it.yml +++ b/config/locales/activerecord.it.yml @@ -20,7 +20,6 @@ it: invalid: non è un nome di dominio valido messages: invalid_domain_on_line: "%{value} non è un nome di dominio valido" - too_many_lines: è oltre il limite di %{limit} righe models: account: attributes: diff --git a/config/locales/activerecord.ja.yml b/config/locales/activerecord.ja.yml index 90bbd795a1..42a107a31c 100644 --- a/config/locales/activerecord.ja.yml +++ b/config/locales/activerecord.ja.yml @@ -20,7 +20,6 @@ ja: invalid: 有効なドメイン名ではありません messages: invalid_domain_on_line: "%{value} は有効なドメイン名ではありません" - too_many_lines: "%{limit} 行の制限を超えています。" models: account: attributes: diff --git a/config/locales/activerecord.ko.yml b/config/locales/activerecord.ko.yml index 80bc19f7ad..5dbd2e3d78 100644 --- a/config/locales/activerecord.ko.yml +++ b/config/locales/activerecord.ko.yml @@ -20,7 +20,6 @@ ko: invalid: 올바른 도메인 네임이 아닙니다 messages: invalid_domain_on_line: "%{value}는 올바른 도메인 네임이 아닙니다" - too_many_lines: "%{limit}줄 제한을 초과합니다" models: account: attributes: diff --git a/config/locales/activerecord.lt.yml b/config/locales/activerecord.lt.yml index 5171249d57..4f94a38082 100644 --- a/config/locales/activerecord.lt.yml +++ b/config/locales/activerecord.lt.yml @@ -20,7 +20,6 @@ lt: invalid: nėra tinkamas domeno vardas. messages: invalid_domain_on_line: "%{value} nėra tinkamas domeno vardas." - too_many_lines: yra daugiau nei %{limit} eilučių ribojimą. models: account: attributes: diff --git a/config/locales/activerecord.lv.yml b/config/locales/activerecord.lv.yml index 3fb928c89c..6d912bd628 100644 --- a/config/locales/activerecord.lv.yml +++ b/config/locales/activerecord.lv.yml @@ -20,7 +20,6 @@ lv: invalid: nav derīgs domēna nosaukums messages: invalid_domain_on_line: "%{value} nav derīgs domēna nosaukums" - too_many_lines: pārsniedz %{limit} līniju ierobežojumu models: account: attributes: diff --git a/config/locales/activerecord.ml.yml b/config/locales/activerecord.ml.yml index 90c5b38ad5..3c8cf67695 100644 --- a/config/locales/activerecord.ml.yml +++ b/config/locales/activerecord.ml.yml @@ -20,7 +20,6 @@ ml: invalid: ഇതൊരു തെറ്റിയ മേഖലപേരാണു് messages: invalid_domain_on_line: "%{value} ഒരു തെറ്റിയ മേഖലപേരാണു്" - too_many_lines: ഇതു് %{limit} വരിയതിരിന്റെ മേലെയാണു് models: account: attributes: diff --git a/config/locales/activerecord.nl.yml b/config/locales/activerecord.nl.yml index 530e7187d4..447601f0c6 100644 --- a/config/locales/activerecord.nl.yml +++ b/config/locales/activerecord.nl.yml @@ -20,7 +20,6 @@ nl: invalid: is een ongeldige domeinnaam messages: invalid_domain_on_line: "%{value} is een ongeldige domeinnaam" - too_many_lines: overschrijdt de limiet van %{limit} regels models: account: attributes: diff --git a/config/locales/activerecord.nn.yml b/config/locales/activerecord.nn.yml index 2b5b6dd581..f47bafe0b7 100644 --- a/config/locales/activerecord.nn.yml +++ b/config/locales/activerecord.nn.yml @@ -20,7 +20,6 @@ nn: invalid: er ikkje eit gyldig domenenamn messages: invalid_domain_on_line: "%{value} er ikkje gyldig i eit domenenamn" - too_many_lines: er over grensa på %{limit} liner models: account: attributes: diff --git a/config/locales/activerecord.pl.yml b/config/locales/activerecord.pl.yml index 58f2b9ac14..06b3587008 100644 --- a/config/locales/activerecord.pl.yml +++ b/config/locales/activerecord.pl.yml @@ -20,7 +20,6 @@ pl: invalid: nie jest prawidłową nazwą domeny messages: invalid_domain_on_line: "%{value} nie jest prawidłową nazwą domeny" - too_many_lines: przekracza limit %{limit} linii models: account: attributes: diff --git a/config/locales/activerecord.pt-BR.yml b/config/locales/activerecord.pt-BR.yml index 9e6ef96364..fde744bed6 100644 --- a/config/locales/activerecord.pt-BR.yml +++ b/config/locales/activerecord.pt-BR.yml @@ -20,7 +20,6 @@ pt-BR: invalid: não é um nome de domínio válido messages: invalid_domain_on_line: "%{value} não é um nome de domínio válido" - too_many_lines: está acima do limite de %{limit} linhas models: account: attributes: diff --git a/config/locales/activerecord.ro.yml b/config/locales/activerecord.ro.yml index fa8b206448..9f21282ca6 100644 --- a/config/locales/activerecord.ro.yml +++ b/config/locales/activerecord.ro.yml @@ -20,7 +20,6 @@ ro: invalid: nu este un nume de domeniu valid messages: invalid_domain_on_line: "%{value} nu este un nume de domeniu valid" - too_many_lines: este peste limita de %{limit} linii models: account: attributes: diff --git a/config/locales/activerecord.ru.yml b/config/locales/activerecord.ru.yml index b49a135618..8769212d52 100644 --- a/config/locales/activerecord.ru.yml +++ b/config/locales/activerecord.ru.yml @@ -20,7 +20,6 @@ ru: invalid: не является действующим доменным именем messages: invalid_domain_on_line: "%{value} Не является действительным доменным именем" - too_many_lines: Превышает предел %{limit} строк models: account: attributes: diff --git a/config/locales/activerecord.sq.yml b/config/locales/activerecord.sq.yml index 7e53b36b87..8c22f2e0fb 100644 --- a/config/locales/activerecord.sq.yml +++ b/config/locales/activerecord.sq.yml @@ -20,7 +20,6 @@ sq: invalid: s’është emër i vlefshëm përkatësie messages: invalid_domain_on_line: "%{value} s’është emër i vlefshëm përkatësie" - too_many_lines: është tej kufirit prej %{limit} rreshta models: account: attributes: diff --git a/config/locales/activerecord.sv.yml b/config/locales/activerecord.sv.yml index bf1ef22f3d..db488200df 100644 --- a/config/locales/activerecord.sv.yml +++ b/config/locales/activerecord.sv.yml @@ -20,7 +20,6 @@ sv: invalid: är inte ett giltigt domännamn messages: invalid_domain_on_line: "%{value} Är inte ett giltigt domännamn" - too_many_lines: överskrider gränsen på %{limit} rader models: account: attributes: diff --git a/config/locales/activerecord.th.yml b/config/locales/activerecord.th.yml index 6575d30a22..e8a0a37cff 100644 --- a/config/locales/activerecord.th.yml +++ b/config/locales/activerecord.th.yml @@ -20,7 +20,6 @@ th: invalid: ไม่ใช่ชื่อโดเมนที่ถูกต้อง messages: invalid_domain_on_line: "%{value} ไม่ใช่ชื่อโดเมนที่ถูกต้อง" - too_many_lines: เกินขีดจำกัด %{limit} บรรทัด models: account: attributes: diff --git a/config/locales/activerecord.tr.yml b/config/locales/activerecord.tr.yml index 4795e629fb..0b0c34fb82 100644 --- a/config/locales/activerecord.tr.yml +++ b/config/locales/activerecord.tr.yml @@ -20,7 +20,6 @@ tr: invalid: geçerli bir alan adı değil messages: invalid_domain_on_line: "%{value} geçerli bir alan adı değil" - too_many_lines: "%{limit} satır sınırının üzerinde" models: account: attributes: diff --git a/config/locales/activerecord.uk.yml b/config/locales/activerecord.uk.yml index 3e82b5ac3d..1ee426ae45 100644 --- a/config/locales/activerecord.uk.yml +++ b/config/locales/activerecord.uk.yml @@ -20,7 +20,6 @@ uk: invalid: не є дійсним іменем домену messages: invalid_domain_on_line: "%{value} не є дійсним іменем домену" - too_many_lines: перевищує ліміт %{limit} рядків models: account: attributes: diff --git a/config/locales/activerecord.vi.yml b/config/locales/activerecord.vi.yml index 16f106a8bb..8e9e6679c4 100644 --- a/config/locales/activerecord.vi.yml +++ b/config/locales/activerecord.vi.yml @@ -20,7 +20,6 @@ vi: invalid: không phải là một tên miền hợp lệ messages: invalid_domain_on_line: "%{value} không phải là một tên miền hợp lệ" - too_many_lines: vượt quá giới hạn %{limit} dòng models: account: attributes: diff --git a/config/locales/activerecord.zh-CN.yml b/config/locales/activerecord.zh-CN.yml index 262b8c5e77..74cb299b3b 100644 --- a/config/locales/activerecord.zh-CN.yml +++ b/config/locales/activerecord.zh-CN.yml @@ -20,7 +20,6 @@ zh-CN: invalid: 不是有效的域名 messages: invalid_domain_on_line: "%{value} 不是有效的域名" - too_many_lines: 超出 %{limit} 行的长度限制 models: account: attributes: diff --git a/config/locales/activerecord.zh-TW.yml b/config/locales/activerecord.zh-TW.yml index 29c2c86af0..58b703b531 100644 --- a/config/locales/activerecord.zh-TW.yml +++ b/config/locales/activerecord.zh-TW.yml @@ -20,7 +20,6 @@ zh-TW: invalid: 並非一個有效網域 messages: invalid_domain_on_line: "%{value} 並非一個有效網域" - too_many_lines: 已超過行數限制 (%{limit} 行) models: account: attributes: diff --git a/config/locales/simple_form.bg.yml b/config/locales/simple_form.bg.yml index 68386eded6..fee710113b 100644 --- a/config/locales/simple_form.bg.yml +++ b/config/locales/simple_form.bg.yml @@ -3,7 +3,7 @@ bg: simple_form: hints: account: - attribution_domains_as_text: Едно на ред. Защитава от фалшиви атрибути. + attribution_domains: Едно на ред. Защитава от фалшиви атрибути. discoverable: Вашите публични публикации и профил може да се представят или препоръчват в различни области на Mastodon и вашия профил може да се предлага на други потребители. display_name: Вашето пълно име или псевдоним. fields: Вашата начална страница, местоимения, години, всичко що искате. @@ -150,7 +150,7 @@ bg: url: До къде ще се изпращат събитията labels: account: - attribution_domains_as_text: Уебсайтове, на които е позволено да приписват авторството ви + attribution_domains: Уебсайтове, на които е позволено да приписват авторството ви discoverable: Включване на профил и публикации в алгоритмите за откриване fields: name: Етикет diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml index 58cc0a034c..4e70a46d71 100644 --- a/config/locales/simple_form.ca.yml +++ b/config/locales/simple_form.ca.yml @@ -3,7 +3,7 @@ ca: simple_form: hints: account: - attribution_domains_as_text: Un per línia. Protegeix de falses atribucions. + attribution_domains: Un per línia. Protegeix de falses atribucions. discoverable: El teu perfil i els teus tuts públics poden aparèixer o ser recomanats en diverses àreas de Mastodon i el teu perfil pot ser suggerit a altres usuaris. display_name: El teu nom complet o el teu nom divertit. fields: La teva pàgina d'inici, pronoms, edat, el que vulguis. @@ -148,7 +148,7 @@ ca: url: On els esdeveniments seran enviats labels: account: - attribution_domains_as_text: Webs que us poden donar crèdit + attribution_domains: Webs que us poden donar crèdit discoverable: Permet el perfil i el tuts en els algorismes de descobriment fields: name: Etiqueta diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml index 22b92a4434..37ad72a7e4 100644 --- a/config/locales/simple_form.cs.yml +++ b/config/locales/simple_form.cs.yml @@ -3,7 +3,7 @@ cs: simple_form: hints: account: - attribution_domains_as_text: Jeden na řádek. Chrání před falešným připisování autorství. + attribution_domains: Jeden na řádek. Chrání před falešným připisování autorství. discoverable: Vaše veřejné příspěvky a profil mohou být zobrazeny nebo doporučeny v různých oblastech Mastodonu a váš profil může být navrhován ostatním uživatelům. display_name: Vaše celé jméno nebo přezdívka. fields: Vaše domovská stránka, zájmena, věk, cokoliv chcete. @@ -156,7 +156,7 @@ cs: url: Kam budou události odesílány labels: account: - attribution_domains_as_text: Webové stránky s povolením Vám připsat autorství + attribution_domains: Webové stránky s povolením Vám připsat autorství discoverable: Zobrazovat profil a příspěvky ve vyhledávacích algoritmech fields: name: Označení diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml index d5a785e387..b1adc7cbbe 100644 --- a/config/locales/simple_form.cy.yml +++ b/config/locales/simple_form.cy.yml @@ -3,7 +3,7 @@ cy: simple_form: hints: account: - attribution_domains_as_text: Un i bob llinell. Yn amddiffyn rhag priodoli ffug. + attribution_domains: Un i bob llinell. Yn amddiffyn rhag priodoli ffug. discoverable: Mae'n bosibl y bydd eich postiadau cyhoeddus a'ch proffil yn cael sylw neu'n cael eu hargymell mewn gwahanol feysydd o Mastodon ac efallai y bydd eich proffil yn cael ei awgrymu i ddefnyddwyr eraill. display_name: Eich enw llawn neu'ch enw hwyl. fields: Eich tudalen cartref, rhagenwau, oed, neu unrhyw beth. @@ -156,7 +156,7 @@ cy: url: I ble bydd digwyddiadau'n cael eu hanfon labels: account: - attribution_domains_as_text: Gwefannau sy'n cael caniatâd i'ch cydnabod chi + attribution_domains: Gwefannau sy'n cael caniatâd i'ch cydnabod chi discoverable: Proffil nodwedd a phostiadau mewn algorithmau darganfod fields: name: Label diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml index 0ef8232dda..676f184f98 100644 --- a/config/locales/simple_form.da.yml +++ b/config/locales/simple_form.da.yml @@ -3,7 +3,7 @@ da: simple_form: hints: account: - attribution_domains_as_text: Ét pr. linje. Beskytter mod falske tilskrivninger. + attribution_domains: Ét pr. linje. Beskytter mod falske tilskrivninger. discoverable: Dine offentlige indlæg og profil kan blive fremhævet eller anbefalet i forskellige områder af Mastodon, og profilen kan blive foreslået til andre brugere. display_name: Dit fulde navn eller dit sjove navn. fields: Din hjemmeside, dine pronominer, din alder, eller hvad du har lyst til. @@ -156,7 +156,7 @@ da: url: Hvor begivenheder sendes til labels: account: - attribution_domains_as_text: Websteder, man må krediteres af + attribution_domains: Websteder, man må krediteres af discoverable: Fremhæv profil og indlæg i opdagelsesalgoritmer fields: name: Etiket diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml index ea0681e1af..2becfb36dc 100644 --- a/config/locales/simple_form.de.yml +++ b/config/locales/simple_form.de.yml @@ -3,7 +3,7 @@ de: simple_form: hints: account: - attribution_domains_as_text: Eine Domain pro Zeile. Dadurch können falsche Zuschreibungen unterbunden werden. + attribution_domains: Eine Domain pro Zeile. Dadurch können falsche Zuschreibungen unterbunden werden. discoverable: Deine öffentlichen Beiträge und dein Profil können in verschiedenen Bereichen auf Mastodon angezeigt oder empfohlen werden und dein Profil kann anderen vorgeschlagen werden. display_name: Dein richtiger Name oder dein Fantasiename. fields: Deine Website, Pronomen, dein Alter – alles, was du möchtest. @@ -156,7 +156,7 @@ de: url: Wohin Ereignisse gesendet werden labels: account: - attribution_domains_as_text: Websites, die auf dich verweisen dürfen + attribution_domains: Websites, die auf dich verweisen dürfen discoverable: Profil und Beiträge in Suchalgorithmen berücksichtigen fields: name: Beschriftung diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml index c729bef20b..37ec359377 100644 --- a/config/locales/simple_form.el.yml +++ b/config/locales/simple_form.el.yml @@ -3,7 +3,7 @@ el: simple_form: hints: account: - attribution_domains_as_text: Μία ανά γραμμή. Προστατεύει από ψευδείς ιδιότητες. + attribution_domains: Μία ανά γραμμή. Προστατεύει από ψευδείς ιδιότητες. discoverable: Οι δημόσιες δημοσιεύσεις και το προφίλ σου μπορεί να εμφανίζονται ή να συνιστώνται σε διάφορους τομείς του Mastodon και το προφίλ σου μπορεί να προτείνεται σε άλλους χρήστες. display_name: Το πλήρες ή το αστείο σου όνομα. fields: Η αρχική σου σελίδα, αντωνυμίες, ηλικία, ό,τι θες. @@ -155,7 +155,7 @@ el: url: Πού θα σταλούν τα γεγονότα labels: account: - attribution_domains_as_text: Ιστοσελίδες που επιτρέπεται να σου δώσουν εύσημα + attribution_domains: Ιστοσελίδες που επιτρέπεται να σου δώσουν εύσημα discoverable: Παροχή προφίλ και αναρτήσεων σε αλγορίθμους ανακάλυψης fields: name: Περιγραφή diff --git a/config/locales/simple_form.en-GB.yml b/config/locales/simple_form.en-GB.yml index aa1184a02f..d8bfd1122f 100644 --- a/config/locales/simple_form.en-GB.yml +++ b/config/locales/simple_form.en-GB.yml @@ -3,7 +3,7 @@ en-GB: simple_form: hints: account: - attribution_domains_as_text: One per line. Protects from false attributions. + attribution_domains: One per line. Protects from false attributions. discoverable: Your public posts and profile may be featured or recommended in various areas of Mastodon and your profile may be suggested to other users. display_name: Your full name or your fun name. fields: Your homepage, pronouns, age, anything you want. @@ -144,7 +144,7 @@ en-GB: url: Where events will be sent to labels: account: - attribution_domains_as_text: Websites allowed to credit you + attribution_domains: Websites allowed to credit you discoverable: Feature profile and posts in discovery algorithms fields: name: Label diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 3a052ad626..696ccd35dc 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -3,7 +3,7 @@ en: simple_form: hints: account: - attribution_domains_as_text: One per line. Protects from false attributions. + attribution_domains: One per line. Protects from false attributions. discoverable: Your public posts and profile may be featured or recommended in various areas of Mastodon and your profile may be suggested to other users. display_name: Your full name or your fun name. fields: Your homepage, pronouns, age, anything you want. @@ -156,7 +156,7 @@ en: url: Where events will be sent to labels: account: - attribution_domains_as_text: Websites allowed to credit you + attribution_domains: Websites allowed to credit you discoverable: Feature profile and posts in discovery algorithms fields: name: Label diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml index 59fad146d4..4688fe614a 100644 --- a/config/locales/simple_form.eo.yml +++ b/config/locales/simple_form.eo.yml @@ -3,7 +3,7 @@ eo: simple_form: hints: account: - attribution_domains_as_text: Unu por linio. Protektas kontraŭ falsaj atribuoj. + attribution_domains: Unu por linio. Protektas kontraŭ falsaj atribuoj. discoverable: Viaj publikaj afiŝoj kaj profilo povas esti prezentitaj aŭ rekomenditaj en diversaj lokoj de Mastodon kaj via profilo povas esti proponita al aliaj uzantoj. display_name: Via plena nomo aŭ via kromnomo. fields: Via retpaĝo, pronomoj, aĝo, ĉio, kion vi volas. @@ -156,7 +156,7 @@ eo: url: Kien eventoj sendotas labels: account: - attribution_domains_as_text: Retejoj permesitaj krediti vin + attribution_domains: Retejoj permesitaj krediti vin discoverable: Elstarigi profilon kaj afiŝojn en eltrovantaj algoritmoj fields: name: Etikedo diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml index 74fcce8239..0959ac0d7b 100644 --- a/config/locales/simple_form.es-AR.yml +++ b/config/locales/simple_form.es-AR.yml @@ -3,7 +3,7 @@ es-AR: simple_form: hints: account: - attribution_domains_as_text: Una por línea. Protege de falsas atribuciones. + attribution_domains: Una por línea. Protege de falsas atribuciones. discoverable: Tu perfil y publicaciones pueden ser destacadas o recomendadas en varias áreas de Mastodon, y tu perfil puede ser sugerido a otros usuarios. display_name: Tu nombre completo o tu pseudónimo. fields: Tu sitio web, pronombres, edad, o lo que quieras. @@ -156,7 +156,7 @@ es-AR: url: Adónde serán enviados los eventos labels: account: - attribution_domains_as_text: Sitios web autorizados a acreditarte + attribution_domains: Sitios web autorizados a acreditarte discoverable: Destacar perfil y mensajes en algoritmos de descubrimiento fields: name: Nombre de campo diff --git a/config/locales/simple_form.es-MX.yml b/config/locales/simple_form.es-MX.yml index 8dc1c4a3a6..4ed442ae19 100644 --- a/config/locales/simple_form.es-MX.yml +++ b/config/locales/simple_form.es-MX.yml @@ -3,7 +3,7 @@ es-MX: simple_form: hints: account: - attribution_domains_as_text: Uno por línea. Protege contra atribuciones falsas. + attribution_domains: Uno por línea. Protege contra atribuciones falsas. discoverable: Tu perfil y las publicaciones públicas pueden ser destacadas o recomendadas en varias áreas de Mastodon y tu perfil puede ser sugerido a otros usuarios. display_name: Tu nombre completo o tu apodo. fields: Tu página de inicio, pronombres, edad, lo que quieras. @@ -156,7 +156,7 @@ es-MX: url: Donde los eventos serán enviados labels: account: - attribution_domains_as_text: Sitios web autorizados para acreditarte + attribution_domains: Sitios web autorizados para acreditarte discoverable: Destacar el perfil y las publicaciones en el algoritmo de descubrimiento fields: name: Etiqueta diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml index 77cd04cfd0..dd62884d68 100644 --- a/config/locales/simple_form.es.yml +++ b/config/locales/simple_form.es.yml @@ -3,7 +3,7 @@ es: simple_form: hints: account: - attribution_domains_as_text: Una por línea. Protege de falsas atribuciones. + attribution_domains: Una por línea. Protege de falsas atribuciones. discoverable: Tu perfil y publicaciones públicas pueden ser destacadas o recomendadas en varias áreas de Mastodon y tu perfil puede ser sugerido a otros usuarios. display_name: Tu nombre completo o tu apodo. fields: Tu carta de presentación, pronombres, edad, lo que quieras. @@ -156,7 +156,7 @@ es: url: Donde los eventos serán enviados labels: account: - attribution_domains_as_text: Sitios web autorizados a acreditarte + attribution_domains: Sitios web autorizados a acreditarte discoverable: Destacar perfil y publicaciones en algoritmos de descubrimiento fields: name: Etiqueta diff --git a/config/locales/simple_form.et.yml b/config/locales/simple_form.et.yml index 2f421b97b5..e8df5dda47 100644 --- a/config/locales/simple_form.et.yml +++ b/config/locales/simple_form.et.yml @@ -3,7 +3,7 @@ et: simple_form: hints: account: - attribution_domains_as_text: Üks rea peal. See kaitseb pahatahtlike viidete eest. + attribution_domains: Üks rea peal. See kaitseb pahatahtlike viidete eest. discoverable: Su profiili ja avalikke postitusi võidakse Mastodoni erinevates piirkondades esile tõsta või soovitada ning su profiili soovitada teistele kasutajatele. display_name: Su täisnimi või naljanimi. fields: Su koduleht, sugu, vanus. Mistahes, mida soovid. @@ -146,7 +146,7 @@ et: url: Kuhu sündmused saadetakse labels: account: - attribution_domains_as_text: Sinule viidata lubatud veebilehed + attribution_domains: Sinule viidata lubatud veebilehed discoverable: Tõsta postitused ja profiil avastamise algoritmides esile fields: name: Nimetus diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml index 4e37be05d0..493f7972bd 100644 --- a/config/locales/simple_form.fa.yml +++ b/config/locales/simple_form.fa.yml @@ -3,7 +3,7 @@ fa: simple_form: hints: account: - attribution_domains_as_text: یکی در هر خط. محافظت از اعتباردهی‌های اشتباه. + attribution_domains: یکی در هر خط. محافظت از اعتباردهی‌های اشتباه. discoverable: ممکن است نمایه و فرسته‌های عمومیتان در جاهای مختلف ماستودون نمایانده و توصیه شود و نمایه‌تان به دیگر کاربران پیشنهاد شود. display_name: نام کامل یا باحالتان. fields: صفحهٔ خانگی، تلفّظ، سن و هرچیزی که دوست دارید. @@ -156,7 +156,7 @@ fa: url: جایی که رویدادها فرستاده می‌شوند labels: account: - attribution_domains_as_text: پابگاه‌های وبی که اجازهٔ اعتبار دهی به شما را دارند + attribution_domains: پابگاه‌های وبی که اجازهٔ اعتبار دهی به شما را دارند discoverable: مشخص کردن مشخصات و فرسته‌ها در الگوریتم‌های اکتشاف fields: name: برچسب diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml index acd1eefca6..a21781f772 100644 --- a/config/locales/simple_form.fi.yml +++ b/config/locales/simple_form.fi.yml @@ -3,7 +3,7 @@ fi: simple_form: hints: account: - attribution_domains_as_text: Yksi riviä kohti. Suojaa vääriltä tunnustuksilta. + attribution_domains: Yksi riviä kohti. Suojaa vääriltä tunnustuksilta. discoverable: Julkisia julkaisujasi ja profiiliasi voidaan pitää esillä tai suositella Mastodonin eri alueilla ja profiiliasi voidaan ehdottaa toisille käyttäjille. display_name: Koko nimesi tai lempinimesi. fields: Verkkosivustosi, pronominisi, ikäsi ja mitä ikinä haluatkaan ilmoittaa. @@ -156,7 +156,7 @@ fi: url: Mihin tapahtumat lähetetään labels: account: - attribution_domains_as_text: Verkkosivustot, jotka voivat antaa sinulle tunnustusta + attribution_domains: Verkkosivustot, jotka voivat antaa sinulle tunnustusta discoverable: Pidä profiiliasi ja julkaisujasi esillä löytämisalgoritmeissa fields: name: Nimike diff --git a/config/locales/simple_form.fo.yml b/config/locales/simple_form.fo.yml index 99bb1ccaa0..69d41285dc 100644 --- a/config/locales/simple_form.fo.yml +++ b/config/locales/simple_form.fo.yml @@ -3,7 +3,7 @@ fo: simple_form: hints: account: - attribution_domains_as_text: Eitt á hvørja reglu. Tað verjir fyri skeivum tilsipingum. + attribution_domains: Eitt á hvørja reglu. Tað verjir fyri skeivum tilsipingum. discoverable: Tínir almennu postar og tín vangi kunnu vera drigin fram og viðmæld ymsa staðni í Mastodon og vangin hjá tær kann vera viðmæltur øðrum brúkarum. display_name: Títt fulla navn og títt stuttliga navn. fields: Heimasíðan hjá tær, fornøvn, aldur ella hvat tú vil. @@ -156,7 +156,7 @@ fo: url: Hvar hendingar verða sendar til labels: account: - attribution_domains_as_text: Heimasíður, sum hava loyvi at sipa til tín + attribution_domains: Heimasíður, sum hava loyvi at sipa til tín discoverable: Framheva vanga og postar í uppdagingar-algoritmum fields: name: Spjaldur diff --git a/config/locales/simple_form.fr-CA.yml b/config/locales/simple_form.fr-CA.yml index 4f89eec5e6..d229808eae 100644 --- a/config/locales/simple_form.fr-CA.yml +++ b/config/locales/simple_form.fr-CA.yml @@ -3,7 +3,7 @@ fr-CA: simple_form: hints: account: - attribution_domains_as_text: Un par ligne. Protège contre les fausses attributions. + attribution_domains: Un par ligne. Protège contre les fausses attributions. discoverable: Vos messages publics et votre profil peuvent être mis en avant ou recommandés dans diverses parties de Mastodon et votre profil peut être suggéré à d’autres utilisateurs. display_name: Votre nom complet ou votre nom cool. fields: Votre page d'accueil, pronoms, âge, tout ce que vous voulez. @@ -156,7 +156,7 @@ fr-CA: url: Là où les événements seront envoyés labels: account: - attribution_domains_as_text: Sites web autorisés à vous citer + attribution_domains: Sites web autorisés à vous citer discoverable: Autoriser des algorithmes de découverte à mettre en avant votre profil et vos messages fields: name: Étiquette diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml index 62dd23f930..4fa202847b 100644 --- a/config/locales/simple_form.fr.yml +++ b/config/locales/simple_form.fr.yml @@ -3,7 +3,7 @@ fr: simple_form: hints: account: - attribution_domains_as_text: Un par ligne. Protège contre les fausses attributions. + attribution_domains: Un par ligne. Protège contre les fausses attributions. discoverable: Vos messages publics et votre profil peuvent être mis en avant ou recommandés dans diverses parties de Mastodon et votre profil peut être suggéré à d’autres utilisateurs. display_name: Votre nom complet ou votre nom rigolo. fields: Votre page personnelle, vos pronoms, votre âge, ce que vous voulez. @@ -156,7 +156,7 @@ fr: url: Là où les événements seront envoyés labels: account: - attribution_domains_as_text: Sites web autorisés à vous citer + attribution_domains: Sites web autorisés à vous citer discoverable: Autoriser des algorithmes de découverte à mettre en avant votre profil et vos messages fields: name: Étiquette diff --git a/config/locales/simple_form.fy.yml b/config/locales/simple_form.fy.yml index 3c8fef4e05..ffe2f49ef4 100644 --- a/config/locales/simple_form.fy.yml +++ b/config/locales/simple_form.fy.yml @@ -3,7 +3,7 @@ fy: simple_form: hints: account: - attribution_domains_as_text: Ien per rigel. Beskermet tsjin falske attribúsjes. + attribution_domains: Ien per rigel. Beskermet tsjin falske attribúsjes. discoverable: Jo iepenbiere berjochten kinne útljochte wurde op ferskate plakken binnen Mastodon en jo account kin oanrekommandearre wurde oan oare brûkers. display_name: Jo folsleine namme of in aardige bynamme. fields: Jo website, persoanlike foarnammewurden, leeftiid, alles wat jo mar kwyt wolle. @@ -156,7 +156,7 @@ fy: url: Wêr’t eveneminten nei ta stjoerd wurde labels: account: - attribution_domains_as_text: Websites dy’t jo wurdearring jaan meie + attribution_domains: Websites dy’t jo wurdearring jaan meie discoverable: Profyl en bydragen yn sykalgoritmen opnimme litte fields: name: Label diff --git a/config/locales/simple_form.ga.yml b/config/locales/simple_form.ga.yml index 02b2942b5d..877f909ffd 100644 --- a/config/locales/simple_form.ga.yml +++ b/config/locales/simple_form.ga.yml @@ -3,7 +3,7 @@ ga: simple_form: hints: account: - attribution_domains_as_text: Ceann in aghaidh an líne. Cosnaíonn sé ó sannadh bréagach. + attribution_domains: Ceann in aghaidh an líne. Cosnaíonn sé ó sannadh bréagach. discoverable: Seans go mbeidh do phostálacha poiblí agus do phróifíl le feiceáil nó molta i réimsí éagsúla de Mastodon agus is féidir do phróifíl a mholadh d’úsáideoirí eile. display_name: D'ainm iomlán nó d'ainm spraoi. fields: Do leathanach baile, forainmneacha, aois, rud ar bith is mian leat. @@ -156,7 +156,7 @@ ga: url: An áit a seolfar imeachtaí chuig labels: account: - attribution_domains_as_text: Tá cead ag suíomhanna Gréasáin creidmheas a thabhairt duit + attribution_domains: Tá cead ag suíomhanna Gréasáin creidmheas a thabhairt duit discoverable: Próifíl gné agus postálacha in halgartaim fionnachtana fields: name: Lipéad diff --git a/config/locales/simple_form.gd.yml b/config/locales/simple_form.gd.yml index 4c3a297738..6558462c35 100644 --- a/config/locales/simple_form.gd.yml +++ b/config/locales/simple_form.gd.yml @@ -3,7 +3,7 @@ gd: simple_form: hints: account: - attribution_domains_as_text: Loidhne fa leth do gach fear. Dìonaidh seo o iomraidhean meallta. + attribution_domains: Loidhne fa leth do gach fear. Dìonaidh seo o iomraidhean meallta. discoverable: Dh’fhaoidte gun dèid na postaichean poblach ’s a’ phròifil agad a bhrosnachadh no a mholadh ann an caochladh roinnean de Mhastodon agus gun dèid a’ phròifil agad a mholadh do chàch. display_name: D’ ainm slàn no spòrsail. fields: An duilleag-dhachaigh agad, roimhearan, aois, rud sam bith a thogras tu. @@ -144,7 +144,7 @@ gd: url: Far an dèid na tachartasan a chur labels: account: - attribution_domains_as_text: Na làraichean-lìn a dh’fhaodas iomradh a thoirt ort + attribution_domains: Na làraichean-lìn a dh’fhaodas iomradh a thoirt ort discoverable: Brosnaich a’ phròifil is postaichean agad sna h-algairimean rùrachaidh fields: name: Leubail diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml index 6fdbe06d06..9b81d10822 100644 --- a/config/locales/simple_form.gl.yml +++ b/config/locales/simple_form.gl.yml @@ -3,7 +3,7 @@ gl: simple_form: hints: account: - attribution_domains_as_text: Un por liña. Protéxete das atribucións falsas. + attribution_domains: Un por liña. Protéxete das atribucións falsas. discoverable: As túas publicacións públicas e perfil poden mostrarse ou recomendarse en varias zonas de Mastodon e o teu perfil ser suxerido a outras usuarias. display_name: O teu nome completo ou un nome divertido. fields: Páxina web, pronome, idade, o que ti queiras. @@ -156,7 +156,7 @@ gl: url: A onde se enviarán os eventos labels: account: - attribution_domains_as_text: Sitios web que poden acreditarte + attribution_domains: Sitios web que poden acreditarte discoverable: Perfil destacado e publicacións nos algoritmos de descubrimento fields: name: Etiqueta diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml index 85e8cbc53e..0ce10c8617 100644 --- a/config/locales/simple_form.he.yml +++ b/config/locales/simple_form.he.yml @@ -3,7 +3,7 @@ he: simple_form: hints: account: - attribution_domains_as_text: אחד בכל שורה. יגן מפני יחוס מטעה. + attribution_domains: אחד בכל שורה. יגן מפני יחוס מטעה. discoverable: הפוסטים והפרופיל שלך עשויים להיות מוצגים או מומלצים באזורים שונים באתר וייתכן שהפרופיל שלך יוצע למשתמשים אחרים. display_name: שמך המלא או שם הכיף שלך. fields: עמוד הבית שלך, לשון הפנייה, גיל, וכל מידע אחר לפי העדפתך האישית. @@ -156,7 +156,7 @@ he: url: היעד שאליו יישלחו אירועים labels: account: - attribution_domains_as_text: אתרים המורשים לייחס אליך מאמרים + attribution_domains: אתרים המורשים לייחס אליך מאמרים discoverable: הצג משתמש ופוסטים בעמוד התגליות fields: name: תווית diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml index 8a0f867f14..df81f43fd9 100644 --- a/config/locales/simple_form.hu.yml +++ b/config/locales/simple_form.hu.yml @@ -3,7 +3,7 @@ hu: simple_form: hints: account: - attribution_domains_as_text: Megvéd a hamis forrásmegjelölésektől. + attribution_domains: Megvéd a hamis forrásmegjelölésektől. discoverable: A nyilvános bejegyzéseid és a profilod kiemelhető vagy ajánlható a Mastodon különböző területein, a profilod más felhasználóknak is javasolható. display_name: Teljes neved vagy vicces neved. fields: Weboldalad, megszólításaid, korod, bármi, amit szeretnél. @@ -153,7 +153,7 @@ hu: url: Ahová az eseményket küldjük labels: account: - attribution_domains_as_text: Weboldalak, melyek szerzőként tüntethetnek fel + attribution_domains: Weboldalak, melyek szerzőként tüntethetnek fel discoverable: Profil és bejegyzések szerepeltetése a felfedezési algoritmusokban fields: name: Címke diff --git a/config/locales/simple_form.ia.yml b/config/locales/simple_form.ia.yml index 585e84f490..47b81ed1a6 100644 --- a/config/locales/simple_form.ia.yml +++ b/config/locales/simple_form.ia.yml @@ -3,7 +3,7 @@ ia: simple_form: hints: account: - attribution_domains_as_text: Un per linea. Protege contra false attributiones. + attribution_domains: Un per linea. Protege contra false attributiones. discoverable: Tu messages public e tu profilo pote esser mittite in evidentia o recommendate in varie areas de Mastodon e tu profilo pote esser suggerite a altere usatores. display_name: Tu prenomine e nomine de familia o tu pseudonymo. fields: Tu pagina principal, pronomines, etate, tote lo que tu vole. @@ -156,7 +156,7 @@ ia: url: Ubi le eventos essera inviate labels: account: - attribution_domains_as_text: Sitos web autorisate a accreditar te + attribution_domains: Sitos web autorisate a accreditar te discoverable: Evidentiar le profilo e messages in le algorithmos de discoperta fields: name: Etiquetta diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml index 1348fa4e9f..106d2017d2 100644 --- a/config/locales/simple_form.is.yml +++ b/config/locales/simple_form.is.yml @@ -3,7 +3,7 @@ is: simple_form: hints: account: - attribution_domains_as_text: Eitt á hverja línu. Ver fyrir röngum tilvísunum. + attribution_domains: Eitt á hverja línu. Ver fyrir röngum tilvísunum. discoverable: Opinberar færslur og notandasnið þitt geta birst eða verið mælt með á hinum ýmsu svæðum í Mastodon auk þess sem hægt er að mæla með þér við aðra notendur. display_name: Fullt nafn þitt eða eitthvað til gamans. fields: Heimasíðan þín, fornöfn, aldur eða eitthvað sem þú vilt koma á framfæri. @@ -156,7 +156,7 @@ is: url: Hvert atburðir verða sendir labels: account: - attribution_domains_as_text: Vefsvæði sem mega vitna í þig + attribution_domains: Vefsvæði sem mega vitna í þig discoverable: Hafa notandasnið og færslur með í reikniritum leitar fields: name: Skýring diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml index 97565f4b1a..62fe75e838 100644 --- a/config/locales/simple_form.it.yml +++ b/config/locales/simple_form.it.yml @@ -3,7 +3,7 @@ it: simple_form: hints: account: - attribution_domains_as_text: Uno per riga. Protegge da false attribuzioni. + attribution_domains: Uno per riga. Protegge da false attribuzioni. discoverable: I tuoi post pubblici e il tuo profilo potrebbero essere presenti o consigliati in varie aree di Mastodon e il tuo profilo potrebbe essere suggerito ad altri utenti. display_name: Il tuo nome completo o il tuo soprannome. fields: La tua homepage, i pronomi, l'età, tutto quello che vuoi. @@ -156,7 +156,7 @@ it: url: Dove gli eventi saranno inviati labels: account: - attribution_domains_as_text: Siti web autorizzati ad accreditarti + attribution_domains: Siti web autorizzati ad accreditarti discoverable: Include il profilo e i post negli algoritmi di scoperta fields: name: Etichetta diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml index ba619dd37b..7e93de6e32 100644 --- a/config/locales/simple_form.ja.yml +++ b/config/locales/simple_form.ja.yml @@ -3,7 +3,7 @@ ja: simple_form: hints: account: - attribution_domains_as_text: 1行につき1つずつ入力してください。この設定は関わりのないwebサイトに対して虚偽の帰属表示が行われることを防止する役割があります。 + attribution_domains: 1行につき1つずつ入力してください。この設定は関わりのないwebサイトに対して虚偽の帰属表示が行われることを防止する役割があります。 discoverable: プロフィールと公開投稿をMastodonのおすすめやハイライトとしてほかのユーザーに表示することを許可します。 display_name: フルネーム、ハンドルネームなど fields: ホームページ、代名詞、年齢など何でも構いません。 @@ -156,7 +156,7 @@ ja: url: イベントの送信先 labels: account: - attribution_domains_as_text: あなたの著者表示を許可するwebサイト + attribution_domains: あなたの著者表示を許可するwebサイト discoverable: アカウントを見つけやすくする fields: name: ラベル diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml index 71af0b42fd..a8017950c0 100644 --- a/config/locales/simple_form.ko.yml +++ b/config/locales/simple_form.ko.yml @@ -3,7 +3,7 @@ ko: simple_form: hints: account: - attribution_domains_as_text: 한 줄에 하나씩. 가짜 기여로부터 보호합니다. + attribution_domains: 한 줄에 하나씩. 가짜 기여로부터 보호합니다. discoverable: 내 공개 게시물과 프로필이 마스토돈의 다양한 추천 기능에 나타날 수 있고 프로필이 다른 사용자에게 제안될 수 있습니다 display_name: 진짜 이름 또는 재미난 이름. fields: 홈페이지, 호칭, 나이, 뭐든지 적고 싶은 것들. @@ -151,7 +151,7 @@ ko: url: 이벤트가 어디로 전송될 지 labels: account: - attribution_domains_as_text: 나를 기여자로 올릴 수 있도록 허용된 웹사이트들 + attribution_domains: 나를 기여자로 올릴 수 있도록 허용된 웹사이트들 discoverable: 발견하기 알고리즘에 프로필과 게시물을 추천하기 fields: name: 라벨 diff --git a/config/locales/simple_form.lt.yml b/config/locales/simple_form.lt.yml index 865272c60e..2ceb262c5a 100644 --- a/config/locales/simple_form.lt.yml +++ b/config/locales/simple_form.lt.yml @@ -3,7 +3,7 @@ lt: simple_form: hints: account: - attribution_domains_as_text: Po vieną eilutėje. Apsaugo nuo klaidingų atributų. + attribution_domains: Po vieną eilutėje. Apsaugo nuo klaidingų atributų. discoverable: Tavo vieši įrašai ir profilis gali būti rodomi arba rekomenduojami įvairiose Mastodon vietose, o profilis gali būti siūlomas kitiems naudotojams. display_name: Tavo pilnas vardas arba smagus vardas. fields: Tavo pagrindinis puslapis, įvardžiai, amžius, bet kas, ko tik nori. @@ -119,7 +119,7 @@ lt: role: Vaidmuo valdo, kokius leidimus naudotojas turi. labels: account: - attribution_domains_as_text: Svetainės, kuriuose leidžiama jus nurodyti + attribution_domains: Svetainės, kuriuose leidžiama jus nurodyti discoverable: Rekomenduoti profilį ir įrašus į atradimo algoritmus indexable: Įtraukti viešus įrašus į paieškos rezultatus show_collections: Rodyti sekimus ir sekėjus profilyje diff --git a/config/locales/simple_form.lv.yml b/config/locales/simple_form.lv.yml index 7c7b11c1b3..c5a3da8429 100644 --- a/config/locales/simple_form.lv.yml +++ b/config/locales/simple_form.lv.yml @@ -3,7 +3,7 @@ lv: simple_form: hints: account: - attribution_domains_as_text: Viens katrā līnijā. Aizsargā no nepatiesa attiecinājuma. + attribution_domains: Viens katrā līnijā. Aizsargā no nepatiesa attiecinājuma. discoverable: Tavas publiskās ziņas un profils var tikt piedāvāti vai ieteikti dažādās Mastodon vietās, un tavs profils var tikt ieteikts citiem lietotājiem. display_name: Tavs pilnais vārds vai tavs joku vārds. fields: Tava mājas lapa, vietniekvārdi, vecums, viss, ko vēlies. @@ -144,7 +144,7 @@ lv: url: Kur notikumi tiks nosūtīti labels: account: - attribution_domains_as_text: Tīmekļvietnes, kurām ir tiesības uzskaitīt Tevi + attribution_domains: Tīmekļvietnes, kurām ir tiesības uzskaitīt Tevi discoverable: Funkcijas profils un ziņas atklāšanas algoritmos fields: name: Marķējums diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml index d5aa5855ec..771dc3d6ed 100644 --- a/config/locales/simple_form.nl.yml +++ b/config/locales/simple_form.nl.yml @@ -3,7 +3,7 @@ nl: simple_form: hints: account: - attribution_domains_as_text: Eén per regel. Beschermt tegen ongeldige attributies. + attribution_domains: Eén per regel. Beschermt tegen ongeldige attributies. discoverable: Jouw openbare berichten kunnen worden uitgelicht op verschillende plekken binnen Mastodon en jouw account kan worden aanbevolen aan andere gebruikers. display_name: Jouw volledige naam of een leuke bijnaam. fields: Jouw website, persoonlijke voornaamwoorden, leeftijd, alles wat je maar kwijt wilt. @@ -156,7 +156,7 @@ nl: url: Waar gebeurtenissen naartoe worden verzonden labels: account: - attribution_domains_as_text: Websites die jou credit mogen geven + attribution_domains: Websites die jou credit mogen geven discoverable: Jouw account en berichten laten uitlichten door Mastodon fields: name: Label diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml index 297404e153..30f0822973 100644 --- a/config/locales/simple_form.nn.yml +++ b/config/locales/simple_form.nn.yml @@ -3,7 +3,7 @@ nn: simple_form: hints: account: - attribution_domains_as_text: Ein per line. Vernar mot falske krediteringar. + attribution_domains: Ein per line. Vernar mot falske krediteringar. discoverable: Dei offentlege innlegga dine og profilen din kan dukka opp i tilrådingar på ulike stader på Mastodon, og profilen din kan bli føreslegen for andre folk. display_name: Ditt fulle namn eller ditt tøysenamn. fields: Heimesida di, pronomen, alder, eller kva du måtte ynskje. @@ -156,7 +156,7 @@ nn: url: Kvar hendingar skal sendast labels: account: - attribution_domains_as_text: Nettstader som har lov å kreditera deg + attribution_domains: Nettstader som har lov å kreditera deg discoverable: Ta med profilen og innlegga i oppdagingsalgoritmar fields: name: Merkelapp diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml index 6061ff44dc..553c0bb7a2 100644 --- a/config/locales/simple_form.pl.yml +++ b/config/locales/simple_form.pl.yml @@ -3,7 +3,7 @@ pl: simple_form: hints: account: - attribution_domains_as_text: Jedna na linię. Chroni przed fałszywym przypisaniem wpisów. + attribution_domains: Jedna na linię. Chroni przed fałszywym przypisaniem wpisów. discoverable: Twój profil i publiczne wpisy mogą być promowane lub polecane na Mastodonie i twój profil może być sugerowany innym użytkownikom. display_name: Twoje imię lub pseudonim. fields: Co ci się tylko podoba – twoja strona domowa, zaimki, wiek… @@ -145,7 +145,7 @@ pl: url: Dokąd będą wysłane zdarzenia labels: account: - attribution_domains_as_text: Strony które mogą ci przypisywać autorstwo. + attribution_domains: Strony które mogą ci przypisywać autorstwo. discoverable: Udostępniaj profil i wpisy funkcjom odkrywania fields: name: Nazwa diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml index 417d69d88e..90b1db7d9b 100644 --- a/config/locales/simple_form.pt-BR.yml +++ b/config/locales/simple_form.pt-BR.yml @@ -3,7 +3,7 @@ pt-BR: simple_form: hints: account: - attribution_domains_as_text: Um por linha. Protege de falsas atribuições. + attribution_domains: Um por linha. Protege de falsas atribuições. discoverable: Suas publicações e perfil públicos podem ser destaques ou recomendados em várias áreas de Mastodon, e seu perfil pode ser sugerido a outros usuários. display_name: Seu nome completo ou apelido. fields: Sua página inicial, pronomes, idade ou qualquer coisa que quiser. @@ -147,7 +147,7 @@ pt-BR: url: Aonde os eventos serão enviados labels: account: - attribution_domains_as_text: Sites permitidos para credenciar você + attribution_domains: Sites permitidos para credenciar você discoverable: Destacar perfil e publicações nos algoritmos de descoberta fields: name: Rótulo diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml index 207d77f38b..b2823c1359 100644 --- a/config/locales/simple_form.pt-PT.yml +++ b/config/locales/simple_form.pt-PT.yml @@ -3,7 +3,7 @@ pt-PT: simple_form: hints: account: - attribution_domains_as_text: Um por linha. Protege contra falsas atribuições. + attribution_domains: Um por linha. Protege contra falsas atribuições. discoverable: As suas publicações e perfil públicos podem ser destacados ou recomendados em várias áreas do Mastodon e o seu perfil pode ser sugerido a outros utilizadores. display_name: O seu nome completo ou o seu nome divertido. fields: A sua página inicial, os seus pronomes, idade e tudo o que quiser. @@ -156,7 +156,7 @@ pt-PT: url: Para onde os eventos serão enviados labels: account: - attribution_domains_as_text: Sites autorizados a atribuir-lhe crédito + attribution_domains: Sites autorizados a atribuir-lhe crédito discoverable: Destacar perfil e publicações nos algoritmos de descoberta fields: name: Rótulo diff --git a/config/locales/simple_form.ro.yml b/config/locales/simple_form.ro.yml index 63dcf91343..5774d6562c 100644 --- a/config/locales/simple_form.ro.yml +++ b/config/locales/simple_form.ro.yml @@ -3,7 +3,7 @@ ro: simple_form: hints: account: - attribution_domains_as_text: Una pe linie. Protejează împotriva atribuirilor false. + attribution_domains: Una pe linie. Protejează împotriva atribuirilor false. discoverable: Este posibil ca postările și profilul tău să fie recomandate în diferite zone ale Mastodon, iar profilul tău ar poate fi sugerat altor utilizatori. display_name: Numele dvs. complet sau numele dvs. amuzant. fields: Pagina ta principală, pronumele tale, vârsta, sau orice îți dorești. diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml index b81d20704b..e24dac64b2 100644 --- a/config/locales/simple_form.ru.yml +++ b/config/locales/simple_form.ru.yml @@ -3,7 +3,7 @@ ru: simple_form: hints: account: - attribution_domains_as_text: По одному на строку. Защищает от ложных атрибуций. + attribution_domains: По одному на строку. Защищает от ложных атрибуций. discoverable: Ваши публичные сообщения и профиль могут быть показаны или рекомендованы в различных разделах Mastodon, и ваш профиль может быть предложен другим пользователям. display_name: Ваше полное имя или псевдоним. fields: Ваша домашняя страница, местоимения, возраст - все, что угодно. @@ -156,7 +156,7 @@ ru: url: Куда события будут отправляться labels: account: - attribution_domains_as_text: Веб-сайты, которым разрешено ссылаться на вас + attribution_domains: Веб-сайты, которым разрешено ссылаться на вас discoverable: Профиль и сообщения в алгоритмах обнаружения fields: name: Пункт diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml index 8e01c6264d..daaa5cdf2b 100644 --- a/config/locales/simple_form.sq.yml +++ b/config/locales/simple_form.sq.yml @@ -3,7 +3,7 @@ sq: simple_form: hints: account: - attribution_domains_as_text: Një për rresht. Kjo mbron nga atribuime të rreme. + attribution_domains: Një për rresht. Kjo mbron nga atribuime të rreme. discoverable: Postimet dhe profili juaj publik mund të shfaqen, ose rekomandohen në zona të ndryshme të Mastodon-it dhe profili juaj mund të sugjerohet përdoruesve të tjerë. display_name: Emri juaj i plotë, ose emri juaj lojcak. fields: Faqja juaj hyrëse, përemra, moshë, ç’të keni qejf. @@ -155,7 +155,7 @@ sq: url: Ku do të dërgohen aktet labels: account: - attribution_domains_as_text: Sajte të lejuar t’ju japin hakë + attribution_domains: Sajte të lejuar t’ju japin hakë discoverable: Profilin dhe postimet bëji objekt të algoritmeve të zbulimit fields: name: Etiketë diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml index 2d2c1c0060..2a15cf3e1a 100644 --- a/config/locales/simple_form.sv.yml +++ b/config/locales/simple_form.sv.yml @@ -3,7 +3,7 @@ sv: simple_form: hints: account: - attribution_domains_as_text: En per rad. Skyddar mot falska attributioner. + attribution_domains: En per rad. Skyddar mot falska attributioner. discoverable: Dina offentliga inlägg och din profil kan komma att presenteras eller rekommenderas inom olika områden av Mastodon och din profil kan komma att föreslås till andra användare. display_name: Ditt fullständiga namn eller ditt roliga namn. fields: Din hemsida, ditt pronomen, din ålder, vadhelst du vill. @@ -153,7 +153,7 @@ sv: url: Dit händelser kommer skickas labels: account: - attribution_domains_as_text: Webbplatser som får kreditera dig + attribution_domains: Webbplatser som får kreditera dig discoverable: Presentera profil och inlägg med upptäcktsalgoritmer fields: name: Etikett diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml index f644294092..e5b6399d06 100644 --- a/config/locales/simple_form.th.yml +++ b/config/locales/simple_form.th.yml @@ -3,7 +3,7 @@ th: simple_form: hints: account: - attribution_domains_as_text: หนึ่งรายการต่อบรรทัด ปกป้องจากการระบุแหล่งที่มาที่ผิด + attribution_domains: หนึ่งรายการต่อบรรทัด ปกป้องจากการระบุแหล่งที่มาที่ผิด discoverable: อาจแสดงหรือแนะนำโพสต์และโปรไฟล์สาธารณะของคุณในพื้นที่ต่าง ๆ ของ Mastodon และอาจเสนอแนะโปรไฟล์ของคุณให้กับผู้ใช้อื่น ๆ display_name: ชื่อเต็มของคุณหรือชื่อแบบสนุกสนานของคุณ fields: หน้าแรก, สรรพนาม, อายุของคุณ สิ่งใดก็ตามที่คุณต้องการ @@ -144,7 +144,7 @@ th: url: ที่ซึ่งจะส่งเหตุการณ์ไปยัง labels: account: - attribution_domains_as_text: เว็บไซต์ที่ได้รับอนุญาตให้ให้เครดิตคุณ + attribution_domains: เว็บไซต์ที่ได้รับอนุญาตให้ให้เครดิตคุณ discoverable: แสดงโปรไฟล์และโพสต์ในอัลกอริทึมการค้นพบ fields: name: ป้ายชื่อ diff --git a/config/locales/simple_form.tok.yml b/config/locales/simple_form.tok.yml index 8d9aa9585a..9eadefd055 100644 --- a/config/locales/simple_form.tok.yml +++ b/config/locales/simple_form.tok.yml @@ -3,7 +3,7 @@ tok: simple_form: hints: account: - attribution_domains_as_text: linja sitelen wan la wan taso o lon. ni la, sona pona pi jan pali li lon. + attribution_domains: linja sitelen wan la wan taso o lon. ni la, sona pona pi jan pali li lon. display_name: nimi sina ale anu nimi sina musi. fields: lipu open sina, en nimi pi kon sina, en suli tenpo sina, en ijo ante ale pi wile sina. note: 'sina ken @mu e jan ante, li ken lon e #kulupu toki suli.' diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml index 26cade806e..74f508d0a5 100644 --- a/config/locales/simple_form.tr.yml +++ b/config/locales/simple_form.tr.yml @@ -3,7 +3,7 @@ tr: simple_form: hints: account: - attribution_domains_as_text: Her satırda bir tanesi. Sahte atıflardan korur. + attribution_domains: Her satırda bir tanesi. Sahte atıflardan korur. discoverable: Herkese açık gönderileriniz ve profiliniz Mastodon'un çeşitli kısımlarında öne çıkarılabilir veya önerilebilir ve profiliniz başka kullanıcılara önerilebilir. display_name: Tam adınız veya kullanıcı adınız. fields: Ana sayfanız, zamirleriniz, yaşınız, istediğiniz herhangi bir şey. @@ -156,7 +156,7 @@ tr: url: Olayların gönderileceği yer labels: account: - attribution_domains_as_text: Size atıf verebilecek websiteleri + attribution_domains: Size atıf verebilecek websiteleri discoverable: Profil ve gönderileri keşif algoritmalarında kullan fields: name: Etiket diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml index 9ecd12517b..78474f53d5 100644 --- a/config/locales/simple_form.uk.yml +++ b/config/locales/simple_form.uk.yml @@ -3,7 +3,7 @@ uk: simple_form: hints: account: - attribution_domains_as_text: Один на рядок. Захищає від фальшивих атрибутів. + attribution_domains: Один на рядок. Захищає від фальшивих атрибутів. discoverable: Ваші дописи та профіль можуть бути рекомендовані в різних частинах Mastodon і ваш профіль може бути запропонований іншим користувачам. display_name: Ваше повне ім'я або ваш псевдонім. fields: Ваша домашня сторінка, займенники, вік, все, що вам заманеться. @@ -156,7 +156,7 @@ uk: url: Куди надсилатимуться події labels: account: - attribution_domains_as_text: Сайти дозволяють вам вказувати ваше авторство + attribution_domains: Сайти дозволяють вам вказувати ваше авторство discoverable: Функції профілю та дописів у алгоритмах виявлення fields: name: Мітка diff --git a/config/locales/simple_form.vi.yml b/config/locales/simple_form.vi.yml index 6d9a8c749e..3292211780 100644 --- a/config/locales/simple_form.vi.yml +++ b/config/locales/simple_form.vi.yml @@ -3,7 +3,7 @@ vi: simple_form: hints: account: - attribution_domains_as_text: Mỗi cái một dòng. Bảo vệ khỏi những sự gán ghép sai. + attribution_domains: Mỗi cái một dòng. Bảo vệ khỏi những sự gán ghép sai. discoverable: Hồ sơ và tút công khai của bạn được đề xuất cho những người dùng Mastodon khác. display_name: Tên đầy đủ hoặc biệt danh đều được. fields: Trang blog của bạn, nghề nghiệp, tuổi hoặc bất cứ thứ gì. @@ -156,7 +156,7 @@ vi: url: Nơi những sự kiện được gửi đến labels: account: - attribution_domains_as_text: Các trang web được ghi nhận cho bạn + attribution_domains: Các trang web được ghi nhận cho bạn discoverable: Cho phép khám phá hồ sơ fields: name: Nhãn diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml index 226ebfd0b8..d0becfb068 100644 --- a/config/locales/simple_form.zh-CN.yml +++ b/config/locales/simple_form.zh-CN.yml @@ -3,7 +3,7 @@ zh-CN: simple_form: hints: account: - attribution_domains_as_text: 每行一个域名。这样就可以保护作品免受虚假署名。 + attribution_domains: 每行一个域名。这样就可以保护作品免受虚假署名。 discoverable: 你的公开嘟文和个人资料可能会在 Mastodon 的多个位置展示，你的个人资料可能会被推荐给其他用户。 display_name: 你的全名或昵称。 fields: 你的主页、人称代词、年龄，以及任何你想要添加的内容。 @@ -156,7 +156,7 @@ zh-CN: url: 事件将被发往的目的地 labels: account: - attribution_domains_as_text: 授权展示你的署名的网站 + attribution_domains: 授权展示你的署名的网站 discoverable: 在发现算法中展示你的账户与嘟文 fields: name: 标签 diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml index 48a7941f76..1243807d77 100644 --- a/config/locales/simple_form.zh-TW.yml +++ b/config/locales/simple_form.zh-TW.yml @@ -3,7 +3,7 @@ zh-TW: simple_form: hints: account: - attribution_domains_as_text: 每行一個。以保護偽造署名。 + attribution_domains: 每行一個。以保護偽造署名。 discoverable: 公開嘟文及個人檔案可能於各 Mastodon 功能中被推薦，並且您的個人檔案可能被推薦至其他使用者。 display_name: 完整名稱或暱稱。 fields: 烘培雞、自我認同代稱、年齡，及任何您想分享的。 @@ -156,7 +156,7 @@ zh-TW: url: 事件會被傳送至何處 labels: account: - attribution_domains_as_text: 允許對您予與信譽之網站 + attribution_domains: 允許對您予與信譽之網站 discoverable: 於探索演算法中推薦個人檔案及嘟文 fields: name: 標籤 diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 3aa93bbba6..ad8fb0a345 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -45,7 +45,7 @@ module Mastodon def api_versions { - mastodon: 2, + mastodon: 3, } end diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb index a0187b6211..2baf1fd3db 100644 --- a/spec/models/account_spec.rb +++ b/spec/models/account_spec.rb @@ -516,38 +516,16 @@ RSpec.describe Account do end end - describe '#attribution_domains_as_text=' do - subject { Fabricate(:account) } - - it 'sets attribution_domains accordingly' do - subject.attribution_domains_as_text = "hoge.com\nexample.com" - - expect(subject.attribution_domains).to contain_exactly('hoge.com', 'example.com') - end - - it 'strips leading "*."' do - subject.attribution_domains_as_text = "hoge.com\n*.example.com" - - expect(subject.attribution_domains).to contain_exactly('hoge.com', 'example.com') - end - - it 'strips the protocol if present' do - subject.attribution_domains_as_text = "http://hoge.com\nhttps://example.com" - - expect(subject.attribution_domains).to contain_exactly('hoge.com', 'example.com') - end - - it 'strips a combination of leading "*." and protocol' do - subject.attribution_domains_as_text = "http://*.hoge.com\nhttps://*.example.com" - - expect(subject.attribution_domains).to contain_exactly('hoge.com', 'example.com') - end - end - describe 'Normalizations' do describe 'username' do it { is_expected.to normalize(:username).from(" \u3000bob \t \u00a0 \n ").to('bob') } end + + describe 'attribution_domains' do + it { is_expected.to normalize(:attribution_domains).from(['example.com', ' example.com ', ' example.net ']).to(['example.com', 'example.net']) } + it { is_expected.to normalize(:attribution_domains).from(['https://example.com', 'http://example.net', '*.example.org']).to(['example.com', 'example.net', 'example.org']) } + it { is_expected.to normalize(:attribution_domains).from(['', ' ', nil]).to([]) } + end end describe 'Validations' do @@ -598,6 +576,9 @@ RSpec.describe Account do it { is_expected.to validate_absence_of(:inbox_url).on(:create) } it { is_expected.to validate_absence_of(:shared_inbox_url).on(:create) } it { is_expected.to validate_absence_of(:uri).on(:create) } + + it { is_expected.to allow_values([], ['example.com'], (1..100).to_a).for(:attribution_domains) } + it { is_expected.to_not allow_values(['example com'], ['@'], (1..101).to_a).for(:attribution_domains) } end context 'when account is remote' do diff --git a/spec/requests/api/v1/accounts/credentials_spec.rb b/spec/requests/api/v1/accounts/credentials_spec.rb index 0badc17e1b..c92f4c7973 100644 --- a/spec/requests/api/v1/accounts/credentials_spec.rb +++ b/spec/requests/api/v1/accounts/credentials_spec.rb @@ -64,6 +64,7 @@ RSpec.describe 'credentials API' do indexable: true, locked: false, note: 'Hello!', + attribution_domains: ['example.com'], source: { privacy: 'unlisted', sensitive: true, @@ -121,7 +122,8 @@ RSpec.describe 'credentials API' do display_name: eq("Alice Isn't Dead"), note: 'Hello!', avatar: exist, - header: exist + header: exist, + attribution_domains: ['example.com'] ) end diff --git a/spec/system/settings/verifications_spec.rb b/spec/system/settings/verifications_spec.rb index 75be191c83..26197f06f0 100644 --- a/spec/system/settings/verifications_spec.rb +++ b/spec/system/settings/verifications_spec.rb @@ -15,12 +15,27 @@ RSpec.describe 'Settings verification page' do .to have_content(verification_summary) .and have_private_cache_control - fill_in attribution_field, with: 'host.example' + fill_in attribution_field, with: " example.com\n\n https://example.net" expect { click_on submit_button } - .to(change { user.account.reload.attribution_domains_as_text }) + .to(change { user.account.reload.attribution_domains }.to(['example.com', 'example.net'])) expect(page) .to have_content(success_message) + expect(find_field(attribution_field).value) + .to have_content("example.com\nexample.net") + end + + it 'rejects invalid attribution domains' do + visit settings_verification_path + + fill_in attribution_field, with: "example.com \n invalid_com" + + expect { click_on submit_button } + .to_not(change { user.account.reload.attribution_domains }) + expect(page) + .to have_content(I18n.t('activerecord.errors.messages.invalid_domain_on_line', value: 'invalid_com')) + expect(find_field(attribution_field).value) + .to have_content("example.com\ninvalid_com") end end @@ -29,6 +44,6 @@ RSpec.describe 'Settings verification page' do end def attribution_field - I18n.t('simple_form.labels.account.attribution_domains_as_text') + I18n.t('simple_form.labels.account.attribution_domains') end end diff --git a/spec/validators/lines_validator_spec.rb b/spec/validators/lines_validator_spec.rb deleted file mode 100644 index a80dbbaf3e..0000000000 --- a/spec/validators/lines_validator_spec.rb +++ /dev/null @@ -1,46 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -RSpec.describe LinesValidator do - let(:record_class) do - Class.new do - include ActiveModel::Validations - - attr_accessor :text - - validates :text, lines: { maximum: 5 } - end - end - - let(:record) { record_class.new } - - describe '#validate_each' do - context 'with a nil value' do - it 'does not add errors' do - record.text = nil - - expect(record).to be_valid - expect(record.errors).to be_empty - end - end - - context 'with lines below the limit' do - it 'does not add errors' do - record.text = "hoge\n" * 5 - - expect(record).to be_valid - expect(record.errors).to be_empty - end - end - - context 'with more lines than limit' do - it 'adds an error' do - record.text = "hoge\n" * 6 - - expect(record).to_not be_valid - expect(record.errors.where(:text)).to_not be_empty - end - end - end -end