feat: Update reminder help formatting (#1709)

See #1704
monicahq · Aug 17, 2018 · 991b9d1 · 991b9d1
1 parent ba417b0
commit 991b9d1
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 12 deletions.
diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/js/langs/en.json b/public/js/langs/en.json
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,6 +1,6 @@
 {
-    "/js/app.js": "/js/app.js?id=38213d96d3dbfa44dd07",
-    "/css/app.css": "/css/app.css?id=10b48a582263122f8bc7",
+    "/js/app.js": "/js/app.js?id=4fb0de1f6b9b9a0eed7e",
+    "/css/app.css": "/css/app.css?id=54cc33bf2d4fce1b7a6f",
     "/css/stripe.css": "/css/stripe.css?id=64c68c04c4e475fcc7c6",
     "/js/vendor.js": "/js/vendor.js?id=490bf428af4c7224b600",
     "/js/stripe.js": "/js/stripe.js?id=e2284957ba723a52a4b7",

diff --git a/resources/assets/js/components/settings/ReminderTime.vue b/resources/assets/js/components/settings/ReminderTime.vue
@@ -27,9 +27,7 @@
                 :required="true"
                 :formClass="'form-control'">
             </form-select>
-            <small class="form-text text-muted">
-                {{ $t('settings.reminder_time_to_send_help', {dateTime:formatted}) }}
-            </small>
+            <small class="form-text text-muted" v-html="message"></small>
         </div>
     </div>
 </template>
@@ -41,8 +39,7 @@
          */
         data() {
             return {
-                formatted: '',
-                formattedUtc: '',
+                message: '',
             };
         },
 
@@ -93,7 +90,10 @@
                   date = date.add(1, 'days');
                 }
 
-                this.formatted = date.format('lll');
+                this.message = this.$t('settings.reminder_time_to_send_help', {
+                    dateTime: date.format('LLL'),
+                    dateTimeUtc: date.utc().format('YYYY-MM-DD HH:mm z')
+                });
             },
 
             timezoneUpdate: function(event) {

diff --git a/resources/assets/sass/settings.scss b/resources/assets/sass/settings.scss
@@ -285,4 +285,8 @@
       }
     }
   }
+
+  .reminder-info {
+    text-decoration: underline dotted;
+  }
 }
diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php
@@ -309,7 +309,7 @@
     'personalisation_paid_upgrade' => 'This is a premium feature that requires a Paid subscription to be active. Upgrade your account by visiting Settings > Subscription.',
 
     'reminder_time_to_send' => 'Time of the day reminders should be sent',
-    'reminder_time_to_send_help' => 'For your information, your next reminder will be sent on {dateTime}.',
+    'reminder_time_to_send_help' => 'For your information, your next reminder will be sent on <span title="{dateTimeUtc}" class="reminder-info">{dateTime}</span>.',
 
     'personalization_activity_type_category_title' => 'Activity type categories',
     'personalization_activity_type_category_add' => 'Add a new activity type category',
-Original file line number
+Diff line change
@@ Expand Up / @@ -285,4 +285,8 @@ @@
           }
         }
       }
+      .reminder-info {
+        text-decoration: underline dotted;
+      }
     }