Merge pull request #5706 from aka001/help_section

Update the help section #5698

Changelog.md

@@ -176,7 +176,7 @@ diaspora.yml file**. The existing settings from 0.4.x and before will not work a
 * Add year to notifications page [#5676](https://github.com/diaspora/diaspora/pull/5676)
 * Give admins the ability to lock & unlock accounts [#5643](https://github.com/diaspora/diaspora/pull/5643)
 * Add reshares to the stream view immediately [#5699](https://github.com/diaspora/diaspora/pull/5699)
-* Start help section for the chat [#5665](https://github.com/diaspora/diaspora/pull/5665)
+* Update and improve help section [#5665](https://github.com/diaspora/diaspora/pull/5665), [#5706](https://github.com/diaspora/diaspora/pull/5706)
 * Expose participation controls in the stream view [#5511](https://github.com/diaspora/diaspora/pull/5511)
 
 # 0.4.1.2

app/assets/javascripts/app/views/help_view.js

@@ -20,6 +20,7 @@ app.views.Help = app.views.StaticContentView.extend({
       get_support_a_tutorials: { tutorials: this.linkHtml("https://diasporafoundation.org/tutorials", Diaspora.I18n.t( 'tutorials' ))},
       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")}
 	};
 

app/assets/templates/faq_getting_help_tpl.jst.hbs

@@ -15,6 +15,7 @@
       <li>{{{ get_support_a_tutorials }}}</li>
       <li>{{{ get_support_a_wiki }}}</li>
       <li>{{{ get_support_a_irc }}}</li>
+      <li>{{{ get_support_a_faq }}}</li>
       <li>{{{ get_support_a_hashtag }}}</li>
     </ul>
   </div>

app/assets/templates/faq_keyboard_shortcuts_tpl.jst.hbs

@@ -13,6 +13,7 @@
         <li>{{ keyboard_shortcuts_li5 }}</li>
         <li>{{ keyboard_shortcuts_li6 }}</li>
         <li>{{ keyboard_shortcuts_li7 }}</li>
+        <li>{{ keyboard_shortcuts_li8 }}</li>
       </ul>
     </div>
   </div>

config/locales/diaspora/en.yml

@@ -398,6 +398,7 @@ en:
     tutorial: "tutorial"
     irc: "IRC"
     wiki: "wiki"
+    faq: "FAQ"
     markdown: "Markdown"
     here: "Here"
     foundation_website: "diaspora* foundation website"
@@ -412,6 +413,7 @@ en:
       get_support_a_tutorials: "Check out our %{tutorials}"
       get_support_a_wiki: "Search the %{link}"
       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"
     account_and_data_management:
       title: "Account and data management"
@@ -585,6 +587,7 @@ en:
       keyboard_shortcuts_li5: "r - Reshare the current post"
       keyboard_shortcuts_li6: "m - Expand the current post"
       keyboard_shortcuts_li7: "o - Open the first link in the current post"
+      keyboard_shortcuts_li8: "ctrl + enter - Send the message you are writing"
     miscellaneous:
       title: "Miscellaneous"
       back_to_top_q: "Is there a quick way to go back to the top of a page after I scroll down?"