Merge branch 'instance/fid' into instance/fid_bbi

themes/fid/languages/fid/en.ini

@@ -18,8 +18,8 @@ label_salutation = "Salutation"
 label_salutation_mr = "Mr"
 label_salutation_mrs = "Mrs"
 label_academic_title = "Academic title"
-label_firstname = "Firstname"
-label_lastname = "Lastname"
+label_firstname = "First name"
+label_lastname = "Last name"
 label_home_library = "Home library"
 label_year_of_birth = "Year of birth (YYYY)"
 label_job_title = "Occupation"
@@ -41,14 +41,14 @@ label_country = "Country"
 label_submit = "Submit"
 terms = "Terms of Use"
 policy = "Privacy Policy"
-policy_text = "I herby accept the "
+policy_text = "I hereby accept the "
 terms_text = " and "
 
 error_username = "Please specify an email address."
 error_username_confirmation = "The email addresses do not match."
 error_password_confirmation = "The passwords do not match."
 error_password_pattern = "The password needs to contain at least one digit and one special character."
-error_password_length = "Thes password needs to contain at least 8 and at most 256 characters."
+error_password_length = "The password needs to contain at least 8 and at most 256 characters."
 error_eula_accepted = "Please confirm the Terms of Use and Privacy Policy."
 
 user_init_success = "We have received your registration. We have sent you an e-mail with a validation link to %s. This may take several minutes. Please check also the junk folder of your mailbox."

themes/fid/templates/fid/user/create.phtml

@@ -243,14 +243,10 @@ $elemEulaAccepted->setAttribute('id', 'eulaAccepted');
             <?= $this->formLabel()->openTag($elemEulaAccepted) ?>
             <?= $this->translate("fid::policy_text") ?>
             <?php $url = $this->url('fid/user/policy') ?>
-            <a data-lightbox href="<?= $url ?>">
-                <?= $this->translate("fid::policy") ?>
-            </a>
+            <a data-lightbox href="<?= $url ?>"><?= $this->translate("fid::policy") ?></a>
             <?= $this->translate("fid::terms_text") ?>
             <?php $url = $this->url('fid/user/terms') ?>
-            <a data-lightbox href="<?= $url ?>">
-                <?= $this->translate("fid::terms") ?>
-            </a>.
+            <a data-lightbox href="<?= $url ?>"><?= $this->translate("fid::terms") ?></a>.
             <?= $this->formLabel()->closeTag($elemEulaAccepted) ?>
         </div>
         <?= $this->formElementErrors($elemEulaAccepted) ?>
@@ -268,4 +264,4 @@ $elemSubmit->setAttributes(['class' => 'btn btn-primary']);
         </div>
     </div>
 
-<?= $this->form()->closeTag($form) ?>
\ No newline at end of file
+<?= $this->form()->closeTag($form) ?>