From 3971d2d16c6d5e8010a96ba451fe23e1adaee4e4 Mon Sep 17 00:00:00 2001 From: Quantum Date: Sun, 13 Feb 2022 00:02:01 -0500 Subject: [PATCH] Display rural date names --- src/Calendar.tsx | 4 +++- src/dates.test.ts | 25 ++++++++++++++++++++++++- src/dates.ts | 9 +++++++++ src/rural-days.json | 1 + 4 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 src/rural-days.json diff --git a/src/Calendar.tsx b/src/Calendar.tsx index 5dd6e33..6004ad8 100644 --- a/src/Calendar.tsx +++ b/src/Calendar.tsx @@ -1,7 +1,7 @@ import React from 'react'; import './Calendar.scss'; import { - dateName, + dateName, dateRuralName, Day, decadeNames, endYear, @@ -37,9 +37,11 @@ function DayDetail({jdn}: { jdn: number }): JSX.Element { function NormalDay({year, month, day, todayJDN}: DateProps & { todayJDN: number }): JSX.Element { const jdn = frJDN(year, month, day); + const rural = dateRuralName(month, day)!; return
{day}
{decadeNames[(day - 1) % 10]}
+
{rural.name}
; } diff --git a/src/dates.test.ts b/src/dates.test.ts index b860b37..73b6071 100644 --- a/src/dates.test.ts +++ b/src/dates.test.ts @@ -1,4 +1,14 @@ -import {dateName, frIsLeap, frJDN, gregorianJDN, jdnFrench, jdnGregorian, jdnLongCount, monthName} from './dates'; +import { + dateName, + dateRuralName, + frIsLeap, + frJDN, + gregorianJDN, + jdnFrench, + jdnGregorian, + jdnLongCount, + monthName +} from './dates'; describe('gregorianJDN', () => { it('works', () => { @@ -170,3 +180,16 @@ describe('dateName', () => { expect(dateName(13, 7)).toBeNull(); }); }); + +describe('dateRuralName', () => { + it('works', () => { + expect(dateRuralName(1, 1)).toEqual({name: 'Raisin', title: 'Grape'}); + expect(dateRuralName(1, 30)).toEqual({name: 'Tonneau', title: 'Barrel'}); + expect(dateRuralName(12, 1)).toEqual({name: 'Prune', title: 'Plum'}); + expect(dateRuralName(12, 30)).toEqual({name: 'Panier', title: 'Pack Basket'}); + }); + + it('returns null for complimentary days', () => { + expect(dateRuralName(13, 1)).toBeNull(); + }); +}); diff --git a/src/dates.ts b/src/dates.ts index 5ee648b..ea42eea 100644 --- a/src/dates.ts +++ b/src/dates.ts @@ -1,4 +1,5 @@ import data from './cal.json'; +import ruralName from './rural-days.json'; // Month 13 is for the complementary days export type Month = 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13; @@ -170,3 +171,11 @@ export function dateName(month: Month, day: Day): string | null { } return `${day} ${monthNames[month]}`; } + +export function dateRuralName(month: Month, day: Day): {name: string, title: string} | null { + const rural = ruralName[month * 30 + day - 31]; + if (!rural) + return null; + const [name, title] = rural; + return {name, title}; +} diff --git a/src/rural-days.json b/src/rural-days.json new file mode 100644 index 0000000..5522337 --- /dev/null +++ b/src/rural-days.json @@ -0,0 +1 @@ +[["Raisin","Grape"],["Safran","Saffron"],["Châtaigne","Chestnut"],["Colchique","Autumn Crocus"],["Cheval","Horse"],["Balsamine","Impatiens"],["Carotte","Carrot"],["Amaranthe","Amaranth"],["Panais","Parsnip"],["Cuve","Vat"],["Pomme de terre","Potato"],["Immortelle","Strawflower"],["Potiron","Winter squash"],["Réséda","Mignonette"],["Âne","Donkey"],["Belle de nuit","Four o'clock flower"],["Citrouille","Pumpkin"],["Sarrasin","Buckwheat"],["Tournesol","Sunflower"],["Pressoir","Wine-Press"],["Chanvre","Hemp"],["Pêche","Peach"],["Navet","Turnip"],["Amaryllis","Amaryllis"],["Bœuf","Ox"],["Aubergine","Eggplant"],["Piment","Chili pepper"],["Tomate","Tomato"],["Orge","Barley"],["Tonneau","Barrel"],["Pomme","Apple"],["Céleri","Celery"],["Poire","Pear"],["Betterave","Beetroot"],["Oie","Goose"],["Héliotrope","Heliotrope"],["Figue","Common fig"],["Scorsonère","Black Salsify"],["Alisier","Chequer Tree"],["Charrue","Plough"],["Salsifis","Salsify"],["Mâcre","Water caltrop"],["Topinambour","Jerusalem artichoke"],["Endive","Endive"],["Dindon","Turkey"],["Chervis","Skirret"],["Cresson","Watercress"],["Dentelaire","Leadworts"],["Grenade","Pomegranate"],["Herse","Harrow"],["Bacchante","Baccharis"],["Azerole","Azarole"],["Garance","Madder"],["Orange","Orange"],["Faisan","Pheasant"],["Pistache","Pistachio Nut"],["Macjonc","Tuberous pea"],["Coing","Quince"],["Cormier","Service tree"],["Rouleau","Roller"],["Raiponce","Rampion"],["Turneps","Cattle turnip"],["Chicorée","Chicory"],["Nèfle","Medlar"],["Cochon","Pig"],["Mâche","Lamb's lettuce"],["Chou-fleur","Cauliflower"],["Miel","Honey"],["Genièvre","Juniper"],["Pioche","Pickaxe"],["Cire","Wax"],["Raifort","Horseradish"],["Cèdre","Cedar tree"],["Sapin","Fir"],["Chevreuil","Roe deer"],["Ajonc","Gorse"],["Cyprès","Cypress Tree"],["Lierre","Ivy"],["Sabine","Savin Juniper"],["Hoyau","Grub-hoe"],["Érable à sucre","Sugar Maple"],["Bruyère","Heather"],["Roseau","Reed plant"],["Oseille","Sorrel"],["Grillon","Cricket"],["Pignon","Pine nut"],["Liège","Cork"],["Truffe","Truffle"],["Olive","Olive"],["Pelle","Shovel"],["Tourbe","Peat"],["Houille","Coal"],["Bitume","Bitumen"],["Soufre","Sulphur"],["Chien","Dog"],["Lave","Lava"],["Terre végétale","Topsoil"],["Fumier","Manure"],["Salpêtre","Saltpeter"],["Fléau","Flail"],["Granit","Granite"],["Argile","Clay"],["Ardoise","Slate"],["Grès","Sandstone"],["Lapin","Rabbit"],["Silex","Flint"],["Marne","Marl"],["Pierre à chaux","Limestone"],["Marbre","Marble"],["Van","Winnowing fan"],["Pierre à plâtre","Gypsum"],["Sel","Salt"],["Fer","Iron"],["Cuivre","Copper"],["Chat","Cat"],["Étain","Tin"],["Plomb","Lead"],["Zinc","Zinc"],["Mercure","Mercury"],["Crible","Sieve"],["Lauréole","Spurge-laurel"],["Mousse","Moss"],["Fragon","Butcher's Broom"],["Perce-neige","Snowdrop"],["Taureau","Bull"],["Laurier-thym","Laurustinus"],["Amadouvier","Tinder polypore"],["Mézéréon","Daphne mezereum"],["Peuplier","Poplar"],["Coignée","Axe"],["Ellébore","Hellebore"],["Brocoli","Broccoli"],["Laurier","Bay laurel"],["Avelinier","Filbert"],["Vache","Cow"],["Buis","Box Tree"],["Lichen","Lichen"],["If","Yew tree"],["Pulmonaire","Lungwort"],["Serpette","Billhook"],["Thlaspi","Pennycress"],["Thimelé","Rose Daphne"],["Chiendent","Couch grass"],["Trainasse","Common Knotgrass"],["Lièvre","Hare"],["Guède","Woad"],["Noisetier","Hazel"],["Cyclamen","Cyclamen"],["Chélidoine","Celandine"],["Traîneau","Sleigh"],["Tussilage","Coltsfoot"],["Cornouiller","Dogwood"],["Violier","Matthiola"],["Troène","Privet"],["Bouc","Billygoat"],["Asaret","Wild Ginger"],["Alaterne","Italian Buckthorn"],["Violette","Violet"],["Marceau","Goat Willow"],["Bêche","Spade"],["Narcisse","Narcissus"],["Orme","Elm"],["Fumeterre","Common fumitory"],["Vélar","Hedge mustard"],["Chèvre","Goat"],["Épinard","Spinach"],["Doronic","Doronicum"],["Mouron","Pimpernel"],["Cerfeuil","Chervil"],["Cordeau","Gardener's Line"],["Mandragore","Mandrake"],["Persil","Parsley"],["Cochléaria","Scurvy-grass"],["Pâquerette","Daisy"],["Thon","Tuna"],["Pissenlit","Dandelion"],["Sylvie","Wood Anemone"],["Capillaire","Maidenhair fern"],["Frêne","Ash tree"],["Plantoir","Dibber"],["Primevère","Primrose"],["Platane","Plane Tree"],["Asperge","Asparagus"],["Tulipe","Tulip"],["Poule","Hen"],["Bette","Chard"],["Bouleau","Birch"],["Jonquille","Daffodil"],["Aulne","Alder"],["Couvoir","Incubator"],["Pervenche","Periwinkle"],["Charme","Hornbeam"],["Morille","Morel"],["Hêtre","Beech Tree"],["Abeille","Bee"],["Laitue","Lettuce"],["Mélèze","Larch"],["Ciguë","Hemlock"],["Radis","Radish"],["Ruche","Hive"],["Gainier","Judas tree"],["Romaine","Romaine lettuce"],["Marronnier","Horse chestnut"],["Roquette","Arugula"],["Pigeon","Pigeon"],["Lilas","Lilac"],["Anémone","Anemone"],["Pensée","Pansy"],["Myrtille","Bilberry"],["Greffoir","Grafting knife"],["Rose","Rose"],["Chêne","Oak Tree"],["Fougère","Fern"],["Aubépine","Hawthorn"],["Rossignol","Nightingale"],["Ancolie","Common Columbine"],["Muguet","Lily of the valley"],["Champignon","Button mushroom"],["Hyacinthe","Hyacinth"],["Râteau","Rake"],["Rhubarbe","Rhubarb"],["Sainfoin","Sainfoin"],["Bâton d'or","Wallflower"],["Chamerisier","Fan Palm tree"],["Ver à soie","Silkworm"],["Consoude","Comfrey"],["Pimprenelle","Salad burnet"],["Corbeille d'or","Basket of Gold"],["Arroche","Orache"],["Sarcloir","Weeding hoe"],["Statice","Sea thrift"],["Fritillaire","Fritillary"],["Bourrache","Borage"],["Valériane","Valerian"],["Carpe","Carp"],["Fusain","Spindle (shrub)"],["Civette","Chive"],["Buglosse","Bugloss"],["Sénevé","White mustard"],["Houlette","Shepherd's crook"],["Luzerne","Alfalfa"],["Hémérocalle","Daylily"],["Trèfle","Clover"],["Angélique","Angelica"],["Canard","Duck"],["Mélisse","Lemon balm"],["Fromental","Oat grass"],["Martagon","Martagon lily"],["Serpolet","Wild Thyme"],["Faux","Scythe"],["Fraise","Strawberry"],["Bétoine","Betony"],["Pois","Pea"],["Acacia","Acacia"],["Caille","Quail"],["Œillet","Carnation"],["Sureau","Elderberry"],["Pavot","Poppy plant"],["Tilleul","Linden or Lime tree"],["Fourche","Pitchfork"],["Barbeau","Cornflower"],["Camomille","Camomile"],["Chèvrefeuille","Honeysuckle"],["Caille-lait","Bedstraw"],["Tanche","Tench"],["Jasmin","Jasmine"],["Verveine","Verbena"],["Thym","Thyme"],["Pivoine","Peony"],["Chariot","Hand Cart"],["Seigle","Rye"],["Avoine","Oat"],["Oignon","Onion"],["Véronique","Speedwell"],["Mulet","Mule"],["Romarin","Rosemary"],["Concombre","Cucumber"],["Échalote","Shallot"],["Absinthe","Wormwood"],["Faucille","Sickle"],["Coriandre","Coriander"],["Artichaut","Artichoke"],["Girofle","Clove"],["Lavande","Lavender"],["Chamois","Chamois"],["Tabac","Tobacco"],["Groseille","Redcurrant"],["Gesse","Hairy Vetchling"],["Cerise","Cherry"],["Parc","Park"],["Menthe","Mint"],["Cumin","Cumin"],["Haricot","Bean"],["Orcanète","Alkanet"],["Pintade","Guineafowl"],["Sauge","Sage"],["Ail","Garlic"],["Vesce","Tare"],["Blé","Wheat"],["Chalémie","Shawm"],["Épeautre","Spelt"],["Bouillon blanc","Common mullein"],["Melon","Melon"],["Ivraie","Ryegrass"],["Bélier","Ram"],["Prêle","Horsetail"],["Armoise","Mugwort"],["Carthame","Safflower"],["Mûre","Blackberry"],["Arrosoir","Watering can"],["Panic","Foxtail millet"],["Salicorne","Common Glasswort"],["Abricot","Apricot"],["Basilic","Basil"],["Brebis","Ewe"],["Guimauve","Marshmallow"],["Lin","Flax"],["Amande","Almond"],["Gentiane","Gentian"],["Écluse","Lock"],["Carline","Carline thistle"],["Câprier","Caper"],["Lentille","Lentil"],["Aunée","Inula"],["Loutre","Otter"],["Myrte","Myrtle"],["Colza","Rapeseed"],["Lupin","Lupin"],["Coton","Cotton"],["Moulin","Mill"],["Prune","Plum"],["Millet","Millet"],["Lycoperdon","Puffball"],["Escourgeon","Six-row Barley"],["Saumon","Salmon"],["Tubéreuse","Tuberose"],["Sucrion","Winter Barley"],["Apocyn","Apocynum"],["Réglisse","Liquorice"],["Échelle","Ladder"],["Pastèque","Watermelon"],["Fenouil","Fennel"],["Épine vinette","European Barberry"],["Noix","Walnut"],["Truite","Trout"],["Citron","Lemon"],["Cardère","Teasel"],["Nerprun","Buckthorn"],["Tagette","Mexican Marigold"],["Hotte","Harvesting basket"],["Églantier","Wild Rose"],["Noisette","Hazelnut"],["Houblon","Hops"],["Sorgho","Sorghum"],["Écrevisse","Crayfish"],["Bigarade","Bitter orange"],["Verge d'or","Goldenrod"],["Maïs","Maize"],["Marron","Sweet Chestnut"],["Panier","Pack Basket"]] \ No newline at end of file