about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-07-31 18:59:34 +0200
committerGitHub <noreply@github.com>2018-07-31 18:59:34 +0200
commitcc56f2230a10c4fded80a34e5297fad8d9891e02 (patch)
treeb1bb13c698c8aeffc946da8a1f1025983ba58398 /config
parent9ae53ad59ee18459775d19c4699c771c7f86fa7c (diff)
Add separate setting for sidebar text (site_short_description) (#8107)
* Add separate setting for sidebar text (site_short_description)

* Fix tests
Diffstat (limited to 'config')
-rw-r--r--config/locales/en.yml5
-rw-r--r--config/settings.yml1
2 files changed, 5 insertions, 1 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 66f475ded..4693fe1ba 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -372,11 +372,14 @@ en:
         desc_html: Show a staff badge on a user page
         title: Show staff badge
       site_description:
-        desc_html: Introductory paragraph on the frontpage and in meta tags. You can use HTML tags, in particular <code>&lt;a&gt;</code> and <code>&lt;em&gt;</code>.
+        desc_html: Introductory paragraph on the frontpage. Describe what makes this Mastodon server special and anything else important. You can use HTML tags, in particular <code>&lt;a&gt;</code> and <code>&lt;em&gt;</code>.
         title: Instance description
       site_description_extended:
         desc_html: A good place for your code of conduct, rules, guidelines and other things that set your instance apart. You can use HTML tags
         title: Custom extended information
+      site_short_description:
+        desc_html: Displayed in sidebar and meta tags. Describe what Mastodon is and what makes this server special in a single paragraph. If empty, defaults to instance description.
+        title: Short instance description
       site_terms:
         desc_html: You can write your own privacy policy, terms of service or other legalese. You can use HTML tags
         title: Custom terms of service
diff --git a/config/settings.yml b/config/settings.yml
index 190f6afcd..399f25a9a 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -8,6 +8,7 @@
 #
 defaults: &defaults
   site_title: Mastodon
+  site_short_description: ''
   site_description: ''
   site_extended_description: ''
   site_terms: ''