Merge pull request #1904 from dtolnay-contrib/roles

Render custom roles

Author: Manishearth

Cargo.lock

@@ -289,3 +289,5 @@ governance-team-wg-triage-description = Triaging repositories under the rust-lan
 
 governance-team-wg-wasm-name = WebAssembly (WASM) working group
 governance-team-wg-wasm-description = Improving on the end-to-end experience of embedding Rust code in JS libraries and apps via WebAssembly
+
+governance-role-spec-editor = Editor

locales/en-US/teams.ftl

@@ -59,6 +59,7 @@ use sass_rs::{compile_file, Options};
 use category::Category;
 
 use caching::CachedNamedFile;
+use handlebars::handlebars_helper;
 use handlebars_fluent::{loader::Loader, FluentHelper};
 use i18n::{create_loader, LocaleInfo, SupportedLocale, TeamHelper, EXPLICIT_LOCALE_INFO};
 
@@ -491,6 +492,11 @@ async fn rocket() -> _ {
         engine
             .handlebars
             .register_helper("encode-zulip-stream", Box::new(encode_zulip_stream));
+
+        handlebars_helper!(concat: |x: String, y: String| x + &y);
+        engine
+            .handlebars
+            .register_helper("concat", Box::new(concat));
     });
 
     let rust_version = RustVersion::fetch().await.unwrap_or_default();

src/main.rs

@@ -298,17 +298,26 @@ mod tests {
             kind: TeamKind::Team,
             subteam_of: None,
             members: vec![
+                TeamMember {
+                    name: "Jupiter Doe".into(),
+                    github: "jupiterd".into(),
+                    github_id: 123,
+                    is_lead: false,
+                    roles: vec!["convener".to_owned()],
+                },
                 TeamMember {
                     name: "John Doe".into(),
                     github: "johnd".into(),
+                    github_id: 456,
                     is_lead: false,
-                    github_id: 1234,
+                    roles: Vec::new(),
                 },
                 TeamMember {
                     name: "Jane Doe".into(),
                     github: "janed".into(),
+                    github_id: 789,
                     is_lead: true,
-                    github_id: 1234,
+                    roles: Vec::new(),
                 },
             ],
             alumni: Vec::new(),

src/teams.rs

@@ -60,6 +60,10 @@
                         </div>
                         {{#if member.is_lead}}
                             <div>{{fluent "governance-user-team-leader"}}</div>
+                        {{else}}
+                            {{#if member.roles}}
+                                <div>{{fluent (concat "governance-role-" (lookup member.roles 0))}}</div>
+                            {{/if}}
                         {{/if}}
                     </div>
                 </div>