Merge branch 'rust-lang:main' into main

Author: TC999

locales/en-US/governance.ftl

@@ -36,8 +36,8 @@ governance-alumni-thanks = We also want to thank all past members for their inva
 
 ## governance/all-team-members.hbs
 governance-all-team-members-title = All Rust team members
-governance-all-team-members-intro = This section lists the members of currently active Rust teams.
-governance-all-team-members-alumni-intro = This section lists our team alumni.
+governance-all-team-members-intro = This section lists the { $count } members of currently active Rust teams.
+governance-all-team-members-alumni-intro = This section lists our { $count } team alumni.
 
 ## govenance/person.hbs
 governance-person-title = Rust Project team member

src/redirect.rs

@@ -39,6 +39,7 @@ pub static PAGE_REDIRECTS: &[(&str, &str)] = &[
     // miscellaneous
     ("governance/teams", "governance#teams"),
     ("governance/wgs", "governance#working-groups"),
+    ("governance/all-team-members.html", "governance/people"),
 ];
 
 pub static STATIC_FILES_REDIRECTS: &[(&str, &str)] = &[

src/render.rs

@@ -227,7 +227,7 @@ pub fn render_governance(render_ctx: &RenderCtx) -> anyhow::Result<()> {
 
     // Page with all team members
     let all_team_members_data = render_ctx.teams.all_team_members();
-    for_all_langs("governance/all-team-members.html", |dst_path, lang| {
+    for_all_langs("governance/people/index.html", |dst_path, lang| {
         render_ctx
             .page(
                 "governance/all-team-members",

src/styles/app.scss

@@ -34,6 +34,12 @@ body {
   flex-direction: column;
   & > main {
     flex: 1;
+    display: flex;
+    flex-direction: column;
+
+    & > section:last-child {
+      flex: 1;
+    }
   }
 }
 

templates/governance/all-team-members.html.hbs

@@ -17,7 +17,8 @@
 {{#*inline "page"}}
   <section class="green" style="padding-bottom: 10px;">
     <div class="w-100 mw-none mw-8-m mw9-l center f2">
-      <p>{{fluent "governance-all-team-members-intro"}}</p>
+      <p>{{#fluent "governance-all-team-members-intro"}}{{#fluentparam
+      "count"}}{{len data.active}}{{/fluentparam}}{{/fluent}}</p>
     </div>
   </section>
 
@@ -31,7 +32,8 @@
 
   <section class="red" style="padding-bottom: 10px;">
     <div class="w-100 mw-none mw-8-m mw9-l center f2">
-      <p>{{fluent "governance-all-team-members-alumni-intro"}}</p>
+      <p>{{#fluent "governance-all-team-members-alumni-intro"}}{{#fluentparam
+      "count"}}{{len data.alumni}}{{/fluentparam}}{{/fluent}}</p>
     </div>
   </section>
 

templates/governance/index.html.hbs

@@ -35,7 +35,7 @@
             {{/each~}}
         </div>
         <div class="flex">
-          <a href="{{baseurl}}/governance/all-team-members.html" class="center w-100 mw6 button button-secondary">
+          <a href="{{baseurl}}/governance/people" class="center w-100 mw6 button button-secondary">
             {{fluent "governance-rust-project-link"}}
           </a>
         </div>