Merge pull request #1885 from rust-lang/master

Manishearth · web-flow · commit 0c741d6d75f7 · 2023-10-27T10:42:46.000-07:00
Deploy
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/locales/de/common.ftl b/locales/de/common.ftl
@@ -7,6 +7,7 @@ why-rust = Warum Rust?
 production-use = Im Einsatz
 learn-more = Mehr lesen
 discord = Discord
+mastodon = Mastodon
 
 ## components/layout.hbs
 
diff --git a/locales/en-US/common.ftl b/locales/en-US/common.ftl
@@ -10,6 +10,7 @@ production-use = Production use
 learn-more = Learn More
 discord = Discord
 zulip = Zulip
+mastodon = Mastodon
 
 ## components/panels/domain.hbs
 
diff --git a/locales/en-US/community.ftl b/locales/en-US/community.ftl
@@ -37,7 +37,6 @@ community-meetup-header = Find a local meetup or conference
 community-meetup = There are more than 90 Meetups and several conferences worldwide in over 35 countries. Rustaceans meet periodically in Rust User Groups. They are a great introduction to the community and a great way to learn and socialize with other people with a similar interest. Meetings are usually informal and open to everyone.
 community-calendar = View Calendar
 community-conference-lineup = Check out the 2020 Conference Lineup
-community-timetill-cta = See conference lineup on timetill.rs
 
 community-event-run-header = Run your own event
 community-event-run =
diff --git a/locales/es/common.ftl b/locales/es/common.ftl
@@ -8,6 +8,7 @@ production-use = Uso en producción
 learn-more = Saber más
 discord = Discord
 zulip = Zulip
+mastodon = Mastodon
 
 ## components/panels/domain.hbs
 
diff --git a/locales/es/community.ftl b/locales/es/community.ftl
@@ -36,7 +36,6 @@ community-meetup-header = Encuentra un meetup o una conferencia local
 community-meetup = Hay más de 90 Meetups y numerosas conferencias repartidas en más de 35 países. Los Rustáceos se reúnen periódicamente en los Grupos de Usuarios de Rust. Esos grupos son un modo perfecto de introducirte en la comunidad y una gran forma de socializar con otras personas con intereses similares. Las reuniones son generalmente informales y abiertas a todo el mundo.
 community-calendar = Ver el calendario
 community-conference-lineup = Consultar el programa de conferencias de 2020
-community-timetill-cta = Ver los ponentes de la conferencia en timetill.rs
 community-event-run-header = Organizar tu propio evento
 community-event-run =
     <p>
diff --git a/locales/fa/common.ftl b/locales/fa/common.ftl
@@ -5,6 +5,7 @@ get-started-exclamation = شروع کنید!
 why-rust = چرا Rust؟
 learn-more = یادگیری بیشتر
 discord = دیسکورد
+mastodon = Mastodon
 
 ## components/panels/domain.hbs
 
diff --git a/locales/fr/common.ftl b/locales/fr/common.ftl
@@ -8,6 +8,7 @@ production-use = Utilisation en production
 learn-more = En savoir plus
 discord = Discord
 zulip = Zulip
+mastodon = Mastodon
 
 ## components/panels/domain.hbs
 
diff --git a/locales/fr/community.ftl b/locales/fr/community.ftl
@@ -23,7 +23,6 @@ community-meetup-header = Trouver une rencontre locale ou une conférence
 community-meetup = Il y a plus de 90 rencontres et plusieurs conférences de part le monde sur plus de 35 pays. Les Rustacés se rencontrent périodiquement dans les groupes d’utilisateurs Rust. Ce sont d'excellents moyens d'entrer dans la communauté et un excellent moyen d'apprendre et de socialiser avec des gens avec un intérêt commun. Les rencontres sont généralement informelles et ouvertes à tous.
 community-calendar = Voir le calendrier
 community-conference-lineup = Consulter le programme des conférences 2020
-community-timetill-cta = Voir le programme de la conférence sur timetill.rs
 community-event-run-header = Organisez votre propre évènement
 community-event-run =
     <p>
diff --git a/locales/it/common.ftl b/locales/it/common.ftl
@@ -8,6 +8,7 @@ production-use = Uso in produzione
 learn-more = Scopri di più
 discord = Discord
 zulip = Zulip
+mastodon = Mastodon
 
 ## components/panels/domain.hbs
 
diff --git a/locales/it/community.ftl b/locales/it/community.ftl
@@ -23,7 +23,6 @@ community-meetup-header = Cerca una conferenza o un meetup locale
 community-meetup = Ci sono oltre 90 Meetup e numerose conferenze sparse in 35 paesi di tutto il mondo. I "Rustacean" si incontrano periodicamente negli Rust User Group. I Rust User Group sono un modo perfetto per presentarsi alla community ed ancora meglio se si vuole imparare o anche solo socializzare con persone che condividono i propri interessi. Gli incontri sono solitamente eventi informali e aperti a tutti.
 community-calendar = Vai al Calendario
 community-conference-lineup = Guarda dove si terranno le conferenze nel 2020
-community-timetill-cta = Vai alla lista delle conference su timetill.rs
 community-event-run-header = Organizza il tuo evento
 community-event-run =
     <p>
diff --git a/locales/ja/common.ftl b/locales/ja/common.ftl
@@ -8,6 +8,7 @@ production-use = 本番環境での利用
 learn-more = もっと読む
 discord = Discord
 zulip = Zulip
+mastodon = Mastodon
 
 ## components/panels/domain.hbs
 
diff --git a/locales/ja/community.ftl b/locales/ja/community.ftl
@@ -23,7 +23,6 @@ community-meetup-header = 近くのミートアップやカンファレンスを
 community-meetup = 世界35カ国以上で、90以上のミートアップや様々なカンファレンスが開催されており、RustaceansはRustユーザグループに定期的に集まります。それらはコミュニティへの導入として優れていて、関心の近い人々と学び交流することができる素晴らしい機会です。ミーティングは堅苦しいものではなく、誰にでも開かれています。
 community-calendar = カレンダーを見る
 community-conference-lineup = 2020年のカンファレンス一覧を確認する
-community-timetill-cta = timetill.rsでカンファレンス一覧を見る
 community-event-run-header = イベントを開催する
 community-event-run =
     <p>
diff --git a/locales/ko/common.ftl b/locales/ko/common.ftl
@@ -8,6 +8,7 @@ production-use = 실사용
 learn-more = 더 알아보기
 discord = Discord
 zulip = Zulip
+mastodon = Mastodon
 
 ## components/panels/domain.hbs
 
diff --git a/locales/ko/community.ftl b/locales/ko/community.ftl
@@ -15,7 +15,6 @@ community-teams-learn = 팀 더 알아보기
 community-events-header = 행사
 community-calendar = 일정표 보기
 community-conference-lineup = 2020 컴퍼런스 라인업 살펴보기
-community-timetill-cta = timetill.rs에서 컨퍼런스 라인업 살펴보기
 community-event-register = 행사 등록하기
 community-rustfest-alt = Rustfest 참가자
 community-rustbridge-header = Rustbridge
diff --git a/locales/pl/common.ftl b/locales/pl/common.ftl
@@ -8,6 +8,7 @@ production-use = Użycie w produkcji
 learn-more = Dowiedz się więcej
 discord = Discord
 zulip = Zulip
+mastodon = Mastodon
 
 ## components/panels/domain.hbs
 
diff --git a/locales/pl/community.ftl b/locales/pl/community.ftl
@@ -31,7 +31,6 @@ community-meetup-header = Znajdź lokalne spotkanie lub konferencję
 community-meetup = Na tą chwilę na całym świecie organizowanych jest ponad 90 spotkań oraz kilka większych konferencji, mających miejsce w ponad 35 różnych krajach. Rustianie spotykają się ze sobą regularnie w ramach Grup Użytkowników Rusta. Grupy te są znakomitym sposobem na wdrożenie się w społeczność oraz świetną okazją do nauki oraz spędzania czasu z ludźmi o podobnych zainteresowaniach. Spotkania są zwykle nieformalne i otwarte dla wszystkich.
 community-calendar = Zobacz kalendarz
 community-conference-lineup = Zobacz Listę Konferencji na rok 2020
-community-timetill-cta = Zobacz listę konferencji na timetill.rs
 community-event-run-header = Zorganizuj własne wydarzenie
 community-event-run =
     <p>
diff --git a/locales/pt-BR/common.ftl b/locales/pt-BR/common.ftl
@@ -8,6 +8,7 @@ production-use = Uso em produção
 learn-more = Aprenda mais
 discord = Discord
 zulip = Zulip
+mastodon = Mastodon
 
 ## components/panels/domain.hbs
 
diff --git a/locales/pt-BR/community.ftl b/locales/pt-BR/community.ftl
@@ -36,7 +36,6 @@ community-meetup =
     Rustaceans se encontram periodicamente em Encontros de Grupos Usuários. Essa é uma ótima introdução a comunidade, e um ótimo jeito de aprender e socializar com outras pessoas de interesses similares. Encontros locais geralmente são informais e aberto a todas as pessoas.
 community-calendar = Vejo o Calendário
 community-conference-lineup = Confira as apresentações da conferência de 2020
-community-timetill-cta = Veja a lista de conferências em timetill.rs
 community-event-run-header = Faça seu próprio evento
 community-event-run =
     <p>
diff --git a/locales/ru/common.ftl b/locales/ru/common.ftl
@@ -8,6 +8,7 @@ production-use = Промышленное использование
 learn-more = Узнать больше
 discord = Discord
 zulip = Zulip
+mastodon = Mastodon
 
 ## components/panels/domain.hbs
 
diff --git a/locales/ru/community.ftl b/locales/ru/community.ftl
@@ -23,7 +23,6 @@ community-meetup-header = Найти встречу или конференци
 community-meetup = Более чем в 35 странах проводится более 90 митапов и несколько конференций. Rustaceans периодически встречаются в Rust User Group. Они являются отличным местом для входа в сообщество и отличным способом учиться и общаться с другими людьми со схожими интересами. Встречи обычно неформальные и открыты для всех.
 community-calendar = Посмотреть календарь
 community-conference-lineup = Программа конференций на 2020 год
-community-timetill-cta = Смотрите состав конференции на timetill.rs
 community-event-run-header = Запустите своё мероприятие
 community-event-run =
     <p>
diff --git a/locales/tr/common.ftl b/locales/tr/common.ftl
@@ -7,6 +7,7 @@ why-rust = Neden Rust?
 production-use = Üretimde kullanım
 learn-more = Daha fazla bilgi edinin
 discord = Discord
+mastodon = Mastodon
 
 ## components/panels/domain.hbs
 
diff --git a/locales/tr/community.ftl b/locales/tr/community.ftl
@@ -20,7 +20,6 @@ community-meetup-header = Yerel bir buluşma veya konferans bulun
 community-meetup = Dünya üzerinde 35'ten fazla ülkede çeşitli konferanslar ve 90'ın üzerinde buluşma düzenleniyor. Rustaceanlar, Rust Kullanıcı Grupları'nda belirli aralıklarla buluşuyor. Bu buluşmalar, benzer ilgi alanlarına sahip insanlarla buluşmak için harika bir yöntem olmakla birlikte Rust topluluğuna girmek için de mükemmel bir yöntem. Buluşmalar çoğunlukla samimi bir ortamda gerçekleşmekle birlikte herkese açıktır.
 community-calendar = Takvimi Göster
 community-conference-lineup = 2020 Konferans Programına Göz Atın
-community-timetill-cta = timetill.rs üzerinden konferans programına bakın
 community-event-run-header = Kendi etkinliğinizi düzenleyin
 community-event-run =
     <p>
diff --git a/locales/xx-AU/common.ftl b/locales/xx-AU/common.ftl
@@ -1,6 +1,7 @@
 # Translations that appear on most/all pages
 
 rust = ʇsnɹ
+mastodon = Mastodon
 
 # components/nav.hbs
 nav-install = llɐʇsuI
diff --git a/locales/zh-CN/common.ftl b/locales/zh-CN/common.ftl
@@ -8,6 +8,7 @@ production-use = 产品应用
 learn-more = 了解更多
 discord = Discord
 zulip = Zulip
+mastodon = Mastodon
 
 ## components/panels/domain.hbs
 
diff --git a/locales/zh-CN/community.ftl b/locales/zh-CN/community.ftl
@@ -23,7 +23,6 @@ community-meetup-header = 参与线下聚会或会议
 community-meetup = 我们有超过 90 个聚会和几个世界级的会议，遍布 35 个国家。Rust 爱好者会在 Rust 用户论坛定期举办聚会。它们是您进入 Rust 社区的最佳入口，也是一个和相同爱好者进行学习和交流的绝佳途径。聚会对每个人来说都会带来丰富和开放的信息。
 community-calendar = 查看日程
 community-conference-lineup = 查看 2020 会议阵容
-community-timetill-cta = 在 timetil.rs 上查看会议阵容
 community-event-run-header = 举办您的活动
 community-event-run =
     <p>
diff --git a/locales/zh-TW/common.ftl b/locales/zh-TW/common.ftl
@@ -8,6 +8,7 @@ production-use = 產品應用
 learn-more = 了解更多
 discord = Discord
 zulip = Zulip
+mastodon = Mastodon
 
 ## components/panels/domain.hbs
 
diff --git a/locales/zh-TW/community.ftl b/locales/zh-TW/community.ftl
@@ -23,7 +23,6 @@ community-meetup-header = 各地聚會或研討會
 community-meetup = 在全球超過 35 個國家有超過 90 個聚會與數個研討會。Rust 愛好者們(Rustaceans) 會定期在 Rust 使用者群組聚會。這些活動可以幫助您進入社群、學習還有和同好交流，聚會通常是非正式的開放活動。
 community-calendar = 查看行事曆
 community-conference-lineup = 2020 研討會時間表
-community-timetill-cta = 在 timetill.rs 上查看研討會時間表
 community-event-run-header = 自己辦活動！
 community-event-run = 隨著 Rust 的發展，我們樂於幫忙大家推動自己的地區性活動。從學習、實作、駭客、聚會以至研討會，Rust 活動團隊都已準備好為您提供支援。
 community-events-repo = 活動團隊 Repo
diff --git a/static/images/mastodon.svg b/static/images/mastodon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" image-rendering="optimizeQuality" fill-rule="evenodd" clip-rule="evenodd" viewBox="0 0 480 511.475"><path fill="#fff" fill-rule="nonzero" d="M478.065 113.237c-7.393-54.954-55.29-98.266-112.072-106.656C356.413 5.162 320.121 0 236.043 0h-.626c-84.099 0-102.141 5.162-111.72 6.581C68.498 14.738 18.089 53.653 5.859 109.26c-5.882 27.384-6.51 57.747-5.416 85.594C2 234.794 2.302 274.662 5.93 314.438a562.647 562.647 0 0013.09 78.437c11.625 47.653 58.686 87.311 104.793 103.494a281.07 281.07 0 00153.315 8.09 223.879 223.879 0 0016.578-4.533c12.368-3.929 26.855-8.323 37.507-16.043a1.198 1.198 0 00.486-.928v-38.544a1.12 1.12 0 00-.437-.879 1.134 1.134 0 00-.957-.215 424.764 424.764 0 01-99.49 11.626c-57.665 0-73.172-27.361-77.611-38.75a120.008 120.008 0 01-6.745-30.549 1.048 1.048 0 01.094-.51c.07-.161.178-.304.317-.415a1.094 1.094 0 01.982-.213 417.004 417.004 0 0097.865 11.624c7.927 0 15.834 0 23.761-.213 33.156-.928 68.105-2.625 100.722-8.997.816-.16 1.63-.301 2.327-.508 51.455-9.883 100.423-40.894 105.397-119.421.184-3.092.652-32.382.652-35.588.021-10.904 3.509-77.344-.511-118.166zm-82.796 61.744V311.51h-54.104V179.003c0-27.897-11.627-42.126-35.273-42.126-25.998 0-39.018 16.834-39.018 50.073v72.534h-53.776V186.95c0-33.239-13.045-50.073-39.04-50.073-23.507 0-35.249 14.229-35.249 42.126V311.51H84.73V174.981c0-27.896 7.121-50.059 21.366-66.488 14.693-16.388 33.969-24.805 57.893-24.805 27.692 0 48.618 10.648 62.569 31.919l13.464 22.597 13.485-22.597c13.95-21.271 34.876-31.919 62.52-31.919 23.903 0 43.177 8.417 57.919 24.805 14.231 16.413 21.337 38.576 21.323 66.488z"/></svg>
diff --git a/static/images/twitter.svg b/static/images/twitter.svg
@@ -1 +1 @@
-<svg enable-background="new 0 0 512 512" sstroke="#fff" fill="#fff" height="512" viewBox="0 0 512 512" width="512" xmlns="http://www.w3.org/2000/svg"><path d="M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z"/></svg>
+<svg enable-background="new 0 0 512 512" stroke="#fff" fill="#fff" height="512" viewBox="0 0 512 512" width="512" xmlns="http://www.w3.org/2000/svg"><path d="M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z"/></svg>
diff --git a/templates/community/index.html.hbs b/templates/community/index.html.hbs
@@ -157,11 +157,6 @@
             <a href="https://blog.rust-lang.org/2020/01/31/conf-lineup.html"
               class="button button-secondary">{{fluent "community-conference-lineup"}}</a>
           </li>
-          <li class="mb3">
-            <a href="https://timetill.rs"
-              target="_blank"
-              class="button button-secondary">{{fluent "community-timetill-cta"}}</a>
-          </li>
         </ul>
       </div>
       <div class="mw-50-l mh3-l pt4 pt0-l flex flex-column justify-between" id="conferences">
diff --git a/templates/components/footer.html.hbs b/templates/components/footer.html.hbs
@@ -31,6 +31,7 @@
       <div class="flex flex-column mw8 w-100 measure-wide-l pv2 pv5-m pv2-ns ph4-m ph4-l">
         <h4>{{fluent "footer-social"}}</h4>
         <div class="flex flex-row flex-wrap items-center">
+          <a rel="me" href="https://social.rust-lang.org/@rust" target="_blank"><img src="/static/images/mastodon.svg" alt="{{fluent "mastodon"}}" title="{{fluent "mastodon"}}" /></a>
           <a href="https://twitter.com/rustlang" target="_blank"><img src="/static/images/twitter.svg" alt="twitter logo" title="{{fluent "footer-youtube-alt"}}"/></a>
           <a href="https://www.youtube.com/channel/UCaYhcUwRBNscFNUKTjgPFiA" target="_blank"><img class="pv2" src="/static/images/youtube.svg" alt="{{fluent "footer-alt-youtube"}}" title="YouTube"/></a>
           <a href="https://discord.gg/rust-lang" target="_blank"><img src="/static/images/discord.svg" alt="discord logo" title="{{fluent "footer-discord-alt"}}"/></a>
