[Scummvm-git-logs] scummvm-web master -> 83f30ce40e884b74c497c7a972f20e8abd0cca1d

[lotharsm]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm-web' repo located at https://github.com/scummvm/scummvm-web .

Summary:
674374f6be WEB: Add our Discord server to the Contacts page
83f30ce40e WEB: Remove the previously used IRC password from the Contacts page


Commit: 674374f6bef47a7742276c05b7abf52c29785b46
    https://github.com/scummvm/scummvm-web/commit/674374f6bef47a7742276c05b7abf52c29785b46
Author: Lothar Serra Mari (serra at scummvm.org)
Date: 2019-06-01T13:46:17+02:00

Commit Message:
WEB: Add our Discord server to the Contacts page

Changed paths:
    lang/i18n/lang.en.json
    templates/pages/contact.tpl


diff --git a/lang/i18n/lang.en.json b/lang/i18n/lang.en.json
index ad65c6c..16feda3 100644
--- a/lang/i18n/lang.en.json
+++ b/lang/i18n/lang.en.json
@@ -27,6 +27,8 @@
     "contactTitle": "Contact",
     "contactContentTitle": "Contact",
     "contactIntro": "<p><b>Please do not contact the team for questions about using ScummVM. Instead use the <a href=\"http://forums.scummvm.org/\">forums</a> or the <a href=\"http://bugs.scummvm.org/\">bug reporting system</a>!</b></p>",
+    "contactDiscordHeader": "Discord",
+    "contactDiscord": "<p>Join us on Discord! No matter if you just want to hang around with the ScummVM community or if you want to discuss the latest development, our <a href=\"https://discord.gg/5D8yTtF\">Discord Server</a> is the place to go.",
     "contactIRCHeader": "IRC channel",
     "contactIRC": "<p>The #scummvm IRC channel on <a href=\"http://freenode.net/irc_servers.shtml\">irc.freenode.net</a> is also a good place to ask questions. Many ScummVM developers hang out there regularly, as well as many ScummVM users. You will need a password to join the channel, which is set to \"scummvm\". This is to prevent general spambots.</p>",
     "contactForumsHeader": "Forums",
diff --git a/templates/pages/contact.tpl b/templates/pages/contact.tpl
index d888888..9a6679f 100644
--- a/templates/pages/contact.tpl
+++ b/templates/pages/contact.tpl
@@ -1,4 +1,9 @@
 {capture "content"}
+  <div class="subhead">{#contactDiscordHeader#}</div>
+  <div class="subhead-content">
+    {#contactDiscord#}
+  </div>
+
   <div class="subhead">{#contactIRCHeader#}</div>
   <div class="subhead-content">
     {#contactIRC#}


Commit: 83f30ce40e884b74c497c7a972f20e8abd0cca1d
    https://github.com/scummvm/scummvm-web/commit/83f30ce40e884b74c497c7a972f20e8abd0cca1d
Author: Lothar Serra Mari (serra at scummvm.org)
Date: 2019-06-01T13:47:16+02:00

Commit Message:
WEB: Remove the previously used IRC password from the Contacts page

Changed paths:
    lang/i18n/lang.en.json


diff --git a/lang/i18n/lang.en.json b/lang/i18n/lang.en.json
index 16feda3..5e64942 100644
--- a/lang/i18n/lang.en.json
+++ b/lang/i18n/lang.en.json
@@ -30,7 +30,7 @@
     "contactDiscordHeader": "Discord",
     "contactDiscord": "<p>Join us on Discord! No matter if you just want to hang around with the ScummVM community or if you want to discuss the latest development, our <a href=\"https://discord.gg/5D8yTtF\">Discord Server</a> is the place to go.",
     "contactIRCHeader": "IRC channel",
-    "contactIRC": "<p>The #scummvm IRC channel on <a href=\"http://freenode.net/irc_servers.shtml\">irc.freenode.net</a> is also a good place to ask questions. Many ScummVM developers hang out there regularly, as well as many ScummVM users. You will need a password to join the channel, which is set to \"scummvm\". This is to prevent general spambots.</p>",
+    "contactIRC": "<p>The #scummvm IRC channel on <a href=\"http://freenode.net/irc_servers.shtml\">irc.freenode.net</a> is also a good place to ask questions. Many ScummVM developers hang out there regularly, as well as many ScummVM users.",
     "contactForumsHeader": "Forums",
     "contactForums": "<p>We offer several <a href=\"http://forums.scummvm.org/\">forums</a>. Use the <a href=\"http://forums.scummvm.org/viewforum.php?f=2\">Help and Support forum</a> if you encounter problems using ScummVM. The <a href=\"http://forums.scummvm.org/viewforum.php?f=1\">General discussion forum</a> is, as the name suggests, meant for general discussion of any topics somehow related to ScummVM. Also there are some platform-specific forums and <a href=\"http://forums.scummvm.org/viewforum.php?f=8\">the Junkyard</a>. </p><p><b>Don't forget to read <a href=\"http://forums.scummvm.org/viewtopic.php?t=17\">Forum Rules</a> before your first post.</b></p>",
     "contactTrackersHeader": "Bug reports, feature requests, patches",