Fix #2549 - Do not hardcode the exclamation in "toot!", wrap it in an extra locale key (#3089)

app/javascript/mastodon/features/compose/components/compose_form.js

@@ -22,7 +22,8 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 const messages = defineMessages({
   placeholder: { id: 'compose_form.placeholder', defaultMessage: 'What is on your mind?' },
   spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Content warning' },
-  publish: { id: 'compose_form.publish', defaultMessage: 'Toot' }
+  publish: { id: 'compose_form.publish', defaultMessage: 'Toot' },
+  publishLoud: { id: 'compose_form.publish_loud', defaultMessage: '{publish}!' },
 });
 
 class ComposeForm extends ImmutablePureComponent {
@@ -143,7 +144,7 @@ class ComposeForm extends ImmutablePureComponent {
     if (this.props.privacy === 'private' || this.props.privacy === 'direct') {
       publishText = <span className='compose-form__publish-private'><i className='fa fa-lock' /> {intl.formatMessage(messages.publish)}</span>;
     } else {
-      publishText = intl.formatMessage(messages.publish) + (this.props.privacy !== 'unlisted' ? '!' : '');
+      publishText = this.props.privacy !== 'unlisted' ? intl.formatMessage(messages.publishLoud, { publish: intl.formatMessage(messages.publish) }) : intl.formatMessage(messages.publish);
     }
 
     return (

app/javascript/mastodon/locales/ar.json

@@ -31,6 +31,7 @@
   "compose_form.placeholder": "فيمَ تفكّر؟",
   "compose_form.privacy_disclaimer": "Your private status will be delivered to mentioned users on {domains}. Do you trust {domainsCount, plural, one {that server} other {those servers}}? Post privacy only works on Mastodon instances. If {domains} {domainsCount, plural, one {is not a Mastodon instance} other {are not Mastodon instances}}, there will be no indication that your post is private, and it may be boosted or otherwise made visible to unintended recipients.",
   "compose_form.publish": "بوّق !",
+  "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive": "ضع علامة على الوسيط باعتباره حسّاس",
   "compose_form.spoiler": "أخفِ النص واعرض تحذيرا",
   "compose_form.spoiler_placeholder": "تنبيه عن المحتوى",

app/javascript/mastodon/locales/bg.json

@@ -31,6 +31,7 @@
   "compose_form.placeholder": "Какво си мислиш?",
   "compose_form.privacy_disclaimer": "Поверителни публикации ще бъдат изпратени до споменатите потребители на {domains}. Доверяваш ли се на {domainsCount, plural, one {that server} other {those servers}}, че няма да издаде твоята публикация?",
   "compose_form.publish": "Раздумай",
+  "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive": "Отбележи съдържанието като деликатно",
   "compose_form.spoiler": "Скрий текста зад предупреждение",
   "compose_form.spoiler_placeholder": "Content warning",

app/javascript/mastodon/locales/de.json

@@ -31,6 +31,7 @@
   "compose_form.placeholder": "Worüber möchtest du schreiben?",
   "compose_form.privacy_disclaimer": "Dein privater Status wird an die genannten Benutzer auf den Domains {domains} zugestellt. Vertraust du {domainsCount, plural, one {diesem Server} other {diesen Servern}}? Private Beiträge funktionieren nur auf Mastodon-Instanzen. Wenn {domains} {domainsCount, plural, one {keine Mastodon-Instanz ist} other {keine Mastodon-Instanzen sind}}, wird es dort kein Anzeichen geben, dass dein Beitrag privat ist und er könnte geteilt oder anderweitig für unerwünschte Empfänger sichtbar gemacht werden.",
   "compose_form.publish": "Tröt",
+  "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive": "Medien als heikel markieren",
   "compose_form.spoiler": "Text hinter Warnung verbergen",
   "compose_form.spoiler_placeholder": "Inhaltswarnung",

app/javascript/mastodon/locales/defaultMessages.json

@@ -374,6 +374,10 @@
       {
         "defaultMessage": "Toot",
         "id": "compose_form.publish"
+      },
+      {
+        "defaultMessage": "{publish}!",
+        "id": "compose_form.publish_loud"
       }
     ],
     "path": "app/javascript/mastodon/features/compose/components/compose_form.json"

app/javascript/mastodon/locales/en.json

@@ -31,6 +31,7 @@
   "compose_form.placeholder": "What is on your mind?",
   "compose_form.privacy_disclaimer": "Your post will be delivered to mentioned users on {domains}. Do you trust {domainsCount, plural, one {that server} other {those servers}}? Post privacy only works on Mastodon instances. If {domains} {domainsCount, plural, one {is not a Mastodon instance} other {are not Mastodon instances}}, there will be no indication that your post is not a public post, and it may be boosted or otherwise made visible to unintended recipients.",
   "compose_form.publish": "Toot",
+  "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive": "Mark media as sensitive",
   "compose_form.spoiler": "Hide text behind warning",
   "compose_form.spoiler_placeholder": "Content warning",

app/javascript/mastodon/locales/eo.json

@@ -31,6 +31,7 @@
   "compose_form.placeholder": "Pri kio vi pensas?",
   "compose_form.privacy_disclaimer": "Via privata mesaĝo estos sendita nur al menciitaj uzantoj en {domains}. Ĉu vi fidas {domainsCount, plural, one {tiun servilon} other {tiujn servilojn}}? Mesaĝa privateco funkcias nur en aperaĵoj de Mastodon. Se {domains} {domainsCount, plural, one {ne estas aperaĵo de Mastodon} other {ne estas aperaĵoj de Mastodon}}, estos neniu indiko ke via mesaĝo estas privata, kaj ĝi povus esti diskonigita aŭ videbligita al necelitaj ricevantoj.",
   "compose_form.publish": "Hup",
+  "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive": "Marki ke la enhavo estas tikla",
   "compose_form.spoiler": "Kaŝi la tekston malantaŭ averto",
   "compose_form.spoiler_placeholder": "Content warning",

app/javascript/mastodon/locales/es.json

@@ -31,6 +31,7 @@
   "compose_form.placeholder": "¿En qué estás pensando?",
   "compose_form.privacy_disclaimer": "Your private status will be delivered to mentioned users on {domains}. Do you trust {domainsCount, plural, one {that server} other {those servers}}? Post privacy only works on Mastodon instances. If {domains} {domainsCount, plural, one {is not a Mastodon instance} other {are not Mastodon instances}}, there will be no indication that your post is private, and it may be boosted or otherwise made visible to unintended recipients.",
   "compose_form.publish": "Tootear",
+  "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive": "Marcar contenido como sensible",
   "compose_form.spoiler": "Ocultar texto tras advertencia",
   "compose_form.spoiler_placeholder": "Advertencia de contenido",

app/javascript/mastodon/locales/fa.json

@@ -31,6 +31,7 @@
   "compose_form.placeholder": "تازه چه خبر؟",
   "compose_form.privacy_disclaimer": "نوشتهٔ خصوصی شما به کاربران نام‌برده‌شده در {domains} فرستاده می‌شود. آیا به {domainsCount, plural, one {آن سرور} other {آن سرورها}} اعتماد دارید؟ تنظیمات حریم خصوصی نوشته‌ها تنها در سرورهای ماستدون کار می‌کند. اگر {domains} {domainsCount, plural, one {یک سرور ماستدون نباشد} other {سرورهای ماستدون نباشند}}، اشاره‌ای به خصوصی‌بودن نوشتهٔ شما نخواهد شد و شاید نوشتهٔ شما هم‌رسان شود یا برای کاربرانی که نمی‌خواهید نمایش یابد.",
   "compose_form.publish": "بوق",
+  "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive": "تصاویر حساس هستند",
   "compose_form.spoiler": "نوشته را پشت هشدار پنهان کنید",
   "compose_form.spoiler_placeholder": "هشدار محتوا",

app/javascript/mastodon/locales/fi.json

@@ -31,6 +31,7 @@
   "compose_form.placeholder": "Mitä sinulla on mielessä?",
   "compose_form.privacy_disclaimer": "Sinun yksityinen status toimitetaan mainitsemallesi käyttäjille domaineissa {domains}. Luotatko {domainsCount, plural, one {tähän palvelimeen} other {näihin palvelimiin}}? Postauksen yksityisyys toimii van Mastodon palvelimilla. Jos {domains} {domainsCount, plural, one {ei ole Mastodon palvelin} other {eivät ole Mastodon palvelin}}, viestiin ei tule Yksityinen-merkintää, ja sitä voidaan boostata tai muuten tehdä näkyväksi muille vastaanottajille.",
   "compose_form.publish": "Toot",
+  "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive": "Merkitse media herkäksi",
   "compose_form.spoiler": "Piiloita teksti varoituksen taakse",
   "compose_form.spoiler_placeholder": "Content warning",

app/javascript/mastodon/locales/fr.json

@@ -31,6 +31,7 @@
   "compose_form.placeholder": "Qu’avez-vous en tête ?",
   "compose_form.privacy_disclaimer": "Votre statut privé va être transmis aux personnes mentionnées sur {domains}. Avez-vous confiance en {domainsCount, plural, one {ce serveur} other {ces serveurs}} pour ne pas divulguer votre statut ? Les statuts privés ne fonctionnent que sur les instances de Mastodon. Si {domains} {domainsCount, plural, one {n’est pas une instance de Mastodon} other {ne sont pas des instances de Mastodon}}, il n’y aura aucune indication que votre statut est privé, et il pourrait être partagé ou rendu visible d’une autre manière à d’autres personnes imprévues.",
   "compose_form.publish": "Pouet ",
+  "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive": "Marquer le média comme délicat",
   "compose_form.spoiler": "Masquer le texte derrière un avertissement",
   "compose_form.spoiler_placeholder": "Avertissement",

app/javascript/mastodon/locales/he.json

@@ -31,6 +31,7 @@
   "compose_form.placeholder": "מה עובר לך בראש?",
   "compose_form.privacy_disclaimer": "הודעתך הפרטית תשלח למשתמשים על {domains}. האם ניתן לסמוך על {domainsCount, plural, one {שרת זה} other {שרתים אלו}}? פרטיות ההודעה קיימת רק על שרתי מסטודון. אם {domains} {domainsCount, plural, one {הוא לא שרת מסטודון} other {הם לא שרתי מסטודון}}, לא יהיה שום סימן שההודעה פרטית, והוא עשוי להיות מקודם או להחשף למשתמשים שלא ברשימת היעד.",
   "compose_form.publish": "לחצרץ",
+  "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive": "סימון תוכן כרגיש",
   "compose_form.spoiler": "הסתרה מאחורי אזהרת תוכן",
   "compose_form.spoiler_placeholder": "אזהרת תוכן",

app/javascript/mastodon/locales/hr.json

@@ -31,6 +31,7 @@
   "compose_form.placeholder": "Što ti je na umu?",
   "compose_form.privacy_disclaimer": "Tvoj privatni status će biti dostavljen spomenutim korisnicima na {domains}. Vjeruješ li {domainsCount, plural, one {that server} drugim {those servers}}? Privatnost postova radi samo na Mastodon instancama. Ako {domains} {domainsCount, plural, one {is not a Mastodon instance} other {are not Mastodon instances}}, neće biti indikacije da je tvoj post privatan, i mogao bit biti podignut ili biti učinjen vidljivim na drugi način neželjenim primateljima.",
   "compose_form.publish": "Toot",
+  "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive": "Označi media sadržaj kao osjetljiv",
   "compose_form.spoiler": "Sakrij text iza upozorenja",
   "compose_form.spoiler_placeholder": "Upozorenje o sadržaju",

app/javascript/mastodon/locales/hu.json

@@ -31,6 +31,7 @@
   "compose_form.placeholder": "Mire gondolsz?",
   "compose_form.privacy_disclaimer": "Your private status will be delivered to mentioned users on {domains}. Do you trust {domainsCount, plural, one {that server} other {those servers}}? Post privacy only works on Mastodon instances. If {domains} {domainsCount, plural, one {is not a Mastodon instance} other {are not Mastodon instances}}, there will be no indication that your post is private, and it may be boosted or otherwise made visible to unintended recipients.",
   "compose_form.publish": "Tülk!",
+  "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive": "Tartalom érzékenynek jelölése",
   "compose_form.spoiler": "Hide text behind warning",
   "compose_form.spoiler_placeholder": "Content warning",

app/javascript/mastodon/locales/id.json

@@ -31,6 +31,7 @@
   "compose_form.placeholder": "Apa yang ada di pikiran anda?",
   "compose_form.privacy_disclaimer": "Status pribadi anda akan dikirim ke pengguna yang disebut dalam {domains}. Apa anda mempercayai {domainsCount, plural, one {server tersebut} other {server tersebut}}? Privasi postingan hanya bekerja dalam server Mastodon. Jika {domains} {domainsCount, plural, one {bukan server Mastodon} other {bukan server Mastodon}}, akan ada indikasi bahwa postingan anda adalah postingan pribadi, dan dapat di-boost atau dapat dilihat oleh orang lain.",
   "compose_form.publish": "Toot",
+  "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive": "Tandai media sensitif",
   "compose_form.spoiler": "Sembunyikan teks dibalik peringatan",
   "compose_form.spoiler_placeholder": "Peringatan konten",

app/javascript/mastodon/locales/io.json

@@ -31,6 +31,7 @@
   "compose_form.placeholder": "Quo esas en tua spirito?",
   "compose_form.privacy_disclaimer": "Tua privata mesajo livresos a mencionata uzeri en {domains}. Ka tu fidas {domainsCount, plural, one {ta servero} other {ta serveri}}? Privateso di mesaji funcionas nur en instaluri di Mastodon. Se {domains} {domainsCount, plural, one {ne esas instaluro di Mastodon} other {ne esas instaluri di Mastodon}}, esos nula indiko, ke tua mesajo esas privata, ed ol povos repetesar od altre divenar videbla da nedezirinda recevanti.",
   "compose_form.publish": "Siflar",
+  "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive": "Markizar kontenajo kom trubliva",
   "compose_form.spoiler": "Celar texto dop averto",
   "compose_form.spoiler_placeholder": "Averto di kontenajo",

app/javascript/mastodon/locales/it.json

@@ -31,6 +31,7 @@
   "compose_form.placeholder": "A cosa stai pensando?",
   "compose_form.privacy_disclaimer": "Il tuo status privato verrà condiviso con gli utenti menzionati su {domains}. Ti fidi di {domainsCount, plural, one {quel server} other {quei server}}? Le impostazioni sulla privacy valgono solo su server Mastodon. Se {domains} {domainsCount, plural, one {non è un server Mastodon} other {non sono server Mastodon}}, non ci saranno indicazioni sulla privacy del tuo status, e potrebbe essere condiviso o reso visibile a destinatari indesiderati.",
   "compose_form.publish": "Toot",
+  "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive": "Segnala file come sensibile",
   "compose_form.spoiler": "Nascondi testo con avvertimento",
   "compose_form.spoiler_placeholder": "Content warning",

app/javascript/mastodon/locales/ja.json

@@ -31,6 +31,7 @@
   "compose_form.placeholder": "今なにしてる？",
   "compose_form.privacy_disclaimer": "あなたの非公開トゥートは返信先ユーザーが所属する {domains} に送信されます。{domainsCount, plural, one {このサーバー} other {これらのサーバー}}は信頼できますか？投稿のプライバシー保護はMastodonサーバー内でのみ有効です。 {domains} {domainsCount, plural, one {がMastodonインスタンス} other {がMastodonインスタンス}}でない場合、あなたの投稿がプライベートなものとして扱われず、ブーストされたり予期しないユーザーに見られる可能性があります。",
   "compose_form.publish": "トゥート",
+  "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive": "メディアを閲覧注意としてマークする",
   "compose_form.spoiler": "テキストを隠す",
   "compose_form.spoiler_placeholder": "警告",

app/javascript/mastodon/locales/nl.json

 {
   "account.block": "Blokkeer @{name}",
-  "account.disclaimer": "Deze gebruiker zit op een andere server. Dit getal kan hoger zijn.",  "account.follow": "Volgen",
+  "account.disclaimer": "Deze gebruiker zit op een andere server. Dit getal kan hoger zijn.",
+  "account.edit_profile": "Edit profile",
+  "account.follow": "Volgen",
   "account.followers": "Volgers",
   "account.follows": "Volgt",
   "account.follows_you": "Volgt jou",
@@ -29,6 +31,7 @@
   "compose_form.placeholder": "Wat wil je kwijt?",
   "compose_form.privacy_disclaimer": "Jouw privétoot wordt afgeleverd aan de vermelde gebruikers op {domains}. Vertrouw jij {domainsCount, plural, one {die server} other {die servers}}? Het privé plaatsen van toots werkt alleen op Mastodon-servers. Wanneer {domains} {domainsCount, plural, one {geen Mastodon-server is} other {geen Mastodon-servers zijn}}, dan wordt er niet aangegeven dat de toot privé is, waardoor het kan worden geboost of op een andere manier zichtbaar wordt gemaakt voor mensen waarvoor het niet was bedoeld.",
   "compose_form.publish": "Toot",
+  "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive": "Media als gevoelig markeren",
   "compose_form.spoiler": "Tekst achter waarschuwing verbergen",
   "compose_form.spoiler_placeholder": "Waarschuwingstekst",

app/javascript/mastodon/locales/no.json

@@ -31,6 +31,7 @@
   "compose_form.placeholder": "Hva har du på hjertet?",
   "compose_form.privacy_disclaimer": "Din private status vil leveres til nevnte brukere på {domains}. Stoler du på {domainsCount, plural, one {den serveren} other {de serverne}}? Synlighet fungerer kun på Mastodon-instanser. Hvis {domains} {domainsCount, plural, one {ike er en Mastodon-instans} other {ikke er Mastodon-instanser}}, vil det ikke indikeres at posten din er privat, og den kan kanskje bli fremhevd eller på annen måte bli synlig for uventede mottakere.",
   "compose_form.publish": "Tut",
+  "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive": "Merk media som følsomt",
   "compose_form.spoiler": "Skjul tekst bak advarsel",
   "compose_form.spoiler_placeholder": "Innholdsadvarsel",