diff options
34 files changed, 129 insertions, 57 deletions
diff --git a/app/javascript/mastodon/features/account/components/action_bar.js b/app/javascript/mastodon/features/account/components/action_bar.js index 374da103e..b8df724c6 100644 --- a/app/javascript/mastodon/features/account/components/action_bar.js +++ b/app/javascript/mastodon/features/account/components/action_bar.js @@ -16,7 +16,6 @@ const messages = defineMessages({ follow: { id: 'account.follow', defaultMessage: 'Follow' }, report: { id: 'account.report', defaultMessage: 'Report @{name}' }, media: { id: 'account.media', defaultMessage: 'Media' }, - disclaimer: { id: 'account.disclaimer', defaultMessage: 'This user is from another instance. This number may be larger.' }, blockDomain: { id: 'account.block_domain', defaultMessage: 'Hide everything from {domain}' }, unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' }, }); @@ -68,7 +67,19 @@ export default class ActionBar extends React.PureComponent { if (account.get('acct') !== account.get('username')) { const domain = account.get('acct').split('@')[1]; - extraInfo = <abbr title={intl.formatMessage(messages.disclaimer)}>*</abbr>; + + extraInfo = ( + <div className='account__disclaimer'> + <FormattedMessage + id='account.disclaimer_full' + defaultMessage="Information below may reflect the user's profile incompletely." + /> + {' '} + <a target='_blank' rel='noopener' href={account.get('url')}> + <FormattedMessage id='account.view_full_profile' defaultMessage='View full profile' /> + </a> + </div> + ); menu.push(null); @@ -80,26 +91,30 @@ export default class ActionBar extends React.PureComponent { } return ( - <div className='account__action-bar'> - <div className='account__action-bar-dropdown'> - <DropdownMenu items={menu} icon='bars' size={24} direction='right' /> - </div> - - <div className='account__action-bar-links'> - <Link className='account__action-bar__tab' to={`/accounts/${account.get('id')}`}> - <span><FormattedMessage id='account.posts' defaultMessage='Posts' /></span> - <strong><FormattedNumber value={account.get('statuses_count')} /> {extraInfo}</strong> - </Link> - - <Link className='account__action-bar__tab' to={`/accounts/${account.get('id')}/following`}> - <span><FormattedMessage id='account.follows' defaultMessage='Follows' /></span> - <strong><FormattedNumber value={account.get('following_count')} /> {extraInfo}</strong> - </Link> - - <Link className='account__action-bar__tab' to={`/accounts/${account.get('id')}/followers`}> - <span><FormattedMessage id='account.followers' defaultMessage='Followers' /></span> - <strong><FormattedNumber value={account.get('followers_count')} /> {extraInfo}</strong> - </Link> + <div> + {extraInfo} + + <div className='account__action-bar'> + <div className='account__action-bar-dropdown'> + <DropdownMenu items={menu} icon='bars' size={24} direction='right' /> + </div> + + <div className='account__action-bar-links'> + <Link className='account__action-bar__tab' to={`/accounts/${account.get('id')}`}> + <span><FormattedMessage id='account.posts' defaultMessage='Posts' /></span> + <strong><FormattedNumber value={account.get('statuses_count')} /></strong> + </Link> + + <Link className='account__action-bar__tab' to={`/accounts/${account.get('id')}/following`}> + <span><FormattedMessage id='account.follows' defaultMessage='Follows' /></span> + <strong><FormattedNumber value={account.get('following_count')} /></strong> + </Link> + + <Link className='account__action-bar__tab' to={`/accounts/${account.get('id')}/followers`}> + <span><FormattedMessage id='account.followers' defaultMessage='Followers' /></span> + <strong><FormattedNumber value={account.get('followers_count')} /></strong> + </Link> + </div> </div> </div> ); diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json index 89ddb2d15..7f27d78cd 100644 --- a/app/javascript/mastodon/locales/ar.json +++ b/app/javascript/mastodon/locales/ar.json @@ -1,7 +1,7 @@ { "account.block": "حظر @{name}", "account.block_domain": "Hide everything from {domain}", - "account.disclaimer": "هذا المستخدم من مثيل خادم آخر. قد يكون هذا الرقم أكبر.", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "تعديل الملف الشخصي", "account.follow": "تابِع", "account.followers": "المتابعون", @@ -17,6 +17,7 @@ "account.unblock_domain": "Unhide {domain}", "account.unfollow": "إلغاء المتابعة", "account.unmute": "إلغاء الكتم عن @{name}", + "account.view_full_profile": "View full profile", "boost_modal.combo": "يمكنك ضغط {combo} لتخطّي هذه في المرّة القادمة", "bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.retry": "Try again", diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json index 3dba91b82..68aaf56b0 100644 --- a/app/javascript/mastodon/locales/bg.json +++ b/app/javascript/mastodon/locales/bg.json @@ -1,7 +1,7 @@ { "account.block": "Блокирай", "account.block_domain": "Hide everything from {domain}", - "account.disclaimer": "This user is from another instance. This number may be larger.", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "Редактирай профила си", "account.follow": "Последвай", "account.followers": "Последователи", @@ -17,6 +17,7 @@ "account.unblock_domain": "Unhide {domain}", "account.unfollow": "Не следвай", "account.unmute": "Unmute @{name}", + "account.view_full_profile": "View full profile", "boost_modal.combo": "You can press {combo} to skip this next time", "bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.retry": "Try again", diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json index 54f2e5e22..6fdcde4b4 100644 --- a/app/javascript/mastodon/locales/ca.json +++ b/app/javascript/mastodon/locales/ca.json @@ -1,7 +1,7 @@ { "account.block": "Bloquejar @{name}", "account.block_domain": "Amagar tot de {domain}", - "account.disclaimer": "Aquest usuari és d'un altra instància. Aquest número podria ser més gran.", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "Editar perfil", "account.follow": "Seguir", "account.followers": "Seguidors", @@ -17,6 +17,7 @@ "account.unblock_domain": "Mostra {domain}", "account.unfollow": "Deixar de seguir", "account.unmute": "Treure silenci de @{name}", + "account.view_full_profile": "View full profile", "boost_modal.combo": "Pots premer {combo} per saltar-te això el proper cop", "bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.retry": "Try again", diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json index a041e6655..f911c7b75 100644 --- a/app/javascript/mastodon/locales/de.json +++ b/app/javascript/mastodon/locales/de.json @@ -1,7 +1,7 @@ { "account.block": "@{name} blocken", "account.block_domain": "Hide everything from {domain}", - "account.disclaimer": "Dieser Benutzer ist von einer anderen Instanz. Diese Zahl könnte größer sein.", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "Profil bearbeiten", "account.follow": "Folgen", "account.followers": "Folgende", @@ -17,6 +17,7 @@ "account.unblock_domain": "Unhide {domain}", "account.unfollow": "Entfolgen", "account.unmute": "@{name} nicht mehr stummschalten", + "account.view_full_profile": "View full profile", "boost_modal.combo": "Du kannst {combo} drücken, um dies beim nächsten Mal zu überspringen", "bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.retry": "Try again", diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index a50c8b338..047a89ebb 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -359,10 +359,6 @@ "id": "account.media" }, { - "defaultMessage": "This user is from another instance. This number may be larger.", - "id": "account.disclaimer" - }, - { "defaultMessage": "Hide everything from {domain}", "id": "account.block_domain" }, @@ -371,6 +367,14 @@ "id": "account.unblock_domain" }, { + "defaultMessage": "Information below may reflect the user's profile incompletely.", + "id": "account.disclaimer_full" + }, + { + "defaultMessage": "View full profile", + "id": "account.view_full_profile" + }, + { "defaultMessage": "Posts", "id": "account.posts" }, diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index b6e92dda0..3a201b9c1 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -1,7 +1,7 @@ { "account.block": "Block @{name}", "account.block_domain": "Hide everything from {domain}", - "account.disclaimer": "This user is from another instance. This number may be larger.", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "Edit profile", "account.follow": "Follow", "account.followers": "Followers", @@ -17,6 +17,7 @@ "account.unblock_domain": "Unhide {domain}", "account.unfollow": "Unfollow", "account.unmute": "Unmute @{name}", + "account.view_full_profile": "View full profile", "boost_modal.combo": "You can press {combo} to skip this next time", "bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.retry": "Try again", diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json index 029cef883..0bb5159c8 100644 --- a/app/javascript/mastodon/locales/eo.json +++ b/app/javascript/mastodon/locales/eo.json @@ -1,7 +1,7 @@ { "account.block": "Bloki @{name}", "account.block_domain": "Hide everything from {domain}", - "account.disclaimer": "This user is from another instance. This number may be larger.", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "Redakti la profilon", "account.follow": "Sekvi", "account.followers": "Sekvantoj", @@ -17,6 +17,7 @@ "account.unblock_domain": "Unhide {domain}", "account.unfollow": "Malsekvi", "account.unmute": "Unmute @{name}", + "account.view_full_profile": "View full profile", "boost_modal.combo": "You can press {combo} to skip this next time", "bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.retry": "Try again", diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json index 36ad66ace..a39b608c6 100644 --- a/app/javascript/mastodon/locales/es.json +++ b/app/javascript/mastodon/locales/es.json @@ -1,7 +1,7 @@ { "account.block": "Bloquear", "account.block_domain": "Hide everything from {domain}", - "account.disclaimer": "This user is from another instance. This number may be larger.", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "Editar perfil", "account.follow": "Seguir", "account.followers": "Seguidores", @@ -17,6 +17,7 @@ "account.unblock_domain": "Unhide {domain}", "account.unfollow": "Dejar de seguir", "account.unmute": "Unmute @{name}", + "account.view_full_profile": "View full profile", "boost_modal.combo": "You can press {combo} to skip this next time", "bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.retry": "Try again", diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json index 113daef77..6842558d9 100644 --- a/app/javascript/mastodon/locales/fa.json +++ b/app/javascript/mastodon/locales/fa.json @@ -1,7 +1,7 @@ { "account.block": "مسدودسازی @{name}", "account.block_domain": "پنهانسازی همه چیز از سرور {domain}", - "account.disclaimer": "این کاربر عضو سرور متفاوتی است. شاید عدد واقعی بیشتر از این باشد.", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "ویرایش نمایه", "account.follow": "پی بگیرید", "account.followers": "پیگیران", @@ -17,6 +17,7 @@ "account.unblock_domain": "رفع پنهانسازی از {domain}", "account.unfollow": "پایان پیگیری", "account.unmute": "باصدا کردن @{name}", + "account.view_full_profile": "View full profile", "boost_modal.combo": "دکمهٔ {combo} را بزنید تا دیگر این را نبینید", "bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.retry": "Try again", diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json index da9e5d0f2..efc9b1053 100644 --- a/app/javascript/mastodon/locales/fi.json +++ b/app/javascript/mastodon/locales/fi.json @@ -1,7 +1,7 @@ { "account.block": "Estä @{name}", "account.block_domain": "Hide everything from {domain}", - "account.disclaimer": "This user is from another instance. This number may be larger.", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "Muokkaa", "account.follow": "Seuraa", "account.followers": "Seuraajia", @@ -17,6 +17,7 @@ "account.unblock_domain": "Unhide {domain}", "account.unfollow": "Lopeta seuraaminen", "account.unmute": "Unmute @{name}", + "account.view_full_profile": "View full profile", "boost_modal.combo": "You can press {combo} to skip this next time", "bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.retry": "Try again", diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json index 5b734a253..c7418e246 100644 --- a/app/javascript/mastodon/locales/fr.json +++ b/app/javascript/mastodon/locales/fr.json @@ -1,7 +1,7 @@ { "account.block": "Bloquer", "account.block_domain": "Tout masquer de {domain}", - "account.disclaimer": "Ce compte est situé sur une autre instance. Les nombres peuvent être plus grands.", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "Modifier le profil", "account.follow": "Suivre", "account.followers": "Abonné⋅e⋅s", @@ -17,6 +17,7 @@ "account.unblock_domain": "Ne plus masquer {domain}", "account.unfollow": "Ne plus suivre", "account.unmute": "Ne plus masquer", + "account.view_full_profile": "View full profile", "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour pouvoir passer ceci, la prochaine fois", "bundle_column_error.body": "Une erreur s'est produite lors du chargement de ce composant.", "bundle_column_error.retry": "Réessayer", diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json index c8dc4fe8d..36be0842b 100644 --- a/app/javascript/mastodon/locales/he.json +++ b/app/javascript/mastodon/locales/he.json @@ -1,7 +1,7 @@ { "account.block": "חסימת @{name}", "account.block_domain": "להסתיר הכל מהקהילה {domain}", - "account.disclaimer": "משתמש זה מגיע מקהילה אחרת. המספר הזה עשוי להיות גדול יותר.", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "עריכת פרופיל", "account.follow": "מעקב", "account.followers": "עוקבים", @@ -17,6 +17,7 @@ "account.unblock_domain": "הסר חסימה מקהילת {domain}", "account.unfollow": "הפסקת מעקב", "account.unmute": "הפסקת השתקת @{name}", + "account.view_full_profile": "View full profile", "boost_modal.combo": "ניתן להקיש {combo} כדי לדלג בפעם הבאה", "bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.retry": "Try again", diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json index fd669b2b2..363c4c490 100644 --- a/app/javascript/mastodon/locales/hr.json +++ b/app/javascript/mastodon/locales/hr.json @@ -1,7 +1,7 @@ { "account.block": "Blokiraj @{name}", "account.block_domain": "Sakrij sve sa {domain}", - "account.disclaimer": "Ovaj korisnik je sa druge instance. Ovaj broj bi mogao biti veći.", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "Uredi profil", "account.follow": "Slijedi", "account.followers": "Sljedbenici", @@ -17,6 +17,7 @@ "account.unblock_domain": "Otkrij {domain}", "account.unfollow": "Prestani slijediti", "account.unmute": "Poništi utišavanje @{name}", + "account.view_full_profile": "View full profile", "boost_modal.combo": "Možeš pritisnuti {combo} kako bi ovo preskočio sljedeći put", "bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.retry": "Try again", diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json index b3672cb7a..d43570f0d 100644 --- a/app/javascript/mastodon/locales/hu.json +++ b/app/javascript/mastodon/locales/hu.json @@ -1,7 +1,7 @@ { "account.block": "Blokkolás", "account.block_domain": "Hide everything from {domain}", - "account.disclaimer": "This user is from another instance. This number may be larger.", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "Profil szerkesztése", "account.follow": "Követés", "account.followers": "Követők", @@ -17,6 +17,7 @@ "account.unblock_domain": "Unhide {domain}", "account.unfollow": "Követés abbahagyása", "account.unmute": "Unmute @{name}", + "account.view_full_profile": "View full profile", "boost_modal.combo": "You can press {combo} to skip this next time", "bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.retry": "Try again", diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json index 8a17262fe..916f313bb 100644 --- a/app/javascript/mastodon/locales/id.json +++ b/app/javascript/mastodon/locales/id.json @@ -1,7 +1,7 @@ { "account.block": "Blokir @{name}", "account.block_domain": "Hide everything from {domain}", - "account.disclaimer": "Pengguna ini berasal dari server lain. Angka berikut mungkin lebih besar.", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "Ubah profil", "account.follow": "Ikuti", "account.followers": "Pengikut", @@ -17,6 +17,7 @@ "account.unblock_domain": "Unhide {domain}", "account.unfollow": "Berhenti mengikuti", "account.unmute": "Berhenti membisukan @{name}", + "account.view_full_profile": "View full profile", "boost_modal.combo": "Anda dapat menekan {combo} untuk melewati ini", "bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.retry": "Try again", diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json index 154ca66ce..a87cc9328 100644 --- a/app/javascript/mastodon/locales/io.json +++ b/app/javascript/mastodon/locales/io.json @@ -1,7 +1,7 @@ { "account.block": "Blokusar @{name}", "account.block_domain": "Hide everything from {domain}", - "account.disclaimer": "Ca uzero esas de altra instaluro. Ca nombro forsan esas plu granda.", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "Modifikar profilo", "account.follow": "Sequar", "account.followers": "Sequanti", @@ -17,6 +17,7 @@ "account.unblock_domain": "Unhide {domain}", "account.unfollow": "Ne plus sequar", "account.unmute": "Ne plus celar @{name}", + "account.view_full_profile": "View full profile", "boost_modal.combo": "Tu povas presar sur {combo} por omisar co en la venonta foyo", "bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.retry": "Try again", diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json index 6cb274bae..243ed7344 100644 --- a/app/javascript/mastodon/locales/it.json +++ b/app/javascript/mastodon/locales/it.json @@ -1,7 +1,7 @@ { "account.block": "Blocca @{name}", "account.block_domain": "Hide everything from {domain}", - "account.disclaimer": "Questo utente si trova su un altro server. Questo numero potrebbe essere maggiore.", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "Modifica profilo", "account.follow": "Segui", "account.followers": "Seguaci", @@ -17,6 +17,7 @@ "account.unblock_domain": "Unhide {domain}", "account.unfollow": "Non seguire", "account.unmute": "Non silenziare @{name}", + "account.view_full_profile": "View full profile", "boost_modal.combo": "Puoi premere {combo} per saltare questo passaggio la prossima volta", "bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.retry": "Try again", diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index c52f8c2bb..ca36122f7 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -1,7 +1,7 @@ { "account.block": "ブロック", "account.block_domain": "{domain}全体を非表示", - "account.disclaimer": "このユーザーは他のインスタンスに所属しているため、数字が正確で無い場合があります。", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "プロフィールを編集", "account.follow": "フォロー", "account.followers": "フォロワー", @@ -17,6 +17,7 @@ "account.unblock_domain": "{domain}を表示", "account.unfollow": "フォロー解除", "account.unmute": "ミュート解除", + "account.view_full_profile": "View full profile", "boost_modal.combo": "次からは{combo}を押せば、これをスキップできます。", "bundle_column_error.body": "コンポーネントの読み込み中に問題が発生しました。", "bundle_column_error.retry": "再試行", diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json index fbd0098d7..768efa37d 100644 --- a/app/javascript/mastodon/locales/ko.json +++ b/app/javascript/mastodon/locales/ko.json @@ -1,7 +1,7 @@ { "account.block": "차단", "account.block_domain": "{domain} 전체를 숨김", - "account.disclaimer": "이 사용자는 다른 인스턴스에 소속되어 있으므로, 수치가 정확하지 않을 수도 있습니다.", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "프로필 편집", "account.follow": "팔로우", "account.followers": "팔로워", @@ -17,6 +17,7 @@ "account.unblock_domain": "{domain} 숨김 해제", "account.unfollow": "팔로우 해제", "account.unmute": "뮤트 해제", + "account.view_full_profile": "View full profile", "boost_modal.combo": "다음부터 {combo}를 누르면 이 과정을 건너뛸 수 있습니다.", "bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.retry": "Try again", diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json index f7b0bbf68..66b622d56 100644 --- a/app/javascript/mastodon/locales/nl.json +++ b/app/javascript/mastodon/locales/nl.json @@ -1,7 +1,7 @@ { "account.block": "Blokkeer @{name}", "account.block_domain": "Negeer alles van {domain}", - "account.disclaimer": "Deze gebruiker zit op een andere server. Dit getal kan hoger zijn.", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "Profiel bewerken", "account.follow": "Volgen", "account.followers": "Volgers", @@ -17,6 +17,7 @@ "account.unblock_domain": "{domain} niet meer negeren", "account.unfollow": "Ontvolgen", "account.unmute": "@{name} niet meer negeren", + "account.view_full_profile": "View full profile", "boost_modal.combo": "Je kunt {combo} klikken om dit de volgende keer over te slaan", "bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.retry": "Try again", diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json index 98f59f774..8727f6147 100644 --- a/app/javascript/mastodon/locales/no.json +++ b/app/javascript/mastodon/locales/no.json @@ -1,7 +1,7 @@ { "account.block": "Blokkér @{name}", "account.block_domain": "Skjul alt fra {domain}", - "account.disclaimer": "Denne brukeren er fra en annen instans. Dette tallet kan være høyere.", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "Rediger profil", "account.follow": "Følg", "account.followers": "Følgere", @@ -17,6 +17,7 @@ "account.unblock_domain": "Vis {domain}", "account.unfollow": "Avfølg", "account.unmute": "Avdemp @{name}", + "account.view_full_profile": "View full profile", "boost_modal.combo": "You kan trykke {combo} for å hoppe over dette neste gang", "bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.retry": "Try again", diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json index 34469deac..c39d57333 100644 --- a/app/javascript/mastodon/locales/oc.json +++ b/app/javascript/mastodon/locales/oc.json @@ -1,7 +1,7 @@ { "account.block": "Blocar @{name}", "account.block_domain": "Tot amagar del domeni {domain}", - "account.disclaimer": "Aqueste compte es sus una autra instància. Los nombres pòdon èsser mai grandes.", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "Modificar lo perfil", "account.follow": "Sègre", "account.followers": "Seguidors", @@ -17,6 +17,7 @@ "account.unblock_domain": "Desblocar {domain}", "account.unfollow": "Quitar de sègre", "account.unmute": "Quitar de rescondre @{name}", + "account.view_full_profile": "View full profile", "boost_modal.combo": "Podètz botar {combo} per passar aquò lo còp que ven", "bundle_column_error.body": "Quicòm a fach meuca pendent lo cargament d’aqueste compausant.", "bundle_column_error.retry": "Tornar ensejar", diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json index 92782ec2a..857e4df10 100644 --- a/app/javascript/mastodon/locales/pl.json +++ b/app/javascript/mastodon/locales/pl.json @@ -1,7 +1,7 @@ { "account.block": "Blokuj @{name}", "account.block_domain": "Blokuj wszystko z {domain}", - "account.disclaimer": "Ten użytkownik pochodzi z innej instancji. Ta liczba może być większa.", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "Edytuj profil", "account.follow": "Śledź", "account.followers": "Śledzący", @@ -17,6 +17,7 @@ "account.unblock_domain": "Odblokuj domenę {domain}", "account.unfollow": "Przestań śledzić", "account.unmute": "Cofnij wyciszenie @{name}", + "account.view_full_profile": "View full profile", "boost_modal.combo": "Naciśnij {combo}, aby pominąć to następnym razem", "bundle_column_error.body": "Coś poszło nie tak podczas ładowania tego składnika.", "bundle_column_error.retry": "Spróbuj ponownie", diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json index 3944e33e9..86da7c4e6 100644 --- a/app/javascript/mastodon/locales/pt-BR.json +++ b/app/javascript/mastodon/locales/pt-BR.json @@ -1,7 +1,7 @@ { "account.block": "Bloquear @{name}", "account.block_domain": "Hide everything from {domain}", - "account.disclaimer": "Essa conta está localizado em outra instância. Os nomes podem ser maiores.", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "Editar perfil", "account.follow": "Seguir", "account.followers": "Seguidores", @@ -17,6 +17,7 @@ "account.unblock_domain": "Unhide {domain}", "account.unfollow": "Deixar de seguir", "account.unmute": "Não silenciar @{name}", + "account.view_full_profile": "View full profile", "boost_modal.combo": "Pode clicar {combo} para não voltar a ver", "bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.retry": "Try again", diff --git a/app/javascript/mastodon/locales/pt.json b/app/javascript/mastodon/locales/pt.json index 3944e33e9..86da7c4e6 100644 --- a/app/javascript/mastodon/locales/pt.json +++ b/app/javascript/mastodon/locales/pt.json @@ -1,7 +1,7 @@ { "account.block": "Bloquear @{name}", "account.block_domain": "Hide everything from {domain}", - "account.disclaimer": "Essa conta está localizado em outra instância. Os nomes podem ser maiores.", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "Editar perfil", "account.follow": "Seguir", "account.followers": "Seguidores", @@ -17,6 +17,7 @@ "account.unblock_domain": "Unhide {domain}", "account.unfollow": "Deixar de seguir", "account.unmute": "Não silenciar @{name}", + "account.view_full_profile": "View full profile", "boost_modal.combo": "Pode clicar {combo} para não voltar a ver", "bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.retry": "Try again", diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json index 9e8573efa..16af3fe7e 100644 --- a/app/javascript/mastodon/locales/ru.json +++ b/app/javascript/mastodon/locales/ru.json @@ -1,7 +1,7 @@ { "account.block": "Блокировать", "account.block_domain": "Блокировать все с {domain}", - "account.disclaimer": "Это пользователь с другого узла. Число может быть больше.", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "Изменить профиль", "account.follow": "Подписаться", "account.followers": "Подписаны", @@ -17,6 +17,7 @@ "account.unblock_domain": "Разблокировать {domain}", "account.unfollow": "Отписаться", "account.unmute": "Снять глушение", + "account.view_full_profile": "View full profile", "boost_modal.combo": "Нажмите {combo}, чтобы пропустить это в следующий раз", "bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.retry": "Try again", diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json index 63bed6d8c..be5c0815d 100644 --- a/app/javascript/mastodon/locales/th.json +++ b/app/javascript/mastodon/locales/th.json @@ -1,7 +1,7 @@ { "account.block": "Block @{name}", "account.block_domain": "Hide everything from {domain}", - "account.disclaimer": "This user is from another instance. This number may be larger.", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "Edit profile", "account.follow": "Follow", "account.followers": "Followers", @@ -17,6 +17,7 @@ "account.unblock_domain": "Unhide {domain}", "account.unfollow": "Unfollow", "account.unmute": "Unmute @{name}", + "account.view_full_profile": "View full profile", "boost_modal.combo": "You can press {combo} to skip this next time", "bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.retry": "Try again", diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json index 5bd308e95..9d4d5fa17 100644 --- a/app/javascript/mastodon/locales/tr.json +++ b/app/javascript/mastodon/locales/tr.json @@ -1,7 +1,7 @@ { "account.block": "Engelle @{name}", "account.block_domain": "Hide everything from {domain}", - "account.disclaimer": "Bu kullanıcının hesabı farklı sunucuda bulunduğu için bu sayı daha fazla olabilir.", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "Profili düzenle", "account.follow": "Takip et", "account.followers": "Takipçiler", @@ -17,6 +17,7 @@ "account.unblock_domain": "Unhide {domain}", "account.unfollow": "Takipten vazgeç", "account.unmute": "Sesi aç @{name}", + "account.view_full_profile": "View full profile", "boost_modal.combo": "Bir dahaki sefere {combo} tuşuna basabilirsiniz", "bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.retry": "Try again", diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json index e1611505d..60a551bb6 100644 --- a/app/javascript/mastodon/locales/uk.json +++ b/app/javascript/mastodon/locales/uk.json @@ -1,7 +1,7 @@ { "account.block": "Заблокувати", "account.block_domain": "Заглушити {domain}", - "account.disclaimer": "Це користувач з іншої інстанції. Число може бути більше.", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "Налаштування профілю", "account.follow": "Підписатися", "account.followers": "Підписники", @@ -17,6 +17,7 @@ "account.unblock_domain": "Розблокувати {domain}", "account.unfollow": "Відписатися", "account.unmute": "Зняти глушення", + "account.view_full_profile": "View full profile", "boost_modal.combo": "Ви можете натиснути {combo}, щоб пропустити це наступного разу", "bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.retry": "Try again", diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json index 18bf872e5..97f1f5e27 100644 --- a/app/javascript/mastodon/locales/zh-CN.json +++ b/app/javascript/mastodon/locales/zh-CN.json @@ -1,7 +1,7 @@ { "account.block": "屏蔽 @{name}", "account.block_domain": "Hide everything from {domain}", - "account.disclaimer": "由于这个账户处于另一个服务器实例上，实际数字会比这个更多。", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "修改个人资料", "account.follow": "关注", "account.followers": "关注者", @@ -17,6 +17,7 @@ "account.unblock_domain": "Unhide {domain}", "account.unfollow": "取消关注", "account.unmute": "取消 @{name} 的静音", + "account.view_full_profile": "View full profile", "boost_modal.combo": "如你想在下次路过时显示，请按{combo}，", "bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.retry": "Try again", diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json index a461085c7..c65c3d45c 100644 --- a/app/javascript/mastodon/locales/zh-HK.json +++ b/app/javascript/mastodon/locales/zh-HK.json @@ -1,7 +1,7 @@ { "account.block": "封鎖 @{name}", "account.block_domain": "Hide everything from {domain}", - "account.disclaimer": "由於這個用戶在另一個服務站，實際數字會比這個更多。", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "修改個人資料", "account.follow": "關注", "account.followers": "關注的人", @@ -17,6 +17,7 @@ "account.unblock_domain": "Unhide {domain}", "account.unfollow": "取消關注", "account.unmute": "取消 @{name} 的靜音", + "account.view_full_profile": "View full profile", "boost_modal.combo": "如你想在下次路過這顯示，請按{combo}，", "bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.retry": "Try again", diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json index d766fb394..12e840b16 100644 --- a/app/javascript/mastodon/locales/zh-TW.json +++ b/app/javascript/mastodon/locales/zh-TW.json @@ -1,7 +1,7 @@ { "account.block": "封鎖 @{name}", "account.block_domain": "隱藏來自 {domain} 的一切", - "account.disclaimer": "這使用者來自其他副本，實際數字可能更大。", + "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", "account.edit_profile": "編輯用戶資訊", "account.follow": "關注", "account.followers": "專注者", @@ -17,6 +17,7 @@ "account.unblock_domain": "不再隱藏 {domain}", "account.unfollow": "取消關注", "account.unmute": "不再消音 @{name}", + "account.view_full_profile": "View full profile", "boost_modal.combo": "下次你可以按 {combo} 來跳過", "bundle_column_error.body": "Something went wrong while loading this component.", "bundle_column_error.retry": "Try again", diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss index c4c4420eb..1be07b023 100644 --- a/app/javascript/styles/components.scss +++ b/app/javascript/styles/components.scss @@ -855,6 +855,28 @@ } } +.account__disclaimer { + padding: 10px; + border-top: 1px solid lighten($ui-base-color, 8%); + color: $ui-base-lighter-color; + + strong { + font-weight: 500; + } + + a { + font-weight: 500; + color: inherit; + text-decoration: underline; + + &:hover, + &:focus, + &:active { + text-decoration: none; + } + } +} + .account__header__content { color: $ui-primary-color; font-size: 14px; |