Merge remote-tracking branch 'origin/main'

This commit is contained in:
Andrea Vos 2021-11-21 17:43:49 +01:00
commit 4fa2d3b84f
3 changed files with 27 additions and 35 deletions

View File

@ -38,7 +38,7 @@ module.exports = [
new Event('trans_prisoner', 'Transgender', 1, day(22), EventLevel.Day, ['transgender']),
new Event('xenogender_day', 'Xenogender', 5, day(15), EventLevel.Day, ['xenogender']),
new Event('genderqueer_day', 'Genderqueer', 4, day(25), EventLevel.Day, ['genderqueer']),
new Event('genderfluid_day', 'Genderfluid', 6, day(16), EventLevel.Day, ['genderfluid']),
new Event('genderfluid_day', 'Genderfluid', 6, day(16), EventLevel.Day, ['genderfluid', 'demifluid']),
new Event('aids_day', null, 12, day(1), EventLevel.Day),
new Event('tolerance_day', null, 11, day(16), EventLevel.Day),
new Event('social_justice_day', null, 2, day(20), EventLevel.Day, ['progress pride']),
@ -46,7 +46,7 @@ module.exports = [
new Event('domestic_violence', null, 5, day(25), EventLevel.Day, ['lgbtq']),
new Event('polysexual_day', 'Polysexual', 7, day(26), EventLevel.Day, ['polysexual', 'polyromantic']),
new Event('orlando_day', null, 6, day(12), EventLevel.Day, ['homophobia']),
new Event('demigender_day', 'Demigender', 12, day(15), EventLevel.Day, ['demigender']),
new Event('demigender_day', 'Demigender', 12, day(15), EventLevel.Day, ['demigender', 'demiboy', 'demigirl', 'deminonbinary', 'demineutrois', 'demifluid']),
new Event('pan_pride_day', 'Pansexual', 12, day(8), EventLevel.Day, ['pansexual']),
new Event('transmasculine_day', 'Transmasculine', 2, day(20), EventLevel.Day, ['trans man', 'transmasculine']),
new Event('asexual_visibility_day', 'Asexual', 5, day(8), EventLevel.Day, ['asexual', 'asexual spectrum']),

View File

@ -53,7 +53,7 @@ module.exports = [
new Event('{https://en.wikipedia.org/wiki/Matthew_Shepard=Matthew Shepard} Day of Remembrance', null, 10, day(12), EventLevel.Day),
new Event('{/terminology#transgender=Trans-}, {/terminology#travesti=Travesti} and {{/terminology#nonbinary=Non-Binary} Visibility Day (Paraguay)', 'Transgender', 10, day(15), EventLevel.Day, ['transgender', 'nonbinary', 'travesti']),
new Event('Missing and Murdered Indigenous Women, Girls, and {/terminology#two%20spirit=Two Spirit} Awareness Day', 'Two Spirit', 5, day(5), EventLevel.Day, ['two spirit']),
new Event('Gender Expansive Parents'' Day (US)', null, 12, day(6), EventLevel.Day,
// dynamic date
new Event('Wear it Purple Day (Australia)', null, 8, function* (monthDays) {

View File

@ -9,22 +9,22 @@
<table class="table table-sm">
<thead>
<tr>
<th>Mianownik</th>
<th>Dopełniacz</th>
<th>Celownik</th>
<th>Biernik</th>
<th>Narzędnik</th>
<th>Miejscownik</th>
<th>именительный</th>
<th>родительный</th>
<th>дательный</th>
<th>винительный</th>
<th>творительный</th>
<th>предложный</th>
</tr>
</thead>
<tbody>
<tr>
<td><Morpheme :pronoun="selectedPronoun" morpheme="pronoun_n" :counter="counter"/></td>
<td><Morpheme :pronoun="selectedPronoun" morpheme="pronoun_g" :counter="counter"/> / <Morpheme :pronoun="selectedPronoun" morpheme="pronoun_g_acc" :counter="counter"/></td>
<td><Morpheme :pronoun="selectedPronoun" morpheme="pronoun_d" :counter="counter"/></td>
<td><Morpheme :pronoun="selectedPronoun" morpheme="pronoun_a" :counter="counter"/></td>
<td><Morpheme :pronoun="selectedPronoun" morpheme="pronoun_i" :counter="counter"/></td>
<td><Morpheme :pronoun="selectedPronoun" morpheme="pronoun_l" :counter="counter"/></td>
<td><Morpheme :pronoun="selectedPronoun" morpheme="nominative" :counter="counter"/></td>
<td><Morpheme :pronoun="selectedPronoun" morpheme="genitive" :counter="counter"/></td> / <td><Morpheme :pronoun="selectedPronoun" morpheme="genitive_with_preposition" :counter="counter"/>
<td><Morpheme :pronoun="selectedPronoun" morpheme="dative" :counter="counter"/></td>
<td><Morpheme :pronoun="selectedPronoun" morpheme="accusative" :counter="counter"/></td>
<td><Morpheme :pronoun="selectedPronoun" morpheme="instrumental" :counter="counter"/></td> / <td><Morpheme :pronoun="selectedPronoun" morpheme="instrumental_with_preposition" :counter="counter"/></td>
<td><Morpheme :pronoun="selectedPronoun" morpheme="prepositional" :counter="counter"/></td>
</tr>
</tbody>
</table>
@ -34,30 +34,22 @@
<table class="table table-sm">
<thead>
<tr>
<th>1 os.</th>
<th>2 os.</th>
<th>3 os.</th>
<th>Przymiotniki</th>
<th>Nonreflexive verb past</th>
<th>Reflexive verb past</th>
<th>Short adjective</th>
<th>Adjective</th>
<th>Possessive</th>
<th>Definitive</th>
</tr>
</thead>
<tbody>
<tr>
<td>
<Morpheme :pronoun="selectedPronoun" morpheme="verb_middle_inter" :counter="counter"
prepend=""
:append="selectedPronoun.isPlural(counter) ? 'śmy' : 'm'"
:appendPr="selectedPronoun.isPlural(counter) ? 'ɕmɨ' : 'm'"
/>
</td>
<td>
<Morpheme :pronoun="selectedPronoun" morpheme="verb_middle_inter" :counter="counter"
prepend=""
:append="selectedPronoun.isPlural(counter) ? 'ście' : 'ś'"
:appendPr="selectedPronoun.isPlural(counter) ? 'ɕʨ̑ɛ' : 'ɕ'"
/>
</td>
<td><Morpheme :pronoun="selectedPronoun" morpheme="verb_end_about" :counter="counter" prepend=""/></td>
<td><Morpheme :pronoun="selectedPronoun" morpheme="adjective_n" :counter="counter" prepend=""/></td>
<td><Morpheme :pronoun="selectedPronoun" morpheme="nonreflexive_verb_past" :counter="counter" prepend=""/></td>
<td><Morpheme :pronoun="selectedPronoun" morpheme="reflexive_verb_past" :counter="counter" prepend=""/></td>
<td><Morpheme :pronoun="selectedPronoun" morpheme="short_adjective" :counter="counter" prepend=""/></td>
<td><Morpheme :pronoun="selectedPronoun" morpheme="adjective" :counter="counter" prepend=""/></td>
<td><Morpheme :pronoun="selectedPronoun" morpheme="possessive" :counter="counter"/></td>
<td><Morpheme :pronoun="selectedPronoun" morpheme="definitive" :counter="counter"/></td>
</tr>
</tbody>
</table>