From b9f35b5556b7e9a93ce60a1ca86930c10d9d842c Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Tue, 21 Mar 2023 11:21:59 +0100 Subject: [PATCH] add term "hobby" to related shop presets, closes #24 --- data/fields/scuba_diving.json | 11 ++++---- data/presets/shop/anime.json | 8 +++--- data/presets/shop/bicycle.json | 1 + data/presets/shop/boat.json | 1 + data/presets/shop/books.json | 3 +++ data/presets/shop/brewing_supplies.json | 1 + data/presets/shop/collector.json | 1 + data/presets/shop/doityourself.json | 1 + data/presets/shop/fishing.json | 1 + data/presets/shop/games.json | 1 + data/presets/shop/hunting.json | 1 + data/presets/shop/music.json | 1 + data/presets/shop/musical_instrument.json | 1 + data/presets/shop/outdoor.json | 1 + data/presets/shop/sports.json | 3 ++- data/presets/shop/toys.json | 1 + data/presets/shop/video.json | 1 + data/presets/shop/video_games.json | 3 +++ interim/source_strings.yaml | 32 ++++++++++++----------- 19 files changed, 48 insertions(+), 25 deletions(-) diff --git a/data/fields/scuba_diving.json b/data/fields/scuba_diving.json index a714f3e6d..b2ab348b8 100644 --- a/data/fields/scuba_diving.json +++ b/data/fields/scuba_diving.json @@ -3,14 +3,15 @@ "type": "multiCombo", "label": "Services", "options": [ - "repair", + "air_filling", "courses", - "rental", "filling", - "air_filling", + "hobby", "nitrox_filling", - "trimix_filling", - "oxygen_filling" + "oxygen_filling", + "rental", + "repair", + "trimix_filling" ], "autoSuggestions": false } diff --git a/data/presets/shop/anime.json b/data/presets/shop/anime.json index 2922dd50b..41cfea49b 100644 --- a/data/presets/shop/anime.json +++ b/data/presets/shop/anime.json @@ -8,12 +8,12 @@ "shop": "anime" }, "terms": [ - "manga", - "japan", "cosplay", - "figurine", "dakimakura", - "hobby" + "figurine", + "hobby", + "japan", + "manga" ], "name": "Anime / Manga Shop" } diff --git a/data/presets/shop/bicycle.json b/data/presets/shop/bicycle.json index c90c64b04..b6a9301a6 100644 --- a/data/presets/shop/bicycle.json +++ b/data/presets/shop/bicycle.json @@ -12,6 +12,7 @@ "bicycle store", "bike", "bike store", + "hobby", "repair", "tricycle", "unicycle" diff --git a/data/presets/shop/boat.json b/data/presets/shop/boat.json index 64f080a59..2ffb55ffd 100644 --- a/data/presets/shop/boat.json +++ b/data/presets/shop/boat.json @@ -6,6 +6,7 @@ ], "terms": [ "fishing boat", + "hobby", "jetski", "motorboat", "rowboat", diff --git a/data/presets/shop/books.json b/data/presets/shop/books.json index 36453f59b..c5e879ed6 100644 --- a/data/presets/shop/books.json +++ b/data/presets/shop/books.json @@ -16,6 +16,9 @@ "tags": { "shop": "books" }, + "terms": [ + "hobby" + ], "name": "Bookstore", "aliases": [ "Bookshop", diff --git a/data/presets/shop/brewing_supplies.json b/data/presets/shop/brewing_supplies.json index 3983f711a..0c0d6a39d 100644 --- a/data/presets/shop/brewing_supplies.json +++ b/data/presets/shop/brewing_supplies.json @@ -6,6 +6,7 @@ ], "terms": [ "brew shop", + "hobby", "homebrew supply store" ], "tags": { diff --git a/data/presets/shop/collector.json b/data/presets/shop/collector.json index a1f4ac465..35a9b06b4 100644 --- a/data/presets/shop/collector.json +++ b/data/presets/shop/collector.json @@ -17,6 +17,7 @@ "comics", "dolls", "figurines", + "hobby", "numismatics", "philately", "stamps", diff --git a/data/presets/shop/doityourself.json b/data/presets/shop/doityourself.json index da3a2b966..b7a8cb668 100644 --- a/data/presets/shop/doityourself.json +++ b/data/presets/shop/doityourself.json @@ -12,6 +12,7 @@ "diy", "do it yourself", "hardware", + "hobby", "home improvement", "tools" ], diff --git a/data/presets/shop/fishing.json b/data/presets/shop/fishing.json index d1264b216..138e67695 100644 --- a/data/presets/shop/fishing.json +++ b/data/presets/shop/fishing.json @@ -12,6 +12,7 @@ "fishing line", "flies", "fly", + "hobby", "lure", "reel", "rod", diff --git a/data/presets/shop/games.json b/data/presets/shop/games.json index b0b6b2817..110444df1 100644 --- a/data/presets/shop/games.json +++ b/data/presets/shop/games.json @@ -12,6 +12,7 @@ "card game", "dice game", "game shop", + "hobby", "larp", "live action role-playing game", "miniature wargame", diff --git a/data/presets/shop/hunting.json b/data/presets/shop/hunting.json index 4b31a741f..e0051a576 100644 --- a/data/presets/shop/hunting.json +++ b/data/presets/shop/hunting.json @@ -12,6 +12,7 @@ "bows", "bullets", "crossbows", + "hobby", "rifles", "traps" ], diff --git a/data/presets/shop/music.json b/data/presets/shop/music.json index 0be8aed88..2bf03af09 100644 --- a/data/presets/shop/music.json +++ b/data/presets/shop/music.json @@ -8,6 +8,7 @@ "tape cassettes", "CDs", "compact discs", + "hobby", "vinyl records", "CD store", "casette", diff --git a/data/presets/shop/musical_instrument.json b/data/presets/shop/musical_instrument.json index 18c4f9999..3e7cdf074 100644 --- a/data/presets/shop/musical_instrument.json +++ b/data/presets/shop/musical_instrument.json @@ -12,6 +12,7 @@ "drum", "flute", "guitar", + "hobby", "keyboard", "piano", "saxophone", diff --git a/data/presets/shop/outdoor.json b/data/presets/shop/outdoor.json index 96cbbdb0d..5033e4420 100644 --- a/data/presets/shop/outdoor.json +++ b/data/presets/shop/outdoor.json @@ -16,6 +16,7 @@ "camping", "climbing", "hiking", + "hobby", "outfitter", "outdoor equipment", "outdoor supplies" diff --git a/data/presets/shop/sports.json b/data/presets/shop/sports.json index 25eeb9568..ad60c63c7 100644 --- a/data/presets/shop/sports.json +++ b/data/presets/shop/sports.json @@ -18,7 +18,8 @@ "shop": "sports" }, "terms": [ - "athletics" + "athletics", + "hobby" ], "name": "Sporting Goods Store" } diff --git a/data/presets/shop/toys.json b/data/presets/shop/toys.json index 881f94f1d..173d1ddef 100644 --- a/data/presets/shop/toys.json +++ b/data/presets/shop/toys.json @@ -9,6 +9,7 @@ }, "terms": [ "games", + "hobby", "teddy" ], "name": "Toy Store" diff --git a/data/presets/shop/video.json b/data/presets/shop/video.json index 3a7000d55..44b024c76 100644 --- a/data/presets/shop/video.json +++ b/data/presets/shop/video.json @@ -10,6 +10,7 @@ ], "terms": [ "DVD", + "hobby", "VHS", "video cassette", "video casette" diff --git a/data/presets/shop/video_games.json b/data/presets/shop/video_games.json index 2745520b7..55bb7e0ea 100644 --- a/data/presets/shop/video_games.json +++ b/data/presets/shop/video_games.json @@ -7,5 +7,8 @@ "tags": { "shop": "video_games" }, + "terms": [ + "hobby" + ], "name": "Video Game Store" } diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index ee42037a1..d109d1e2f 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -11317,7 +11317,7 @@ en: shop/anime: # shop=anime | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Anime / Manga Shop - # 'terms: manga,japan,cosplay,figurine,dakimakura,hobby' + # 'terms: cosplay,dakimakura,figurine,hobby,japan,manga' terms: shop/antiques: # shop=antiques | Antique Store, Antiques Shop, Antiques Store | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -11379,12 +11379,12 @@ en: shop/bicycle: # shop=bicycle | Bike Shop | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Bicycle Shop - # 'terms: bicycle store,bike,bike store,repair,tricycle,unicycle' + # 'terms: bicycle store,bike,bike store,hobby,repair,tricycle,unicycle' terms: shop/boat: # shop=boat | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Boat Store - # 'terms: fishing boat,jetski,motorboat,rowboat,sailboat,vessel,watercraft' + # 'terms: fishing boat,hobby,jetski,motorboat,rowboat,sailboat,vessel,watercraft' terms: shop/bookmaker: # shop=bookmaker | Bookie, Turf Accountant | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -11394,6 +11394,7 @@ en: shop/books: # shop=books | Bookshop, Bookseller, Book Store, Book Shop, Book Seller | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Bookstore + # 'terms: hobby' terms: shop/boutique: # shop=boutique | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -11401,7 +11402,7 @@ en: shop/brewing_supplies: # shop=brewing_supplies | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Brewing Supply Store - # 'terms: brew shop,homebrew supply store' + # 'terms: brew shop,hobby,homebrew supply store' terms: shop/butcher: # shop=butcher | Butcher Shop, Pork Store, Butchery | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -11513,7 +11514,7 @@ en: shop/collector: # shop=collector | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Collectibles Shop - # 'terms: antiques,coins,collection,collectors,comics,dolls,figurines,numismatics,philately,stamps,thrift' + # 'terms: antiques,coins,collection,collectors,comics,dolls,figurines,hobby,numismatics,philately,stamps,thrift' terms: shop/computer: # shop=computer | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -11571,7 +11572,7 @@ en: shop/doityourself: # shop=doityourself | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: DIY Store - # 'terms: craft,diy,do it yourself,hardware,home improvement,tools' + # 'terms: craft,diy,do it yourself,hardware,hobby,home improvement,tools' terms: shop/doors: # shop=doors | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -11632,7 +11633,7 @@ en: shop/fishing: # shop=fishing | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Fishing Shop - # 'terms: bait,fishing line,flies,fly,lure,reel,rod,tackle' + # 'terms: bait,fishing line,flies,fly,hobby,lure,reel,rod,tackle' terms: shop/flooring: # shop=flooring | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -11670,7 +11671,7 @@ en: shop/games: # shop=games | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Tabletop Game Store - # 'terms: board game,card game,dice game,game shop,larp,live action role-playing game,miniature wargame,role-playing,strategy game,wargame' + # 'terms: board game,card game,dice game,game shop,hobby,larp,live action role-playing game,miniature wargame,role-playing,strategy game,wargame' terms: shop/garden_centre: # shop=garden_centre | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -11747,7 +11748,7 @@ en: shop/hunting: # shop=hunting | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Hunting Shop - # 'terms: arrows,bows,bullets,crossbows,rifles,traps' + # 'terms: arrows,bows,bullets,crossbows,hobby,rifles,traps' terms: shop/interior_decoration: # shop=interior_decoration | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -11840,12 +11841,12 @@ en: shop/music: # shop=music | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Music Store - # 'terms: tape cassettes,cds,compact discs,vinyl records,cd store,casette,casette store' + # 'terms: tape cassettes,cds,compact discs,hobby,vinyl records,cd store,casette,casette store' terms: shop/musical_instrument: # shop=musical_instrument | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Musical Instrument Store - # 'terms: accordion,brass instruments,cello,clarinet,drum,flute,guitar,keyboard,piano,saxophone,trumpet,violin' + # 'terms: accordion,brass instruments,cello,clarinet,drum,flute,guitar,hobby,keyboard,piano,saxophone,trumpet,violin' terms: shop/newsagent: # shop=newsagent | Newspaper/Magazine Shop | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -11869,7 +11870,7 @@ en: shop/outdoor: # shop=outdoor | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Outdoors Store - # 'terms: camping,climbing,hiking,outfitter,outdoor equipment,outdoor supplies' + # 'terms: camping,climbing,hiking,hobby,outfitter,outdoor equipment,outdoor supplies' terms: shop/outpost: # shop=outpost | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -11989,7 +11990,7 @@ en: shop/sports: # shop=sports | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Sporting Goods Store - # 'terms: athletics' + # 'terms: athletics,hobby' terms: shop/stationery: # shop=stationery | Office Supply Store | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -12056,7 +12057,7 @@ en: shop/toys: # shop=toys | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Toy Store - # 'terms: games,teddy' + # 'terms: games,hobby,teddy' terms: shop/trade: # shop=trade | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -12092,11 +12093,12 @@ en: shop/video: # shop=video | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Video Store - # 'terms: dvd,vhs,video cassette,video casette' + # 'terms: dvd,hobby,vhs,video cassette,video casette' terms: shop/video_games: # shop=video_games | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Video Game Store + # 'terms: hobby' terms: shop/watches: # shop=watches | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).