Merge pull request #340 from City-of-Helsinki/develop

Release 28.10.
City-of-Helsinki · Oct 28, 2022 · be75c08 · be75c08
2 parents 8d2c16b + 02644ad
commit be75c08
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 50 deletions.
diff --git a/public/modules/custom/asu_application/src/Form/ReservedApartmentContactForm.php b/public/modules/custom/asu_application/src/Form/ReservedApartmentContactForm.php
@@ -78,7 +78,7 @@ public function buildForm(array $form, FormStateInterface $form_state, string $u
 
     $form['submit'] = [
       '#type' => 'submit',
-      '#value' => t('Apply'),
+      '#value' => t('Submit'),
     ];
 
     return $form;

diff --git a/public/modules/custom/asu_application/translations/fi.po b/public/modules/custom/asu_application/translations/fi.po
@@ -0,0 +1,2 @@
+msgid "Thank you, Your application has been successfully sent."
+msgstr "Kiitos, Hakemuksesi on onnistuneesti lähetetty."
diff --git a/public/modules/custom/asu_csv_import/src/ImportTypes/DecimalType.php b/public/modules/custom/asu_csv_import/src/ImportTypes/DecimalType.php
@@ -21,6 +21,7 @@ class DecimalType extends ImportType {
    */
   public function __construct($decimal) {
     $value = str_replace(',', '.', $decimal);
+    $value = str_replace(' ', '', $value);
     if ($this->isAllowedValue($value)) {
       $this->value = $value;
     }

diff --git a/public/modules/custom/asu_mailer/src/EventSubscriber/ApplicationSubscriber.php b/public/modules/custom/asu_mailer/src/EventSubscriber/ApplicationSubscriber.php
@@ -70,13 +70,13 @@ public function sendAskoMail(ApplicationEvent $applicationEvent) {
 
     if ($result['result'] != TRUE) {
       // Email sending failed.
-      \Drupal::messenger()->addMessage('Asko email sending failed. Most likely due to misconfigured email system.');
+      \Drupal::messenger()->addMessage(t('Email sending failed. Please check the form and try again.'));
       // @todo Add logging.
       return;
     }
 
     // @todo Remove message when logging is done.
-    \Drupal::messenger()->addMessage('Email successfully sent to As-Ko');
+    \Drupal::messenger()->addMessage(t('Thank you, Your application has been successfully sent.'));
   }
 
   /**

diff --git a/public/modules/custom/asu_mailer/translations/fi.po b/public/modules/custom/asu_mailer/translations/fi.po
@@ -0,0 +1,2 @@
+msgid "Email sending failed. Please check the form and try again."
+msgstr "Sähköpostin lähetys epäonnistui. Tarkista lomake ja yritä uudelleen"
diff --git a/public/themes/custom/asuntotuotanto/asuntotuotanto.theme b/public/themes/custom/asuntotuotanto/asuntotuotanto.theme
@@ -218,10 +218,10 @@ function asuntotuotanto_preprocess_views_view_table(&$variables) {
 
       $reserved_or_sold = FALSE;
       if ($apartment->isSold() || $apartment->isReserved() || $apartment->isFree()) {
-        $reserved_or_sold = $apartment->isReserved() ? 'Reserved' : 'Vacant';
+        $reserved_or_sold = $apartment->isReserved() ? t('Reserved') : t('Vacant');
         // Sold apartment is not listed so this is not necessary.
         if ($apartment->isSold()) {
-          $reserved_or_sold = 'Sold';
+          $reserved_or_sold = t('Sold');
         }
       }
 

diff --git a/public/themes/custom/asuntotuotanto/dist/js/intenseImages.min.js b/public/themes/custom/asuntotuotanto/dist/js/intenseImages.min.js
diff --git a/public/themes/custom/asuntotuotanto/src/js/intenseImages.js b/public/themes/custom/asuntotuotanto/src/js/intenseImages.js
@@ -3,7 +3,7 @@
     attach: function attach() {
       // Intensify all slide/carousel images (make them fullscreen on click/touch).
       const elements = document.querySelectorAll(
-        ".slide__content .media picture img"
+        ".slick .media picture img"
       );
       Intense(elements);
     },

diff --git a/...ustom/asuntotuotanto/templates/form/application/form--asu-application-haso-form.html.twig b/...ustom/asuntotuotanto/templates/form/application/form--asu-application-haso-form.html.twig
@@ -121,22 +121,6 @@
         {% endtrans %}
       </p>
     </section>
-    <section class="application-form__section">
-      <h2>
-        {% trans %}
-          Applicant's Social Security Number
-        {% endtrans %}
-      </h2>
-      <p>
-        {% trans %}
-          Enter your ID's last 5 characters.
-        {% endtrans %}
-      </p>
-      <div class="application-form__personal-id">
-        <p aria-label="{% trans %} The beginning of social security number {% endtrans %} {{ element['#pid_start'] }}">{{ element['#pid_start'] }}</p>
-          {{ element.field_personal_id }}
-      </div>
-    </section>
     <section class="application-form__section">
       <h2>
         {% trans %}

diff --git a/...stom/asuntotuotanto/templates/form/application/form--asu-application-hitas-form.html.twig b/...stom/asuntotuotanto/templates/form/application/form--asu-application-hitas-form.html.twig
@@ -131,22 +131,6 @@
         {% endtrans %}
       </p>
     </section>
-    <section class="application-form__section">
-      <h2>
-        {% trans %}
-          Applicant's Social Security Number
-        {% endtrans %}
-      </h2>
-      <p>
-        {% trans %}
-          Enter your ID's last 5 characters.
-        {% endtrans %}
-      </p>
-      <div class="application-form__personal-id">
-        <p aria-label="{% trans %} The beginning of social security number {% endtrans %} {{ element['#pid_start'] }}">{{ element['#pid_start'] }}</p>
-        {{ element.field_personal_id }}
-      </div>
-    </section>
     <section class="application-form__section">
       <h2>
         {% trans %}

diff --git a/public/themes/custom/asuntotuotanto/templates/form/login/form--user-login-form.html.twig b/public/themes/custom/asuntotuotanto/templates/form/login/form--user-login-form.html.twig
@@ -24,17 +24,6 @@
     <form{{ attributes|without('class') }}>
       {{ children }}
     </form>
-
-    {{ 'Or identify yourself'|t }}
-
-    {% include '@asuntotuotanto/button/button.html.twig' with {
-      type: 'primary',
-      disabled: false,
-      label: 'Bank ID'|t,
-      href: path('user.register')
-    }
-    %}
-
     <div class="user-form__actions">
       <a href="{{ path('user.pass') }}">{% trans %}Forgot password{% endtrans %}?</a>
     </div>