add combined SP/D type

.github/workflows/build.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Prettify code
         uses: creyD/prettier_action@v4.2
         with:
-          prettier_options: --write **/*.{js,md}
+          prettier_options: --write **/*.{ts,tsx}
           only_changed: True
       - name: Coveralls
         uses: coverallsapp/github-action@master

README.md

@@ -89,6 +89,10 @@ Second, while we can infer that a meeting is "online" if there is a Zoom URL (fo
 
 Web servants may [add their own meeting types](#add-custom-types) of course.
 
+### What is Speaker/Discussion?
+
+When meetings are tagged both Speaker (`SP`) and Discussion (`D`), TSML UI merges them into a combined Speaker/Discussion type. This enables users to use existing filters to locate Speaker-only and Discussion-only meetings.
+
 ### Can I import TSML UI from NPM for use in a NextJS or Gatsby project?
 
 Not yet! Please open a pull request and walk us through the process of adding it to NPM and we'll give it a shot.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsml-ui",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "private": false,
   "license": "MIT",
   "scripts": {

src/helpers/data/load-meeting-data.ts

@@ -176,6 +176,13 @@ export function loadMeetingData(
       );
     }
 
+    //if meeting is both speaker and discussion, combine
+    if (types.includes('SP') && types.includes('D')) {
+      types.splice(types.indexOf('SP'), 1);
+      types.splice(types.indexOf('D'), 1);
+      types.push('SPD');
+    }
+
     //check location/group capability
     if (
       !capabilities.location &&

src/i18n/en.ts

@@ -122,6 +122,7 @@ export const en: Translation = {
     SEN: 'Seniors',
     SM: 'Smoking Permitted',
     SP: 'Speaker',
+    SPD: 'Speaker/Discussion',
     ST: 'Step Study',
     T: 'Transgender',
     TC: 'Location Temporarily Closed',

src/i18n/es.ts

@@ -122,6 +122,7 @@ export const es: Translation = {
     SEN: 'Personas mayores',
     SM: 'Se permite fumar',
     SP: 'Orador',
+    SPD: 'Orador/Discusión',
     ST: 'Estudio de pasos',
     T: 'Transgénero',
     TC: 'Ubicación temporalmente cerrada',

src/i18n/fr.ts

@@ -122,6 +122,7 @@ export const fr: Translation = {
     SEN: 'Séniors',
     SM: 'Permis de fumer',
     SP: 'Conférencier',
+    SPD: 'Conférencier/Discussion',
     ST: 'Sur les Étapes',
     T: 'Transgenre',
     TC: 'Emplacement temporairement fermé',

src/i18n/ja.ts

@@ -122,6 +122,7 @@ export const ja: Translation = {
     SEN: '高齢者',
     SM: '喫煙可',
     SP: 'スピーカー',
+    SPD: 'スピーカー/ディスカッション',
     ST: 'ステップスタディ',
     T: 'トランスジェンダー',
     TC: '一時的休止中',

src/types/MeetingType.ts

@@ -52,6 +52,7 @@ export type MeetingType =
   | 'SEN' // Seniors
   | 'SM' // Smoking Permitted
   | 'SP' // Speaker
+  | 'SPD' // Speaker/Discussion
   | 'ST' // Step Study
   | 'T' // Transgender
   | 'TC' // Location Temporarily Closed