about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorjeroenpraat <jeroenpraat@users.noreply.github.com>2017-05-06 13:43:43 +0200
committerEugen Rochko <eugen@zeonfederated.com>2017-05-06 13:43:43 +0200
commit496f466d73610f24821d7806541c749e8e5dda97 (patch)
treec463fb262af92dba430c1d451e7c089b205067d0 /app/javascript
parentfa033c4d5ff7167c030cbdc2d7b6a95bba96045f (diff)
Added support options to the bottom right (#2769)
* Added support options to the bottom right

I don't know if this is actually wanted, but I made these changes on my instance, so why not share it. Not wanted? No problem! BTW: Maybe the Mastodon image should leave here, cause there is no space left cause of the increased height of the getting started column.

* 2 paragraphs looks cleaner

* Update

* Good morning
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/mastodon/features/getting_started/index.js3
-rw-r--r--app/javascript/mastodon/locales/en.json8
2 files changed, 7 insertions, 4 deletions
diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js
index 6bdff2fba..f2125a96c 100644
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@@ -57,7 +57,8 @@ class GettingStarted extends ImmutablePureComponent {
 
         <div className='scrollable optionally-scrollable' style={{ display: 'flex', flexDirection: 'column' }}>
           <div className='static-content getting-started'>
-            <p><FormattedMessage id='getting_started.open_source_notice' defaultMessage='Mastodon is open source software. You can contribute or report issues on GitHub at {github}. {apps}.' values={{ github: <a href="https://github.com/tootsuite/mastodon" target="_blank">tootsuite/mastodon</a>, apps: <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md" target="_blank"><FormattedMessage id='getting_started.apps' defaultMessage='Various apps are available' /></a> }} /></p>
+            <p><FormattedMessage id='getting_started.support' defaultMessage='{faq} • {userguide} • {apps}' values={{ faq: <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/FAQ.md" target="_blank"><FormattedMessage id='getting_started.faq' defaultMessage='FAQ' /></a>, userguide: <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/User-guide.md" target="_blank"><FormattedMessage id='getting_started.userguide' defaultMessage='User Guide' /></a>, apps: <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md" target="_blank"><FormattedMessage id='getting_started.appsshort' defaultMessage='Apps' /></a> }} /></p>
+            <p><FormattedMessage id='getting_started.open_source_notice' defaultMessage='Mastodon is open source software. You can contribute or report issues on GitHub at {github}.' values={{ github: <a href="https://github.com/tootsuite/mastodon" target="_blank">tootsuite/mastodon</a> }} /></p>
           </div>
         </div>
       </Column>
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 8a7a5e4e6..bd26a2e6f 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -60,9 +60,11 @@
   "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other instances to fill it up",
   "follow_request.authorize": "Authorize",
   "follow_request.reject": "Reject",
-  "getting_started.apps": "Various apps are available",
+  "getting_started.appsshort": "Apps",
+  "getting_started.faq": "FAQ",
   "getting_started.heading": "Getting started",
-  "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}. {apps}.",
+  "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
+  "getting_started.userguide": "User Guide",
   "home.column_settings.advanced": "Advanced",
   "home.column_settings.basic": "Basic",
   "home.column_settings.filter_regex": "Filter out by regular expressions",
@@ -161,4 +163,4 @@
   "video_player.toggle_sound": "Toggle sound",
   "video_player.toggle_visible": "Toggle visibility",
   "video_player.video_error": "Video could not be played"
-}
\ No newline at end of file
+}