summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-07-24 20:05:29 +0200
committerGitHub <noreply@github.com>2017-07-24 20:05:29 +0200
commit07d93716aa226714bc13f87bd716a562139e6f60 (patch)
tree0435ddf988a56b128b3b171ec76f66a63d745328
parent88b5e0b70340138cfb2495abb5384f62908b82a6 (diff)
Improve remote profile disclaimer (#4342)v1.5.0rc1
* Improve remote profile disclaimer * yarn run manage:translations
-rw-r--r--app/javascript/mastodon/features/account/components/action_bar.js59
-rw-r--r--app/javascript/mastodon/locales/ar.json3
-rw-r--r--app/javascript/mastodon/locales/bg.json3
-rw-r--r--app/javascript/mastodon/locales/ca.json3
-rw-r--r--app/javascript/mastodon/locales/de.json3
-rw-r--r--app/javascript/mastodon/locales/defaultMessages.json12
-rw-r--r--app/javascript/mastodon/locales/en.json3
-rw-r--r--app/javascript/mastodon/locales/eo.json3
-rw-r--r--app/javascript/mastodon/locales/es.json3
-rw-r--r--app/javascript/mastodon/locales/fa.json3
-rw-r--r--app/javascript/mastodon/locales/fi.json3
-rw-r--r--app/javascript/mastodon/locales/fr.json3
-rw-r--r--app/javascript/mastodon/locales/he.json3
-rw-r--r--app/javascript/mastodon/locales/hr.json3
-rw-r--r--app/javascript/mastodon/locales/hu.json3
-rw-r--r--app/javascript/mastodon/locales/id.json3
-rw-r--r--app/javascript/mastodon/locales/io.json3
-rw-r--r--app/javascript/mastodon/locales/it.json3
-rw-r--r--app/javascript/mastodon/locales/ja.json3
-rw-r--r--app/javascript/mastodon/locales/ko.json3
-rw-r--r--app/javascript/mastodon/locales/nl.json3
-rw-r--r--app/javascript/mastodon/locales/no.json3
-rw-r--r--app/javascript/mastodon/locales/oc.json3
-rw-r--r--app/javascript/mastodon/locales/pl.json3
-rw-r--r--app/javascript/mastodon/locales/pt-BR.json3
-rw-r--r--app/javascript/mastodon/locales/pt.json3
-rw-r--r--app/javascript/mastodon/locales/ru.json3
-rw-r--r--app/javascript/mastodon/locales/th.json3
-rw-r--r--app/javascript/mastodon/locales/tr.json3
-rw-r--r--app/javascript/mastodon/locales/uk.json3
-rw-r--r--app/javascript/mastodon/locales/zh-CN.json3
-rw-r--r--app/javascript/mastodon/locales/zh-HK.json3
-rw-r--r--app/javascript/mastodon/locales/zh-TW.json3
-rw-r--r--app/javascript/styles/components.scss22
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 374da103eab..b8df724c673 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 89ddb2d154e..7f27d78cd3b 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 3dba91b822b..68aaf56b0e8 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 54f2e5e221c..6fdcde4b44c 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 a041e665509..f911c7b75e7 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 a50c8b33888..047a89ebbbf 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 b6e92dda0fb..3a201b9c111 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 029cef883df..0bb5159c8cd 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 36ad66aceba..a39b608c697 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 113daef77b7..6842558d990 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 da9e5d0f28e..efc9b1053ac 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 5b734a2533d..c7418e24654 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 c8dc4fe8dbd..36be0842be6 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 fd669b2b27a..363c4c490e1 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 b3672cb7a40..d43570f0d31 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 8a17262fe80..916f313bb0e 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 154ca66ceea..a87cc932861 100644
--- a/