feat(#12): improve wording

fluster-app · Sep 23, 2018 · b26731f · b26731f
1 parent 8c2c293
commit b26731f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 13 deletions.
diff --git a/src/app/components/browse/item-appointments-date-picker/item-appointments-date-picker.html b/src/app/components/browse/item-appointments-date-picker/item-appointments-date-picker.html
@@ -14,26 +14,35 @@
 
 <div text-center id="helpText" padding-bottom>
     <div *ngIf="manyPossibleTimeSlots">
-        <div *ngIf="!manyTimeSlotsSelected && !manyDaysSelected">
+        <ng-container *ngIf="!manyTimeSlotsSelected && !manyDaysSelected">
             <span>{{'ITEM_APPOINTMENTS.TIPS.SELECT_MANY_TIMESLOTS.BEGIN' | translate}}</span> <strong> {{'ITEM_APPOINTMENTS.TIPS.SELECT_MANY_TIMESLOTS.HIGHLIGHT' | translate}} </strong> <span>{{'ITEM_APPOINTMENTS.TIPS.SELECT_MANY_TIMESLOTS.END' | translate}}</span>
-        </div>
-        <div *ngIf="manyTimeSlotsSelected && !manyDaysSelected && manyPossibleDays">
+        </ng-container>
+        <ng-container *ngIf="manyTimeSlotsSelected && !manyDaysSelected && manyPossibleDays">
+            <ng-container *ngIf="selectedAppointmentsStartTime.length == 1">
+                <span>{{'ITEM_APPOINTMENTS.TIPS.SELECT_COUNT.BEGIN' | translate}}</span> <span> {{ 'ITEM_APPOINTMENTS.TIPS.SELECT_COUNT.HIGHLIGHT' | translate:{count: selectedAppointmentsStartTime.length} }} </span> <span>{{'ITEM_APPOINTMENTS.TIPS.SELECT_COUNT.END' | translate}}</span>
+            </ng-container>
+
+            <ng-container *ngIf="selectedAppointmentsStartTime.length > 1">
+                <span>{{'ITEM_APPOINTMENTS.TIPS.SELECT_COUNT.BEGIN' | translate}}</span> <span> {{ 'ITEM_APPOINTMENTS.TIPS.SELECT_COUNT.HIGHLIGHTS' | translate:{count: selectedAppointmentsStartTime.length} }} </span> <span>{{'ITEM_APPOINTMENTS.TIPS.SELECT_COUNT.END' | translate}}</span>
+            </ng-container>
+
+            <br/>
             <span>{{'ITEM_APPOINTMENTS.TIPS.SELECT_MANY_DAYS.BEGIN' | translate}}</span> <strong> {{'ITEM_APPOINTMENTS.TIPS.SELECT_MANY_DAYS.HIGHLIGHT' | translate}} </strong> <span>{{'ITEM_APPOINTMENTS.TIPS.SELECT_MANY_DAYS.END' | translate}}</span>
-        </div>
-        <div *ngIf="manyTimeSlotsSelected && (manyDaysSelected || !manyPossibleDays)">
+        </ng-container>
+        <ng-container *ngIf="manyTimeSlotsSelected && (manyDaysSelected || !manyPossibleDays)">
             <span>{{'ITEM_APPOINTMENTS.TIPS.SELECT_COUNT.BEGIN' | translate}}</span> <strong> {{ 'ITEM_APPOINTMENTS.TIPS.SELECT_COUNT.HIGHLIGHTS' | translate:{count: selectedAppointmentsStartTime.length} }} </strong> <span>{{'ITEM_APPOINTMENTS.TIPS.SELECT_COUNT.END' | translate}}</span>
-        </div>
+        </ng-container>
     </div>
     <div *ngIf="!manyPossibleTimeSlots">
-        <div *ngIf="selectedAppointmentsStartTime == null || selectedAppointmentsStartTime.length <= 0">
+        <ng-container *ngIf="selectedAppointmentsStartTime == null || selectedAppointmentsStartTime.length <= 0">
             <span>{{'ITEM_APPOINTMENTS.TIPS.SELECT_ZERO_COUNT.BEGIN' | translate}}</span> <strong> {{'ITEM_APPOINTMENTS.TIPS.SELECT_ZERO_COUNT.HIGHLIGHT' | translate}} </strong> <span>{{'ITEM_APPOINTMENTS.TIPS.SELECT_ZERO_COUNT.END' | translate}}</span>
-        </div>
-        <div *ngIf="selectedAppointmentsStartTime != null && selectedAppointmentsStartTime.length == 1">
+        </ng-container>
+        <ng-container *ngIf="selectedAppointmentsStartTime != null && selectedAppointmentsStartTime.length == 1">
             <span>{{'ITEM_APPOINTMENTS.TIPS.SELECT_COUNT.BEGIN' | translate}}</span> <strong> {{ 'ITEM_APPOINTMENTS.TIPS.SELECT_COUNT.HIGHLIGHT' | translate:{count: selectedAppointmentsStartTime.length} }} </strong> <span>{{'ITEM_APPOINTMENTS.TIPS.SELECT_COUNT.END' | translate}}</span>
-        </div>
-        <div *ngIf="selectedAppointmentsStartTime != null && selectedAppointmentsStartTime.length > 1">
+        </ng-container>
+        <ng-container *ngIf="selectedAppointmentsStartTime != null && selectedAppointmentsStartTime.length > 1">
             <span>{{'ITEM_APPOINTMENTS.TIPS.SELECT_COUNT.BEGIN' | translate}}</span> <strong> {{ 'ITEM_APPOINTMENTS.TIPS.SELECT_COUNT.HIGHLIGHTS' | translate:{count: selectedAppointmentsStartTime.length} }} </strong> <span>{{'ITEM_APPOINTMENTS.TIPS.SELECT_COUNT.END' | translate}}</span>
-        </div>
+        </ng-container>
     </div>
 </div>
 

diff --git a/src/app/components/browse/item-appointments-date-picker/item-appointments-date-picker.ts b/src/app/components/browse/item-appointments-date-picker/item-appointments-date-picker.ts
@@ -239,7 +239,7 @@ export class ItemAppointmentsDatePickerComponent extends AbstractPickAppointment
 
     private hasManyTimeSlotsSelected() {
         this.manyTimeSlotsSelected = Comparator.hasElements(this.selectedAppointmentsStartTime) &&
-            this.selectedAppointmentsStartTime.length > (this.manyPossibleTimeSlots ? 1 : 0);
+            this.selectedAppointmentsStartTime.length > 0;
     }
 
     private hasManyAppointmentDaysSelected(): Promise<{}> {