From 5d5b7852a2dd27ebaa7ed1b9bc263463045f305c Mon Sep 17 00:00:00 2001 From: m52go Date: Wed, 2 Sep 2020 16:08:03 -0400 Subject: [PATCH 1/6] Add telegram as language property It's currently the only social channel that differs among languages. --- _data/languages.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/_data/languages.yml b/_data/languages.yml index 2dd8f143..ae5effa1 100644 --- a/_data/languages.yml +++ b/_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: "Update this before merging" - site_desc: "Update this before merging" \ No newline at end of file + site_desc: "Update this before merging" + telegram_link: https://t.me/bisq_p2p From b9f2641740e33ecca2b7726016ba94ecca57ed07 Mon Sep 17 00:00:00 2001 From: m52go Date: Wed, 2 Sep 2020 16:09:40 -0400 Subject: [PATCH 2/6] Remove contrib mailing list from social channels It's not really something we want most users signing up for. --- _includes/footer.html | 1 - _layouts/page_home.html | 1 - 2 files changed, 2 deletions(-) diff --git a/_includes/footer.html b/_includes/footer.html index d3a1a87a..1a992210 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -72,7 +72,6 @@
{{ item.joinBisq }}
youtube keybase forum - mailinglist irc reddit diff --git a/_layouts/page_home.html b/_layouts/page_home.html index bb195eae..d5a78828 100644 --- a/_layouts/page_home.html +++ b/_layouts/page_home.html @@ -269,7 +269,6 @@

{{ item.hJoin }}

  • Twitter profile {{ item.liTwitter }}
  • YouTube account {{ item.liYoutube }}
  • Forum {{ item.liForum }}
    • -
  • Mailing list {{ item.liMailingList }}
  • IRC channel {{ item.liFreenodeIRC }}
  • Bisq subreddit {{ item.liSubreddit }}
    • From ce60da7a8b7ee776ff7c8908e0557a034902b3ba Mon Sep 17 00:00:00 2001 From: m52go Date: Wed, 2 Sep 2020 18:35:26 -0400 Subject: [PATCH 3/6] Add matrix and telegram to footer and community --- _data/en.yml | 9 +-- _includes/footer.html | 8 +++ _layouts/page_home.html | 20 +++++-- images/community/matrix.svg | 14 +++++ images/community/matrix_w.svg | 57 +++++++++++++++++++ images/community/telegram.svg | 98 +++++++++++++++++++++++---------- images/community/telegram_w.svg | 93 +++++++++++++++++++++++++++++++ 7 files changed, 256 insertions(+), 43 deletions(-) create mode 100644 images/community/matrix.svg create mode 100644 images/community/matrix_w.svg create mode 100644 images/community/telegram_w.svg diff --git a/_data/en.yml b/_data/en.yml index 080b63b9..3f3f81f3 100644 --- a/_data/en.yml +++ b/_data/en.yml @@ -64,14 +64,7 @@ homepage_content: hJoin: Join the Community pJoin: >

    Bisq is always looking for highly-skilled developers, designers and security experts to join our community. If you’re interested in helping make Bisq better, there are many ways to contribute. We’d love to hear from you!

    - 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 diff --git a/_includes/footer.html b/_includes/footer.html index 1a992210..9eaaa6df 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -74,6 +74,14 @@
    {{ item.joinBisq }}
    forum irc reddit + matrix + {% for language in site.data.languages %} + {% if language.tag == page.lang %} + {% assign current_lang = language %} + {% break %} + {% endif %} + {% endfor %} + telegram diff --git a/_layouts/page_home.html b/_layouts/page_home.html index d5a78828..fed13649 100644 --- a/_layouts/page_home.html +++ b/_layouts/page_home.html @@ -264,13 +264,21 @@

    {{ item.hJoin }}

    diff --git a/images/community/matrix.svg b/images/community/matrix.svg new file mode 100644 index 00000000..bb8278ae --- /dev/null +++ b/images/community/matrix.svg @@ -0,0 +1,14 @@ + + + + + + + diff --git a/images/community/matrix_w.svg b/images/community/matrix_w.svg new file mode 100644 index 00000000..d1660b1e --- /dev/null +++ b/images/community/matrix_w.svg @@ -0,0 +1,57 @@ + + + +image/svg+xml + + + + \ No newline at end of file diff --git a/images/community/telegram.svg b/images/community/telegram.svg index eec23ec8..abec213f 100644 --- a/images/community/telegram.svg +++ b/images/community/telegram.svg @@ -5,49 +5,89 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - id="svg15" - viewBox="0 0 240 240" - version="1.1"> + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="1000px" + height="1000px" + viewBox="0 0 1000 1000" + version="1.1" + id="svg16" + sodipodi:docname="telegram.svg" + inkscape:version="0.92.5 (0.92.5+69)"> + id="metadata20"> image/svg+xml - + Artboard + + + Artboard + Created with Sketch. + id="defs11"> + x1="50%" + y1="0%" + x2="50%" + y2="99.2583404%" + id="linearGradient-1"> + stop-color="#2AABEE" + offset="0%" + id="stop6" /> + stop-color="#229ED9" + offset="100%" + id="stop8" /> - - + + + + diff --git a/images/community/telegram_w.svg b/images/community/telegram_w.svg new file mode 100644 index 00000000..691540b6 --- /dev/null +++ b/images/community/telegram_w.svg @@ -0,0 +1,93 @@ + + + + + + image/svg+xml + + Artboard + + + + + + Artboard + Created with Sketch. + + + + + + + + + + + From d00281ae28080918f1a933e040c5ff72d656119c Mon Sep 17 00:00:00 2001 From: m52go Date: Wed, 2 Sep 2020 19:28:08 -0400 Subject: [PATCH 4/6] Add custom tag for language-specific social links --- _includes/footer.html | 8 +------- _layouts/page_home.html | 8 +------- _plugins/custom_tag.rb | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/_includes/footer.html b/_includes/footer.html index 9eaaa6df..2ba4d024 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -75,13 +75,7 @@
    {{ item.joinBisq }}
    irc reddit matrix - {% for language in site.data.languages %} - {% if language.tag == page.lang %} - {% assign current_lang = language %} - {% break %} - {% endif %} - {% endfor %} - telegram + telegram diff --git a/_layouts/page_home.html b/_layouts/page_home.html index fed13649..78408e07 100644 --- a/_layouts/page_home.html +++ b/_layouts/page_home.html @@ -272,13 +272,7 @@

    {{ item.hJoin }}

  • IRC channel Freenode IRC
  • Bisq subreddit Reddit
  • matrix Matrix
    • - {% for language in site.data.languages %} - {% if language.tag == page.lang %} - {% assign current_lang = language %} - {% break %} - {% endif %} - {% endfor %} -
  • telegram Telegram
    • +
  • telegram Telegram
    • diff --git a/_plugins/custom_tag.rb b/_plugins/custom_tag.rb index d11fcf6a..235adfd6 100644 --- a/_plugins/custom_tag.rb +++ b/_plugins/custom_tag.rb @@ -32,3 +32,21 @@ def render(context) end Liquid::Template.register_tag('is_current_page', IsCurrentPage) + +class LocalSocialLink < Liquid::Tag + def initialize(tag_name, dest, _tokens) + super + @dest = dest + end + + def render(context) + currentLang = context.environments.first["page"]["lang"] + for language in context.environments.first["site"]["data"]["languages"] + if( language["tag"] == currentLang ) + return language["telegram_link"] + end + end + end + end + + Liquid::Template.register_tag('local_social_link', LocalSocialLink) From 0ff998295d31261b6951c58bd6cfa807217777f0 Mon Sep 17 00:00:00 2001 From: m52go Date: Wed, 2 Sep 2020 19:36:45 -0400 Subject: [PATCH 5/6] Expand LocalSocialLink beyond telegram So new region-specific social channels can be added easily. --- _plugins/custom_tag.rb | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/_plugins/custom_tag.rb b/_plugins/custom_tag.rb index 235adfd6..899b6113 100644 --- a/_plugins/custom_tag.rb +++ b/_plugins/custom_tag.rb @@ -34,16 +34,23 @@ def render(context) Liquid::Template.register_tag('is_current_page', IsCurrentPage) class LocalSocialLink < Liquid::Tag - def initialize(tag_name, dest, _tokens) + def initialize(tag_name, channel, _tokens) super - @dest = dest + @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["telegram_link"] + return language[channel_property] end end end From d9f5c62db53adeaec459c6b86d66917835b65508 Mon Sep 17 00:00:00 2001 From: m52go Date: Wed, 2 Sep 2020 19:47:41 -0400 Subject: [PATCH 6/6] Change "join bisq" message in footer Changed it to "join community" since that seemed more appropriate. Did it for all languages since it's a string we already had. --- _data/de.yml | 2 +- _data/en.yml | 2 +- _data/es.yml | 2 +- _data/fr.yml | 2 +- _data/ja.yml | 2 +- _data/pt-BR.yml | 2 +- _data/pt-PT.yml | 2 +- _data/ru.yml | 2 +- _data/zh-CN.yml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/_data/de.yml b/_data/de.yml index 28a26f0f..6c4d1187 100644 --- a/_data/de.yml +++ b/_data/de.yml @@ -18,7 +18,7 @@ footer: liRoadmap: Roadmap liContribute: Mitarbeiten liMarketData: Marktdaten API - joinBisq: Bisq nutzen + joinBisq: Treten Sie der Community bei homepage_content: title: "Exchange, Dezentralisiert." diff --git a/_data/en.yml b/_data/en.yml index 3f3f81f3..7e965e76 100644 --- a/_data/en.yml +++ b/_data/en.yml @@ -18,7 +18,7 @@ footer: liRoadmap: Roadmap liContribute: Contribute liMarketData: Market Data API - joinBisq: Join Bisq + joinBisq: Join the Community homepage_content: title: "Exchange, Decentralized." diff --git a/_data/es.yml b/_data/es.yml index 5b9426d3..fd83f8b9 100644 --- a/_data/es.yml +++ b/_data/es.yml @@ -18,7 +18,7 @@ footer: liRoadmap: Hoja de ruta liContribute: Contribuir liMarketData: API de datos de mercado - joinBisq: Unirse a Bisq + joinBisq: Unirse a la comunidad homepage_content: title: "Exchange, Descentralizado." diff --git a/_data/fr.yml b/_data/fr.yml index c79b8739..a89a8beb 100644 --- a/_data/fr.yml +++ b/_data/fr.yml @@ -18,7 +18,7 @@ footer: liRoadmap: Feuille de route liContribute: Contribuer liMarketData: API pour les données du marché - joinBisq: Rejoindre Bisq + joinBisq: Rejoignez la communauté homepage_content: title: "Plateforme d'échange, Décentralisée." diff --git a/_data/ja.yml b/_data/ja.yml index 6fd0bd19..2575661d 100644 --- a/_data/ja.yml +++ b/_data/ja.yml @@ -18,7 +18,7 @@ footer: liRoadmap: ロードマップ liContribute: 貢献 liMarketData: 市場データAPI - joinBisq: Bisqに参加 + joinBisq: コミュニティに参加 homepage_content: title: "取引所、非中央集権化された" diff --git a/_data/pt-BR.yml b/_data/pt-BR.yml index 6620a467..0589e588 100644 --- a/_data/pt-BR.yml +++ b/_data/pt-BR.yml @@ -18,7 +18,7 @@ footer: liRoadmap: Plano liContribute: Contribuir liMarketData: API de dados de mercado - joinBisq: Junte-se à Bisq + joinBisq: Junte-se à Comunidade homepage_content: title: "Exchange, Descentralizada." diff --git a/_data/pt-PT.yml b/_data/pt-PT.yml index d492c2d6..9189d159 100644 --- a/_data/pt-PT.yml +++ b/_data/pt-PT.yml @@ -18,7 +18,7 @@ footer: liRoadmap: Roadmap liContribute: Contribuir liMarketData: API de Informação de Mercado - joinBisq: Juntar-se ao Bisq + joinBisq: Junte-se à Comunidade homepage_content: title: "Exchange, Descentralizada." diff --git a/_data/ru.yml b/_data/ru.yml index 5a109a08..0a41c88f 100644 --- a/_data/ru.yml +++ b/_data/ru.yml @@ -18,7 +18,7 @@ footer: liRoadmap: Дорожная карта liContribute: Стать участником проекта liMarketData: API для доступа к рыночным данным - joinBisq: Следить за Bisq + joinBisq: Присоединяйтесь к сообществу homepage_content: title: "Децентрализованная биржа." diff --git a/_data/zh-CN.yml b/_data/zh-CN.yml index 2d2a14f8..84a938d1 100644 --- a/_data/zh-CN.yml +++ b/_data/zh-CN.yml @@ -18,7 +18,7 @@ footer: liRoadmap: 计划 liContribute: 贡献 liMarketData: 市场数据 API - joinBisq: 加入 Bisq + joinBisq: 加入社区 homepage_content: title: "交易、去中心化。"