Revert "Revert "feature-8866: Rename form with meaningful name in order form (#8903)""

This reverts commit 1cfe343.

Author: norbusan

app/components/forms/orders/attendee-list.js

@@ -20,11 +20,11 @@ export default class AttendeeList extends Component {
   @computed('data.attendees')
   get holders() {
     this.data.attendees.forEach(attendee => {
-      if (attendee.language_form_1) {
-        this.languageFormMapCodeToName(attendee, 'language_form_1', languageForms1);
+      if (attendee.native_language) {
+        this.languageFormMapCodeToName(attendee, 'native_language', languageForms1);
       }
-      if (attendee.language_form_2) {
-        this.languageFormMapCodeToName(attendee, 'language_form_2', languageForms2);
+      if (attendee.fluent_language) {
+        this.languageFormMapCodeToName(attendee, 'fluent_language', languageForms2);
       }
       if (attendee.gender) {
         this.genderAddSpaces(attendee);
@@ -58,7 +58,6 @@ export default class AttendeeList extends Component {
     const current_locale = this.cookies.read('current_locale');
     const customFields = orderBy(this.fields.toArray()?.map(field => {
       const { main_language } = field;
-
       if ((main_language && main_language.split('-')[0] === current_locale) || !field.translations || !field.translations.length) {
         field.transName = field.name;
       } else if (field.translations?.length) {

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

@@ -476,7 +476,7 @@ export default Component.extend(FormMixin, {
       ]
     };
 
-    const languageForm1Validation = {
+    const nativeLanguageValidation = {
       rules: [
         {
           type   : 'empty',
@@ -485,7 +485,7 @@ export default Component.extend(FormMixin, {
       ]
     };
 
-    const languageForm2Validation = {
+    const fluentLanguageValidation = {
       rules: [
         {
           type   : 'empty',
@@ -598,8 +598,8 @@ export default Component.extend(FormMixin, {
       validationRules.fields[`instagram_required_${  index}`] = instagramRequiredValidation;
       validationRules.fields[`linkedin_${  index}`] = linkedinValidation;
       validationRules.fields[`linkedin_required_${  index}`] = linkedinRequiredValidation;
-      validationRules.fields[`language_form_1_required_${  index}`] = languageForm1Validation;
-      validationRules.fields[`language_form_2_required_${  index}`] = languageForm2Validation;
+      validationRules.fields[`native_language_required_${  index}`] = nativeLanguageValidation;
+      validationRules.fields[`fluent_language_required_${  index}`] = fluentLanguageValidation;
       validationRules.fields[`is_consent_form_field_required_${  index}`] = isConsentFormFieldValidation;
       validationRules.fields[`is_consent_of_refund_policy_required_${  index}`] = isConsentOfRefundPolicyValidation;
       this.allFields.attendee.filter(field => field.isComplex && field.isRequired).forEach(field => {

app/mixins/custom-form.js

@@ -640,8 +640,8 @@ export default Mixin.create(MutableArray, {
         event           : parent
       }),
       this.store.createRecord('custom-form', {
-        name            : 'languageForm1',
-        fieldIdentifier : 'language_form_1',
+        name            : 'nativeLanguage',
+        fieldIdentifier : 'native_language',
         formID          : _formID,
         form            : 'attendee',
         type            : 'checkbox',
@@ -651,8 +651,8 @@ export default Mixin.create(MutableArray, {
         event           : parent
       }),
       this.store.createRecord('custom-form', {
-        name            : 'languageForm2',
-        fieldIdentifier : 'language_form_2',
+        name            : 'fluentLanguage',
+        fieldIdentifier : 'fluent_language',
         formID          : _formID,
         form            : 'attendee',
         type            : 'checkbox',

app/models/attendee.js

@@ -43,8 +43,8 @@ export default ModelBase.extend({
   birthDate                   : attr('moment'),
   complexFieldValues          : attr(),
   is_consent_of_refund_policy : attr('boolean', { defaultValue: false }),
-  language_form_1             : attr('string'),
-  language_form_2             : attr('string'),
+  native_language             : attr('string'),
+  fluent_language             : attr('string'),
   home_wiki                   : attr('string'),
   is_consent_form_field       : attr('boolean', { defaultValue: false }),
   is_consent_form_field_photo : attr('boolean', { defaultValue: false }),

app/models/custom-form.js

@@ -112,9 +112,9 @@ export default ModelBase.extend({
     is_consent_form_field_photo : tn.t('Wikimania photo consent'),
     is_consent_form_field_email : tn.t('Wikimania email updates'),
     isConsentOfRefundPolicy     : tn.t('Consent of refund policy'),
-    languageForm1               : tn.t('What is your native language, or what language are you most fluent in?'),
-    languageForm2               : tn.t('Are you fluent in any other of the following languages?'),
     homeWiki                    : tn.t('What is your home wiki'),
+    nativeLanguage              : tn.t('What is your native language, or what language are you most fluent in?'),
+    fluentLanguage              : tn.t('Are you fluent in any other of the following languages?'),
     wikiScholarship             : tn.t('Have you received a Wikimania scholarship?')
   },
 

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

@@ -54,7 +54,7 @@
                     {{else if (eq field.type 'select')}}
                       <span class="word-break">{{get holder field.identifierPath}}</span>
                     {{else if (eq field.type 'checkbox')}}
-                      {{#if (or (eq field.fieldIdentifier "language_form_1") (eq field.fieldIdentifier "language_form_2") (eq field.fieldIdentifier "gender"))}}
+                      {{#if (or (eq field.fieldIdentifier "native_language") (eq field.fieldIdentifier "fluent_language") (eq field.fieldIdentifier "gender"))}}
                         <span class="word-break">{{get holder (concat field.fieldIdentifier '_name_mapping')}}</span>
                       {{else}}
                         <span class="word-break">

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

@@ -240,7 +240,7 @@
                     @onChange={{action (mut (get holder field.identifierPath))}} />
                     <span>{{t 'I want to receive email updates about future Wikimania editions.'}} </span>
                 {{else if (eq field.type 'checkbox')}}
-                  {{#if (and (not-eq field.fieldIdentifier "language_form_1") (not-eq field.fieldIdentifier "language_form_2"))}}     
+                  {{#if (and (not-eq field.fieldIdentifier "native_language") (not-eq field.fieldIdentifier "fluent_language"))}}     
                     <UiCheckbox
                       @checked={{get holder field.identifierPath}}         
                       @name={{if field.isRequired (concat field.fieldIdentifier "_required_" index) (concat field.fieldIdentifier "_" index)}}       
@@ -268,15 +268,15 @@
                     </div>
                   </UiDropdown>
                 {{/if}}
-                {{#if (eq field.fieldIdentifier "language_form_1")}}
+                {{#if (eq field.fieldIdentifier "native_language")}}
                   <Widgets::Forms::UiCheckboxGroup 
                     @options={{languageForms1}}
                     @onChange={{action "updateLanguageFormsSelection"}}
                     @holder={{holder}}
                     @field={{field}}
                   />
                 {{/if}}
-                {{#if (eq field.fieldIdentifier "language_form_2")}}
+                {{#if (eq field.fieldIdentifier "fluent_language")}}
                   <Widgets::Forms::UiCheckboxGroup 
                     @options={{languageForms2}}
                     @onChange={{action "updateLanguageFormsSelection"}}