From 45af29912f1f1817598ee4be471b75c7b7e08ccd Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Mon, 24 Jul 2017 06:32:53 +0900 Subject: Change about_mastodon to about_mastodon_html for all locales (#4326) --- config/locales/uk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/locales/uk.yml') diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 129fc5bb7..48a4046df 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -1,7 +1,7 @@ --- uk: about: - about_mastodon: Mastodon - це вільна соціальна мережа з відкритим вихідним кодом. Вона є децентралізованою альтернативою комерційним платформам, що дозволяє уникнути ризиків монополізації вашого спілкування однією компанією. Виберіть сервер, якому ви довіряєте — що б ви не вибрали, Ви зможете спілкуватись з усіма іншими. Будь-який користувач може запустити власну інстанцію Mastodon та без проблем брати участь в соціальній мережі. + about_mastodon_html: Mastodon - це вільна соціальна мережа з відкритим вихідним кодом. Вона є децентралізованою альтернативою комерційним платформам, що дозволяє уникнути ризиків монополізації вашого спілкування однією компанією. Виберіть сервер, якому ви довіряєте — що б ви не вибрали, Ви зможете спілкуватись з усіма іншими. Будь-який користувач може запустити власну інстанцію Mastodon та без проблем брати участь в соціальній мережі. about_this: Про цю інстанцію business_email: 'Діловий email:' closed_registrations: На даний момент реєстрація на цій інстанції закрита. -- cgit From 2374d63536fd9459243a235763c87f8e9fdfc581 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 24 Jul 2017 15:09:08 +0200 Subject: Redesign extended information page (#4322) * Redesign extended information page * Remove unused keys * Add $ui-base-lighter-color variable to SCSS --- app/javascript/styles/about.scss | 241 ++++++++++++++++++---------------- app/javascript/styles/boost.scss | 2 +- app/javascript/styles/components.scss | 48 +++---- app/javascript/styles/forms.scss | 4 +- app/javascript/styles/variables.scss | 9 +- app/views/about/_contact.html.haml | 16 ++- app/views/about/more.html.haml | 59 +++++++-- config/locales/ar.yml | 1 - config/locales/bg.yml | 1 - config/locales/ca.yml | 1 - config/locales/de.yml | 1 - config/locales/en.yml | 6 +- config/locales/eo.yml | 1 - config/locales/es.yml | 1 - config/locales/fa.yml | 1 - config/locales/fi.yml | 1 - config/locales/fr.yml | 66 +--------- config/locales/he.yml | 1 - config/locales/hr.yml | 1 - config/locales/id.yml | 1 - config/locales/io.yml | 1 - config/locales/it.yml | 1 - config/locales/ja.yml | 1 - config/locales/ko.yml | 1 - config/locales/nl.yml | 1 - config/locales/no.yml | 1 - config/locales/oc.yml | 1 - config/locales/pl.yml | 1 - config/locales/pt-BR.yml | 1 - config/locales/pt.yml | 1 - config/locales/ru.yml | 1 - config/locales/th.yml | 1 - config/locales/tr.yml | 1 - config/locales/uk.yml | 1 - config/locales/zh-CN.yml | 1 - config/locales/zh-HK.yml | 1 - config/locales/zh-TW.yml | 1 - 37 files changed, 219 insertions(+), 260 deletions(-) (limited to 'config/locales/uk.yml') diff --git a/app/javascript/styles/about.scss b/app/javascript/styles/about.scss index 90ad9bea9..01a341538 100644 --- a/app/javascript/styles/about.scss +++ b/app/javascript/styles/about.scss @@ -120,18 +120,55 @@ } .information-board { - margin: 20px 0; - display: flex; - justify-content: space-between; - border-top: 1px solid lighten($ui-base-color, 10%); - border-bottom: 1px solid lighten($ui-base-color, 10%); - padding-right: 14px; + background: darken($ui-base-color, 4%); + padding: 40px 0; + + .panel { + position: absolute; + width: 280px; + box-sizing: border-box; + background: darken($ui-base-color, 8%); + padding: 20px; + padding-top: 10px; + border-radius: 4px 4px 0 0; + right: 0; + bottom: -40px; + + .panel-header { + font-family: 'mastodon-font-display', sans-serif; + font-size: 14px; + line-height: 24px; + font-weight: 500; + color: $ui-base-lighter-color; + padding-bottom: 5px; + margin-bottom: 15px; + border-bottom: 1px solid lighten($ui-base-color, 4%); + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + + span { + font-weight: 400; + color: lighten($ui-base-color, 34%); + } + } + } + + .container { + position: relative; + padding-right: 280px + 15px; + } + + .information-board-sections { + display: flex; + justify-content: space-between; + } .section { flex: 1 0 0; - padding: 14px; - text-align: right; font: 16px/28px 'mastodon-font-sans-serif', sans-serif; + text-align: right; + padding: 0 15px; span, strong { @@ -143,7 +180,6 @@ &:last-child { color: $ui-secondary-color; - font-size: 14px; } } @@ -203,100 +239,6 @@ } } -.contact-email { - text-align: center; - margin: 40px 0; - - strong { - display: block; - color: $primary-text-color; - word-break: break-word; - } -} - -.sidebar-layout { - display: flex; - - .main { - flex: 1 1 auto; - padding: 14px 0; - - .panel { - padding-right: 14px; - } - } - - .sidebar { - border-left: 1px solid lighten($ui-base-color, 10%); - width: 200px; - flex: 0 0 auto; - } - - .panel { - .panel-header { - background: lighten($ui-base-color, 10%); - padding: 7px 14px; - text-transform: uppercase; - font-size: 12px; - font-weight: 500; - } - - .panel-body { - padding: 14px; - } - - .panel-list { - ul { - list-style: none; - margin: 0; - - li { - margin: 0; - font-family: inherit; - font-size: 13px; - line-height: 18px; - - a { - display: block; - padding: 7px 14px; - color: rgba($primary-text-color, 0.7); - text-decoration: none; - transition: all 200ms linear; - - i.fa { - margin-right: 5px; - } - - &:hover { - color: $primary-text-color; - background-color: darken($ui-base-color, 5%); - transition: all 100ms linear; - } - - &.selected { - color: $primary-text-color; - background-color: $ui-highlight-color; - - &:hover { - background-color: lighten($ui-highlight-color, 5%); - } - } - } - } - } - } - } - - @media screen and (max-width: 625px) { - flex-direction: column; - - .sidebar { - border: 1px solid lighten($ui-base-color, 10%); - width: auto; - } - } -} - .features-list__row { display: flex; padding: 10px 0; @@ -322,7 +264,7 @@ .text { font-size: 16px; line-height: 30px; - color: lighten($ui-base-color, 26%); + color: $ui-base-lighter-color; h6 { font-weight: 500; @@ -338,6 +280,15 @@ background: linear-gradient(150deg, lighten($ui-base-color, 8%), $ui-base-color); position: relative; + &.compact { + background: $ui-base-color; + padding-bottom: 15px; + + .hero .heading { + padding-bottom: 30px; + } + } + .mascot-container { max-width: 800px; margin: 0 auto; @@ -402,7 +353,7 @@ right: -120px; bottom: 0; animation-duration: 3s; - background-image: url('data:image/svg+xml;utf8,'); + background-image: url('data:image/svg+xml;utf8,'); } .float-2 { @@ -412,7 +363,7 @@ bottom: 0; animation-duration: 3.5s; animation-delay: 0.2s; - background-image: url('data:image/svg+xml;utf8,'); + background-image: url('data:image/svg+xml;utf8,'); } .float-3 { @@ -422,7 +373,7 @@ top: -30px; animation-duration: 4s; animation-delay: 0.5s; - background-image: url('data:image/svg+xml;utf8,'); + background-image: url('data:image/svg+xml;utf8,'); } } @@ -505,10 +456,6 @@ a { padding-left: 0; color: $white; - - &:hover img { - opacity: 1; - } } img { @@ -517,7 +464,6 @@ position: relative; top: 4px; left: -10px; - opacity: 0.8; } } } @@ -541,6 +487,42 @@ padding: 50px 0; } + .extended-description { + padding: 50px 0; + + ul, + ol { + list-style: inherit; + margin-left: 20px; + + &[type='a'] { + list-style-type: lower-alpha; + } + + &[type='i'] { + list-style-type: lower-roman; + } + } + + li > ol, + li > ul { + margin-top: 20px; + } + + p, + li { + font: 16px/28px 'mastodon-font-sans-serif', sans-serif; + font-weight: 400; + margin-bottom: 12px; + color: $ui-base-lighter-color; + + a { + color: $ui-highlight-color; + text-decoration: underline; + } + } + } + h3 { font-family: 'mastodon-font-display', sans-serif; font-size: 16px; @@ -553,7 +535,7 @@ p { font-size: 16px; line-height: 30px; - color: lighten($ui-base-color, 26%); + color: $ui-base-lighter-color; } .features { @@ -645,14 +627,14 @@ display: block; font-size: 18px; font-weight: 400; - color: lighten($ui-base-color, 26%); + color: $ui-base-lighter-color; } } .footer-links { padding-bottom: 50px; text-align: right; - color: lighten($ui-base-color, 26%); + color: $ui-base-lighter-color; p { font-size: 14px; @@ -669,6 +651,29 @@ padding: 0 20px; } + .information-board { + padding-bottom: 20px; + } + + .information-board .container { + padding-right: 20px; + + .panel { + position: static; + margin-top: 30px; + width: 100%; + border-radius: 4px; + + .panel-header { + text-align: center; + } + } + } + + .information-board .section { + text-align: center; + } + .header-wrapper .mascot { left: 20px; } @@ -720,6 +725,12 @@ padding: 30px 0; } + .links .brand img { + left: 0; + top: 0; + margin-right: 0; + } + .hero { .simple_form, .closed-registrations-message { diff --git a/app/javascript/styles/boost.scss b/app/javascript/styles/boost.scss index 5eb3149ef..31053decc 100644 --- a/app/javascript/styles/boost.scss +++ b/app/javascript/styles/boost.scss @@ -6,7 +6,7 @@ } button.icon-button i.fa-retweet { - background-image: url("data:image/svg+xml;utf8,"); + background-image: url("data:image/svg+xml;utf8,"); &:hover { background-image: url("data:image/svg+xml;utf8,"); diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss index 4523c9156..c4c4420eb 100644 --- a/app/javascript/styles/components.scss +++ b/app/javascript/styles/components.scss @@ -107,7 +107,7 @@ .icon-button { display: inline-block; padding: 0; - color: lighten($ui-base-color, 26%); + color: $ui-base-lighter-color; border: none; background: transparent; cursor: pointer; @@ -145,7 +145,7 @@ &:hover, &:active, &:focus { - color: lighten($ui-base-color, 26%); + color: $ui-base-lighter-color; } &.active { @@ -185,7 +185,7 @@ &:hover, &:active, &:focus { - color: lighten($ui-base-color, 26%); + color: $ui-base-lighter-color; transition: color 200ms ease-out; } @@ -610,13 +610,13 @@ } .status__relative-time { - color: lighten($ui-base-color, 26%); + color: $ui-base-lighter-color; float: right; font-size: 14px; } .status__display-name { - color: lighten($ui-base-color, 26%); + color: $ui-base-lighter-color; } .status__info .status__display-name { @@ -652,14 +652,14 @@ .status__prepend { margin-left: 68px; - color: lighten($ui-base-color, 26%); + color: $ui-base-lighter-color; padding: 8px 0; padding-bottom: 2px; font-size: 14px; position: relative; .status__display-name strong { - color: lighten($ui-base-color, 26%); + color: $ui-base-lighter-color; } } @@ -725,7 +725,7 @@ .detailed-status__meta { margin-top: 15px; - color: lighten($ui-base-color, 26%); + color: $ui-base-lighter-color; font-size: 14px; line-height: 18px; } @@ -944,7 +944,7 @@ } abbr { - color: lighten($ui-base-color, 26%); + color: $ui-base-lighter-color; } } @@ -1046,11 +1046,11 @@ .muted { .status__content p, .status__content a { - color: lighten($ui-base-color, 26%); + color: $ui-base-lighter-color; } .status__display-name strong { - color: lighten($ui-base-color, 26%); + color: $ui-base-lighter-color; } .status__avatar { @@ -1058,7 +1058,7 @@ } a.status__content__spoiler-link { - background: lighten($ui-base-color, 26%); + background: $ui-base-lighter-color; color: lighten($ui-base-color, 4%); &:hover { @@ -1273,7 +1273,7 @@ .static-content { padding: 10px; padding-top: 20px; - color: lighten($ui-base-color, 26%); + color: $ui-base-lighter-color; h1 { font-size: 16px; @@ -1736,7 +1736,7 @@ .column-subheading { background: $ui-base-color; - color: lighten($ui-base-color, 26%); + color: $ui-base-lighter-color; padding: 8px 20px; font-size: 12px; font-weight: 500; @@ -1875,7 +1875,7 @@ } a { - color: lighten($ui-base-color, 26%); + color: $ui-base-lighter-color; } } @@ -1939,7 +1939,7 @@ button.icon-button.active i.fa-retweet { font-size: 14px; border: 1px solid lighten($ui-base-color, 8%); border-radius: 4px; - color: lighten($ui-base-color, 26%); + color: $ui-base-lighter-color; margin-top: 14px; text-decoration: none; overflow: hidden; @@ -2034,7 +2034,7 @@ button.icon-button.active i.fa-retweet { .load-more { display: block; - color: lighten($ui-base-color, 26%); + color: $ui-base-lighter-color; background-color: transparent; border: 0; font-size: inherit; @@ -2723,13 +2723,13 @@ button.icon-button.active i.fa-retweet { color: $ui-secondary-color; font-size: 18px; font-weight: 500; - border: 2px dashed lighten($ui-base-color, 26%); + border: 2px dashed $ui-base-lighter-color; border-radius: 4px; } .upload-progress { padding: 10px; - color: lighten($ui-base-color, 26%); + color: $ui-base-lighter-color; overflow: hidden; display: flex; @@ -2754,7 +2754,7 @@ button.icon-button.active i.fa-retweet { width: 100%; height: 6px; border-radius: 6px; - background: lighten($ui-base-color, 26%); + background: $ui-base-lighter-color; position: relative; margin-top: 5px; } @@ -2965,7 +2965,7 @@ button.icon-button.active i.fa-retweet { } .search-results__header { - color: lighten($ui-base-color, 26%); + color: $ui-base-lighter-color; background: lighten($ui-base-color, 2%); border-bottom: 1px solid darken($ui-base-color, 4%); padding: 15px 10px; @@ -3559,7 +3559,7 @@ button.icon-button.active i.fa-retweet { .attachment-list__icon { flex: 0 0 auto; - color: lighten($ui-base-color, 26%); + color: $ui-base-lighter-color; padding: 8px 18px; cursor: default; border-right: 1px solid lighten($ui-base-color, 8%); @@ -3589,7 +3589,7 @@ button.icon-button.active i.fa-retweet { a { text-decoration: none; - color: lighten($ui-base-color, 26%); + color: $ui-base-lighter-color; font-weight: 500; &:hover { @@ -3752,7 +3752,7 @@ button.icon-button.active i.fa-retweet { } .account-section-headline { - color: lighten($ui-base-color, 26%); + color: $ui-base-lighter-color; background: lighten($ui-base-color, 2%); border-bottom: 1px solid lighten($ui-base-color, 4%); padding: 15px 10px; diff --git a/app/javascript/styles/forms.scss b/app/javascript/styles/forms.scss index c467aa7db..cffb6f197 100644 --- a/app/javascript/styles/forms.scss +++ b/app/javascript/styles/forms.scss @@ -32,7 +32,7 @@ code { line-height: 18px; margin-top: 15px; margin-bottom: 0; - color: lighten($ui-base-color, 26%); + color: $ui-base-lighter-color; a { color: $ui-primary-color; @@ -308,7 +308,7 @@ code { padding: 7px 4px; padding-bottom: 9px; font-size: 16px; - color: lighten($ui-base-color, 26%); + color: $ui-base-lighter-color; font-family: inherit; pointer-events: none; cursor: default; diff --git a/app/javascript/styles/variables.scss b/app/javascript/styles/variables.scss index 8362096e1..52c8cd1cf 100644 --- a/app/javascript/styles/variables.scss +++ b/app/javascript/styles/variables.scss @@ -22,7 +22,8 @@ $valid-value-color: $success-green !default; $error-value-color: $error-red !default; // Tell UI to use selected colors -$ui-base-color: $classic-base-color !default; // Darkest -$ui-primary-color: $classic-primary-color !default; // Lighter -$ui-secondary-color: $classic-secondary-color !default; // Lightest -$ui-highlight-color: $classic-highlight-color !default; // Vibrant +$ui-base-color: $classic-base-color !default; // Darkest +$ui-base-lighter-color: lighten($ui-base-color, 26%) !default; // Lighter darkest +$ui-primary-color: $classic-primary-color !default; // Lighter +$ui-secondary-color: $classic-secondary-color !default; // Lightest +$ui-highlight-color: $classic-highlight-color !default; // Vibrant diff --git a/app/views/about/_contact.html.haml b/app/views/about/_contact.html.haml index 292a58575..4394aebdd 100644 --- a/app/views/about/_contact.html.haml +++ b/app/views/about/_contact.html.haml @@ -1,5 +1,8 @@ .panel - .panel-header= t 'about.contact' + .panel-header + = succeed ':' do + = t 'about.contact' + %span{ title: contact.site_contact_email.presence }= contact.site_contact_email.presence .panel-body - if contact.contact_account .owner @@ -8,8 +11,9 @@ = link_to TagManager.instance.url_for(contact.contact_account) do %span.display_name.emojify= display_name(contact.contact_account) %span.username @#{contact.contact_account.acct} - - - unless contact.site_contact_email.blank? - .contact-email - = t 'about.business_email' - %strong= contact.site_contact_email + - else + .owner + .avatar= image_tag full_asset_url('avatars/original/missing.png') + .name + %span.display_name= t 'about.contact_missing' + %span.username= t 'about.contact_unavailable' diff --git a/app/views/about/more.html.haml b/app/views/about/more.html.haml index cce749561..11315fefa 100644 --- a/app/views/about/more.html.haml +++ b/app/views/about/more.html.haml @@ -1,16 +1,44 @@ - content_for :page_title do = site_hostname -.wrapper.thicc - .sidebar-layout - .main - .panel - %h2= site_hostname +- content_for :header_tags do + = javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous' - - unless @instance_presenter.site_description.blank? - %p!= @instance_presenter.site_description + %meta{ property: 'og:site_name', content: site_title }/ + %meta{ property: 'og:url', content: about_url }/ + %meta{ property: 'og:type', content: 'website' }/ + %meta{ property: 'og:title', content: site_hostname }/ + %meta{ property: 'og:description', content: strip_tags(@instance_presenter.site_description.presence || t('about.about_mastodon_html')) }/ + %meta{ property: 'og:image', content: asset_pack_path('mastodon_small.jpg', protocol: :request) }/ + %meta{ property: 'og:image:width', content: '400' }/ + %meta{ property: 'og:image:height', content: '400' }/ + %meta{ property: 'twitter:card', content: 'summary' }/ - .information-board +.landing-page + .header-wrapper.compact + .header + .container.links + .brand + = link_to root_url do + = image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon' + + %ul.nav + %li + - if user_signed_in? + = link_to t('settings.back'), root_url, class: 'webapp-btn' + - else + = link_to t('auth.login'), new_user_session_path, class: 'webapp-btn' + %li= link_to t('about.about_this'), about_more_path + %li= link_to t('about.other_instances'), 'https://joinmastodon.org/' + + .container.hero + .heading + %h3= t('about.description_headline', domain: site_hostname) + %p= @instance_presenter.site_description.html_safe.presence || t('about.generic_description', domain: site_hostname) + + .information-board + .container + .information-board-sections .section %span= t 'about.user_count_before' %strong= number_with_delimiter @instance_presenter.user_count @@ -23,11 +51,14 @@ %span= t 'about.domain_count_before' %strong= number_with_delimiter @instance_presenter.domain_count %span= t 'about.domain_count_after' + = render 'contact', contact: @instance_presenter - - unless @instance_presenter.site_extended_description.blank? - .panel!= @instance_presenter.site_extended_description + .extended-description + .container + = @instance_presenter.site_extended_description.html_safe.presence || t('about.extended_description_html') - .sidebar - = render 'contact', contact: @instance_presenter - = render 'links', instance: @instance_presenter - = render 'version', version: @instance_presenter + .footer-links + .container + %p + = link_to t('about.source_code'), 'https://github.com/tootsuite/mastodon' + = " (#{@instance_presenter.version_number})" diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 81e685bf6..2df8b01aa 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -3,7 +3,6 @@ ar: about: about_mastodon_html: ماستدون شبكة إجتماعية حرة و مفتوحة المصدر. هو بديل لامركزي لمنصات تجارية ، يمكنك من تجنب احتكار شركة واحدة للإتصالات الخاصة بك. يمكنك اختيار أي خادم تثق فيه. أيهما تختار، يمكنك التفاعل مع أي شخص آخر على الشبكة. يمكن لأي شخص تنصيب و تشغيل خادم ماستدون خاص به والمشاركة في الشبكات الاجتماعية بكل شفافية. about_this: عن مثيل الخادوم هذا - business_email: 'البريد الإلكتروني المهني :' closed_registrations: التسجيلات في مثيل الخادوم هذا مُغلقة حاليًا. contact: للتواصل معنا description_headline: ما هو %{domain}? diff --git a/config/locales/bg.yml b/config/locales/bg.yml index ab024c741..c23a7907c 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -3,7 +3,6 @@ bg: about: about_mastodon_html: Mastodon е безплатен сървър с отворен код за социални мрежи. Като децентрализирана алтернатива на комерсиалните платформи, той позволява избягването на риска от монополизация на твоята комуникация от единични компании. Изберете си сървър, на който се доверявате, и ще можете да контактувате с всички останали. Всеки може да пусне Mastodon и лесно да вземе участие в социалната мрежа. about_this: За тази инстанция - business_email: 'Служебен e-mail:' closed_registrations: В момента регистрациите за тази инстанция са затворени. contact: За контакти description_headline: Какво е %{domain}? diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 4109ed5ce..9c58214d5 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -3,7 +3,6 @@ ca: about: about_mastodon_html: Mastodon és un servidor de xarxa social lliure i de codi obert. Una alternativa descentralitzada a plataformes comercials, que evita el risc que una única companyia monopolitzi la teva comunicació. Qualsevol pot executar Mastodon i participar sense problemes en la xarxa social. about_this: Sobre aquesta instància - business_email: 'Adreça de contacte:' closed_registrations: Els registres estan actualment tancats en aquesta instància. contact: Contacte description_headline: Què es %{domain}? diff --git a/config/locales/de.yml b/config/locales/de.yml index 4e081eb27..6ac8c1bf4 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -3,7 +3,6 @@ de: about: about_mastodon_html: 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. about_this: Über diese Instanz - business_email: 'Geschäftliche E-Mail:' closed_registrations: Die Registrierung ist auf dieser Instanz momentan geschlossen. contact: Kontakt description_headline: Was ist %{domain}? diff --git a/config/locales/en.yml b/config/locales/en.yml index 1ec727ca7..664a26348 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3,12 +3,16 @@ en: about: about_mastodon_html: Mastodon is a social network based on open web protocols and free, open-source software. It is decentralized like e-mail. about_this: About - business_email: 'Business e-mail:' closed_registrations: Registrations are currently closed on this instance. However! You can find a different instance to make an account on and get access to the very same network from there. contact: Contact + contact_missing: Not set + contact_unavailable: N/A description_headline: What is %{domain}? domain_count_after: other instances domain_count_before: Connected to + extended_description_html: | +

A good place for rules

+

The extended description has not been set up yet.

features: humane_approach_body: Learning from failures of other networks, Mastodon aims to make ethical design choices to combat the misuse of social media. humane_approach_title: A more humane approach diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 2b95d4565..c79342e2c 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -3,7 +3,6 @@ eo: about: about_mastodon_html: Mastodon estas senpaga, malfermitkoda socia reto. Ĝi estas sencentra alia eblo al komercaj servoj. Ĝi evitigas, ke unusola firmao regu vian tutan komunikadon. Elektu servilon, kiun vi fidas. Kiu ajn estas via elekto, vi povas interagi kun ĉiuj aliaj uzantoj. Iu ajn povas krei sian propran aperaĵon de Mastodon en sia servilo, kaj partopreni en la socia reto tute glate. about_this: Pri tiu aperaĵo - business_email: 'Profesia retpoŝt-adreso:' contact: Kontakti description_headline: Kio estas %{domain}? domain_count_after: aliaj aperaĵoj diff --git a/config/locales/es.yml b/config/locales/es.yml index d845a18c2..70774c73a 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -3,7 +3,6 @@ es: about: about_mastodon_html: Mastodon es un servidor de red social libre y de código abierto. Una alternativa descentralizada a plataformas comerciales, que evita el riesgo de que una única compañía monopolice tu comunicación. Cualquiera puede ejecutar Mastodon y participar sin problemas en la red social. about_this: Acerca de esta instancia - business_email: 'Correo de negocios:' closed_registrations: Los registros están actualmente cerrados en esta instancia. contact: Contacto description_headline: "¿Qué es %{domain}?" diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 5fb215262..0febff307 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -3,7 +3,6 @@ fa: about: about_mastodon_html: ماستدون (Mastodon) یک شبکهٔ اجتماعی آزاد و کدباز است. یک جایگزین غیرمتمرکز برای شبکه‌های تجاری، که نمی‌گذارد ارتباط‌های شما را یک شرکت در انحصار خود بگیرد. یک سرور مورد اعتماد را انتخاب کنید — هر سروری که باشد، همچنان می‌توانید با سرورهای دیگر ارتباط داشته باشید. هر کسی می‌تواند سرور ماستدون خود را راه بیندازد و در شبکهٔ اجتماعی سهیم شود. about_this: دربارهٔ این سرور - business_email: 'ایمیل کاری:' closed_registrations: امکان ثبت نام روی این سرور هم‌اینک فعال نیست. contact: تماس description_headline: "%{domain} چیست؟" diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 382c60cc2..6bf2092b9 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -3,7 +3,6 @@ fi: about: about_mastodon_html: Mastodon on ilmainen, avoimeen lähdekoodiin perustuva sosiaalinen verkosto. Hajautettu vaihtoehto kaupallisille alustoille, se välttää eiskit yhden yrityksen monopolisoinnin sinun viestinnässäsi. Valitse palvelin mihin luotat — minkä tahansa valitset, voit vuorovaikuttaa muiden kanssa. Kuka tahansa voi luoda Mastodon palvelimen ja ottaa osaa sosiaaliseen verkkoon saumattomasti. about_this: Tietoja tästä palvelimesta - business_email: 'Business e-mail:' contact: Ota yhteyttä description_headline: Mikä on %{domain}? domain_count_after: muuhun palvelimeen diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 7ba9e2525..c8e55460c 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -3,7 +3,6 @@ fr: about: about_mastodon_html: Mastodon est un réseau social utilisant des formats ouverts et des logiciels libres. Comme le courriel, il est décentralisé. about_this: À propos - business_email: Courriel professionnel closed_registrations: Les inscriptions sont actuellement fermées sur cette instance. Cependant, vous pouvez trouver une autre instance sur laquelle vous créer un compte et à partir de laquelle vous pourrez accéder au même réseau. contact: Contact description_headline: Qu’est-ce que %{domain} ? @@ -432,70 +431,7 @@ fr: reblogged: partagé sensitive_content: Contenu sensible terms: - body_html: | -

Politique de confidentialité

- -

Quelles données collectons-nous?

- -

Nous collectons des données lorsque vous vous enregistrez sur notre site et les récoltons lorsque vous participez dans le forum en lisant, écrivant, et évaluant le contenu partagé ici.

- -

Lors de l'enregistrement sur notre site, il peut vous être demandé de renseigner votre nom et adresse e-mail. Vous pouvez, cependant, visiter notre site sans inscription. Votre adresse e-mail devra être vérifiée grâce à un e-mail contenant un lien unique. Si ce lien est visité, nous savons que vous contrôlez cette adresse e-mail.

- -

Lors de l'inscription et de la publication de statuts, nous enregistrons l'adresse IP de laquelle le(s) status viennent. Nous pouvons également conserver des historiques serveurs qui contiendront l'adresse IP de chaque requête adressée à notre serveur.

- -

Que faisons-nous avec vos données?

- -

Toute information que nous collectons pourra être utilisée d'une des manières suivantes :

- - - -

Comment protégeons-nous vos données?

- -

Nous appliquons une multitude de mesures afin de maintenir la sécurité de vos données personnelles lorsque vous entrez, soumettez, ou accédez à ces dernières.

- -

Quelle est notre politique de conservation des données?

- -

Nous nous efforçons de:

- - - -

Utilisons nous des "cookies"?

- -

Oui. Les cookies sont de petits fichiers qu'un site ou prestataires de services transfèrent sur le disque dur de votre ordinateur par le biais de votre navigateur Web (si ce dernier le permet). Ces cookies permettent au site de reconnaître votre navigateur et, si vous disposez d'un compte, l'associer à votre compte.

- -

Nous utilisons les cookies pour enregistrer vos préférences pour de futures visites, compiler des données agrégées à propos du trafic et des interactions effectuées sur le site afin de proposer une meilleure expérience dans le futur. Nous pouvons contracter les services d'acteurs tiers afin de nous aider à mieux comprendre les visiteurs de notre site. Ces acteurs ont l'autorisation d'utiliser ces données seulement à des fins d'améliorations.

- -

Divulguons-nous des données à des acteurs tiers ?

- -

Nous n'échangeons pas, ne vendons pas ni effectuons de quelconques transferts avec des acteurs tiers d'informations permettant de vous identifier personnellement. Cela n'inclut pas les acteurs de confiance qui nous aident à gérer notre entreprise et à vous servir tant que ces acteurs s'accordent à garder lesdites informations confidentielles. Nous pouvons être amenés à délivrer vos informations lorsque jugé adéquat afin de respecter la loi, d'appliquer la politique de notre site, ou afin de protéger nos droits, ceux des autres, notre propriété ou sécurité. Cependant, aucune information permettant l'identification de nos visiteurs ne sera divulguée à des fins publicitaires, commerciales ou tout autre usage.

- -

Liens vers des acteurs tiers

- -

Nous pouvons être amenés à inclure ou offrir les services ou produits d'acteurs tiers sur notre site. Ces acteurs tiers possèdent leur propre politique de confidentialité. Nous ne sommes donc pas responsables du contenu ou activités desdits acteurs. Néanmoins, nous cherchons à protéger l'intégrité de notre site et sommes ouverts à toute remarque concernant ces acteurs.

- -

Children's Online Privacy Protection Act

- -

Notre site, nos produits et services sont tous dirigés à l'usage de personnes étant âgés de 13 ans ou plus. Si ce serveur est hébergé aux États-Unis et que vous êtes âgé⋅e de moins de 13 ans, au vu du COPPA (Children's Online Privacy Protection Act) n'utilisez pas ce site.

- - - -

En utilisant notre site, vous consentez à la politique de confiedentialité de notre site Web.

- -

Changements de notre politique de confidentialité

- -

Si nous décidons d'apporter des changements à notre politique de confidentialité, nous les mettrons à disposition sur cette page.

- -

Ce document est distribué sous licence CC-BY-SA. Il a été mis à jour pour la dernière fois le 31 Mai 2013. Il a été traduit en français en Juillet 2017.

- -

Originellement adapté à partir de la politique de confidentialité de Discourse

. + body_html: "

Politique de confidentialité

\n\n

Quelles données collectons-nous?

\n\n

Nous collectons des données lorsque vous vous enregistrez sur notre site et les récoltons lorsque vous participez dans le forum en lisant, écrivant, et évaluant le contenu partagé ici.

\n\n

Lors de l'enregistrement sur notre site, il peut vous être demandé de renseigner votre nom et adresse e-mail. Vous pouvez, cependant, visiter notre site sans inscription. Votre adresse e-mail devra être vérifiée grâce à un e-mail contenant un lien unique. Si ce lien est visité, nous savons que vous contrôlez cette adresse e-mail.

\n\n

Lors de l'inscription et de la publication de statuts, nous enregistrons l'adresse IP de laquelle le(s) status viennent. Nous pouvons également conserver des historiques serveurs qui contiendront l'adresse IP de chaque requête adressée à notre serveur.

\n\n

Que faisons-nous avec vos données?

\n\n

Toute information que nous collectons pourra être utilisée d'une des manières suivantes :

\n\n\n\n

Comment protégeons-nous vos données?

\n \n

Nous appliquons une multitude de mesures afin de maintenir la sécurité de vos données personnelles lorsque vous entrez, soumettez, ou accédez à ces dernières.

\n\n

Quelle est notre politique de conservation des données?

\n\n

Nous nous efforçons de:

\n\n\n\n

Utilisons nous des \"cookies\"?

\n\n

Oui. Les cookies sont de petits fichiers qu'un site ou prestataires de services transfèrent sur le disque dur de votre ordinateur par le biais de votre navigateur Web (si ce dernier le permet). Ces cookies permettent au site de reconnaître votre navigateur et, si vous disposez d'un compte, l'associer à votre compte.

\n\n

Nous utilisons les cookies pour enregistrer vos préférences pour de futures visites, compiler des données agrégées à propos du trafic et des interactions effectuées sur le site afin de proposer une meilleure expérience dans le futur. Nous pouvons contracter les services d'acteurs tiers afin de nous aider à mieux comprendre les visiteurs de notre site. Ces acteurs ont l'autorisation d'utiliser ces données seulement à des fins d'améliorations.

\n\n

Divulguons-nous des données à des acteurs tiers ?

\n\n

Nous n'échangeons pas, ne vendons pas ni effectuons de quelconques transferts avec des acteurs tiers d'informations permettant de vous identifier personnellement. Cela n'inclut pas les acteurs de confiance qui nous aident à gérer notre entreprise et à vous servir tant que ces acteurs s'accordent à garder lesdites informations confidentielles. Nous pouvons être amenés à délivrer vos informations lorsque jugé adéquat afin de respecter la loi, d'appliquer la politique de notre site, ou afin de protéger nos droits, ceux des autres, notre propriété ou sécurité. Cependant, aucune information permettant l'identification de nos visiteurs ne sera divulguée à des fins publicitaires, commerciales ou tout autre usage.

\n\n

Liens vers des acteurs tiers

\n\n

Nous pouvons être amenés à inclure ou offrir les services ou produits d'acteurs tiers sur notre site. Ces acteurs tiers possèdent leur propre politique de confidentialité. Nous ne sommes donc pas responsables du contenu ou activités desdits acteurs. Néanmoins, nous cherchons à protéger l'intégrité de notre site et sommes ouverts à toute remarque concernant ces acteurs.

\n\n

Children's Online Privacy Protection Act

\n\n

Notre site, nos produits et services sont tous dirigés à l'usage de personnes étant âgés de 13 ans ou plus. Si ce serveur est hébergé aux États-Unis et que vous êtes âgé⋅e de moins de 13 ans, au vu du COPPA (Children's Online Privacy Protection Act) n'utilisez pas ce site.

\n\n

Votre consentement

\n\n

En utilisant notre site, vous consentez à la politique de confiedentialité de notre site Web.

\n\n

Changements de notre politique de confidentialité

\n\n

Si nous décidons d'apporter des changements à notre politique de confidentialité, nous les mettrons à disposition sur cette page.

\n\n

Ce document est distribué sous licence CC-BY-SA. Il a été mis à jour pour la dernière fois le 31 Mai 2013. Il a été traduit en français en Juillet 2017.

\n\n

Originellement adapté à partir de la politique de confidentialité de Discourse

.\n" title: "%{instance} Conditions d'utilisations et Politique de confidentialité" time: formats: diff --git a/config/locales/he.yml b/config/locales/he.yml index 798265e9f..0dce40e2b 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -3,7 +3,6 @@ he: about: about_mastodon_html: מסטודון היא רשת חברתית חופשית, מבוססת תוכנה חופשית ("קוד פתוח"). כאלטרנטיבה בלתי ריכוזית לפלטפרומות המסחריות, מסטודון מאפשרת להמנע מהסיכונים הנלווים להפקדת התקשורת שלך בידי חברה יחידה. שמת את מבטחך בשרת אחד — לא משנה במי בחרת, תמיד אפשר לדבר עם כל שאר המשתמשים. לכל מי שרוצה יש את האפשרות להקים שרת מסטודון עצמאי, ולהשתתף ברשת החברתית באופן חלק. about_this: אודות שרת זה - business_email: 'דוא"ל עסקי:' closed_registrations: הרשמות סגורות לשרת זה לעת עתה. contact: צור קשר description_headline: מהו %{domain}? diff --git a/config/locales/hr.yml b/config/locales/hr.yml index e1d92b9b4..328230e17 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -3,7 +3,6 @@ hr: about: about_mastodon_html: Mastodon je besplatna, open-source socijalna mreža. Decentralizirana alternativa komercijalnim platformama, izbjegava rizik toga da jedna tvrtka monopolizira vašu komunikaciju. Izaberite server kojem ćete vjerovati — koji god odabrali, moći ćete komunicirati sa svima ostalima. Bilo tko može imati svoju vlastitu Mastodon instancu i sudjelovati u socijalnoj mreži bez problema. about_this: O ovoj instanci - business_email: 'Poslovni e-mail:' closed_registrations: Registracije na ovoj instanci su trenutno zatvorene. contact: Kontakt description_headline: Što je %{domain}? diff --git a/config/locales/id.yml b/config/locales/id.yml index d0e708749..f49516268 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -3,7 +3,6 @@ id: about: about_mastodon_html: Mastodon adalah sebuah jejaring sosial terbuka, open-sourcedesentralisasi dari platform komersial, menjauhkan anda resiko dari sebuah perusahaan yang memonopoli komunikasi anda. Pilih server yang anda percayai — apapun yang anda pilih, anda tetap dapat berinteraksi dengan semua orang. Semua orang dapat menjalankan server Mastodon sendiri dan berpartisipasi dalam jejaring sosial dengan mudah. about_this: Tentang server ini - business_email: 'E-mail bisnis:' closed_registrations: Pendaftaran untuk server ini sedang ditutup. contact: Kontak description_headline: Apa itu %{domain}? diff --git a/config/locales/io.yml b/config/locales/io.yml index 7c074e349..cfde5b333 100644 --- a/config/locales/io.yml +++ b/config/locales/io.yml @@ -3,7 +3,6 @@ io: about: about_mastodon_html: Mastodon esas gratuita, apertitkodexa sociala reto. Ol esas sencentra altra alternativo a komercala servadi. Ol evitigas, ke sola firmo guvernez tua tota komunikadol. Selektez servero, quan tu fidas. Irge qua esas tua selekto, tu povas komunikar kun omna altra uzeri. Irgu povas krear sua propra instaluro di Mastodon en sua servero, e partoprenar en la sociala reto tote glate. about_this: Pri ta instaluro - business_email: 'Profesionala retpost-adreso:' closed_registrations: Membresko ne nun esas posible en ta instaluro. contact: Kontaktar description_headline: Quo esas %{domain}? diff --git a/config/locales/it.yml b/config/locales/it.yml index ab15726c4..5aa0e1da6 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -3,7 +3,6 @@ it: about: about_mastodon_html: Mastodon è un social network gratuito e open-source. Un'alternativa decentralizzata alle piattaforme commerciali che evita che una singola compagnia monopolizzi il tuo modo di comunicare. Scegli un server di cui ti fidi — qualunque sia la tua scelta, potrai interagire con chiunque altro. Chiunque può sviluppare un suo server Mastodon e partecipare alla vita del social network. about_this: A proposito di questo server - business_email: 'Email di lavoro:' closed_registrations: Al momento le iscrizioni a questo server sono chiuse. contact: Contatti description_headline: Cos'è %{domain}? diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 98ecd37f8..5bd4c38a3 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -3,7 +3,6 @@ ja: about: about_mastodon_html: Mastodon は、オープンなウェブプロトコルを採用した、自由でオープンソースなソーシャルネットワークです。電子メールのような分散型の仕組みを採っています。 about_this: このインスタンスについて - business_email: 'ビジネスメールアドレス:' closed_registrations: 現在このインスタンスでの新規登録は受け付けていません。しかし、他のインスタンスにアカウントを作成しても全く同じネットワークに参加することができます。 contact: 連絡先 description_headline: "%{domain} とは？" diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 6e73c7697..fbd250c95 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -3,7 +3,6 @@ ko: about: about_mastodon_html: Mastodon 은자유로운 오픈 소스소셜 네트워크입니다. 상용 플랫폼의 대체로써 분산형 구조를 채택해, 여러분의 대화가 한 회사에 독점되는 것을 방지합니다. 신뢰할 수 있는 인스턴스를 선택하세요 — 어떤 인스턴스를 고르더라도, 누구와도 대화할 수 있습니다. 누구나 자신만의 Mastodon 인스턴스를 만들 수 있으며, Seamless하게 소셜 네트워크에 참가할 수 있습니다. about_this: 이 인스턴스에 대해서 - business_email: '비즈니스 메일 주소:' closed_registrations: 현재 이 인스턴스에서는 신규 등록을 받고 있지 않습니다. contact: 연락처 description_headline: "%{domain} 는 무엇인가요?" diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 301b0296f..482eeaf82 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -3,7 +3,6 @@ nl: about: about_mastodon_html: 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 - business_email: 'E-mailadres:' closed_registrations: Registreren op deze server is momenteel uitgeschakeld. contact: Contact description_headline: Wat is %{domain}? diff --git a/config/locales/no.yml b/config/locales/no.yml index 11bf4eef0..f75e2a031 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -3,7 +3,6 @@ about: about_mastodon_html: Mastodon er et sosialt nettverk laget med fri programvare. Et desentralisert alternativ til kommersielle plattformer. Slik kan det unngå risikoene ved å ha et enkelt selskap som monopoliserer din kommunikasjon. Velg en tjener du stoler på — uansett hvilken du velger så kan du kommunisere med alle andre. Alle kan kjøre sin egen Mastodon og delta sømløst i det sosiale nettverket. about_this: Om denne instansen - business_email: 'Bedriftsepost:' closed_registrations: Registreringer er for øyeblikket lukket på denne instansen. contact: Kontakt description_headline: Hva er %{domain}? diff --git a/config/locales/oc.yml b/config/locales/oc.yml index dbdd6eacf..ed9ff99c1 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -3,7 +3,6 @@ oc: about: about_mastodon_html: Mastodon es un malhum social liure e open-source. Una alternativa descentralizada a las plat-formas comercialas, aquò evita qu’una sola companhiá monopolize vòstra comunicacion. Causissètz un servidor que vos fisatz, quina que siasque vòstra causida, podètz interagir amb tot lo mond. Qual que siasque 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 - business_email: 'Corrièl professional :' closed_registrations: Las inscripcions son clavadas pel moment sus aquesta instància. contact: Contacte description_headline: Qué es %{domain} ? diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 766eb9887..77412be78 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -3,7 +3,6 @@ pl: about: about_mastodon_html: Mastodon jest wolną i otwartą siecią społecznościową, zdecentralizowaną alternatywą dla zamkniętych, komercyjnych platform. about_this: O tej instancji - business_email: 'Służbowy adres e-mail:' closed_registrations: Rejestracja na tej instancji jest obecnie zamknięta. Możesz jednak zarejestrować się na innej instancji, uzyskując dostęp do tej samej sieci. contact: Kontakt description_headline: Czym jest %{domain}? diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 1881c6f66..9d08c2010 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -3,7 +3,6 @@ pt-BR: about: about_mastodon_html: 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 - business_email: 'Email comercial:' closed_registrations: Registros estão fechadas para essa instância. contact: Contato description_headline: O que é %{domain}? diff --git a/config/locales/pt.yml b/config/locales/pt.yml index de6428d42..7a31f4bbe 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -3,7 +3,6 @@ pt: about: about_mastodon_html: 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 - business_email: 'Email comercial:' closed_registrations: Novos registos estão fechados nesta instância. contact: Contacto description_headline: O que é o %{domain}? diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 5d307f444..2854c6c7c 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -3,7 +3,6 @@ ru: about: about_mastodon_html: Mastodon - это свободная социальная сеть с открытым исходным кодом. Как децентрализованная альтернатива коммерческим платформам, Mastodon предотвращает риск монополизации Вашего общения одной компанией. Выберите сервер, которому Вы доверяете — что бы Вы ни выбрали, Вы сможете общаться со всеми остальными. Любой может запустить свой собственный узел Mastodon и участвовать в социальной сети совершенно бесшовно. about_this: Об этом узле - business_email: 'Деловой e-mail:' closed_registrations: В данный момент регистрация на этом узле закрыта. contact: Связаться description_headline: Что такое %{domain}? diff --git a/config/locales/th.yml b/config/locales/th.yml index 4b929cb77..a4a9c0647 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -3,7 +3,6 @@ th: about: about_mastodon_html: แมสโทดอน เป็น ดีเซ็นทรัลไลซ์ฟรีโอเพ่นซอร์ส โซเชี่ยวเน็ตเวริ์ค. เป็นทางเลือกทดแทนโซเชี่ยวเน็ตเวิร์คที่ทำเป็นธุรกิจการค้า, ป้องกันการผูกขาดช่องทางการสื่อสารของคุณ. เลือกเซร์ฟเวอร์ที่คุณไว้ใจ — ที่คุณเลือกได้เอง, สื่อสารกับคนที่คุณต้องการได้เสมอ. ใครๆก็รันแมสโทดอนอินซะแตนซ์ได้ และ เชื่อมต่อกับโซเชี่ยวเน็ตเวิร์ค โดยไม่มีอะไรมาขวางกั้น. about_this: เกี่ยวกับอินซะแตนซ์นี้ - business_email: 'อีเมล์ธุรกิจ:' closed_registrations: อินซะแตนซ์นี้ปิดรับลงทะเบียนแล้ว. contact: ติดต่อ description_headline: โดเมนคือ %{domain} ? diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 9c03890c6..16d374627 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -3,7 +3,6 @@ tr: about: about_mastodon_html: Mastodon ücretsiz ve açık kaynaklı bir sosyal ağdır. Merkezileştirilmemiş yapısı sayesinde diğer ticari sosyal platformların aksine iletişimininizin tek bir firmada tutulmasının/yönetilmesinin önüne geçer. Güvendiğiniz bir sunucuyu seçerek oradaki kişilerle etkileşimde bulunabilirsiniz. Herkes kendi Mastodon sunucusunu kurabilir ve sorunsuz bir şekilde Mastodon sosyal ağına dahil edebilir. about_this: Bu sunucu hakkında - business_email: 'İş e-postası:' closed_registrations: Bu sunucu şu anda yeni kayıt almamaktadır. contact: İletişim description_headline: Peki %{domain} nedir? diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 48a4046df..437113711 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -3,7 +3,6 @@ uk: about: about_mastodon_html: Mastodon - це вільна соціальна мережа з відкритим вихідним кодом. Вона є децентралізованою альтернативою комерційним платформам, що дозволяє уникнути ризиків монополізації вашого спілкування однією компанією. Виберіть сервер, якому ви довіряєте — що б ви не вибрали, Ви зможете спілкуватись з усіма іншими. Будь-який користувач може запустити власну інстанцію Mastodon та без проблем брати участь в соціальній мережі. about_this: Про цю інстанцію - business_email: 'Діловий email:' closed_registrations: На даний момент реєстрація на цій інстанції закрита. contact: Зв'язатися description_headline: Що таке %{domain}? diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 3dffc1db0..3df5d1483 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -3,7 +3,6 @@ zh-CN: about: about_mastodon_html: Mastodon（长毛象）是一个自由、开放源码的社交网站。它是一个分布式的服务，避免你的通信被单一商业机构垄断操控。请你选择一家你信任的 Mastodon 实例，在上面创建帐号，然后你就可以和任一 Mastodon 实例上的用户互通，享受无缝的社交交流。 about_this: 关于本实例 - business_email: 商业电邮︰ closed_registrations: 这个实例目前不开放注册 _(:3」∠)_ contact: 联络 description_headline: 关于 %{domain} diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml index 916678b71..396d084c5 100644 --- a/config/locales/zh-HK.yml +++ b/config/locales/zh-HK.yml @@ -3,7 +3,6 @@ zh-HK: about: about_mastodon_html: Mastodon（萬象）是自由、開源的社交網絡。服務站各自獨立而互連，避免單一商業機構壟斷。找你所信任的服務站，建立帳號，你即可與任何服務站上的用戶溝通，享受無縫的網絡交流。 about_this: 關於本服務站 - business_email: 聯絡網站管理者︰ closed_registrations: 本服務站暫時停止接受登記。 contact: 聯絡 description_headline: 關於 %{domain} diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 31846dac3..6726d6779 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -3,7 +3,6 @@ zh-TW: about: about_mastodon_html: Mastodon （長毛象）是一個自由、開放原始碼的社群網站。它是一個分散式的服務，避免您的通訊被單一商業機構壟斷操控。請您選擇一家您信任的 Mastodon 服務站，在上面建立帳號，然後您就可以和任一 Mastodon 服務站上的使用者互通，享受無縫的社群網路交流。 about_this: 關於本服務站 - business_email: 商務信箱︰ closed_registrations: 本服務站暫時停止接受註冊。 contact: 聯絡我們 description_headline: 關於 %{domain} -- cgit From 029f2c4545de617f82c1dfaea3543a9bd75ebcab Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 24 Jul 2017 17:15:15 +0200 Subject: Redesign /terms page (#4338) * Redesign /terms page * Fix tests * Remove unused keys --- app/views/about/_contact.html.haml | 2 +- app/views/about/_links.html.haml | 12 --------- app/views/about/_version.html.haml | 4 --- app/views/about/terms.html.haml | 25 +++++++++++++++---- config/locales/ar.yml | 3 --- config/locales/bg.yml | 3 --- config/locales/ca.yml | 4 --- config/locales/de.yml | 4 --- config/locales/en.yml | 4 --- config/locales/eo.yml | 3 --- config/locales/es.yml | 3 --- config/locales/fa.yml | 4 --- config/locales/fi.yml | 3 --- config/locales/fr.yml | 4 --- config/locales/he.yml | 4 --- config/locales/hr.yml | 3 --- config/locales/hu.yml | 4 +-- config/locales/id.yml | 4 --- config/locales/io.yml | 3 --- config/locales/it.yml | 3 --- config/locales/ja.yml | 4 --- config/locales/ko.yml | 4 --- config/locales/nl.yml | 3 --- config/locales/no.yml | 4 --- config/locales/oc.yml | 4 --- config/locales/pl.yml | 4 --- config/locales/pt-BR.yml | 4 --- config/locales/pt.yml | 4 --- config/locales/ru.yml | 4 --- config/locales/th.yml | 4 --- config/locales/tr.yml | 4 --- config/locales/uk.yml | 4 --- config/locales/zh-CN.yml | 4 --- config/locales/zh-HK.yml | 4 --- config/locales/zh-TW.yml | 3 --- spec/views/about/_contact.html.haml_spec.rb | 7 ------ spec/views/about/_links.html.haml_spec.rb | 38 ----------------------------- 37 files changed, 22 insertions(+), 180 deletions(-) delete mode 100644 app/views/about/_links.html.haml delete mode 100644 app/views/about/_version.html.haml delete mode 100644 spec/views/about/_links.html.haml_spec.rb (limited to 'config/locales/uk.yml') diff --git a/app/views/about/_contact.html.haml b/app/views/about/_contact.html.haml index 4394aebdd..822639962 100644 --- a/app/views/about/_contact.html.haml +++ b/app/views/about/_contact.html.haml @@ -13,7 +13,7 @@ %span.username @#{contact.contact_account.acct} - else .owner - .avatar= image_tag full_asset_url('avatars/original/missing.png') + .avatar= image_tag full_asset_url('avatars/original/missing.png', skip_pipeline: true) .name %span.display_name= t 'about.contact_missing' %span.username= t 'about.contact_unavailable' diff --git a/app/views/about/_links.html.haml b/app/views/about/_links.html.haml deleted file mode 100644 index fb3350539..000000000 --- a/app/views/about/_links.html.haml +++ /dev/null @@ -1,12 +0,0 @@ -.panel - .panel-header= t 'about.links' - .panel-list - %ul - - if user_signed_in? - %li= link_to t('about.get_started'), root_path - - else - - if instance.open_registrations - %li= link_to t('about.get_started'), new_user_registration_path - %li= link_to t('auth.login'), new_user_session_path - %li= link_to t('about.terms'), terms_path - %li= link_to t('about.source_code'), 'https://github.com/tootsuite/mastodon' diff --git a/app/views/about/_version.html.haml b/app/views/about/_version.html.haml deleted file mode 100644 index f8ebc4c6d..000000000 --- a/app/views/about/_version.html.haml +++ /dev/null @@ -1,4 +0,0 @@ -.panel - .panel-header= t 'about.version' - .panel-body - %strong= version.version_number diff --git a/app/views/about/terms.html.haml b/app/views/about/terms.html.haml index 58064f0be..7004cb0b1 100644 --- a/app/views/about/terms.html.haml +++ b/app/views/about/terms.html.haml @@ -1,8 +1,23 @@ - content_for :page_title do = t('terms.title', instance: site_hostname) -.wrapper - - if @instance_presenter.site_terms.present? - = raw @instance_presenter.site_terms - - else - = t('terms.body_html') +.landing-page + .header-wrapper.compact + .header + .container.links + .brand + = link_to root_url do + = image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon' + + %ul.nav + %li + - if user_signed_in? + = link_to t('settings.back'), root_url, class: 'webapp-btn' + - else + = link_to t('auth.login'), new_user_session_path, class: 'webapp-btn' + %li= link_to t('about.about_this'), about_more_path + %li= link_to t('about.other_instances'), 'https://joinmastodon.org/' + + .extended-description + .container + = @instance_presenter.site_terms.html_safe.presence || t('terms.body_html') diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 2df8b01aa..ec051591a 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -8,13 +8,10 @@ ar: description_headline: ما هو %{domain}? domain_count_after: خوادم أخرى domain_count_before: متصل بـ - get_started: إبدأ الآن - links: الروابط other_instances: خوادم أخرى source_code: الشفرة المصدرية status_count_after: منشورا status_count_before: نشروا - terms: شروط الاستعمال user_count_after: مستخدم user_count_before: يستضيف accounts: diff --git a/config/locales/bg.yml b/config/locales/bg.yml index c23a7907c..65ff5c025 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -8,13 +8,10 @@ bg: description_headline: Какво е %{domain}? domain_count_after: други инстанции domain_count_before: Свързани към - get_started: Първи стъпки - links: Връзки other_instances: Други инстанции source_code: Програмен код status_count_after: публикации status_count_before: Написали - terms: Условия user_count_after: потребители user_count_before: Дом на accounts: diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 9c58214d5..ce4831ac2 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -8,16 +8,12 @@ ca: description_headline: Què es %{domain}? domain_count_after: altres instàncies domain_count_before: Connectat a - get_started: Començar - links: Vincles other_instances: Altres instàncies source_code: Codi font status_count_after: estats status_count_before: Que han escrit - terms: Termes user_count_after: usuaris registrats user_count_before: Tenim - version: Versió accounts: follow: Seguir followers: Seguidors diff --git a/config/locales/de.yml b/config/locales/de.yml index 6ac8c1bf4..04d3fd0b8 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -8,16 +8,12 @@ de: description_headline: Was ist %{domain}? domain_count_after: andere Instanzen domain_count_before: Verbunden mit - get_started: Erste Schritte - links: Links other_instances: Andere Instanzen source_code: Quellcode status_count_after: Beiträge verfassten status_count_before: die - terms: AGB user_count_after: Benutzer user_count_before: Heimat für - version: Version accounts: follow: Folgen followers: Folgende diff --git a/config/locales/en.yml b/config/locales/en.yml index 664a26348..8fa1ac0e3 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -24,18 +24,14 @@ en: within_reach_title: Always within reach find_another_instance: Find another instance generic_description: "%{domain} is one server in the network" - get_started: Get started hosted_on: Mastodon hosted on %{domain} learn_more: Learn more - links: Links other_instances: Instance list source_code: Source code status_count_after: statuses status_count_before: Who authored - terms: Terms user_count_after: users user_count_before: Home to - version: Version what_is_mastodon: What is Mastodon? accounts: follow: Follow diff --git a/config/locales/eo.yml b/config/locales/eo.yml index c79342e2c..6673b6516 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -7,13 +7,10 @@ eo: description_headline: Kio estas %{domain}? domain_count_after: aliaj aperaĵoj domain_count_before: Konektita al - get_started: Komenci - links: Ligiloj other_instances: Aliaj aperaĵoj source_code: Fontkodo status_count_after: mesaĝoj status_count_before: Kiu publikigis - terms: Terms user_count_after: uzantoj user_count_before: Hejmo de accounts: diff --git a/config/locales/es.yml b/config/locales/es.yml index 70774c73a..89e2828d0 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -8,13 +8,10 @@ es: description_headline: "¿Qué es %{domain}?" domain_count_after: otras instancias domain_count_before: Conectado a - get_started: Comenzar - links: Enlaces other_instances: Otras instancias source_code: Código fuente status_count_after: estados status_count_before: Que han escrito - terms: Términos user_count_after: usuarios registrados user_count_before: Tenemos accounts: diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 0febff307..c42016eb3 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -8,16 +8,12 @@ fa: description_headline: "%{domain} چیست؟" domain_count_after: سرور دیگر domain_count_before: متصل به - get_started: آغاز کنید - links: پیوندها other_instances: سرورهای دیگر source_code: کدهای منبع status_count_after: چیز نوشته‌اند status_count_before: که جمعاً - terms: شرایط استفاده user_count_after: کاربر user_count_before: دارای - version: نسخه accounts: follow: پی بگیرید followers: پیگیران diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 6bf2092b9..23c844741 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -7,13 +7,10 @@ fi: description_headline: Mikä on %{domain}? domain_count_after: muuhun palvelimeen domain_count_before: Yhdistyneenä - get_started: Aloita käyttö - links: Linkit other_instances: Muut palvelimet source_code: Lähdekoodi status_count_after: statusta status_count_before: Ovat luoneet - terms: Ehdot user_count_after: käyttäjälle user_count_before: Koti accounts: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index c8e55460c..13514bfc3 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -19,18 +19,14 @@ fr: within_reach_title: Toujours à portée de main find_another_instance: Trouver une autre instance generic_description: "%{domain} est seulement un serveur du réseau" - get_started: Rejoindre le réseau hosted_on: Instance Mastodon hébergée par %{domain} learn_more: En savoir plus - links: Liens other_instances: Liste des instances source_code: Code source status_count_after: posts status_count_before: Ayant publié - terms: Conditions d’utilisation user_count_after: utilisateur⋅ice⋅s user_count_before: Abrite - version: Version what_is_mastodon: Qu’est-ce que Mastodon ? accounts: follow: Suivre diff --git a/config/locales/he.yml b/config/locales/he.yml index 0dce40e2b..dc6caf87a 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -8,16 +8,12 @@ he: description_headline: מהו %{domain}? domain_count_after: שרתים אחרים domain_count_before: מחובר אל - get_started: בואו נתחיל - links: קישורים other_instances: שרתים אחרים source_code: קוד מקור status_count_after: הודעות status_count_before: שכתבו - terms: תנאים user_count_after: משתמשים user_count_before: ביתם של - version: גרסה accounts: follow: לעקוב followers: עוקבים diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 328230e17..2d43fcad8 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -8,13 +8,10 @@ hr: description_headline: Što je %{domain}? domain_count_after: druge instance domain_count_before: Spojen na - get_started: Započni - links: Linkovi other_instances: Druge instance source_code: Izvorni kod status_count_after: statusi status_count_before: Tko je autor - terms: Uvjeti user_count_after: korisnici user_count_before: Home to accounts: diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 5b52b256b..53319a673 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -2,9 +2,7 @@ hu: about: about_mastodon_html: Mastodon egy szabad, nyílt forráskódú szociális hálózati kiszolgálo. Egy központosítatlan alternatíva a kereskedelmi platformokra, elkerüli a kommunikációd monopolizációját veszélyét. Bárki futtathatja a Mastodon-t és részt vehet a szociális hálózatban. - get_started: Első lépések source_code: Forráskód - terms: Feltételek accounts: follow: Követés followers: Követők @@ -32,7 +30,7 @@ hu: validation_errors: one: Valami nincs rendjén! Kérlek tekintsd meg a hibát alant other: Valami nincs rendjén! Kérlek tekintsd meg a %{count} darab hibát alant. - landing_strip_html: %{name} is a user on %{link_to_root_path}. You can follow them or interact with them if you have an account anywhere in the fediverse. + landing_strip_html: "%{name} is a user on %{link_to_root_path}. You can follow them or interact with them if you have an account anywhere in the fediverse." landing_strip_signup_html: If you don't, you can sign up here. notification_mailer: favourite: diff --git a/config/locales/id.yml b/config/locales/id.yml index f49516268..e0e82d378 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -8,16 +8,12 @@ id: description_headline: Apa itu %{domain}? domain_count_after: server lain domain_count_before: Terhubung dengan - get_started: Mulai - links: Link other_instances: Server lain source_code: Kode sumber status_count_after: status status_count_before: Yang telah menulis - terms: Ketentuan user_count_after: pengguna user_count_before: Tempat bernaung bagi - version: Versi accounts: follow: Ikuti followers: Pengikut diff --git a/config/locales/io.yml b/config/locales/io.yml index cfde5b333..4f7323a6f 100644 --- a/config/locales/io.yml +++ b/config/locales/io.yml @@ -8,13 +8,10 @@ io: description_headline: Quo esas %{domain}? domain_count_after: altra instaluri domain_count_before: Konektita ad - get_started: Komencar - links: Ligili other_instances: Altra instaluri source_code: Fontkodexo status_count_after: mesaji status_count_before: Qua publikigis - terms: Terms user_count_after: uzeri user_count_before: Hemo di accounts: diff --git a/config/locales/it.yml b/config/locales/it.yml index 5aa0e1da6..de9682589 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -8,13 +8,10 @@ it: description_headline: Cos'è %{domain}? domain_count_after: altri server domain_count_before: Connesso a - get_started: Inizia - links: Links other_instances: Altri server source_code: Codice sorgente status_count_after: status status_count_before: Che hanno pubblicato - terms: Termini di Utilizzo user_count_after: utenti user_count_before: Casa di accounts: diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 5bd4c38a3..74448ff42 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -19,18 +19,14 @@ ja: within_reach_title: いつでも身近に find_another_instance: 他のインスタンスを探す generic_description: "%{domain} は、Mastodon インスタンスの一つです。" - get_started: 参加する hosted_on: Mastodon hosted on %{domain} learn_more: もっと詳しく - links: リンク other_instances: 他のインスタンス source_code: ソースコード status_count_after: トゥート status_count_before: トゥート数 - terms: プライバシーポリシー user_count_after: 人 user_count_before: ユーザー数 - version: バージョン what_is_mastodon: Mastodon とは？ accounts: follow: フォロー diff --git a/config/locales/ko.yml b/config/locales/ko.yml index fbd250c95..a081de38d 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -8,16 +8,12 @@ ko: description_headline: "%{domain} 는 무엇인가요?" domain_count_after: 개의 인스턴스 domain_count_before: 연결됨 - get_started: 참가하기 - links: 링크 other_instances: 다른 인스턴스 source_code: 소스 코드 status_count_after: Toot status_count_before: Toot 수 - terms: 개인 정보 보호 정책 user_count_after: 명 user_count_before: 사용자 수 - version: 버전 accounts: follow: 팔로우 followers: 팔로워 diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 482eeaf82..016cddc22 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -8,13 +8,10 @@ nl: description_headline: Wat is %{domain}? domain_count_after: andere servers domain_count_before: Verbonden met - get_started: Beginnen - links: Links other_instances: Andere servers source_code: Broncode status_count_after: toots status_count_before: Zij schreven - terms: Voorwaarden user_count_after: gebruikers user_count_before: Thuisbasis van accounts: diff --git a/config/locales/no.yml b/config/locales/no.yml index f75e2a031..122ad5675 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -8,16 +8,12 @@ description_headline: Hva er %{domain}? domain_count_after: andre instanser domain_count_before: Koblet til - get_started: Kom i gang - links: Lenker other_instances: Andre instanser source_code: Kildekode status_count_after: statuser status_count_before: Som skrev - terms: Betingelser user_count_after: brukere user_count_before: Her bor - version: Versjon accounts: follow: Følg followers: Følgere diff --git a/config/locales/oc.yml b/config/locales/oc.yml index ed9ff99c1..6d9996dbc 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -8,16 +8,12 @@ oc: description_headline: Qué es %{domain} ? domain_count_after: autras instàncias domain_count_before: Connectat a - get_started: Venètz al malhum - links: Ligams other_instances: Autras instàncias source_code: Còdi font status_count_after: estatuts status_count_before: qu’an escrich - terms: Tèrmes user_count_after: personas user_count_before: Ostal de - version: Version accounts: follow: Sègre followers: Seguidors diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 77412be78..c0cb126fa 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -19,18 +19,14 @@ pl: within_reach_title: Zawsze w Twoim zasięgu find_another_instance: Znajdź inną instancję generic_description: "%{domain} jest jednym z serwerów sieci" - get_started: Rozpocznijmy! hosted_on: Mastodon uruchomiony na %{domain} learn_more: Dowiedz się więcej - links: Odnośniki other_instances: Lista instancji source_code: Kod źródłowy status_count_after: wpisów status_count_before: Są autorami - terms: Regulamin user_count_after: użytkowników user_count_before: Z serwera korzysta - version: Wersja what_is_mastodon: Czym jest Mastodon? accounts: follow: Śledź diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 9d08c2010..9bd1b0d28 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -8,16 +8,12 @@ pt-BR: description_headline: O que é %{domain}? domain_count_after: outras instâncias domain_count_before: Conectado a - get_started: Comece aqui - links: Links other_instances: Outras instâncias source_code: Source code status_count_after: status status_count_before: Quem autorizou - terms: Termos user_count_after: usuários user_count_before: Lugar de - version: Versão accounts: follow: Seguir followers: Seguidores diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 7a31f4bbe..6bf592d1c 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -8,16 +8,12 @@ pt: description_headline: O que é o %{domain}? domain_count_after: outras instâncias domain_count_before: Ligado a - get_started: Começar - links: Links 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: utilizadores user_count_before: Casa para - version: Versão accounts: follow: Seguir followers: Seguidores diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 2854c6c7c..141017f40 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -8,16 +8,12 @@ ru: description_headline: Что такое %{domain}? domain_count_after: другими узлами domain_count_before: Связан с - get_started: Начать - links: Ссылки other_instances: Другие узлы source_code: Исходный код status_count_after: статусов status_count_before: Опубликовано - terms: Условия user_count_after: пользователей user_count_before: Здесь живет - version: Версия accounts: follow: Подписаться followers: Подписчики diff --git a/config/locales/th.yml b/config/locales/th.yml index a4a9c0647..89782209e 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -8,16 +8,12 @@ th: description_headline: โดเมนคือ %{domain} ? domain_count_after: อินซะแตนซ์อื่นๆ domain_count_before: เชื่อมต่อกับ - get_started: เริ่มกันเลย - links: ลิงก์ other_instances: อินซะแตนซ์อื่นๆ source_code: ซอร์สโค๊ด status_count_after: สถานะ status_count_before: Who authored - terms: เงื่อนไข user_count_after: ผู้ใช้ user_count_before: Home to - version: เวอร์ชั่น accounts: follow: ติดตาม followers: ผู้ติดตาม diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 16d374627..a1f2d2078 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -8,16 +8,12 @@ tr: description_headline: Peki %{domain} nedir? domain_count_after: sunucu var. domain_count_before: Bağlı olduğu - get_started: Kayıt ol - links: Bağlantılar other_instances: Diğer sunucular source_code: Kaynak kodu status_count_after: adet gönderi yazıldı. status_count_before: Şu ana kadar - terms: Kullanım koşulları user_count_after: kullanıcı var. user_count_before: Kayıtlı - version: Sürüm accounts: follow: Takip et followers: Takipçiler diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 437113711..3237ea1db 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -8,16 +8,12 @@ uk: description_headline: Що таке %{domain}? domain_count_after: іншими інстанціями domain_count_before: Зв'язаний з - get_started: Почати - links: Посилання other_instances: Інші інстанції source_code: Вихідний код status_count_after: статусів status_count_before: Опубліковано - terms: Умови user_count_after: користувачів user_count_before: Тут живе - version: Версія accounts: follow: Підписатися followers: Підписники diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 3df5d1483..0b0263294 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -8,16 +8,12 @@ zh-CN: description_headline: 关于 %{domain} domain_count_after: 个其它实例 domain_count_before: 现已接入 - get_started: 上手使用 - links: 链接 other_instances: 其它实例 source_code: 源码 status_count_after: 条嘟文 status_count_before: 他们共嘟出了 - terms: 条款 user_count_after: 位用户 user_count_before: 这里共注册有 - version: 版本 accounts: follow: 关注 followers: 粉丝 diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml index 396d084c5..40087ed53 100644 --- a/config/locales/zh-HK.yml +++ b/config/locales/zh-HK.yml @@ -8,16 +8,12 @@ zh-HK: description_headline: 關於 %{domain} domain_count_after: 個其他服務站 domain_count_before: 已連接至 - get_started: 立即登記 - links: 連結 other_instances: 其他服務站 source_code: 源代碼 status_count_after: 篇文章 status_count_before: 他們共發佈了 - terms: 使用條款 user_count_after: 位使用者 user_count_before: 這裏共註冊有 - version: 版本 accounts: follow: 關注 followers: 關注者 diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 6726d6779..e25edc890 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -8,13 +8,10 @@ zh-TW: description_headline: 關於 %{domain} domain_count_after: 個服務站相連 domain_count_before: 與其他 - get_started: 立即註冊 - links: 連結 other_instances: 其他服務站 source_code: 原始碼 status_count_after: 篇文章 status_count_before: 他們共發佈了 - terms: 使用條款 user_count_after: 位註冊使用者 user_count_before: 這裡共有 accounts: diff --git a/spec/views/about/_contact.html.haml_spec.rb b/spec/views/about/_contact.html.haml_spec.rb index d2e7a4598..25ba15794 100644 --- a/spec/views/about/_contact.html.haml_spec.rb +++ b/spec/views/about/_contact.html.haml_spec.rb @@ -31,12 +31,5 @@ describe 'about/_contact.html.haml' do expect(rendered).to have_content('admin@example.com') end - - it 'does not show info when email is missing' do - contact = double(site_contact_email: nil, contact_account: nil) - render 'about/contact', contact: contact - - expect(rendered).not_to have_content(I18n.t('about.business_email')) - end end end diff --git a/spec/views/about/_links.html.haml_spec.rb b/spec/views/about/_links.html.haml_spec.rb deleted file mode 100644 index 2d7f7467a..000000000 --- a/spec/views/about/_links.html.haml_spec.rb +++ /dev/null @@ -1,38 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -describe 'about/_links.html.haml' do - context 'when signed in' do - before do - allow(view).to receive(:user_signed_in?).and_return(true) - end - - it 'does not show sign in link' do - render 'about/links', instance: InstancePresenter.new - - expect(rendered).to have_content(I18n.t('about.get_started')) - expect(rendered).not_to have_content(I18n.t('auth.login')) - end - end - - context 'when signed out' do - before do - allow(view).to receive(:user_signed_in?).and_return(false) - end - - it 'shows get started link when registrations are allowed' do - render 'about/links', instance: double(open_registrations: true) - - expect(rendered).to have_content(I18n.t('about.get_started')) - expect(rendered).to have_content(I18n.t('auth.login')) - end - - it 'hides get started link when registrations are closed' do - render 'about/links', instance: double(open_registrations: false) - - expect(rendered).not_to have_content(I18n.t('about.get_started')) - expect(rendered).to have_content(I18n.t('auth.login')) - end - end -end -- cgit