Merge pull request #395 from m52go/update-social-links

Update social links

_data/de.yml

@@ -19,7 +19,7 @@ footer:
   liBenefactors: Benefactors # see https://bisq.network/benefactors for context
   liContribute: Mitarbeiten
   liMarketData: Marktdaten API
-  joinBisq: Bisq nutzen
+  joinBisq: Treten Sie der Community bei
 
 homepage_content:
   title: "<span class=\"animate1\">Exchange,</span> <span class=\"animate2\">Dezentralisiert.</span>"

_data/en.yml

@@ -19,7 +19,7 @@ footer:
   liBenefactors: Benefactors # see https://bisq.network/benefactors for context
   liContribute: Contribute
   liMarketData: Market Data API
-  joinBisq: Join Bisq
+  joinBisq: Join the Community
 
 homepage_content:
   title: "<span class=\"animate1\">Exchange,</span> <span class=\"animate2\">Decentralized.</span>"
@@ -65,14 +65,7 @@ homepage_content:
   hJoin: Join the Community
   pJoin: >
     <p>Bisq is always looking for highly-skilled developers, designers and security experts to join our <a href="https://bisq.network/community/">community</a>. If you’re interested in helping make Bisq better, there are many ways to <a href="https://docs.bisq.network/contributor-checklist.html" target="_blank" rel="noopener">contribute</a>. We’d love to hear from you!</p>
-  liGithub: "@bisq-network on GitHub"
-  liTwitter: "@bisq-network on Twitter"
-  liYoutube: Bisq YouTube channel
-  liForum: Bisq Forum
-  liMailingList: Bisq Contributor mailing list
-  liFreenodeIRC: "#bisq on Freenode IRC"
-  liSubreddit: r/Bisq Subreddit
-  liKeybase: "Bisq on Keybase"
+  liForum: Forum
 
 os_selector_options:
   liAllDownloads: All Downloads

_data/es.yml

@@ -19,7 +19,7 @@ footer:
   liBenefactors: Benefactors # see https://bisq.network/benefactors for context
   liContribute: Contribuir
   liMarketData: API de datos de mercado
-  joinBisq: Unirse a Bisq
+  joinBisq: Unirse a la comunidad
 
 homepage_content:
   title: "<span class=\"animate1\">Exchange,</span> <span class=\"animate2\">Descentralizado.</span>"

_data/fr.yml

@@ -19,7 +19,7 @@ footer:
   liBenefactors: Benefactors # see https://bisq.network/benefactors for context
   liContribute: Contribuer
   liMarketData: API pour les données du marché
-  joinBisq: Rejoindre Bisq
+  joinBisq: Rejoignez la communauté
 
 homepage_content:
   title: "<span class=\"animate1\">Plateforme d'échange,</span> <span class=\"animate2\">Décentralisée.</span>"

_data/ja.yml

@@ -19,7 +19,7 @@ footer:
   liBenefactors: Benefactors # see https://bisq.network/benefactors for context
   liContribute: 貢献
   liMarketData: 市場データAPI
-  joinBisq: Bisqに参加
+  joinBisq: コミュニティに参加
 
 homepage_content:
   title: "<span class=\"animate1\">取引所、</span><span class=\"animate2\">非中央集権化された</span>"

_data/languages.yml

@@ -4,51 +4,60 @@
   accept_languages: ["en", "en-us", "en-au", "en-nz", "en-za", "en-bz", "en-tt"]
   site_name: "Bisq - A decentralized bitcoin exchange network"
   site_desc: "Bisq is an open-source desktop application that allows you to buy and sell bitcoins in exchange for national currencies, or alternative cryptocurrencies."
+  telegram_link: https://t.me/bisq_p2p
 - name: "Deutsch"
   tag: "de"
   enabled: Yes
   accept_languages: ["de"]
   site_name: "Bisq - Der dezentrale Bitcoin Exchange"
   site_desc: "Bisq ist eine Open-Source-Desktop-Anwendung, die es Ihnen ermöglicht, Bitcoins im Austausch gegen nationale Währungen oder alternative Krypto-Währungen zu kaufen und zu verkaufen."
+  telegram_link: https://t.me/bisq_p2p
 - name: "Español"
   tag: "es"
   enabled: Yes
   accept_languages: ["es", "es-mx", "es-gt", "es-cr", "es-pa", "es-do", "es-ve", "es-co", "es-pe", "es-ar", "es-ec", "es-cl", "es-uy", "es-py", "es-bo", "es-sv", "es-hn", "es-ni", "es-pr"]
   site_name: "Bisq - A decentralized bitcoin exchange network"
   site_desc: "Bisq is an open-source desktop application that allows you to buy and sell bitcoins in exchange for national currencies, or alternative cryptocurrencies."
+  telegram_link: https://t.me/bisqes
 - name: "Français"
   tag: "fr"
   enabled: Yes
   accept_languages: ["fr", "fr-FR"]
   site_name: "Bisq - La plateforme d'échange de Bitcoin décentralis"
   site_desc: "Bisq est une application desktop open-source qui vous permet d'acheter et de vendre des bitcoins contre des devises nationales ou des altcoins."
+  telegram_link: https://t.me/bisq_p2p
 - name: "日本語"
   tag: "ja"
   enabled: Yes
   accept_languages: ["ja", "ja-jp"]
   site_name: "Bisq - 取引所、非中央集権化された"
   site_desc: "Bisqは、各国通貨と引き換えに暗号通貨と売買できるオープンソースのピアツーピアアプリケーションです。登録は不要です。"
+  telegram_link: https://t.me/bisq_p2p
 - name: "Português"
   tag: "pt-PT"
   enabled: Yes
   accept_languages: ["pt", "pt-PT"]
   site_name: "Bisq - A exchange de Bitcoin descentralizada"
   site_desc: "Bisq é uma aplicação de desktop open-source que lhe permite comprar e vender bitcoins em troca de moedas nacionais ou altcoin."
+  telegram_link: https://t.me/bisq_p2p
 - name: "简体中文"
   tag: "zh-CN"
   enabled: Yes
   accept_languages: ["zh", "zh-CN"]
   site_name: "Bisq - 去中心化的比特币交易"
   site_desc: "Bisq 是一个开源的电脑程序，使你能够使用当地货币或加密货币来买卖比特币。"
+  telegram_link: https://t.me/bisqnetworkCN
 - name: "Português"
   tag: "pt-BR"
   enabled: Yes
   accept_languages: ["pt-BR"]
   site_name: "Bisq - A exchange de Bitcoin descentralizada"
   site_desc: "Bisq é uma aplicação de desktop open-source que lhe permite comprar e vender bitcoins em troca de moedas nacionais ou altcoin."
+  telegram_link: https://t.me/bisqbrasil
 - name: "Русский"
   tag: "ru"
   enabled: Yes
   accept_languages: ["ru"]
   site_name: "Bisq - децентрадизированная сеть обмена биткойном."
   site_desc: "Bisq является открытым компьютерным программным обеспечением для купли и продажи биткойна за фиативные валюты или альтернативные криптовалюты."
+  telegram_link: https://t.me/bisq_p2p

_data/pt-BR.yml

@@ -19,7 +19,7 @@ footer:
   liBenefactors: Benefactors # see https://bisq.network/benefactors for context
   liContribute: Contribuir
   liMarketData: API de dados de mercado
-  joinBisq: Junte-se à Bisq
+  joinBisq: Junte-se à Comunidade
 
 homepage_content:
   title: "<span class=\"animate1\">Exchange,</span> <span class=\"animate2\">Descentralizada.</span>"

_data/pt-PT.yml

@@ -19,7 +19,7 @@ footer:
   liBenefactors: Benefactors # see https://bisq.network/benefactors for context
   liContribute: Contribuir
   liMarketData: API de Informação de Mercado
-  joinBisq: Juntar-se ao Bisq
+  joinBisq: Junte-se à Comunidade
 
 homepage_content:
   title: "<span class=\"animate1\">Exchange,</span> Descentralizada.</span>"

_data/ru.yml

@@ -19,7 +19,7 @@ footer:
   liBenefactors: Benefactors # see https://bisq.network/benefactors for context
   liContribute: Стать участником проекта
   liMarketData: API для доступа к рыночным данным
-  joinBisq: Следить за Bisq
+  joinBisq: Присоединяйтесь к сообществу
 
 homepage_content:
   title: "<span class=\"animate1\">Децентрализованная</span> <span class=\"animate2\">биржа.</span>"

_data/zh-CN.yml

@@ -19,7 +19,7 @@ footer:
   liBenefactors: Benefactors # see https://bisq.network/benefactors for context
   liContribute: 贡献
   liMarketData: 市场数据 API
-  joinBisq: 加入 Bisq
+  joinBisq: 加入社区
 
 homepage_content:
   title: "<span class=\"animate1\">交易</span>、<span class=\"animate2\">去中心化</span>。"

_includes/footer.html

@@ -72,9 +72,10 @@ <h5 class="text-uppercase small grey">{{ item.joinBisq }}</h5>
               <a target="_blank" rel="noopener" title="YouTube" href="https://www.youtube.com/c/bisq-network"><img src="/images/community/youtube_w.svg" alt="youtube" loading="lazy"> </a>
               <a target="_blank" rel="noopener" title="Keybase" href="https://keybase.io/team/bisq"><img src="/images/community/keybase_w.svg" alt="keybase" loading="lazy"> </a>
               <a target="_blank" rel="noopener" title="Bisq Forum" href="https://bisq.community"><img src="/images/community/forum_w.svg" alt="forum" loading="lazy"> </a>
-              <a target="_blank" rel="noopener" title="Mailing List" href="https://lists.bisq.network/listinfo/bisq-contrib"><img src="/images/community/mailinglist_w.svg" alt="mailinglist" loading="lazy"> </a>
               <a target="_blank" rel="noopener" title="IRC" href="https://webchat.freenode.net/?channels=bisq"><img src="/images/community/irc_w.svg" alt="irc" loading="lazy"> </a>
               <a target="_blank" rel="noopener" title="Reddit" href="https://www.reddit.com/r/bisq"><img src="/images/community/reddit_w.svg" alt="reddit" loading="lazy"> </a>
+              <a target="_blank" rel="noopener" title="Matrix" href="https://matrix.to/#/#freenode_#bisq:matrix.org"><img src="/images/community/matrix_w.svg" alt="matrix" loading="lazy"> </a>
+              <a target="_blank" rel="noopener" title="Telegram" href="{% local_social_link telegram %}"><img src="/images/community/telegram_w.svg" alt="telegram" loading="lazy"> </a>
             </span>
 
             </div>

_layouts/page_home.html

@@ -264,14 +264,15 @@ <h2 id="community">{{ item.hJoin }}</h2>
 
       <div class="col-12 col-md-6">
         <ul class="community-links grey community-home pl-0 pl-md-4 pt-4 pl-md-0 pt-md-0">
-          <li><img src="/images/community/github.svg" alt="GitHub repository" loading="lazy"> <a href="https://github.com/bisq-network">{{ item.liGithub }}</a></li>
-          <li><img src="/images/community/keybase.svg" alt="Keybase team" loading="lazy"> <a href="https://keybase.io/team/bisq">{{ item.liKeybase }}</a></li>
-          <li><img src="/images/community/twitter.svg" alt="Twitter profile" loading="lazy"> <a href="https://twitter.com/bisq_network">{{ item.liTwitter }}</a></li>
-          <li><img src="/images/community/youtube.svg" alt="YouTube account" loading="lazy"> <a href="https://www.youtube.com/c/bisq-network">{{ item.liYoutube }}</a></li>
+          <li><img src="/images/community/github.svg" alt="GitHub repository" loading="lazy"> <a href="https://github.com/bisq-network">GitHub</a></li>
+          <li><img src="/images/community/keybase.svg" alt="Keybase team" loading="lazy"> <a href="https://keybase.io/team/bisq">Keybase</a></li>
+          <li><img src="/images/community/twitter.svg" alt="Twitter profile" loading="lazy"> <a href="https://twitter.com/bisq_network">Twitter</a></li>
+          <li><img src="/images/community/youtube.svg" alt="YouTube account" loading="lazy"> <a href="https://www.youtube.com/c/bisq-network">YouTube</a></li>
           <li><img src="/images/community/forum.svg" alt="Forum" loading="lazy"> <a href="https://bisq.community">{{ item.liForum }}</a></li>
-          <li><img src="/images/community/mailinglist.svg" alt="Mailing list" loading="lazy"> <a href="https://lists.bisq.network/listinfo/bisq-contrib">{{ item.liMailingList }}</a></li>
-          <li><img src="/images/community/irc.svg" alt="IRC channel" loading="lazy"> <a href="https://webchat.freenode.net/?channels=bisq">{{ item.liFreenodeIRC }}</a></li>
-          <li><img src="/images/community/reddit.svg" alt="Bisq subreddit" loading="lazy"> <a href="https://www.reddit.com/r/bisq">{{ item.liSubreddit }}</a></li>
+          <li><img src="/images/community/irc.svg" alt="IRC channel" loading="lazy"> <a href="https://webchat.freenode.net/?channels=bisq">Freenode IRC</a></li>
+          <li><img src="/images/community/reddit.svg" alt="Bisq subreddit" loading="lazy"> <a href="https://www.reddit.com/r/bisq">Reddit</a></li>
+          <li><img src="/images/community/matrix.svg" alt="matrix" loading="lazy"> <a href="https://matrix.to/#/#freenode_#bisq:matrix.org">Matrix</a></li>
+          <li><img src="/images/community/telegram.svg" alt="telegram" loading="lazy"> <a href="{% local_social_link telegram %}">Telegram</a></li>
         </ul>
       </div>
 

_plugins/custom_tag.rb

@@ -32,3 +32,28 @@ def render(context)
 end
 
 Liquid::Template.register_tag('is_current_page', IsCurrentPage)
+
+class LocalSocialLink < Liquid::Tag
+    def initialize(tag_name, channel, _tokens)
+      super
+      @channel = channel
+    end
+
+    def render(context)
+
+      # add channels here as necessary
+      channel_property = ""
+      if( @channel.strip == "telegram" )
+        channel_property = "telegram_link"
+      end
+
+      currentLang = context.environments.first["page"]["lang"]
+      for language in context.environments.first["site"]["data"]["languages"]
+        if( language["tag"] == currentLang )
+          return language[channel_property]
+        end
+      end
+    end
+  end
+
+  Liquid::Template.register_tag('local_social_link', LocalSocialLink)