From aba9826291b8669fce755df5107a7dca64f9cb50 Mon Sep 17 00:00:00 2001
From: Chaoyi Zha <cydrobolt@fedoraproject.org>
Date: Fri, 15 Jan 2016 03:05:00 +0000
Subject: [PATCH] Update category and name mappings for mote to reflect updated
 entities

---
 roles/mote/templates/category_mappings.json | 18 +++---
 roles/mote/templates/name_mappings.json     | 62 +++++++++++++--------
 2 files changed, 49 insertions(+), 31 deletions(-)

diff --git a/roles/mote/templates/category_mappings.json b/roles/mote/templates/category_mappings.json
index bae86baf8f..03a720fbb0 100644
--- a/roles/mote/templates/category_mappings.json
+++ b/roles/mote/templates/category_mappings.json
@@ -1,15 +1,17 @@
 {
-    "Project Leadership": ["board"],
-    "Engineering Leadership": ["fesco"],
-    "Ambassadors": ["famna", "#fedora-ambassadors"],
-    "Infrastructure": ["infrastructure", "#fedora-apps", "#fedora-admin"],
+    "Ambassadors": ["famna", "emea_ambassadors", "#fedora-ambassadors"],
+    "Community Operations": ["commops"],
     "Design": ["fedora-design"],
     "Documentation": ["fedora-docs"],
-    "Epel": ["epel"],
+    "Engineering Leadership": ["fesco"],
+    "EPEL": ["epel"],
+    "Globalization": ["g11n"],
+    "Infrastructure": ["infrastructure", "#fedora-apps", "#fedora-admin"],
     "Internationalization": ["i18n"],
-    "Marketing": ["fedora-mktg"],
+    "Marketing": ["fedora-mktg", "magazine"],
     "Packaging": ["fpc"],
+    "Project Leadership": ["fedora_council"],
     "Quality Assurance": ["fedora-qa"],
-    "Websites": ["fedora-websites"],
-    "Release Engineering": ["releng"]
+    "Release Engineering": ["releng"],
+    "Websites": ["fedora-websites"]
 }
diff --git a/roles/mote/templates/name_mappings.json b/roles/mote/templates/name_mappings.json
index b542398392..244fbf39ca 100644
--- a/roles/mote/templates/name_mappings.json
+++ b/roles/mote/templates/name_mappings.json
@@ -1,34 +1,34 @@
 {
-    "famna": {
-        "friendly-name": "Fedora North American Ambassadors",
-        "aliases": []
-    },
-    "infrastructure": {
-        "friendly-name": "Fedora Infrastructure Team",
-        "aliases": ["fedora-infrastructure", "fedora_infrastructure", "#fedora-apps", "#fedora-admin"]
-    },
-    "fedora-design": {
-        "friendly-name": "Fedora Design Team",
-        "aliases": ["fedora-design", "designteam", "#fedora-design"]
+    "emea_ambassadors": {
+        "friendly-name": "Fedora Europe, Middle East, and Africa (EMEA) Ambassadors",
+        "aliases": ["emea"]
     },
     "epel": {
         "friendly-name": "Extra Packages for Enterprise Linux",
         "aliases": []
     },
-    "fedora-mktg": {
-        "friendly-name": "Fedora Marketing",
+    "famna": {
+        "friendly-name": "Fedora North American Ambassadors",
         "aliases": []
     },
+    "fedora-commops": {
+        "friendly-name": "Fedora Community Operations (CommOps)",
+        "aliases": ["commops", "CommOps", "community-operations", "community_operations"]
+    },
+    "fedora_council": {
+        "friendly-name": "Fedora Council",
+        "aliases": ["council", "board"]
+    },
+    "fedora-design": {
+        "friendly-name": "Fedora Design Team",
+        "aliases": ["fedora-design", "designteam", "#fedora-design"]
+    },
     "fedora-docs": {
         "friendly-name": "Fedora Docs Team",
         "aliases": []
     },
-    "i18n": {
-        "friendly-name": "Fedora i18n Team",
-        "aliases": []
-    },
-    "fpc": {
-        "friendly-name": "Fedora Packaging Committee (FPC)",
+    "fedora-mktg": {
+        "friendly-name": "Fedora Marketing",
         "aliases": []
     },
     "fedora-qa": {
@@ -39,16 +39,32 @@
         "friendly-name": "Fedora Websites Team",
         "aliases": []
     },
-    "releng": {
-        "friendly-name": "Fedora Release Engineering (releng)",
+    "fpc": {
+        "friendly-name": "Fedora Packaging Committee (FPC)",
         "aliases": []
     },
     "fesco": {
         "friendly-name": "Fedora Engineering Steering Committee (FESCo)",
         "aliases": []
     },
-    "board": {
-        "friendly-name": "The Board",
+    "g11n": {
+        "friendly-name": "Fedora G11n Team",
+        "aliases": ["fedora-g11n", "fedora-globalization", "#fedora-g11n"]
+    },
+    "i18n": {
+        "friendly-name": "Fedora i18n Team",
+        "aliases": []
+    },
+    "infrastructure": {
+        "friendly-name": "Fedora Infrastructure Team",
+        "aliases": ["fedora-infrastructure", "fedora_infrastructure", "#fedora-apps", "#fedora-admin"]
+    },
+    "magazine": {
+        "friendly-name": "Fedora Magazine Editorial Board",
+        "aliases": ["magazine", "magazine_editorial_board", "fedora_magazine"]
+    },
+    "releng": {
+        "friendly-name": "Fedora Release Engineering (releng)",
         "aliases": []
     }
 }