diff --git a/app/assets/javascripts/app/views/help_view.js b/app/assets/javascripts/app/views/help_view.js index 48731e55c..db4f67d08 100644 --- a/app/assets/javascripts/app/views/help_view.js +++ b/app/assets/javascripts/app/views/help_view.js @@ -10,7 +10,7 @@ app.views.Help = app.views.StaticContentView.extend({ "click .faq-link-posts-and-posting" : "postsAndPosting", "click .faq-link-tags": "tags", "click .faq-link-keyboard-shortcuts" : "keyboardShortcuts", - "click .faq-link-chat" : "chat" + "click .faq-link-chat" : "chat" }, initialize : function() { @@ -21,7 +21,8 @@ app.views.Help = app.views.StaticContentView.extend({ get_support_a_wiki: { link: this.linkHtml("https://wiki.diasporafoundation.org/Special:Search", Diaspora.I18n.t( 'wiki' ))}, get_support_a_irc: { irc: this.linkHtml("https://wiki.diasporafoundation.org/How_We_Communicate#IRC", Diaspora.I18n.t( 'irc' ))}, get_support_a_faq: { faq: this.linkHtml("https://wiki.diasporafoundation.org/FAQ_for_users", Diaspora.I18n.t( 'faq' ))}, - get_support_a_hashtag: { question: this.linkHtml("/tags/question", "#question")} + get_support_a_hashtag: { question: this.linkHtml("/tags/question", "#question")}, + get_support_a_discourse: { discourse: this.linkHtml("https://discourse.diasporafoundation.org/c/support", "discussions & support")} }; this.POSTS_AND_POSTING_SUBS = { diff --git a/app/assets/templates/faq_getting_help_tpl.jst.hbs b/app/assets/templates/faq_getting_help_tpl.jst.hbs index 1457d820d..37859b7d8 100644 --- a/app/assets/templates/faq_getting_help_tpl.jst.hbs +++ b/app/assets/templates/faq_getting_help_tpl.jst.hbs @@ -17,6 +17,7 @@
  • {{{ get_support_a_irc }}}
  • {{{ get_support_a_faq }}}
  • {{{ get_support_a_hashtag }}}
  • +
  • {{{ get_support_a_discourse }}}
  • diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 10f82eb23..0fac4de06 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -330,6 +330,7 @@ en: get_support_a_irc: "Join us on %{irc} (live chat)" get_support_a_faq: "Read our %{faq} page on wiki" get_support_a_hashtag: "Ask in a public post on diaspora* using the %{question} hashtag" + get_support_a_discourse: "Search for existing discussions relating to your enquiry or open a new thread in our %{discourse} platform" account_and_data_management: title: "Account and data management" move_pods_q: "How do I move my seed (account) from one pod to another?"