Bug 1298899 - Update gear request form with correct items available and cost centers

2 files changed, 96 insertions, 92 deletions

diff --git a/extensions/BMO/template/en/default/bug/create/cost-centers.none.tmpl b/extensions/BMO/template/en/default/bug/create/cost-centers.none.tmpl
index 73a61f2d7..38356c830 100644
--- a/extensions/BMO/template/en/default/bug/create/cost-centers.none.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/cost-centers.none.tmpl
@@ -13,7 +13,7 @@
     "1002 - Participation"
     "1003 - Office of CIO"
     "1005 - Corp Consolidation & Elimination"
-    "1006 - Taipei Development Center"
+    "1006 - The Development Center"
     "1010 - Office of CTO"
     "1011 - Research"
     "1012 - Tech Evangelism"
@@ -37,6 +37,10 @@
     "1420 - Enterprise Information Security (EIS)"
     "1430 - End User Services (EUS)"
     "1440 - Enterprise Applications & Services (EApps)"
+    "1500 - General Content Services"
+    "1501 - Engineering"
+    "1502 - Sales"
+    "1503 - Product"
     "2000 - General Marketing"
     "2200 - Mar Com"
     "2300 - Lifecycle Marketing"
@@ -44,27 +48,31 @@
     "2400 - Brand Engagement"
     "2500 - Marketing Operations"
     "2700 - Product Marketing"
-    "5000 - Firefox"
     "5500 - Product Engineering"
     "5650 - Services Engineering"
-    "5660 - Production Cloud Infrastructure"
-    "5670 - Development Cloud Infrastructure"
     "5700 - Firefox UX"
+    "5000 - Firefox"
     "5800 - Product Management"
     "5900 - Program Management"
-    "6000 - Connected Devices"
-    "6110 - Connected Devices Engineering"
-    "6150 - Connected Devices Program Management"
+    "5660 - Production Cloud Infrastructure"
+    "5670 - Development Cloud Infrastructure"
+    "6000 - Mobile"
+    "6110 - Firefox OS Engineering I"
+    "6140 - Firefox OS Automation"
+    "6150 - Firefox OS Engineering Program Management"
     "6160 - Firefox OS QA"
-    "6200 - Connected Devices Product Management"
+    "6200 - Firefox OS Product Management"
+    "6220 - Firefox OS Product Marketing"
     "6300 - Firefox OS UX"
-    "6400 - Web App Development"
-    "6500 - Partnerships"
-    "6600 - Product Strategy & Insights"
-    "6650 - Design"
-    "6700 - Connected Devices Business Operations"
-    "6750 - Connected Devices Product/UX"
-    "6800 - Connected Devices Collaboration"
+    "6500 - Mobile Business Development"
+    "7000 - Mobile Planning and Ecosystem"
+    "7110 - Mobile Partner Engineering"
+    "7120 - Mobile Planning"
+    "7130 - Mobile Apps Engineering"
+    "7150 - Mobile Partners Contents"
+    "7200 - Mobile Ecosystem Program Management"
+    "7220 - Mobile Partner Products"
+    "7500 - Reviews and Community"
     "8000 - Engineering Platform"
     "8200 - Platform Operations"
     "8750 - Localization (l10n)"
diff --git a/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl
index a1d5b3731..6742c42db 100644
--- a/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl
@@ -11,83 +11,79 @@
 [%
 
 items = [
-  { id => ''        , name => 'Splendidest gear,'                   },
-  { id => '#185687' , name => 'Moleskine Notebook (Firefox)'        },
-  { id => '#155749' , name => 'Rickshaw Messenger Bag'              },
-  { id => '#155415S', name => 'Champion Hooded Sweatshirt S'        },
-  { id => '#155415M', name => 'Champion Hooded Sweatshirt M'        },
-  { id => '#155415L', name => 'Champion Hooded Sweatshirt L'        },
-  { id => '#155415X', name => 'Champion Hooded Sweatshirt XL'       },
-  { id => '#1554152', name => 'Champion Hooded Sweatshirt 2XL'      },
-  { id => '#157452S', name => 'Very Splendid Package Ladies S'      },
-  { id => '#157452M', name => 'Very Splendid Package Ladies M'      },
-  { id => '#157452L', name => 'Very Splendid Package Ladies L'      },
-  { id => '#157452X', name => 'Very Splendid Package Ladies XL'     },
-  { id => '#157454S', name => 'Very Splendid Package Men\'s S'      },
-  { id => '#157454M', name => 'Very Splendid Package Men\'s M'      },
-  { id => '#157454L', name => 'Very Splendid Package Men\'s L'      },
-  { id => '#157454X', name => 'Very Splendid Package Men\'s XL'     },
-  { id => '#157451S', name => 'Most Splendid Package'               },
-  { id => '#157451M', name => 'Most Splendid Package'               },
-  { id => '#157451L', name => 'Most Splendid Package'               },
-  { id => '#157451X', name => 'Most Splendid Package'               },
-  { id => ''        , name => 'Splendider gear,'                    },
-  { id => '#155341X', name => 'Unisex Firefox T-shirt Poppy XL'     },
-  { id => '#1553412', name => 'Unisex Firefox T-shirt Poppy 2XL'    },
-  { id => '#155344S', name => 'Ladies\' Firefox T-shirt Poppy S'    },
-  { id => '#155344M', name => 'Ladies\' Firefox T-shirt Poppy M'    },
-  { id => '#155344L', name => 'Ladies\' Firefox T-shirt Poppy L'    },
-  { id => '#190928S', name => 'Unisex Firefox T-shirt Navy S'       },
-  { id => '#190928M', name => 'Unisex Firefox T-shirt Navy M'       },
-  { id => '#190928L', name => 'Unisex Firefox T-shirt Navy L'       },
-  { id => '#190928X', name => 'Unisex Firefox T-shirt Navy XL'      },
-  { id => '#1553422', name => 'Unisex Firefox T-shirt Navy 2XL*'    },
-  { id => '#1553423', name => 'Unisex Firefox T-shirt Navy 3XL*'    },
-  { id => '#155413S', name => 'Ladies\' Firefox T-shirt Navy S'     },
-  { id => '#155413M', name => 'Ladies\' Firefox T-shirt Navy M'     },
-  { id => '#155413L', name => 'Ladies\' Firefox T-shirt Navy L'     },
-  { id => '#155413X', name => 'Ladies\' Firefox T-shirt Navy XL'    },
-  { id => '#190929S', name => 'Unisex Firefox T-shirt Lapis S'      },
-  { id => '#190929M', name => 'Unisex Firefox T-shirt Lapis M'      },
-  { id => '#190929L', name => 'Unisex Firefox T-shirt Lapis L'      },
-  { id => '#155343X', name => 'Unisex Firefox T-shirt Lapis XL'     },
-  { id => '#155414S', name => 'Ladies\' Firefox T-shirt Lapis S'    },
-  { id => '#155414M', name => 'Ladies\' Firefox T-shirt Lapis M'    },
-  { id => '#155414L', name => 'Ladies\' Firefox T-shirt Lapis L'    },
-  { id => '#155339' , name => 'Black Cap with Tote'                 },
-  { id => '#212669' , name => 'Stoneware Ceramic Mug'               },
-  { id => '#155340' , name => 'Beanie'                              },
-  { id => '#155751' , name => 'Drawstring Tote'                     },
-  { id => ''        , name => 'Splendid gear,'                      },
-  { id => '#192150' , name => '1.25" Firefox Button-PKG25'          },
-  { id => '#197156' , name => 'Firefox Tattoos- Pkg50'              },
-  { id => '#155754' , name => 'Lanyard with Bulldog Clip (Mozilla)' },
-  { id => '#197159' , name => 'Firefox Laminated Badge'             },
-  { id => '#155756' , name => 'Silicone Wristband'                  },
-  { id => '#197158' , name => 'Firefox Sticker'                     },
-  { id => ''        , name => 'Firefox OS gear,'                    },
-  { id => '#180593' , name => 'Moleskine Notebook (Firefox OS)'     },
-  { id => '#180595' , name => 'Rubber Grip Pens Firefox OS'         },
-  { id => '#187062' , name => 'OS Lanyard w/ Bulldog Clip'          },
-  { id => '#180589' , name => 'Sunglasses Firefox OS'               },
-  { id => '#189674' , name => '3" Firefox Mobilizer Sticker'        },
-  { id => '#180792S', name => 'Firefox OS Tee Blueprint S'          },
-  { id => '#180792M', name => 'Firefox OS Tee Blueprint M'          },
-  { id => '#180792L', name => 'Firefox OS Tee Blueprint L'          },
-  { id => '#180792X', name => 'Firefox OS Tee Blueprint XL'         },
-  { id => '#1807922', name => 'Firefox OS Tee Blueprint 2XL'        },
-  { id => '#182464S', name => 'Firefox OS Ladies Teal Tee S'        },
-  { id => '#182464M', name => 'Firefox OS Ladies Teal Tee M'        },
-  { id => '#182464L', name => 'Firefox OS Ladies Teal Tee L'        },
-  { id => '#182464X', name => 'Firefox OS Ladies Teal Tee XL'       },
-  { id => '#1824642', name => 'Firefox OS Ladies Teal Tee 2XL'      },
-  { id => '#182465S', name => 'Firefox OS Teal Tee S'               },
-  { id => '#182465M', name => 'Firefox OS Teal Tee M'               },
-  { id => '#182465L', name => 'Firefox OS Teal Tee L'               },
-  { id => '#182465X', name => 'Firefox OS Teal Tee XL'              },
-  { id => '#1824652', name => 'Firefox OS Teal Tee 2XL'             },
-  { id => '#1824653', name => 'Firefox OS Teal Tee 3XL'             },
-  { id => '#1824654', name => 'Firefox OS Teal Tee 4XL'             },
+  { id => '',          name => 'Splendidest Gear' },
+  { id => '#185687',   name => 'Moleskine Notebook (Firefox)' },
+  { id => '#155749',   name => 'Rickshaw Messenger Bag ' },
+  { id => '#155415S',  name => 'Champion Hooded Sweatshirt S' },
+  { id => '#155415M',  name => 'Champion Hooded Sweatshirt M' },
+  { id => '#155415L',  name => 'Champion Hooded Sweatshirt L' },
+  { id => '#155415X',  name => 'Champion Hooded Sweatshirt XL' },
+  { id => '#1554152',  name => 'Champion Hooded Sweatshirt 2XL' },
+  { id => '#157452S',  name => 'Very Splendid Package Ladies S' },
+  { id => '#157452M',  name => 'Very Splendid Package Ladies M' },
+  { id => '#157452L',  name => 'Very Splendid Package Ladies L' },
+  { id => '#157452X',  name => 'Very Splendid Package Ladies XL' },
+  { id => '#1574522',  name => 'Very Splendid Package Ladies 2XL' },
+  { id => '#157454S',  name => 'Very Splendid Package Men\'s S' },
+  { id => '#157454M',  name => 'Very Splendid Package Men\'s M' },
+  { id => '#157454L',  name => 'Very Splendid Package Men\'s L' },
+  { id => '#157454X',  name => 'Very Splendid Package Men\'s XL' },
+  { id => '#1574542',  name => 'Very Splendid Package Men\'s 2XL' },
+  { id => '#1574543',  name => 'Very Splendid Package Men\'s 3XL' },
+  { id => '#157451S',  name => 'Most Splendid Package, S' },
+  { id => '#157451M',  name => 'Most Splendid Package, M' },
+  { id => '#157451L',  name => 'Most Splendid Package, L' },
+  { id => '#157451X',  name => 'Most Splendid Package, XL' },
+  { id => '',          name => 'Splendider Gear' },
+  { id => '#155751',   name => 'Drawstring Tote ' },
+  { id => '#155340',   name => 'Beanie' },
+  { id => '#155339',   name => 'Black Cap with Tote ' },
+  { id => '#212669',   name => 'Stoneware Ceramic Mug' },
+  { id => '#190928S',  name => 'Firefox Tee w/Woven Tag Navy S' },
+  { id => '#190928M',  name => 'Firefox Tee w/Woven Tag Navy M' },
+  { id => '#190928L',  name => 'Firefox Tee w/Woven Tag Navy L' },
+  { id => '#190928X',  name => 'Firefox Tee w/Woven Tag Navy XL' },
+  { id => '#1909282',  name => 'Firefox Tee w/Woven Tag Navy 2XL' },
+  { id => '#1909283',  name => 'Firefox Tee w/Woven Tag Navy 3XL' },
+  { id => '#190929S',  name => 'Firefox SS Lapis Tee Lapis S' },
+  { id => '#190929M',  name => 'Firefox SS Lapis Tee Lapis M' },
+  { id => '#190929L',  name => 'Firefox SS Lapis Tee Lapis L' },
+  { id => '#190929X',  name => 'Firefox SS Lapis Tee Lapis XL' },
+  { id => '#155413S',  name => 'Ladies\' T-shirt Navy S' },
+  { id => '#155413M',  name => 'Ladies\' T-shirt Navy M' },
+  { id => '#155413L',  name => 'Ladies\' T-shirt Navy L' },
+  { id => '#155413X',  name => 'Ladies\' T-shirt Navy XL' },
+  { id => '#1554132',  name => 'Ladies\' T-shirt Navy 2XL' },
+  { id => '',          name => 'Splendid Gear' },
+  { id => '#192150',   name => '1.25" Firefox Button-PKG25 ' },
+  { id => '#197156',   name => 'Firefox Tattoos- Pkg50' },
+  { id => '#197158',   name => 'Firefox Sticker' },
+  { id => '#197159',   name => 'Firefox Laminated Badge' },
+  { id => '#155754',   name => 'Lanyard with Bulldog Clip (Mozilla)' },
+  { id => '#155756',   name => 'Silicone Wristband ' },
+  { id => '',          name => 'Limited Availability Gear' },
+  { id => '#265073',   name => 'Mozilla Cap' },
+  { id => '#265080',   name => 'Fox Plush' },
+  { id => '#265072S',  name => 'Mozilla Custom Hoodie' },
+  { id => '#265072M',  name => 'Mozilla Custom Hoodie' },
+  { id => '#265072L',  name => 'Mozilla Custom Hoodie' },
+  { id => '#265072X',  name => 'Mozilla Custom Hoodie' },
+  { id => '#2650722',  name => 'Mozilla Custom Hoodie' },
+  { id => '#265074S',  name => 'Ladies\' Firefox Logo T-Shirt' },
+  { id => '#265074M',  name => 'Ladies\' Firefox Logo T-Shirt' },
+  { id => '#265074L',  name => 'Ladies\' Firefox Logo T-Shirt' },
+  { id => '#265074X',  name => 'Ladies\' Firefox Logo T-Shirt' },
+  { id => '#2650742',  name => 'Ladies\' Firefox Logo T-Shirt' },
+  { id => '#265075S',  name => 'Women\'s Vertical T-Shirt' },
+  { id => '#265075M',  name => 'Women\'s Vertical T-Shirt' },
+  { id => '#265075L',  name => 'Women\'s Vertical T-Shirt' },
+  { id => '#265075X',  name => 'Women\'s Vertical T-Shirt' },
+  { id => '#2650752',  name => 'Women\'s Vertical T-Shirt' },
+  { id => '#265078S',  name => 'Mozilla Horizontal T-Shirt' },
+  { id => '#265078M',  name => 'Mozilla Horizontal T-Shirt' },
+  { id => '#265078L',  name => 'Mozilla Horizontal T-Shirt' },
+  { id => '#265078X',  name => 'Mozilla Horizontal T-Shirt' },
+  { id => '#2650782',  name => 'Mozilla Horizontal T-Shirt' },
 ];
 
 mozspaces = [