diff options
Diffstat (limited to 'app')
29 files changed, 41 insertions, 0 deletions
diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js index bb494924d..323e2e9b6 100644 --- a/app/javascript/mastodon/actions/notifications.js +++ b/app/javascript/mastodon/actions/notifications.js @@ -2,6 +2,7 @@ import api, { getLinks } from '../api' import Immutable from 'immutable'; import IntlMessageFormat from 'intl-messageformat'; import { fetchRelationships } from './accounts'; +import { defineMessages } from 'react-intl'; export const NOTIFICATIONS_UPDATE = 'NOTIFICATIONS_UPDATE'; @@ -16,6 +17,10 @@ export const NOTIFICATIONS_EXPAND_FAIL = 'NOTIFICATIONS_EXPAND_FAIL'; export const NOTIFICATIONS_CLEAR = 'NOTIFICATIONS_CLEAR'; export const NOTIFICATIONS_SCROLL_TOP = 'NOTIFICATIONS_SCROLL_TOP'; +const messages = defineMessages({ + mention: { id: 'notification.mention', defaultMessage: '{name} mentioned you' }, +}); + const fetchRelatedRelationships = (dispatch, notifications) => { const accountIds = notifications.filter(item => item.type === 'follow').map(item => item.account.id); diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json index 48087f085..e6f6d8c51 100644 --- a/app/javascript/mastodon/locales/ar.json +++ b/app/javascript/mastodon/locales/ar.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "الخيط العام الموحد", "notification.favourite": "{name} أعجب بمنشورك", "notification.follow": "{name} يتابعك", + "notification.mention": "{name} ذكرك", "notification.reblog": "{name} قام بترقية تبويقك", "notifications.clear": "إمسح الإخطارات", "notifications.clear_confirmation": "أمتأكد من أنك تود مسح جل الإخطارات الخاصة بك و المتلقاة إلى حد الآن ؟", diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json index 3afd01fa8..7d0660c25 100644 --- a/app/javascript/mastodon/locales/bg.json +++ b/app/javascript/mastodon/locales/bg.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Публичен канал", "notification.favourite": "{name} хареса твоята публикация", "notification.follow": "{name} те последва", + "notification.mention": "{name} те спомена", "notification.reblog": "{name} сподели твоята публикация", "notifications.clear": "Clear notifications", "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?", diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json index 76656bbf5..1c3a8b656 100644 --- a/app/javascript/mastodon/locales/de.json +++ b/app/javascript/mastodon/locales/de.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Föderierte Zeitleiste", "notification.favourite": "{name} favorisierte deinen Status", "notification.follow": "{name} folgt dir", + "notification.mention": "{name} erwähnte dich", "notification.reblog": "{name} teilte deinen Status", "notifications.clear": "Mitteilungen beseitigen", "notifications.clear_confirmation": "Bist du sicher, dass du alle Mitteilungen beseitigen willst?", diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index 04a149263..9163a3563 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -2,6 +2,15 @@ { "descriptors": [ { + "defaultMessage": "{name} mentioned you", + "id": "notification.mention" + } + ], + "path": "app/javascript/mastodon/actions/notifications.json" + }, + { + "descriptors": [ + { "defaultMessage": "Follow", "id": "account.follow" }, diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index c8fa3fed6..4dd59b883 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Federated timeline", "notification.favourite": "{name} favourited your status", "notification.follow": "{name} followed you", + "notification.mention": "{name} mentioned you", "notification.reblog": "{name} boosted your status", "notifications.clear": "Clear notifications", "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?", diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json index 7a1171306..205af27e1 100644 --- a/app/javascript/mastodon/locales/eo.json +++ b/app/javascript/mastodon/locales/eo.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Fratara tempolinio", "notification.favourite": "{name} favoris vian mesaĝon", "notification.follow": "{name} sekvis vin", + "notification.mention": "{name} menciis vin", "notification.reblog": "{name} diskonigis vian mesaĝon", "notifications.clear": "Clear notifications", "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?", diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json index 16ee1274f..fec4b391e 100644 --- a/app/javascript/mastodon/locales/es.json +++ b/app/javascript/mastodon/locales/es.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Historia federada", "notification.favourite": "{name} marcó tu estado como favorito", "notification.follow": "{name} te empezó a seguir", + "notification.mention": "{name} te ha mencionado", "notification.reblog": "{name} ha retooteado tu estado", "notifications.clear": "Clear notifications", "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?", diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json index 227293ca9..7820da5f6 100644 --- a/app/javascript/mastodon/locales/fa.json +++ b/app/javascript/mastodon/locales/fa.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "نوشتههای همهجا", "notification.favourite": "{name} نوشتهٔ شما را پسندید", "notification.follow": "{name} پیگیر شما شد", + "notification.mention": "{name} از شما نام برد", "notification.reblog": "{name} نوشتهٔ شما را بازبوقید", "notifications.clear": "پاککردن اعلانها", "notifications.clear_confirmation": "واقعاً میخواهید همهٔ اعلانهایتان را برای همیشه پاک کنید؟", diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json index b66f925b9..2621baa51 100644 --- a/app/javascript/mastodon/locales/fi.json +++ b/app/javascript/mastodon/locales/fi.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Yleinen aikajana", "notification.favourite": "{name} tykkäsi statuksestasi", "notification.follow": "{name} seurasi sinua", + "notification.mention": "{name} mainitsi sinut", "notification.reblog": "{name} buustasi statustasi", "notifications.clear": "Clear notifications", "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?", diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json index 30151b771..f80cf5a71 100644 --- a/app/javascript/mastodon/locales/fr.json +++ b/app/javascript/mastodon/locales/fr.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Fil public global", "notification.favourite": "{name} a ajouté à ses favoris :", "notification.follow": "{name} vous suit.", + "notification.mention": "{name} vous a mentionné⋅e :", "notification.reblog": "{name} a partagé votre statut :", "notifications.clear": "Nettoyer", "notifications.clear_confirmation": "Voulez-vous vraiment supprimer toutes vos notifications ?", diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json index 44d883683..56954d8db 100644 --- a/app/javascript/mastodon/locales/he.json +++ b/app/javascript/mastodon/locales/he.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "ציר זמן בין-קהילתי", "notification.favourite": "חצרוצך חובב על ידי {name}", "notification.follow": "{name} במעקב אחרייך", + "notification.mention": "{name} mentioned you", "notification.reblog": "חצרוצך הודהד על ידי {name}", "notifications.clear": "הסרת התראות", "notifications.clear_confirmation": "להסיר את כל ההתראות? בטוח?", diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json index 563e4dbec..726ad9609 100644 --- a/app/javascript/mastodon/locales/hr.json +++ b/app/javascript/mastodon/locales/hr.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Federalni timeline", "notification.favourite": "{name} je lajkao tvoj status", "notification.follow": "{name} te sada slijedi", + "notification.mention": "{name} mentioned you", "notification.reblog": "{name} je podigao tvoj status", "notifications.clear": "Očisti notifikacije", "notifications.clear_confirmation": "Želiš li zaista obrisati sve svoje notifikacije?", diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json index 6dd4cbfdf..dd283d736 100644 --- a/app/javascript/mastodon/locales/hu.json +++ b/app/javascript/mastodon/locales/hu.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Nyilvános időfolyam", "notification.favourite": "{name} kedvencnek jelölte az állapotod", "notification.follow": "{name} követ téged", + "notification.mention": "{name} megemlített", "notification.reblog": "{name} reblogolta az állapotod", "notifications.clear": "Clear notifications", "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?", diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json index d4be39f0a..ce0399a65 100644 --- a/app/javascript/mastodon/locales/id.json +++ b/app/javascript/mastodon/locales/id.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Linimasa gabungan", "notification.favourite": "{name} menyukai status anda", "notification.follow": "{name} mengikuti anda", + "notification.mention": "{name} mentioned you", "notification.reblog": "{name} mem-boost status anda", "notifications.clear": "Hapus notifikasi", "notifications.clear_confirmation": "Apa anda yakin hendak menghapus semua notifikasi anda?", diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json index 03ea719e9..5f63f2a89 100644 --- a/app/javascript/mastodon/locales/io.json +++ b/app/javascript/mastodon/locales/io.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Federata tempolineo", "notification.favourite": "{name} favorizis tua mesajo", "notification.follow": "{name} sequeskis tu", + "notification.mention": "{name} mencionis tu", "notification.reblog": "{name} repetis tua mesajo", "notifications.clear": "Efacar savigi", "notifications.clear_confirmation": "Ka tu esas certa, ke tu volas efacar omna tua savigi?", diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json index 048b9d2ca..38d23f44c 100644 --- a/app/javascript/mastodon/locales/it.json +++ b/app/javascript/mastodon/locales/it.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Timeline federata", "notification.favourite": "{name} ha apprezzato il tuo post", "notification.follow": "{name} ha iniziato a seguirti", + "notification.mention": "{name} ti ha menzionato", "notification.reblog": "{name} ha condiviso il tuo post", "notifications.clear": "Cancella notifiche", "notifications.clear_confirmation": "Vuoi davvero cancellare tutte le notifiche?", diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index 02bf13dca..0c252535f 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "連合タイムライン", "notification.favourite": "{name} さんがあなたのトゥートをお気に入りに登録しました", "notification.follow": "{name} さんにフォローされました", + "notification.mention": "{name} さんがあなたに返信しました", "notification.reblog": "{name} さんがあなたのトゥートをブーストしました", "notifications.clear": "通知を消去", "notifications.clear_confirmation": "本当に通知を消去しますか？", diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json index 11416baa5..5db417c1a 100644 --- a/app/javascript/mastodon/locales/nl.json +++ b/app/javascript/mastodon/locales/nl.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Globale tijdlijn", "notification.favourite": "{name} markeerde jouw toot als favoriet", "notification.follow": "{name} volgt jou nu", + "notification.mention": "{name} vermeldde jou", "notification.reblog": "{name} boostte jouw toot", "notifications.clear": "Meldingen verwijderen", "notifications.clear_confirmation": "Weet je zeker dat je al jouw meldingen wilt verwijderen?", diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json index a43ba2c4f..4254dd2d4 100644 --- a/app/javascript/mastodon/locales/no.json +++ b/app/javascript/mastodon/locales/no.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Felles tidslinje", "notification.favourite": "{name} likte din status", "notification.follow": "{name} fulgte deg", + "notification.mention": "{name} mentioned you", "notification.reblog": "{name} fremhevde din status", "notifications.clear": "Fjern varsler", "notifications.clear_confirmation": "Er du sikker på at du vil fjerne alle dine varsler?", diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json index 7751ddd80..6830bc093 100644 --- a/app/javascript/mastodon/locales/oc.json +++ b/app/javascript/mastodon/locales/oc.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Fil public global", "notification.favourite": "{name} a apondut a sos favorits :", "notification.follow": "{name} vos sèc.", + "notification.mention": "{name} vos a mencionat :", "notification.reblog": "{name} a partejat vòstre estatut :", "notifications.clear": "Levar", "notifications.clear_confirmation": "Volètz vertadièrament levar totas vòstras las notificacions ?", diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json index 4c2090f6f..65c7443d3 100644 --- a/app/javascript/mastodon/locales/pl.json +++ b/app/javascript/mastodon/locales/pl.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Oś czasu federacji", "notification.favourite": "{name} dodał twój status do ulubionych", "notification.follow": "{name} zaczął cię obserwować", + "notification.mention": "{name} mentioned you", "notification.reblog": "{name} podbił twój status", "notifications.clear": "Wyczyść powiadomienia", "notifications.clear_confirmation": "Czy na pewno chcesz bezpowrotnie usunąć wszystkie powiadomienia?", diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json index b6dc04e4f..999742e5b 100644 --- a/app/javascript/mastodon/locales/pt-BR.json +++ b/app/javascript/mastodon/locales/pt-BR.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Global", "notification.favourite": "{name} adicionou o teu post aos favoritos", "notification.follow": "{name} seguiu-te", + "notification.mention": "{name} mencionou-te", "notification.reblog": "{name} partilhou o teu post", "notifications.clear": "Limpar notificações", "notifications.clear_confirmation": "Queres mesmo limpar todas as notificações?", diff --git a/app/javascript/mastodon/locales/pt.json b/app/javascript/mastodon/locales/pt.json index b6dc04e4f..999742e5b 100644 --- a/app/javascript/mastodon/locales/pt.json +++ b/app/javascript/mastodon/locales/pt.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Global", "notification.favourite": "{name} adicionou o teu post aos favoritos", "notification.follow": "{name} seguiu-te", + "notification.mention": "{name} mencionou-te", "notification.reblog": "{name} partilhou o teu post", "notifications.clear": "Limpar notificações", "notifications.clear_confirmation": "Queres mesmo limpar todas as notificações?", diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json index 7db0f5b6b..fc73a280c 100644 --- a/app/javascript/mastodon/locales/ru.json +++ b/app/javascript/mastodon/locales/ru.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Глобальная лента", "notification.favourite": "{name} понравился Ваш статус", "notification.follow": "{name} подписался(-лась) на Вас", + "notification.mention": "{name} упомянул(а) Вас", "notification.reblog": "{name} продвинул(а) Ваш статус", "notifications.clear": "Очистить уведомления", "notifications.clear_confirmation": "Вы уверены, что хотите очистить все уведомления?", diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json index 652b97b7c..f483762b4 100644 --- a/app/javascript/mastodon/locales/tr.json +++ b/app/javascript/mastodon/locales/tr.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Federe zaman tüneli", "notification.favourite": "{name} senin durumunu favorilere ekledi", "notification.follow": "{name} seni takip ediyor", + "notification.mention": "{name} mentioned you", "notification.reblog": "{name} senin durumunu boost etti", "notifications.clear": "Bildirimleri temizle", "notifications.clear_confirmation": "Tüm bildirimlerinizi kalıcı olarak temizlemek ister misiniz?", diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json index 0beffe072..e4c4cf2eb 100644 --- a/app/javascript/mastodon/locales/uk.json +++ b/app/javascript/mastodon/locales/uk.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Глобальна стрічка", "notification.favourite": "{name} сподобався ваш допис", "notification.follow": "{name} підписався(-лась) на Вас", + "notification.mention": "{name} згадав(-ла) Вас", "notification.reblog": "{name} передмухнув(-ла) Ваш допис", "notifications.clear": "Очистити сповіщення", "notifications.clear_confirmation": "Ви впевнені, що хочете видалити всі сповіщеня?", diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json index 03e26c4c8..fa32ebc5e 100644 --- a/app/javascript/mastodon/locales/zh-CN.json +++ b/app/javascript/mastodon/locales/zh-CN.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "跨站公共时间轴", "notification.favourite": "{name} 赞你的嘟文", "notification.follow": "{name} 开始关注你", + "notification.mention": "{name} 提及你", "notification.reblog": "{name} 转嘟你的嘟文", "notifications.clear": "清空通知纪录", "notifications.clear_confirmation": "你确定要清空通知纪录吗？", diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json index 23de10078..157fca27f 100644 --- a/app/javascript/mastodon/locales/zh-HK.json +++ b/app/javascript/mastodon/locales/zh-HK.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "跨站時間軸", "notification.favourite": "{name} 喜歡你的文章", "notification.follow": "{name} 開始關注你", + "notification.mention": "{name} 提及你", "notification.reblog": "{name} 轉推你的文章", "notifications.clear": "清空通知紀錄", "notifications.clear_confirmation": "你確定要清空通知紀錄嗎？", |