Skip to content

Commit cef4446

Browse files
marcoagcweitatkhangonHieu Lam - TMAweblate
authored
Merging development into main. (#8879)
* Update installation video in readme (#8864) * Feature-8830 Attendee Form: Implement scholarship question with dropdown (#8859) * feature-8830: Attendee Form: Implement scholarship question with dropdown * feature-8830: translate text * feature-8830 update translate for indonesia * feature-8830 correct wikimania spelling * feature-8800: Revert UI for 2 field Consent Form Field & Consent Refu… (#8863) * feature-8800: Revert UI for 2 field Consent Form Field & Consent Refund Policy * feature-8800: Make custom form question translatable by the organizer --------- Co-authored-by: cweitat <[email protected]> * Feature-8829: Additional consent boxes in attendee form (#8858) * feature-8829 * feature-8829: Additional consent boxes in attendee form * feature-8829: Additional consent boxes in attendee form format code * feature-8830: Attendee Form: Implement scholarship question with dropdown * feature-8829: Additional consent boxes in attendee form translate for vi * format code * complex field not showing * feature-8824: Spoken languages not correctly displayed (#8846) * feature-8824: Spoken languages not correctly displayed * feature-8824 should not map language for second time * feature-8824 should not map language for second time * feature-8824 new holder for language name mapping * feature-8827: Make names part of the custom form area in attendee forms (#8861) * feature-8827: Make names part of the custom form area in attendee forms * feature-8827: Make name fields part of the custom form area in attendee forms * feature-8827: Make name fields part of the custom form area in attendee forms * Translated using Weblate (Bengali) Currently translated at 4.2% (108 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/bn/ * Translated using Weblate (Bengali) Currently translated at 4.2% (108 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/bn/ * Translated using Weblate (German) Currently translated at 99.9% (2540 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/de/ * Translated using Weblate (German) Currently translated at 99.9% (2540 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/de/ * Translated using Weblate (German) Currently translated at 99.9% (2540 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/de/ * Translated using Weblate (German) Currently translated at 99.9% (2540 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/de/ * Translated using Weblate (German) Currently translated at 99.9% (2540 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/de/ * Translated using Weblate (German) Currently translated at 99.9% (2540 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/de/ * Translated using Weblate (German) Currently translated at 99.9% (2540 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/de/ * Translated using Weblate (Spanish) Currently translated at 99.9% (2539 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/es/ * Translated using Weblate (Spanish) Currently translated at 99.9% (2539 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/es/ * Translated using Weblate (Spanish) Currently translated at 99.9% (2539 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/es/ * Translated using Weblate (French) Currently translated at 100.0% (2541 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (2541 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (2541 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (2541 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (2541 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (2541 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (2541 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/fr/ * Translated using Weblate (Hindi) Currently translated at 22.2% (566 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/hi/ * Translated using Weblate (Hindi) Currently translated at 22.2% (566 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/hi/ * Translated using Weblate (Hindi) Currently translated at 22.2% (566 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/hi/ * Translated using Weblate (Hindi) Currently translated at 22.2% (566 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/hi/ * Translated using Weblate (Hindi) Currently translated at 22.2% (566 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/hi/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (2541 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/id/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (2541 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/id/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (2541 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/id/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (2541 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/id/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (2541 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/id/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (2541 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/id/ * Translated using Weblate (Japanese) Currently translated at 99.9% (2540 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.9% (2540 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.9% (2540 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/ja/ * Translated using Weblate (Korean) Currently translated at 99.9% (2539 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/ko/ * Translated using Weblate (Korean) Currently translated at 99.9% (2539 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/ko/ * Translated using Weblate (Korean) Currently translated at 99.9% (2539 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/ko/ * Translated using Weblate (Korean) Currently translated at 99.9% (2539 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/ko/ * Translated using Weblate (Polish) Currently translated at 1.4% (37 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/pl/ * Translated using Weblate (Polish) Currently translated at 1.4% (37 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/pl/ * Translated using Weblate (Russian) Currently translated at 99.8% (2538 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/ru/ * Translated using Weblate (Russian) Currently translated at 99.8% (2538 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/ru/ * Translated using Weblate (Russian) Currently translated at 99.8% (2538 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/ru/ * Translated using Weblate (Thai) Currently translated at 99.8% (2538 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/th/ * Translated using Weblate (Thai) Currently translated at 99.8% (2538 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/th/ * Translated using Weblate (Thai) Currently translated at 99.8% (2538 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/th/ * Translated using Weblate (Vietnamese) Currently translated at 99.8% (2537 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/vi/ * Translated using Weblate (Vietnamese) Currently translated at 99.8% (2537 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/vi/ * Translated using Weblate (Vietnamese) Currently translated at 99.8% (2537 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/vi/ * Translated using Weblate (Vietnamese) Currently translated at 99.8% (2537 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/vi/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 37.3% (949 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/zh_Hans/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 37.3% (949 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/zh_Hans/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 37.3% (949 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/zh_Hans/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 37.3% (949 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/zh_Hans/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 37.3% (949 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/zh_Hans/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 99.9% (2540 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 99.9% (2540 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/zh_Hant/ * Translated using Weblate (Norwegian Bokmål) Currently translated at 1.1% (29 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/nb_NO/ * Translated using Weblate (Norwegian Bokmål) Currently translated at 1.1% (29 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/nb_NO/ * Translated using Weblate (German (de_DIVEO)) Currently translated at 0.1% (2 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/de_DIVEO/ * Translated using Weblate (Swedish) Currently translated at 3.3% (85 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/sv/ * Translated using Weblate (Swedish) Currently translated at 3.3% (85 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/sv/ * Translated using Weblate (Swedish) Currently translated at 3.3% (85 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/sv/ * Translated using Weblate (Arabic) Currently translated at 99.7% (2522 of 2529 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 99.7% (2522 of 2529 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 99.7% (2522 of 2529 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/ar/ * Translated using Weblate (Spanish) Currently translated at 100.0% (2541 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/es/ * Translated using Weblate (Arabic) Currently translated at 100.0% (2529 of 2529 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/ar/ * Added translation using Weblate (Catalan) (#8873) Co-authored-by: hung nguyen <[email protected]> * feat #8842: changed the attendee gender options (#8874) * feat #8842: changed the attendee gender options * remove "Open" as option --------- Co-authored-by: Rebekka Rossberg <[email protected]> Co-authored-by: cweitat <[email protected]> * Translations update from Hosted Weblate (#8875) * Translated using Weblate (Catalan) Currently translated at 0.1% (3 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/ca/ * Translated using Weblate (Catalan) Currently translated at 0.7% (18 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/ca/ --------- Co-authored-by: hung nguyen <[email protected]> Co-authored-by: Mario Behling <[email protected]> * Translated using Weblate (Catalan) (#8876) Currently translated at 0.1% (3 of 2541 strings) Translation: Open Event/Open Event Frontend Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/ca/ Co-authored-by: hung nguyen <[email protected]> * feature-8845: Languages missing from language dropdown (#8865) * feature-8845: Languages missing from language dropdown * feature-8845: Languages missing from language dropdown * feature-8845: Languages missing from language dropdown * feature-8845: Languages missing from language dropdown * feature-8845: Languages missing from language dropdown * feature-8845: Languages missing from language dropdown * feature-8845: Languages missing from language dropdown --------- Co-authored-by: Mario Behling <[email protected]> Co-authored-by: Khang On - TMA <[email protected]> --------- Co-authored-by: cweitat <[email protected]> Co-authored-by: Khang On - TMA <[email protected]> Co-authored-by: Hieu Lam - TMA <[email protected]> Co-authored-by: Anonymous <[email protected]> Co-authored-by: Meghal Bisht <[email protected]> Co-authored-by: Mario Behling <[email protected]> Co-authored-by: Areeb Jamal <[email protected]> Co-authored-by: Areeb Jamal <[email protected]> Co-authored-by: J. Lavoie <[email protected]> Co-authored-by: Andreas Kleinert <[email protected]> Co-authored-by: nautilusx <[email protected]> Co-authored-by: Hong Phuc Dang <[email protected]> Co-authored-by: François Cartegnie <[email protected]> Co-authored-by: progmatic99 <[email protected]> Co-authored-by: Reza Almanda <[email protected]> Co-authored-by: Untari <[email protected]> Co-authored-by: naofum <[email protected]> Co-authored-by: Youngbin Han <[email protected]> Co-authored-by: Axus Wizix <[email protected]> Co-authored-by: PPNplus <[email protected]> Co-authored-by: thegaro0310 <[email protected]> Co-authored-by: Leslie Wong <[email protected]> Co-authored-by: MikeyWei <[email protected]> Co-authored-by: yzqzss <[email protected]> Co-authored-by: Allan Nordhøy <[email protected]> Co-authored-by: Kristoffer Grundström <[email protected]> Co-authored-by: tygyh <[email protected]> Co-authored-by: hung nguyen <[email protected]> Co-authored-by: Rebekka <[email protected]> Co-authored-by: Rebekka Rossberg <[email protected]>
1 parent 343079f commit cef4446

File tree

16 files changed

+12169
-72
lines changed

16 files changed

+12169
-72
lines changed

‎app/components/forms/orders/order-form.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ export default Component.extend(FormMixin, {
117117
rules: [
118118
{
119119
type : 'empty',
120-
prompt : this.l10n.t('Please select a gender.')
120+
prompt : this.l10n.t('Please select categories that describe your gender identity.')
121121
}
122122
]
123123
};
@@ -661,7 +661,7 @@ export default Component.extend(FormMixin, {
661661
return groupBy(requiredFixed.concat(customFields), field => field.get('form'));
662662
}),
663663

664-
genders : orderBy(genders, 'name'),
664+
genders : orderBy(genders, 'position'),
665665
ageGroups : orderBy(ageGroups, 'position'),
666666
countries : orderBy(countries, 'name'),
667667
years : orderBy(years, 'year'),
@@ -700,6 +700,9 @@ export default Component.extend(FormMixin, {
700700
},
701701
updateLanguageFormsSelection(checked, changed, selectedOptions, holder, field) {
702702
holder.set(field.fieldIdentifier, selectedOptions.map(select => select.value).join(','));
703+
},
704+
updateGendersSelection(checked, changed, selectedOptions, entity, field) {
705+
entity.set(field.fieldIdentifier, selectedOptions.map(select => select.value).join(','));
703706
}
704707
}
705708
});

‎app/components/forms/wizard/custom-form-input-translation.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Component from '@glimmer/component';
2-
import { action } from '@ember/object';
2+
import { action, computed } from '@ember/object';
33

44
interface Args {
55
onChange: ((code: string, value: string) => void) | null,
@@ -14,6 +14,8 @@ interface SubForm {
1414

1515
export default class CustomFormInputTranslation extends Component<Args> {
1616
self = this
17+
18+
@computed('args.data.ignoreLanguages.@each')
1719
get languageList(): object[] {
1820
const { languages, ignoreLanguages, selectedLang } = this.args.data;
1921
return languages.filter((item: SubForm) =>

‎app/components/forms/wizard/custom-form-input.ts

Lines changed: 39 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { action, computed } from '@ember/object';
44
import { inject as service } from '@ember/service';
55
import DS from 'ember-data';
66
import { tracked } from '@glimmer/tracking';
7-
import { languageForms } from 'open-event-frontend/utils/dictionary/language-form';
7+
import { translateLanguages } from 'open-event-frontend/utils/dictionary/translate-language';
88
import { A } from '@ember/array';
99

1010
interface CustomForm {
@@ -53,7 +53,7 @@ interface Args {
5353
form: string,
5454
event: any,
5555
formIdentifier: string | '',
56-
mainLanguage: string | 'en-US',
56+
mainLanguage: string | 'en',
5757
min: number | 0,
5858
max: number | 10,
5959
onSave: (() => void) | null
@@ -76,7 +76,7 @@ export default class CustomFormInput extends Component<Args> {
7676
max = 10;
7777

7878
@tracked
79-
mainLanguage = 'en-US'
79+
mainLanguage = 'en'
8080

8181
@tracked
8282
selectedLanguage:string[] = [this.mainLanguage]
@@ -96,23 +96,29 @@ export default class CustomFormInput extends Component<Args> {
9696
this.max = this.args.field.max;
9797
this.mainLanguage = this.args.field.mainLanguage;
9898
this.translations = this.args.field.translations;
99+
this.selectedLanguage.clear();
100+
this.selectedLanguage.pushObject(this.mainLanguage)
101+
const selectedLanguage = this.translations?.map(trans => trans.code || trans.language_code);
102+
this.selectedLanguage.pushObjects(selectedLanguage)
99103
this.translations?.forEach((trans: Translate) => {
100104
const { name, code, language_code, form_id, isDeleted, id } = trans;
101-
this.subForm.pushObject({
102-
id,
103-
form_id,
104-
name,
105-
languages : languageForms,
106-
ignoreLanguages : this.selectedLanguage,
107-
selectedLang : code || language_code,
108-
isDeleted
109-
})
105+
if (isDeleted || (name && (code || language_code))) {
106+
this.subForm.pushObject({
107+
id,
108+
form_id,
109+
name,
110+
languages : translateLanguages,
111+
ignoreLanguages : this.selectedLanguage,
112+
selectedLang : code || language_code,
113+
isDeleted
114+
})
115+
}
110116
})
111117
} else {
112118
this.name = '';
113119
this.min = 0;
114120
this.max = 10;
115-
this.mainLanguage = 'en-US';
121+
this.mainLanguage = 'en';
116122
}
117123
}
118124

@@ -121,13 +127,15 @@ export default class CustomFormInput extends Component<Args> {
121127
return getIdentifier(this.name, this.args.customForms);
122128
}
123129

124-
@computed('name')
130+
@computed('name', 'selectedLanguage.@each', '[email protected]')
125131
get validIdentifier(): boolean {
126-
return this.identifier.trim().length > 0 && this.name.trim().length > 0;
132+
const nameValid = this.identifier.trim().length > 0 && this.name.trim().length > 0;
133+
const transInValid = this.subForm.filter(field => !field.isDeleted && (!field.name || !field.selectedLang))
134+
return nameValid && !transInValid?.length;
127135
}
128136

129137
get languageList(): object[] {
130-
return languageForms.filter(language =>
138+
return translateLanguages.filter(language =>
131139
language.code === this.mainLanguage || !this.selectedLanguage.includes(language.code)
132140
)
133141
}
@@ -136,15 +144,17 @@ export default class CustomFormInput extends Component<Args> {
136144
get translationsList(): Translate[] {
137145
const translations: Translate[] = []
138146
this.subForm.forEach(field => {
139-
const { id, form_id, name, isDeleted } = field
140-
translations.pushObject({
141-
id,
142-
form_id,
143-
name,
144-
code : field.selectedLang,
145-
language_code : field.selectedLang,
146-
isDeleted
147-
})
147+
const { id, form_id, name, isDeleted, selectedLang } = field
148+
if (isDeleted || (name && selectedLang)) {
149+
translations.pushObject({
150+
id,
151+
form_id,
152+
name,
153+
code : selectedLang,
154+
language_code : selectedLang,
155+
isDeleted
156+
})
157+
}
148158
})
149159
return translations;
150160
}
@@ -164,7 +174,7 @@ export default class CustomFormInput extends Component<Args> {
164174
min : this.min,
165175
max : this.max,
166176
translations : this.translationsList,
167-
mainLanguage : this.mainLanguage || 'en-US'
177+
mainLanguage : this.mainLanguage || 'en'
168178
});
169179
}
170180

@@ -189,7 +199,7 @@ export default class CustomFormInput extends Component<Args> {
189199
this.max = 10;
190200
this.subForm.clear();
191201
this.selectedLanguage.clear();
192-
this.mainLanguage = 'en-US'
202+
this.mainLanguage = 'en'
193203
this.selectedLanguage.pushObject(this.mainLanguage);
194204
this.args.onSave && this.args.onSave();
195205
}
@@ -198,7 +208,7 @@ export default class CustomFormInput extends Component<Args> {
198208
addTranslation():void {
199209
const obj: any = {
200210
name : '',
201-
languages : languageForms,
211+
languages : translateLanguages,
202212
ignoreLanguages : this.selectedLanguage,
203213
selectedLang : '',
204214
isDeleted : false
@@ -229,7 +239,7 @@ export default class CustomFormInput extends Component<Args> {
229239

230240
@computed('[email protected]')
231241
get disableAddTranslation() {
232-
return this.subForm.filter(item => !item.isDeleted).length === languageForms.length - 1;
242+
return this.subForm.filter(item => !item.isDeleted).length === translateLanguages.length - 1;
233243
}
234244

235245
@computed('[email protected]')

‎app/components/forms/wizard/custom-forms/table.hbs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,16 @@
6262
{{/if}}
6363
</div>
6464
{{#each field.translations as |translation|}}
65-
<div>
66-
{{concat translation.name " - " translation.language_code}}
67-
<div class="ui icon d-inline" data-tooltip="Custom Field" style="visibility: hidden">
68-
<i class="info icon"></i>
69-
</div>
70-
</div>
65+
{{#unless translation.isDeleted}}
66+
{{#if (and translation.name translation.language_code )}}
67+
<div>
68+
{{concat translation.name " - " translation.language_code}}
69+
<div class="ui icon d-inline" data-tooltip="Custom Field" style="visibility: hidden">
70+
<i class="info icon"></i>
71+
</div>
72+
</div>
73+
{{/if}}
74+
{{/unless}}
7175
{{/each}}
7276
{{else}}
7377
{{#if (eq field.fieldIdentifier 'is_consent_form_field')}}

‎app/components/widgets/forms/ui-checkbox-group.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export default class UiCheckboxGroupComponent extends Component {
5656
for (let i = 0; i < this.args.options.length; i++) {
5757
const item = this.args.options[i];
5858
const label = item.name;
59-
const value = item.code;
59+
const value = item.code ? item.code : item.name;
6060
const checked = this.isOptionChecked(value);
6161
const obj = EmberObject.create({
6262
label,

‎app/mixins/custom-form.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ export default Mixin.create(MutableArray, {
446446
fieldIdentifier : 'gender',
447447
formID : _formID,
448448
form : 'attendee',
449-
type : 'select',
449+
type : 'checkbox',
450450
isRequired : false,
451451
isIncluded : false,
452452
isPublic : false,

‎app/models/custom-form.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export default ModelBase.extend({
7373
min : attr('number', { defaultValue: 0 }),
7474
max : attr('number', { defaultValue: 10 }),
7575
translations : attr(),
76-
mainLanguage : attr('string', { defaultValue: 'en-US' }),
76+
mainLanguage : attr('string', { defaultValue: 'en' }),
7777

7878
event : belongsTo('event'),
7979
customFormOptions : hasMany('customFormOptions'),
@@ -103,7 +103,7 @@ export default ModelBase.extend({
103103
instagram : tn.t('Instagram'),
104104
linkedin : tn.t('LinkedIn'),
105105
mastodon : tn.t('Mastodon'),
106-
gender : tn.t('Gender'),
106+
gender : tn.t('Which of these categories describe your gender identity? (check all that apply)'),
107107
acceptReceiveEmails : tn.t('Email consent'),
108108
acceptVideoRecording : tn.t('Photo & video & text consent'),
109109
acceptShareDetails : tn.t('Partner contact consent'),

‎app/services/l10n.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export default class L10nService extends L10n {
1515

1616
@computed(function() {
1717
return {
18+
'ar' : 'عربي',
1819
'bn' : 'বাংলা',
1920
'de' : 'Deutsch',
2021
'en' : 'English',
@@ -23,13 +24,15 @@ export default class L10nService extends L10n {
2324
'hi' : 'हिंदी',
2425
'id' : 'Bahasa Indonesia',
2526
'ja' : '日本語',
27+
'ko' : '한국어',
28+
'nb_NO' : 'Norsk bokmål',
2629
'pl' : 'Polski',
2730
'ru' : 'Русский',
31+
'sv' : 'Svenska',
2832
'th' : 'ไทย',
2933
'vi' : 'Tiếng Việt',
3034
'zh_Hans' : '中文（简体)',
31-
'zh_Hant' : '中文（繁體)',
32-
'ko' : '한국어'
35+
'zh_Hant' : '中文（繁體)'
3336
};
3437
})
3538
availableLocales;

‎app/templates/components/forms/orders/attendee-list.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
{{else if (eq field.type 'select')}}
5353
<span class="word-break">{{get holder field.identifierPath}}</span>
5454
{{else if (eq field.type 'checkbox')}}
55-
{{#if (or (eq field.fieldIdentifier "language_form_1") (eq field.fieldIdentifier "language_form_2"))}}
55+
{{#if (or (eq field.fieldIdentifier "language_form_1") (eq field.fieldIdentifier "language_form_2") (eq field.fieldIdentifier "gender"))}}
5656
<span class="word-break">{{get holder (concat field.fieldIdentifier '_name_mapping')}}</span>
5757
{{else}}
5858
<span class="word-break">

‎app/templates/components/forms/orders/order-form.hbs

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -122,23 +122,12 @@
122122
{{/if}}
123123
{{/if}}
124124
{{else if (eq field.fieldIdentifier 'gender')}}
125-
<UiDropdown
126-
@class="search selection"
127-
@selected={{get holder field.identifierPath}}
128-
@onChange={{action (mut holder.gender)}} as |execute mapper|>
129-
<Input
130-
@type="hidden"
131-
@name={{if field.isRequired (concat field.fieldIdentifier "_required_" index) (concat field.fieldIdentifier "_" index)}} />
132-
<i class="dropdown icon"></i>
133-
<div class="default text">{{t 'Select your gender'}}</div>
134-
<div class="menu">
135-
{{#each this.genders as |gender|}}
136-
<div class="item" data-value="{{map-value mapper gender.name}}">
137-
{{gender.name}}
138-
</div>
139-
{{/each}}
140-
</div>
141-
</UiDropdown>
125+
<Widgets::Forms::UiCheckboxGroup
126+
@options={{genders}}
127+
@onChange={{action "updateGendersSelection"}}
128+
@entity={{holder}}
129+
@field={{field}}
130+
/>
142131
{{else if (eq field.fieldIdentifier 'country')}}
143132
<UiDropdown
144133
@class="search selection"

‎app/utils/dictionary/genders.ts

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,30 @@
11
export const genders = [
22
{
3-
name: 'Female'
3+
name : 'Man',
4+
isChecked : false
45
},
56
{
6-
name: 'Male'
7+
name : 'Woman',
8+
isChecked : false
79
},
810
{
9-
name: 'Diverse / Non-binary'
11+
name : 'Transgender',
12+
isChecked : false
1013
},
1114
{
12-
name: 'Other'
15+
name : 'Non-binary',
16+
isChecked : false
1317
},
1418
{
15-
name: 'Prefer not to share'
19+
name : 'Genderqueer',
20+
isChecked : false
21+
},
22+
{
23+
name : 'An identity not listed here',
24+
isChecked : false
25+
},
26+
{
27+
name : 'I prefer not to say',
28+
isChecked : false
1629
}
1730
];

0 commit comments

Comments
 (0)