Revert "fix-8914: Update spelling and translations of attendee form (#8932)"

This reverts commit 0bcc432.

Author: norbusan

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

@@ -460,7 +460,7 @@ export default Component.extend(FormMixin, {
       rules: [
         {
           type   : 'empty',
-          prompt : this.l10n.t('Please enter Code of conduct consent.')
+          prompt : this.l10n.t('Please enter Consent form field.')
         }
       ]
     };

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

@@ -79,7 +79,7 @@
                   <a href="https://foundation.wikimedia.org/wiki/Policy:Universal_Code_of_Conduct">{{t 'Universal Code of Conduct'}} </a>
                   <span> {{t 'and the'}} </span>
                   <a href="https://foundation.wikimedia.org/wiki/Policy:Friendly_space_policy">{{t 'Friendly Space Policy'}}</a>
-                  <span>.</span>
+                  <span> .</span>
                 {{else}}
                   {{t-var field.name}}
                 {{/if}}

app/components/public/ticket-list.js

@@ -45,8 +45,8 @@ export default Component.extend(FormMixin, {
   accessCodeTickets : A(),
   discountedTickets : A(),
 
-  invalidPromotionalAccessCode   : false,
-  invalidPromotionalDiscountCode : false,
+  invalidPromotionalAccessCode: false,
+  invalidPromotionalDiscountCode: false,
 
   tickets: computed('orderAmount', function() {
     const ticketMap = {};

app/mixins/custom-form.js

@@ -673,7 +673,7 @@ export default Mixin.create(MutableArray, {
         event           : parent
       }),
       this.store.createRecord('custom-form', {
-        name            : 'Code of conduct consent',
+        name            : 'Consent form field',
         fieldIdentifier : 'is_consent_form_field',
         formID          : _formID,
         form            : 'attendee',

app/models/custom-form.js

@@ -108,7 +108,7 @@ export default ModelBase.extend({
     acceptVideoRecording        : tn.t('Photo & video & text consent'),
     acceptShareDetails          : tn.t('Partner contact consent'),
     acceptReceiveEmails         : tn.t('Email consent'),
-    is_consent_form_field       : tn.t('Code of conduct consent'),
+    is_consent_form_field       : tn.t('Consent form field'),
     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'),

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

@@ -224,15 +224,15 @@
                     <a href="https://foundation.wikimedia.org/wiki/Policy:Universal_Code_of_Conduct">{{t 'Universal Code of Conduct'}}</a>
                     <span> {{t 'and the'}} </span>
                     <a href="https://foundation.wikimedia.org/wiki/Policy:Friendly_space_policy">{{t 'Friendly Space Policy'}}</a>
-                    <span>.</span>
+                    <span> .</span>
                 {{else if (eq field.fieldIdentifier 'is_consent_form_field_photo')}}
                   <UiCheckbox
                     @checked={{get holder field.identifierPath}}         
                     @name={{if field.isRequired (concat field.fieldIdentifier "_required_" index) (concat field.fieldIdentifier "_" index)}}       
                     @onChange={{action (mut (get holder field.identifierPath))}} />
                     <span>{{t 'I consent to the Wikimania'}} </span>
                     <a href="https://wikimania.wikimedia.org/wiki/2023:Photography_policy">{{t 'photo policy'}}</a>
-                    <span>.</span>
+                    <span> .</span>
                 {{else if (eq field.fieldIdentifier 'is_consent_form_field_email')}}
                   <UiCheckbox
                     @checked={{get holder field.identifierPath}}         

app/templates/components/widgets/forms/ui-checkbox-group.hbs

@@ -10,7 +10,7 @@
         @type={{this.type}}
         @onChange={{action 'childOnChange'}}
         @checked={{op.checked}}/>
-          {{t op.label}}
+          {{op.label}}
     </div>
   {{/each}}
 </div>

translations/ar.po

@@ -12129,8 +12129,8 @@ msgid "Friendly Space Policy"
 msgstr "سياسة المساحة الودية"
 
 #: app/models/custom-form.js:113:28
-msgid "Code of conduct consent"
-msgstr "الموافقة على مدونة قواعد السلوك"
+msgid "Consent form field"
+msgstr "حقل نموذج الموافقة"
 
 #: app/utils/dictionary/age-groups.ts:5:9
 msgid "Under 18"
@@ -12203,55 +12203,3 @@ msgstr "ما هي لغتك الأم ، أو ما هي اللغة التي تتق
 #: app/models/custom-form.js:111:27
 msgid "Are you fluent in any other of the following languages?"
 msgstr "هل تتقن أي لغة أخرى من اللغات التالية؟"
-
-#: app/models/custom-form.js:106:27
-msgid "Which of these categories describe your gender identity? (check all that apply)"
-msgstr "أي من الفئات التالية يصف هويتك الجنسية على أفضل نحو؟ (اختر كل ما ينطبق)"
-
-#: app/utils/dictionary/genders.ts:5:12
-msgid "Man"
-msgstr "رجل"
-
-#: app/utils/dictionary/genders.ts:8:12
-msgid "Woman"
-msgstr "امرأة"
-
-#: app/utils/dictionary/genders.ts:11:12
-msgid "Transgender"
-msgstr "المتحولين جنسيا"
-
-#: app/utils/dictionary/genders.ts:14:12
-msgid "Non-binary"
-msgstr "غير ثنائي"
-
-#: app/utils/dictionary/genders.ts:17:12
-msgid "Genderqueer"
-msgstr "الجنس"
-
-#: app/utils/dictionary/genders.ts:20:12
-msgid "An identity not listed here"
-msgstr "هوية غير مدرجة هنا"
-
-#: app/utils/dictionary/genders.ts:23:12
-msgid "I prefer not to say"
-msgstr "أنا أفضل ألا أقول"
-
-#: app/templates/components/forms/orders/order-form.hbs:251:26
-msgid "I consent to the Wikimania"
-msgstr "أوافق على ويكيمانيا"
-
-#: app/templates/components/forms/orders/order-form.hbs:252:91
-msgid "photo policy"
-msgstr "سياسة الصور"
-
-#: app/models/custom-form.js:116:36
-msgid "Wikimania photo consent"
-msgstr "ويكيمانيا الموافقة على الصورة"
-
-#: app/models/custom-form.js:117:36
-msgid "Wikimania email updates"
-msgstr "تحديثات البريد الإلكتروني Wikimania"
-
-#: app/templates/components/forms/orders/order-form.hbs:259:26
-msgid "I want to receive email updates about future Wikimania editions."
-msgstr "أرغب في تلقي تحديثات عبر البريد الإلكتروني حول إصدارات Wikimania المستقبلية."

translations/bn.po

@@ -11684,8 +11684,8 @@ msgid "Friendly Space Policy"
 msgstr "বন্ধুত্বপূর্ণ মহাকাশ নীতি"
 
 #: app/models/custom-form.js:113:28
-msgid "Code of conduct consent"
-msgstr "আচরণবিধি সম্মতি"
+msgid "Consent form field"
+msgstr "সম্মতি ফর্ম ক্ষেত্র"
 
 #: app/utils/dictionary/boolean-complex.ts:13:15
 msgid "Not sure yet"
@@ -11724,45 +11724,13 @@ msgid "Wikimania email updates"
 msgstr "উইকিমেনিয়া ইমেল আপডেট"
 
 #: app/templates/components/forms/orders/order-form.hbs:251:26
-msgid "I consent to the Wikimania"
-msgstr "আমি উইকিম্যানিয়াতে সম্মতি জানাই"
+msgid "I consent to having my photo taken at Wikimania per the"
+msgstr "আমি প্রতি উইকিম্যানিয়াতে আমার ছবি তোলার বিষয়ে সম্মতি দিচ্ছি"
 
 #: app/templates/components/forms/orders/order-form.hbs:252:91
 msgid "photo policy"
 msgstr "ছবির নীতি"
 
 #: app/templates/components/forms/orders/order-form.hbs:259:26
 msgid "I want to receive email updates about future Wikimania editions."
-msgstr "আমি ভবিষ্যতের উইকিম্যানিয়া সংস্করণ সম্পর্কে ইমেল আপডেট পেতে চাই."
-
-#: app/models/custom-form.js:106:27
-msgid "Which of these categories describe your gender identity? (check all that apply)"
-msgstr "আপনার লিঙ্গ পরিচয় কোন কোন বিভাগের বর্ণনা করে? (যা যা প্রযোজ্য, সেগুলি চেক করুন)"
-
-#: app/utils/dictionary/genders.ts:5:12
-msgid "Man"
-msgstr "পুরুষ"
-
-#: app/utils/dictionary/genders.ts:8:12
-msgid "Woman"
-msgstr "নারী"
-
-#: app/utils/dictionary/genders.ts:11:12
-msgid "Transgender"
-msgstr "ট্রান্সজেন্ডার"
-
-#: app/utils/dictionary/genders.ts:14:12
-msgid "Non-binary"
-msgstr "নন-বাইনারি"
-
-#: app/utils/dictionary/genders.ts:17:12
-msgid "Genderqueer"
-msgstr "জেন্ডারকুইর"
-
-#: app/utils/dictionary/genders.ts:20:12
-msgid "An identity not listed here"
-msgstr "এখানে তালিকাভুক্ত না এমন একটি পরিচয়"
-
-#: app/utils/dictionary/genders.ts:23:12
-msgid "I prefer not to say"
-msgstr "আমি বলতে পছন্দ করি না"
+msgstr "আমি ভবিষ্যতের উইকিম্যানিয়া সংস্করণ সম্পর্কে ইমেল আপডেট পেতে চাই"

translations/ca.po

@@ -11929,7 +11929,7 @@ msgid "Friendly Space Policy"
 msgstr ""
 
 #: app/models/custom-form.js:113:28
-msgid "Code of conduct consent"
+msgid "Consent form field"
 msgstr ""
 
 #: app/utils/dictionary/boolean-complex.ts:13:15
@@ -11969,7 +11969,7 @@ msgid "Wikimania email updates"
 msgstr ""
 
 #: app/templates/components/forms/orders/order-form.hbs:251:26
-msgid "I consent to the Wikimania"
+msgid "I consent to having my photo taken at Wikimania per the"
 msgstr ""
 
 #: app/templates/components/forms/orders/order-form.hbs:252:91
@@ -11979,35 +11979,3 @@ msgstr ""
 #: app/templates/components/forms/orders/order-form.hbs:259:26
 msgid "I want to receive email updates about future Wikimania editions."
 msgstr ""
-
-#: app/models/custom-form.js:106:27
-msgid "Which of these categories describe your gender identity? (check all that apply)"
-msgstr ""
-
-#: app/utils/dictionary/genders.ts:5:12
-msgid "Man"
-msgstr ""
-
-#: app/utils/dictionary/genders.ts:8:12
-msgid "Woman"
-msgstr ""
-
-#: app/utils/dictionary/genders.ts:11:12
-msgid "Transgender"
-msgstr ""
-
-#: app/utils/dictionary/genders.ts:14:12
-msgid "Non-binary"
-msgstr ""
-
-#: app/utils/dictionary/genders.ts:17:12
-msgid "Genderqueer"
-msgstr ""
-
-#: app/utils/dictionary/genders.ts:20:12
-msgid "An identity not listed here"
-msgstr ""
-
-#: app/utils/dictionary/genders.ts:23:12
-msgid "I prefer not to say"
-msgstr ""