From: Tom Hughes <tom@compton.nu>
Date: Fri, 29 Dec 2023 19:11:38 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/4442'
X-Git-Tag: live~925
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/d92864ae490da2f39820aec7223e3b1f2793f227?hp=511a36e965836f6f15f3c67b7c91d80e6bc83ee8

Merge remote-tracking branch 'upstream/pull/4442'
---

diff --git a/app/views/shared/_markdown_help.html.erb b/app/views/shared/_markdown_help.html.erb
index 9097c9d91..d2576bfcc 100644
--- a/app/views/shared/_markdown_help.html.erb
+++ b/app/views/shared/_markdown_help.html.erb
@@ -18,4 +18,7 @@
 
   <dt><%= t ".image" %></dt>
   <dd>![<%= t ".alt" %>](<%= t ".url" %>)</dd>
+
+  <dt><%= t ".codeblock" %></dt>
+  <dd>~~~<br><%= t ".codeblock" %><br>~~~</dd>
 </dl>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 14e9b5c44..792dcdef1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1870,6 +1870,7 @@ en:
       image: Image
       alt: Alt text
       url: URL
+      codeblock: Code block
     richtext_field:
       edit: Edit
       preview: Preview