sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-07-31 19:20:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MynahMarie-fix_addlNotes' into develop

Browse source
This commit is contained in:
Matteo Pagliazzi 2020-03-02 22:42:48 +01:00
commit f448c8cdfb
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
website/common/locales/en/limited.json
View file

@ -130,6 +130,7 @@
"fall2018CandymancerMageSet": "Candymancer (Mage)",
"fall2018CarnivorousPlantSet": "Carnivorous Plant (Healer)",
"fall2018AlterEgoSet": "Alter Ego (Rogue)",
"june2018": "June 2018",
"winter2019BlizzardSet": "Blizzard (Warrior)",
"winter2019PyrotechnicSet": "Pyrotechnic (Mage)",
"winter2019WinterStarSet": "Winter Star (Healer)",

4
website/common/script/content/hatching-potions.js
View file

@ -303,9 +303,9 @@ each(wacky, (pot, key) => {
notes: t('hatchingPotionNotes', {
potText: pot.text,
}),
_addlNotes: t('eventAvailability', {
_addlNotes: pot._seasont && pot._season !== '_PENDING_' ? t('eventAvailability', {
date: t(`dateEnd${pot._season}`),
}),
}) : null,
premium: false,
limited: true,
wacky: true,