diff --git a/extensions/bbcode/extend.php b/extensions/bbcode/extend.php
index 7783be0cf..97df35340 100644
--- a/extensions/bbcode/extend.php
+++ b/extensions/bbcode/extend.php
@@ -10,21 +10,30 @@
 use Flarum\Extend;
 use s9e\TextFormatter\Configurator;
 
-return (new Extend\Formatter)
-    ->configure(function (Configurator $config) {
-        $config->BBCodes->addFromRepository('B');
-        $config->BBCodes->addFromRepository('I');
-        $config->BBCodes->addFromRepository('U');
-        $config->BBCodes->addFromRepository('S');
-        $config->BBCodes->addFromRepository('URL');
-        $config->BBCodes->addFromRepository('IMG');
-        $config->BBCodes->addFromRepository('EMAIL');
-        $config->BBCodes->addFromRepository('CODE');
-        $config->BBCodes->addFromRepository('QUOTE');
-        $config->BBCodes->addFromRepository('LIST');
-        $config->BBCodes->addFromRepository('DEL');
-        $config->BBCodes->addFromRepository('COLOR');
-        $config->BBCodes->addFromRepository('CENTER');
-        $config->BBCodes->addFromRepository('SIZE');
-        $config->BBCodes->addFromRepository('*');
-    });
+return [
+    new Extend\Locales(__DIR__.'/locale'),
+
+    (new Extend\Formatter)
+        ->configure(function (Configurator $config) {
+            $config->BBCodes->addFromRepository('B');
+            $config->BBCodes->addFromRepository('I');
+            $config->BBCodes->addFromRepository('U');
+            $config->BBCodes->addFromRepository('S');
+            $config->BBCodes->addFromRepository('URL');
+            $config->BBCodes->addFromRepository('IMG');
+            $config->BBCodes->addFromRepository('EMAIL');
+            $config->BBCodes->addFromRepository('CODE');
+            $config->BBCodes->addFromRepository('LIST');
+            $config->BBCodes->addFromRepository('DEL');
+            $config->BBCodes->addFromRepository('COLOR');
+            $config->BBCodes->addFromRepository('CENTER');
+            $config->BBCodes->addFromRepository('SIZE');
+            $config->BBCodes->addFromRepository('*');
+
+            // Quote translation
+            $config->BBCodes->addFromRepository('QUOTE');
+            $config->rendering->parameters['L_WROTE'] = resolve('translator')->trans('flarum-bbcode.forum.quote.wrote');
+            $tag = $config->tags['QUOTE'];
+            $tag->template = '<blockquote><xsl:if test="not(@author)"><xsl:attribute name="class">uncited</xsl:attribute></xsl:if><div><xsl:if test="@author"><cite><xsl:value-of select="@author"/> <xsl:value-of select="$L_WROTE"/></cite></xsl:if><xsl:apply-templates/></div></blockquote>';
+        }),
+];
diff --git a/extensions/bbcode/locale/en.yml b/extensions/bbcode/locale/en.yml
new file mode 100644
index 000000000..076fe78ce
--- /dev/null
+++ b/extensions/bbcode/locale/en.yml
@@ -0,0 +1,10 @@
+flarum-bbcode:
+
+  ##
+  # UNIQUE KEYS - The following keys are used in only one location each.
+  ##
+
+  # Translations in this namespace are used by the forum user interface.
+  forum:
+    quote:
+      wrote: wrote