commit chnages resolved conflicts

Author: joaojmendes

src/loc/en-us.ts

@@ -449,6 +449,26 @@ define([], () => {
     ClearAllFiltersTitle: "Clear all filters",
     ClearFilterTitle: "Clear filter",
     ClearAllFiltersText: "Clear filters",
-    FilterOverflowAriaLabel: "More"
+    FilterOverflowAriaLabel: "More",
+
+  CalendarControlDayOfWeekSunday:  "Sunday",
+  CalendarControlDayOfWeekMonday: "Monday",
+  CalendarControlDayOfWeekTuesday: "Tuesday",
+  CalendarControlDayOfWeekWednesday: "Wednesday",
+  CalendarControlDayOfWeekThursday: "Thursday",
+  CalendarControlDayOfWeekFriday: "Friday",
+  CalendarControlDayOfWeekSaturday: "Saturday",
+CalendarControlDetailsLabel: "Details",
+
+CalendarControlViewMonthLabel: "Month",
+CalendarControlViewWeekLabel: "Week",
+CalendarControlViewDayLabel: "Day",
+CalendarControlTodayLabel: "Today",
+CalendarControlPreviousLabel: "Previous",
+CalendarControlNextLabel: "Next",
+
+CalendarControlAttendeessLabel: "Attendees",
+CalendarControlFullDaylabel: "Full Day",
+
   };
 });

src/loc/mystrings.d.ts

@@ -1,8 +1,26 @@
 declare interface IControlStrings {
-  ImagePickderSelectLabel: string;
+  CalendarControlDayOfWeekSunday: string;
+  CalendarControlDayOfWeekMonday: string;
+  CalendarControlDayOfWeekTuesday: string;
+  CalendarControlDayOfWeekWednesday: string;
+  CalendarControlDayOfWeekThursday: string;
+  CalendarControlDayOfWeekFriday: string;
+  CalendarControlDayOfWeekSaturday: string;
+
+  CalendarControlDetailsLabel: string;
+  CalendarControlViewMonthLabel: string;
+  CalendarControlViewWeekLabel: string;
+  CalendarControlViewDayLabel: string;
+  CalendarControlTodayLabel: string;
+
+  CalendarControlPreviousLabel: string;
+  CalendarControlNextLabel: string;
+
+  CalendarControlAttendeessLabel: string;
+  CalendarControlFullDaylabel: string;
 
-  ImagePickerDeleteImageLabel: string;
   ImagePickderSelectLabel: string;
+  ImagePickerDeleteImageLabel: string;
   ImagePickerCancelLabel: string;
   ImagePickerPanelHeaderText: string;
   ImagePickerSharePointTabLabel: string;
@@ -93,19 +111,18 @@ declare interface IControlStrings {
   ListItemAttachmentsdialogOKbuttonLabelOnDelete: string;
   ListItemAttachmentsuploadAttachmentDialogTitle: string;
   ListItemAttachmentsuploadAttachmentButtonLabel: string;
-  ListItemAttachmentsuploadAttachmentErrorMsg: String;
+  ListItemAttachmentsuploadAttachmentErrorMsg: string;
   ListItemAttachmentsCommandBarAddAttachmentLabel: string;
   ListItemAttachmentsloadingMessage: string;
   ListItemAttachmentslPlaceHolderIconText: string;
   ListItemAttachmentslPlaceHolderDescription: string;
   ListItemAttachmentslPlaceHolderButtonLabel: string;
-  //Maps
+
   mapsErrorMessage: string;
   mapsLoadingText: string;
   mapsSearchButtonText: string;
   mapsTitlePrefix: string;
 
-  //RichText
   HeaderNormalText: string;
   HeaderH2: string;
   HeaderH3: string;
@@ -349,23 +366,19 @@ declare interface IControlStrings {
   Yes: string;
   OrgAssetsLinkLabel: string;
 
-  // folder explorer
   NewFolderNamePlaceholder: string;
   FolderFilterBoxPlaceholder: string;
   FolderExplorerLoading: string;
   FolderExplorerNoItems: string;
   NewFolderIncorrectSymbolsError: string;
   SomethingWentWrong: string;
 
-  //Icon picker
   SelectedLabel: string;
   SelectIcon: string;
 
-  //Tree View
   TreeViewExpandTitle: string;
   TreeViewCollapseTitle: string;
 
-  // FieldCollectionData
   CollectionDataEmptyFields: string;
   CollectionDataEmptyValue: string;
   CollectionAddRowButtonLabel: string;
@@ -396,10 +409,8 @@ declare interface IControlStrings {
   DynamicFormChooseFileButtonText: string;
   DynamicFormRequiredFileMessage: string;
 
-  // Location picker
   customDisplayName: string;
 
-  // Modern taxonomy picker
   ModernTaxonomyPickerDefaultPlaceHolder: string;
   ModernTaxonomyPickerTreeTitleSingle: string;
   ModernTaxonomyPickerTreeTitleMulti: string;

src/webparts/controlsTest/IControlsTestWebPartProps.ts

@@ -1,9 +1,9 @@
-export type ValidControls = "all" | 
-  "AccessibleAccordion" | "AdaptiveCardDesignerHost" | "AdaptiveCardHost" | 
-  "AnimatedDialog" | "Carousel" | "ChartControl" | 
-  "ComboBoxListItemPicker" | "ContentTypePicker" | "Dashboard" | "DateTimePicker" | 
-  "DragDropFiles" | "DynamicForm" | "EnhancedThemeProvider" | 
-  "FieldCollectionData" | "FieldPicker" | "FilePicker" | 
+export type ValidControls = "all" |
+  "AccessibleAccordion" | "AdaptiveCardDesignerHost" | "AdaptiveCardHost" |
+  "AnimatedDialog" | "Carousel" | "ChartControl" |
+  "ComboBoxListItemPicker" | "ContentTypePicker" | "Dashboard" | "DateTimePicker" |
+  "DragDropFiles" | "DynamicForm" | "EnhancedThemeProvider" |
+  "FieldCollectionData" | "FieldPicker" | "FilePicker" |
   "FileTypeIcon" | "FilterBar" | "FolderExplorer" | "FolderPicker" |
   "GridLayout" | "HoverReactionsBar" | "IconPicker" | "IFrameDialog" |
   "IFramePanel" | "ImagePicker" | "ListItemAttachments" | "ListItemComments" |
@@ -14,8 +14,8 @@ export type ValidControls = "all" |
   "ShareDialog" | "SecurityTrimmedControl" | "SiteBreadcrumb" | "SitePicker" |
   "TaxonomyPicker" | "TaxonomyTree" | "Teams" | "TermSetNavigation" |
   "TestControl" | "Toolbar" | "TreeView" |
-  "UploadFiles" | "UserPicker" | "VariantThemeProvider" | "ViewPicker" | 
-  "WebPartTitle";
+  "UploadFiles" | "UserPicker" | "VariantThemeProvider" | "ViewPicker" |
+  "WebPartTitle" | "Calendar";
 
 export type ControlVisibility = {
   [K in ValidControls]: boolean;