From 1d8704dfdef224a2fb95834f4aee328fb53af39f Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Sat, 23 Mar 2024 15:11:43 +0100 Subject: [PATCH] Publish news, update donates and fix some issues Signed-off-by: Alexander Borsuk --- content/donate/index.md | 8 +---- content/donate/index.ru.md | 14 +++----- content/news/2022-02-02/46/index.md | 7 ++-- content/news/2024-03-20/324/index.md | 7 ++++ content/news/2024-03-20/_index.md | 5 +++ content/news/2024-03-22/325/index.md | 46 +++++++++++++++++++++++++ content/news/2024-03-22/325/index.ru.md | 46 +++++++++++++++++++++++++ content/news/2024-03-22/_index.md | 5 +++ content/news/2024-03-22/_index.ru.md | 5 +++ sass/main.scss | 21 ++++++++++- templates/shortcodes/bank_transfer.md | 18 ++++------ templates/shortcodes/references.md | 9 ++++- 12 files changed, 158 insertions(+), 33 deletions(-) create mode 100644 content/news/2024-03-20/324/index.md create mode 100644 content/news/2024-03-20/_index.md create mode 100644 content/news/2024-03-22/325/index.md create mode 100644 content/news/2024-03-22/325/index.ru.md create mode 100644 content/news/2024-03-22/_index.md create mode 100644 content/news/2024-03-22/_index.ru.md diff --git a/content/donate/index.md b/content/donate/index.md index d95d1b5f..ade14ec6 100644 --- a/content/donate/index.md +++ b/content/donate/index.md @@ -72,10 +72,4 @@ Please consider donating annually to reduce total fees. Yes! There are many ways to support Organic Maps. Please see [Support Us](@/support-us/index.md) page for more details. -[stripe]: https://donate.organicmaps.app/ "Donate" -[stripe_eur]: https://donate.organicmaps.app/?currency=eur "Donate in EUR" -[stripe_usd]: https://donate.organicmaps.app/?currency=usd "Donate in USD" -[stripe_chf]: https://donate.organicmaps.app/?currency=chf "Donate in CHF" -[stripe_gbp]: https://donate.organicmaps.app/?currency=gbp "Donate in GBP" -[stripe_uah]: https://donate.organicmaps.app/?currency=uah "Donate in UAH" -[github issues]: https://github.com/organicmaps/organicmaps/issues "GitHub Issues" +{{ references() }} \ No newline at end of file diff --git a/content/donate/index.ru.md b/content/donate/index.ru.md index 0bd58d1b..a2331282 100644 --- a/content/donate/index.ru.md +++ b/content/donate/index.ru.md @@ -1,5 +1,5 @@ --- -title: Пожертвовать и финансово поддержать проект +title: Пожертвовать и поддержать Organic Maps деньгами description: Помогите проекту финансово weight: 10 extra: @@ -7,9 +7,7 @@ extra: preview_image: donate/donate.png --- -Желаем органического нового года! - -Благодаря вашим **[пожертвованиям][stripe]**, **Organic Maps**: +Благодаря вашим **[пожертвованиям][stripe]** в **[EUR][stripe_eur]**, **[USD][stripe_usd]**, **[GBP][stripe_GBP]**, **[CHF][stripe_chf]**, **Organic Maps**: - Бесплатны для всех; - Без рекламы; @@ -65,12 +63,10 @@ Organic Maps существует исключительно благодаря - [Linux Desktop Beta (packages)](https://repology.org/project/organicmaps/versions) - Сообщайте о проблемах и предлагайте новые идеи [на GitHub][issues] или [по почте][email]; - Нарисуйте свой дом и район вокруг в [OpenStreetMap](https://openstreetmap.org); -- Помогите с [переводом](https://github.com/organicmaps/organicmaps/blob/master/docs/TRANSLATIONS.md) приложения и веб-сайта на другие языки. +- Помогите с [переводом](https://github.com/organicmaps/organicmaps/blob/master/docs/TRANSLATIONS.md) приложения и веб-сайта на другие языки; - Поучаствуйте в [разработке][contributing] приложения под Android и iOS; -- Подпишитесь на нас в [Facebook][facebook], [Twitter][twitter] и [Instagram][instagram]. +- Помогите нам с маркетингом, поддержкой пользователей, дизайном; +- Подпишитесь на нас в [Facebook][facebook], [Twitter][twitter] и [Instagram][instagram]; - Расскажите своим друзьям и знакомым. -[stripe]: https://donate.organicmaps.app/ "Donate via Stripe" -[github issues]: https://github.com/organicmaps/organicmaps/issues "GitHub Issues" - {{ references() }} diff --git a/content/news/2022-02-02/46/index.md b/content/news/2022-02-02/46/index.md index e0e421c8..25c6af72 100644 --- a/content/news/2022-02-02/46/index.md +++ b/content/news/2022-02-02/46/index.md @@ -1,8 +1,9 @@ --- -title: "We''ve created a Telegram group for Turkish users, moderated by @MetehanOzyurek" +title: "We have created a Telegram group for Turkish users, moderated by @MetehanOzyurek" date: 2022-02-02T11:26:11+00:00 -slug: "we-ve-created-a-telegram-group-for-turkish-users-moderated-by-metehanozyurek" +slug: "we-have-created-a-telegram-group-for-turkish-users-moderated-by-metehanozyurek" +aliases: ["we-ve-created-a-telegram-group-for-turkish-users-moderated-by-metehanozyurek"] --- -We've created a Telegram group for Turkish users, moderated by [@MetehanOzyurek](https://t.me/MetehanOzyurek) +We have created a Telegram group for Turkish users, moderated by [@MetehanOzyurek](https://t.me/MetehanOzyurek) Join [@OrganicMapsTR](https://t.me/OrganicMapsTR) or [use](https://t.me/OrganicMapsTR) [this](https://t.me/OrganicMapsTR) [link](https://t.me/OrganicMapsTR). diff --git a/content/news/2024-03-20/324/index.md b/content/news/2024-03-20/324/index.md new file mode 100644 index 00000000..3f8f6490 --- /dev/null +++ b/content/news/2024-03-20/324/index.md @@ -0,0 +1,7 @@ +--- +title: "Interested in seeing public transport, satellite imagery, track recording, or other features in Organic Maps?" +date: 2024-03-20T05:42:45+00:00 +slug: "interested-in-seeing-public-transport-satellite-imagery-track-recording-or-other-features-in-organic-maps-we-are-open-for-google-summer-of-code-2024-proposals-from-motivated-contributors-students-read-more-here" +--- + +Interested in seeing public transport, satellite imagery, track recording, or other features in Organic Maps? We are open for Google Summer of Code 2024 proposals from motivated contributors/students, [read more here](https://github.com/organicmaps/organicmaps/wiki/GSoC-2024-ideas) diff --git a/content/news/2024-03-20/_index.md b/content/news/2024-03-20/_index.md new file mode 100644 index 00000000..3f4976b7 --- /dev/null +++ b/content/news/2024-03-20/_index.md @@ -0,0 +1,5 @@ +--- +date: 2024-03-20 +sort_by: date +template: news/date_section.html +--- \ No newline at end of file diff --git a/content/news/2024-03-22/325/index.md b/content/news/2024-03-22/325/index.md new file mode 100644 index 00000000..8ba3dd93 --- /dev/null +++ b/content/news/2024-03-22/325/index.md @@ -0,0 +1,46 @@ +--- +title: "Let's build the best maps app together" +date: 2024-03-22T14:51:39+00:00 +slug: "lets-build-the-best-maps-app-together" +--- + +### Let's build the best Ad-Free, Open-Source, Privacy-First maps together! + +We have added additional currencies and payment methods to our [donation page](@/donate/index.md) to minimize transaction fees. + +#### Visa, MasterCard, Apple Pay, Google Pay, PayPal: + +* € 💶 [Euro EUR](https://donate.organicmaps.app/?currency=eur) +* $ 💵 [US Dollar USD](https://donate.organicmaps.app/?currency=usd) +* £ 💷 [British Pound GBP](https://donate.organicmaps.app/?currency=gbp) +* ₣ 🇨🇭 [Swiss Franc CHF](https://donate.organicmaps.app/?currency=chf) +* ₴ 🇺🇦 [Ukrainian Hryvnia UAH](https://donate.organicmaps.app/?currency=uah) + +#### S€PA 🇪🇺 bank transfer with 0% fee: + +| | | +|---|---| +SWIFT/BIC: | TRWIBEB1XXX +IBAN: | BE39 9672 0031 0319 +Bank name: | Wise +Bank address: | Rue du Trône 100, 3rd floor, Brussels, 1050, Belgium + +See other currencies [here](@/donate/index.md). + +#### Crypto: + +``` +BTC: bc1qjkq3tpy2gutsfdlcvys8slkempywk230u8rc8u +ETH: 0x1D59bBe5d4332e34116DccDE5c1a8c736E1C2810 +USDT+TRX: TNQGZwAUCpwy1cuVSyu1vc6AT19nsmWqRF +``` +See more networks [here](/donate/#crypto). + +#### Donate via [Telegram](https://t.me/OrganicMapsApp/117) + +--- + +Your donations are sponsoring the development and scaling of Organic Maps, and greatly motivate our team. +Maintaining a project with more than [one million users](@/news/2023-12-23/281/index.md) would not be possible without your support! + +Can't donate now? Check [other ways to support the project](@/support-us/index.md), or join our contributors team! diff --git a/content/news/2024-03-22/325/index.ru.md b/content/news/2024-03-22/325/index.ru.md new file mode 100644 index 00000000..f527e004 --- /dev/null +++ b/content/news/2024-03-22/325/index.ru.md @@ -0,0 +1,46 @@ +--- +Название: "Давайте вместе создадим лучшие карты для мобильных устройств!" +date: 2024-03-22T14:51:39+00:00 +slug: "lets-build-the-best-maps-app-together" +--- + +### Давайте вместе создадим удобные и быстрые карты без рекламы, с открытым исходным кодом, с защитой персональных данных! + +Мы добавили другие валюты на нашу [страницу пожертвований](@/donate/index.ru.md), чтобы минимизировать комиссию + +#### Visa, MasterCard, Apple Pay, Google Pay, PayPal: + +* € 💶 [Евро EUR](https://donate.organicmaps.app/?currency=eur) +* $ 💵 [Доллар США USD](https://donate.organicmaps.app/?currency=usd) +* £ 💷 [Британский фунт стерлингов](https://donate.organicmaps.app/?currency=gbp) +* ₣ 🇨🇭 [Швейцарский франк CHF](https://donate.organicmaps.app/?currency=chf) + +#### S€PA 🇪🇺 банковский перевод без комиссии: + +| | | +|---|---| +SWIFT/BIC: | TRWIBEB1XXX +IBAN: | BE39 9672 0031 0319 +Название банка: | Wise +Адрес банка: | Rue du Trône 100, 3 floor, Brussels, 1050, Belgium + +Переводы в других валютах доступны [здесь](https://organicmaps.app/donate/#crypto). + +#### Криптовалюты: + +``` +BTC: bc1qjkq3tpy2gutsfdlcvys8slkempywk230u8rc8u +ETH: 0x1D59bBe5d4332e34116DccDE5c1a8c736E1C2810 +USDT+TRX: TNQGZwAUCpwy1cuVSyu1vc6AT19nsmWqRF +``` + +Больше различных криптовалют [здесь](https://organicmaps.app/donate/#crypto). + +#### Пожертвования в [Telegram](https://t.me/OrganicMapsApp/117) + +--- + +Ваши пожертвования способствуют развитию и масштабированию Organic Maps, а так же сильно мотивируют нашу команду. +Без вашей поддержки мы бы не справились с более чем [миллионом пользователей](@/news/2023-12-23/281/index.md). + +Не можете пожертвовать сейчас? Посмотрите [другие способы поддержать проект](@/support-us/index.ru.md) или присоединяйтесь к нашей команде контрибьюторов! diff --git a/content/news/2024-03-22/_index.md b/content/news/2024-03-22/_index.md new file mode 100644 index 00000000..a5075d3f --- /dev/null +++ b/content/news/2024-03-22/_index.md @@ -0,0 +1,5 @@ +--- +date: 2024-03-22 +sort_by: date +template: news/date_section.html +--- \ No newline at end of file diff --git a/content/news/2024-03-22/_index.ru.md b/content/news/2024-03-22/_index.ru.md new file mode 100644 index 00000000..a5075d3f --- /dev/null +++ b/content/news/2024-03-22/_index.ru.md @@ -0,0 +1,5 @@ +--- +date: 2024-03-22 +sort_by: date +template: news/date_section.html +--- \ No newline at end of file diff --git a/sass/main.scss b/sass/main.scss index e5178a58..2557bbd2 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -23,7 +23,8 @@ body { } code { - color: red; + font-family: monospace; + font-size: smaller; } code, @@ -32,6 +33,20 @@ a { word-wrap: anywhere; } +p > code, li > code, dd > code, td > code { + background: #dddddd; + word-wrap: break-word; + box-decoration-break: clone; + padding: .1rem .3rem .2rem; + border-radius: .2rem; +} + +@media (prefers-color-scheme: dark) { + p > code, li > code, dd > code, td > code { + background: #333330; + } +} + header { text-align: center; } @@ -116,6 +131,10 @@ p { margin: 0 0 16px; } +ul { + padding-left: 20px; +} + footer { padding-top: 1rem; border-top: 1px solid #eaecef; diff --git a/templates/shortcodes/bank_transfer.md b/templates/shortcodes/bank_transfer.md index d1cda06c..0c894013 100644 --- a/templates/shortcodes/bank_transfer.md +++ b/templates/shortcodes/bank_transfer.md @@ -10,33 +10,27 @@ Payment description: | Donation SWIFT/BIC: | TRWIBEB1XXX IBAN: | BE39 9672 0031 0319 Bank name: | Wise -Bank address: | Avenue Louise 54/S52, Brussels 1050, Belgium +Bank address: | Rue du Trône 100, 3rd floor, Brussels, 1050, Belgium #### USD, United States Dollar $ | | | |---|---| -Wise's Address: | 30 W. 26th Street, Sixth Floor, New York NY 10010, United States Receiving fee: | $4.14 -| | ***Inside the US*** -Routing number: | 084009519 -Account number: | 9600010051232425 -Bank address: | 6070 Poplar Ave suite 200, Memphis TN 38119, United States -| | ***Outside the US*** -SWIFT/BIC: | CMFGUS33 +Bank Address: | 30 W. 26th Street, Sixth Floor, New York NY 10010, United States +AHC/Wire Routing number: | 026073150 Account number: | 8312564881 -Bank address: | 89-16 Jamaica Ave, Woodhaven NY 11421, United States +Account type: | Checking +SWIFT/BIC: | CMFGUS33 #### GBP, British Pound £ | | | |---|---| -Bank address: | 56 Shoreditch High Street, London, E1 6JJ, United Kingdom IBAN: | GB97 TRWI 2314 7092 7851 63 -| | ***Inside the UK*** +Bank address: | 56 Shoreditch High Street, London, E1 6JJ, United Kingdom Sort code: | 23-14-70 Account number: | 92785163 -| | ***Outside the UK*** SWIFT/BIC: | TRWIGB2L #### Turkish lira (TL, TRY) diff --git a/templates/shortcodes/references.md b/templates/shortcodes/references.md index e8fd4fdc..a45c2c94 100644 --- a/templates/shortcodes/references.md +++ b/templates/shortcodes/references.md @@ -7,12 +7,13 @@ [exodus]: https://reports.exodus-privacy.eu.org/en/reports/app.organicmaps/latest/ [trackercontrol]: https://ios.trackercontrol.org/analysis/app.organicmaps [facebook]: https://facebook.com/OrganicMaps -[fdroid]: https://f-droid.org/{{ lang | truncate(length=2) }}/packages/app.organicmaps/ "{{ trans(key='install-fdroid', lang=lang) }}" +[fdroid]: https://f-droid.org/{{ lang | truncate(length=2, end="") }}/packages/app.organicmaps/ "{{ trans(key='install-fdroid', lang=lang) }}" [firebase]: https://appdistribution.firebase.dev/i/2f0fee463107b137 [flatpak]: https://flathub.org/apps/details/app.organicmaps.desktop [FOSStodon]: https://fosstodon.org/@organicmaps "FOSStodon" [github]: https://github.com/organicmaps/organicmaps [googleplay]: https://play.google.com/store/apps/details?id=app.organicmaps&hl={{ lang }} "{{ trans(key='install-googleplay', lang=lang) }}" +[github issues]: https://github.com/organicmaps/organicmaps/issues "GitHub Issues" [googleplay_review]: market://details?id=app.organicmaps [gpx_issue]: https://github.com/organicmaps/organicmaps/issues/624 [ideas]: https://github.com/organicmaps/organicmaps/discussions/categories/ideas @@ -29,6 +30,12 @@ [public_transport_validator]: https://cdn.organicmaps.app/subway/ [reddit]: https://www.reddit.com/r/organicmaps/ [repology]: https://repology.org/project/organicmaps/versions +[stripe]: https://donate.organicmaps.app/ "Donate" +[stripe_eur]: https://donate.organicmaps.app/?currency=eur "Donate in EUR" +[stripe_usd]: https://donate.organicmaps.app/?currency=usd "Donate in USD" +[stripe_chf]: https://donate.organicmaps.app/?currency=chf "Donate in CHF" +[stripe_gbp]: https://donate.organicmaps.app/?currency=gbp "Donate in GBP" +[stripe_uah]: https://donate.organicmaps.app/?currency=uah "Donate in UAH" [telegram]: https://t.me/OrganicMapsApp [telegram_chat]: https://t.me/OrganicMaps [telegram_chat_ru]: https://t.me/OrganicMapsRu