From c4934e1047567e48425eecc1121e329138e7ea4b Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Tue, 14 Mar 2023 17:49:04 +0100 Subject: [PATCH] consolidate strings for sport fields --- data/fields/sport.json | 10 ++++- data/fields/sport_ice.json | 16 ++++---- data/fields/sport_pub.json | 12 +++--- data/fields/sport_racing_motor.json | 14 +++---- data/fields/sport_racing_nonmotor.json | 18 ++++----- interim/source_strings.yaml | 56 ++++++++------------------ 6 files changed, 51 insertions(+), 75 deletions(-) diff --git a/data/fields/sport.json b/data/fields/sport.json index 0aee07b9..3e1e31fd 100644 --- a/data/fields/sport.json +++ b/data/fields/sport.json @@ -10,11 +10,14 @@ "baseball": "Baseball", "basketball": "Basketball", "beachvolleyball": "Beach Volleyball", + "bmx": "BMX", "boules": "Boules", "bowls": "Bowls", "climbing": "Climbing", "cricket": "Cricket", + "curling": "Curling", "cycling": "Cycling", + "dog_racing": "Dog Racing", "equestrian": "Equestrian", "fitness": "Fitness Training", "free_flying": "Paragliding / Hang Gliding", @@ -23,6 +26,9 @@ "gymnastics": "Gymnastics", "handball": "Team Handball", "horse_racing": "Horse Racing", + "ice_hockey": "Ice Hockey", + "ice_skating": "Ice Skating", + "ice_stock": "Ice Stock", "karting": "Kart Racing", "motocross": "Motocross", "motor": "Motorsports", @@ -35,10 +41,12 @@ "skiing": "Skiing", "soccer": "Soccer", "softball": "Softball", + "speedway": "Motorcycle Speedway", "swimming": "Swimming", "table_tennis": "Table Tennis", "tennis": "Tennis", - "volleyball": "Volleyball" + "volleyball": "Volleyball", + "multi": "Unspecified Other Sports" } } } diff --git a/data/fields/sport_ice.json b/data/fields/sport_ice.json index 77b9eedf..d7833169 100644 --- a/data/fields/sport_ice.json +++ b/data/fields/sport_ice.json @@ -2,14 +2,12 @@ "key": "sport", "type": "semiCombo", "label": "Sports", - "strings": { - "options": { - "ice_skating": "Ice Skating", - "ice_hockey": "Ice Hockey", - "curling": "Curling", - "ice_stock": "Ice Stock", - "multi": "Multiple" - } - }, + "options": [ + "ice_skating", + "ice_hockey", + "curling", + "ice_stock", + "multi" + ], "autoSuggestions": false } diff --git a/data/fields/sport_pub.json b/data/fields/sport_pub.json index 618739f1..64ae92f5 100644 --- a/data/fields/sport_pub.json +++ b/data/fields/sport_pub.json @@ -2,12 +2,10 @@ "key": "sport", "type": "semiCombo", "label": "Sports", - "strings": { - "options": { - "table_soccer": "Foosball", - "billiards": "Billiards", - "darts": "Darts" - } - }, + "options": [ + "table_soccer", + "billiards", + "darts" + ], "autoSuggestions": false } diff --git a/data/fields/sport_racing_motor.json b/data/fields/sport_racing_motor.json index cb151dde..c479fe4e 100644 --- a/data/fields/sport_racing_motor.json +++ b/data/fields/sport_racing_motor.json @@ -2,13 +2,11 @@ "key": "sport", "type": "semiCombo", "label": "Sports", - "strings": { - "options": { - "motor": "Motorsport", - "karting": "Karting", - "motocross": "Motocross", - "speedway": "Motorcycle Speedway" - } - }, + "options": [ + "motor", + "karting", + "motocross", + "speedway" + ], "autoSuggestions": false } diff --git a/data/fields/sport_racing_nonmotor.json b/data/fields/sport_racing_nonmotor.json index 1022b91e..00f7f2e8 100644 --- a/data/fields/sport_racing_nonmotor.json +++ b/data/fields/sport_racing_nonmotor.json @@ -2,15 +2,13 @@ "key": "sport", "type": "semiCombo", "label": "Sports", - "strings": { - "options": { - "running": "Running", - "cycling": "Cycling", - "bmx": "BMX", - "horse_racing": "Horse Racing", - "dog_racing": "Dog Racing", - "athletics": "Track & Field" - } - }, + "options": [ + "running", + "cycling", + "bmx", + "horse_racing", + "dog_racing", + "athletics" + ], "autoSuggestions": false } diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 90ecc794..3d320df3 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -4409,6 +4409,8 @@ en: basketball: Basketball # sport=beachvolleyball beachvolleyball: Beach Volleyball + # sport=bmx + bmx: BMX # sport=boules boules: Boules # sport=bowls @@ -4417,8 +4419,12 @@ en: climbing: Climbing # sport=cricket cricket: Cricket + # sport=curling + curling: Curling # sport=cycling cycling: Cycling + # sport=dog_racing + dog_racing: Dog Racing # sport=equestrian equestrian: Equestrian # sport=fitness @@ -4435,12 +4441,20 @@ en: handball: Team Handball # sport=horse_racing horse_racing: Horse Racing + # sport=ice_hockey + ice_hockey: Ice Hockey + # sport=ice_skating + ice_skating: Ice Skating + # sport=ice_stock + ice_stock: Ice Stock # sport=karting karting: Kart Racing # sport=motocross motocross: Motocross # sport=motor motor: Motorsports + # sport=multi + multi: Unspecified Other Sports # sport=netball netball: Netball # sport=padel @@ -4459,6 +4473,8 @@ en: soccer: Soccer # sport=softball softball: Softball + # sport=speedway + speedway: Motorcycle Speedway # sport=swimming swimming: Swimming # sport=table_tennis @@ -4470,56 +4486,16 @@ en: sport_ice: # sport=* label: Sports - options: - # sport=curling - curling: Curling - # sport=ice_hockey - ice_hockey: Ice Hockey - # sport=ice_skating - ice_skating: Ice Skating - # sport=ice_stock - ice_stock: Ice Stock - # sport=multi - multi: Multiple sport_pub: # sport=* label: Sports - options: - # sport=billiards - billiards: Billiards - # sport=darts - darts: Darts - # sport=table_soccer - table_soccer: Foosball terms: '[translate with synonyms or related terms for ''Sports'', separated by commas]' sport_racing_motor: # sport=* label: Sports - options: - # sport=karting - karting: Karting - # sport=motocross - motocross: Motocross - # sport=motor - motor: Motorsport - # sport=speedway - speedway: Motorcycle Speedway sport_racing_nonmotor: # sport=* label: Sports - options: - # sport=athletics - athletics: Track & Field - # sport=bmx - bmx: BMX - # sport=cycling - cycling: Cycling - # sport=dog_racing - dog_racing: Dog Racing - # sport=horse_racing - horse_racing: Horse Racing - # sport=running - running: Running stars: # stars=* label: Stars