mirror of
https://gitlab.com/PronounsPage/PronounsPage.git
synced 2025-09-22 20:24:18 -04:00
#114 [nouns][en] allow skipping plurals
This commit is contained in:
parent
8a8947d4ab
commit
c8a6f24edc
@ -2,7 +2,7 @@
|
||||
<div>
|
||||
<div v-for="(synonym, i) in val" :key="i" class="input-group input-group-sm p-1">
|
||||
<input type="text" class="form-control" v-model="val[i]" required ref="inp" maxlength="24">
|
||||
<div v-if="i" class="input-group-append">
|
||||
<div v-if="i || !required" class="input-group-append">
|
||||
<button type="button" class="btn btn-outline-danger btn-sm" @click="remove(i)">
|
||||
<Icon v="times"/>
|
||||
</button>
|
||||
@ -20,6 +20,7 @@
|
||||
export default {
|
||||
props: {
|
||||
value: {required: true},
|
||||
required: {type: Boolean}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
@ -57,13 +57,13 @@
|
||||
<span class="d-md-none">⁖ <T>nouns.pluralShort</T></span>
|
||||
</th>
|
||||
<td>
|
||||
<NounForm v-model="form.mascPl"/>
|
||||
<NounForm v-model="form.mascPl" :required="config.nouns.pluralsRequired"/>
|
||||
</td>
|
||||
<td>
|
||||
<NounForm v-model="form.femPl"/>
|
||||
<NounForm v-model="form.femPl" :required="config.nouns.pluralsRequired"/>
|
||||
</td>
|
||||
<td>
|
||||
<NounForm v-model="form.neutrPl"/>
|
||||
<NounForm v-model="form.neutrPl" :required="config.nouns.pluralsRequired"/>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
@ -126,9 +126,9 @@
|
||||
masc: [''],
|
||||
fem: [''],
|
||||
neutr: [''],
|
||||
mascPl: [''],
|
||||
femPl: [''],
|
||||
neutrPl: [''],
|
||||
mascPl: this.config.nouns.pluralsRequired ? [''] : [],
|
||||
femPl: this.config.nouns.pluralsRequired ? [''] : [],
|
||||
neutrPl: this.config.nouns.pluralsRequired ? [''] : [],
|
||||
base: null,
|
||||
},
|
||||
submitting: false,
|
||||
@ -149,9 +149,9 @@
|
||||
masc: [''],
|
||||
fem: [''],
|
||||
neutr: [''],
|
||||
mascPl: [''],
|
||||
femPl: [''],
|
||||
neutrPl: [''],
|
||||
mascPl: this.config.nouns.pluralsRequired ? [''] : [],
|
||||
femPl: this.config.nouns.pluralsRequired ? [''] : [],
|
||||
neutrPl: this.config.nouns.pluralsRequired ? [''] : [],
|
||||
base: null,
|
||||
};
|
||||
this.templateVisible = false;
|
||||
|
@ -46,6 +46,7 @@ nouns:
|
||||
route: 'dictionary'
|
||||
collapsable: false
|
||||
plurals: true
|
||||
pluralsRequired: false
|
||||
declension: false
|
||||
submit: true
|
||||
templates: true
|
||||
|
@ -177,7 +177,7 @@ faq:
|
||||
Because addressing people in the way they want to be addressed is the basis of social relations.
|
||||
You wouldn't call Ashley “Samantha”, you wouldn't drop “sir”/“madam” when addressing your supervisor, etc.
|
||||
And there's people who don't want to be called either “{/he=he}” or “{/she=she}”.
|
||||
If you don't accept that, if only shows you in bad light.
|
||||
If you don't accept that, it only shows <em>you</em> in bad light.
|
||||
- >
|
||||
“Strange pronouns” are just a matter of getting used to.
|
||||
how-to-know:
|
||||
|
@ -26,6 +26,7 @@ nouns:
|
||||
route: 'słownik'
|
||||
collapsable: true
|
||||
plurals: true
|
||||
pluralsRequired: true
|
||||
declension: true
|
||||
submit: true
|
||||
templates: true
|
||||
|
@ -174,7 +174,7 @@ router.get('/nouns/:word.png', async (req, res) => {
|
||||
['masc', 'fem', 'neutr'].forEach((form, column) => {
|
||||
let i = 0;
|
||||
for (let [key, symbol] of [['', '⋅'], ['Pl', '⁖']])
|
||||
noun[form + key].split('|').forEach(part => {
|
||||
noun[form + key].split('|').filter(x => x.length).forEach(part => {
|
||||
context.fillText(symbol + ' ' + part, column * (width - 2 * padding) / 3 + padding, 244 + i * 48);
|
||||
i++;
|
||||
});
|
||||
|
@ -322,9 +322,9 @@ export class Noun {
|
||||
this.masc = masc.split('|');
|
||||
this.fem = fem.split('|');
|
||||
this.neutr = neutr.split('|');
|
||||
this.mascPl = mascPl.split('|');
|
||||
this.femPl = femPl.split('|');
|
||||
this.neutrPl = neutrPl.split('|');
|
||||
this.mascPl = mascPl ? mascPl.split('|') : [];
|
||||
this.femPl = femPl ? femPl.split('|') : [];
|
||||
this.neutrPl = neutrPl ? neutrPl.split('|') : [];
|
||||
this.approved = !!approved;
|
||||
this.base = base_id;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user