From 5fc7a8b3a423e8d25fd603d6d1f8b317dbefc91d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20M=C3=B6rtsell?= <anders.mortsell@sogeti.se>
Date: Sat, 24 Aug 2019 22:18:29 +0200
Subject: [PATCH] Finalized localization issues

---
 .../EventRecurrenceInfoMonthly.tsx                        | 8 ++++----
 .../EventRecurrenceInfoYearly.tsx                         | 6 +++---
 samples/react-calendar/src/webparts/calendar/loc/en-us.js | 5 +++--
 .../src/webparts/calendar/loc/mystrings.d.ts              | 1 +
 samples/react-calendar/src/webparts/calendar/loc/sv-se.js | 3 ++-
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/samples/react-calendar/src/controls/EventRecurrenceInfoMonthly/EventRecurrenceInfoMonthly.tsx b/samples/react-calendar/src/controls/EventRecurrenceInfoMonthly/EventRecurrenceInfoMonthly.tsx
index 3a207434d..c2130722f 100644
--- a/samples/react-calendar/src/controls/EventRecurrenceInfoMonthly/EventRecurrenceInfoMonthly.tsx
+++ b/samples/react-calendar/src/controls/EventRecurrenceInfoMonthly/EventRecurrenceInfoMonthly.tsx
@@ -254,7 +254,7 @@ export class EventRecurrenceInfoMonthly extends React.Component<IEventRecurrence
    * @memberof EventRecurrenceInfoMonthly
    */
   private  onWeekOrderMonthChange(ev: React.FormEvent<HTMLDivElement>, item: IDropdownOption):void {
-    this.setState({selectedWeekOrderMonth: item.text});
+    this.setState({selectedWeekOrderMonth: item.key.toString()});
     this.applyRecurrence();
   }
 
@@ -472,7 +472,7 @@ export class EventRecurrenceInfoMonthly extends React.Component<IEventRecurrence
 
             </div>
             <div style={{ width: '100%', paddingTop: '10px' }}>
-              <Label>Patern</Label>
+              <Label>{ strings.patternLabel }</Label>
               <ChoiceGroup
                 selectedKey={this.state.selectPatern}
                 options={[
@@ -521,9 +521,9 @@ export class EventRecurrenceInfoMonthly extends React.Component<IEventRecurrence
                               disabled={!this.state.disableDayOfMonth}
                               options={[
                                 { key: 'first', text: strings.firstLabel },
-                                { key: 'second', text:strings.secondLabel},
+                                { key: 'second', text: strings.secondLabel},
                                 { key: 'third', text: strings.thirdLabel },
-                                { key: 'fourth', text:strings.fourthLabel },
+                                { key: 'fourth', text: strings.fourthLabel },
                                 { key: 'last', text: strings.lastLabel },
 
                               ]}
diff --git a/samples/react-calendar/src/controls/EventRecurrenceInfoYearly/EventRecurrenceInfoYearly.tsx b/samples/react-calendar/src/controls/EventRecurrenceInfoYearly/EventRecurrenceInfoYearly.tsx
index a8630f4ad..f435372a2 100644
--- a/samples/react-calendar/src/controls/EventRecurrenceInfoYearly/EventRecurrenceInfoYearly.tsx
+++ b/samples/react-calendar/src/controls/EventRecurrenceInfoYearly/EventRecurrenceInfoYearly.tsx
@@ -207,7 +207,7 @@ export class EventRecurrenceInfoYearly extends React.Component<IEventRecurrenceI
    * @memberof EventRecurrenceInfoYearly
    */
   private onWeekOrderMonthChange(ev: React.FormEvent<HTMLDivElement>, item: IDropdownOption): void {
-    this.setState({ selectedWeekOrderMonth: item.text });
+    this.setState({ selectedWeekOrderMonth: item.key.toString() });
     this.applyRecurrence();
   }
 
@@ -232,7 +232,7 @@ export class EventRecurrenceInfoYearly extends React.Component<IEventRecurrenceI
    * @memberof EventRecurrenceInfoYearly
    */
   private onSelectedWeekDayChange(ev: React.FormEvent<HTMLDivElement>, item: IDropdownOption): void {
-    this.setState({ selectedWeekDay: item.text });
+    this.setState({ selectedWeekDay: item.key.toString() });
     this.applyRecurrence();
   }
 
@@ -526,7 +526,7 @@ export class EventRecurrenceInfoYearly extends React.Component<IEventRecurrenceI
                               ]}
                             />
                           </div>
-                          <Label styles={{ root: { display: 'inline-block', verticalAlign: 'top', width: '30px', paddingLeft: '10px' } }}>of</Label>
+                          <Label styles={{ root: { display: 'inline-block', verticalAlign: 'top', width: '30px', paddingLeft: '10px' } }}>{ strings.ofMonthLabel} </Label>
                           <div style={{ display: 'inline-block', verticalAlign: 'top', width: '100px', paddingLeft: '5px' }}>
                             <Dropdown
                               selectedKey={this.state.selectedYearlyByDayMonth}
diff --git a/samples/react-calendar/src/webparts/calendar/loc/en-us.js b/samples/react-calendar/src/webparts/calendar/loc/en-us.js
index 08926903b..7a117bce2 100644
--- a/samples/react-calendar/src/webparts/calendar/loc/en-us.js
+++ b/samples/react-calendar/src/webparts/calendar/loc/en-us.js
@@ -1,7 +1,7 @@
 define([], function () {
   return {
     WeeksOnLabel: "week(s) on",
-    PaternLabel: "Patern",
+    PaternLabel: "Pattern",
     OcurrencesLabel: "Ocurrences",
     dateRangeLabel: "Date Range",
     weekEndDay: "Weekend Day",
@@ -125,6 +125,7 @@ define([], function () {
     yearlyLabel: "Yearly",
     patternLabel: "Pattern",
     dateRangeLabel: "Date Range",
-    occurrencesLabel: "occurrences"
+    occurrencesLabel: "occurrences",
+    ofMonthLabel: "of"
   }
 });
diff --git a/samples/react-calendar/src/webparts/calendar/loc/mystrings.d.ts b/samples/react-calendar/src/webparts/calendar/loc/mystrings.d.ts
index 6b7597c6c..8311be1f9 100644
--- a/samples/react-calendar/src/webparts/calendar/loc/mystrings.d.ts
+++ b/samples/react-calendar/src/webparts/calendar/loc/mystrings.d.ts
@@ -126,6 +126,7 @@ declare interface ICalendarWebPartStrings {
   patternLabel: string;
   dateRangeLabel: string;
   occurrencesLabel: string;
+  ofMonthLabel:string;
 
 }
 
diff --git a/samples/react-calendar/src/webparts/calendar/loc/sv-se.js b/samples/react-calendar/src/webparts/calendar/loc/sv-se.js
index 5e07d34f7..773d0e0d6 100644
--- a/samples/react-calendar/src/webparts/calendar/loc/sv-se.js
+++ b/samples/react-calendar/src/webparts/calendar/loc/sv-se.js
@@ -125,7 +125,8 @@ define([], function () {
       yearlyLabel: "Årligen",
       patternLabel: "Schema",
       dateRangeLabel: "Datumintervall",
-      occurrencesLabel: "tillfällen"
+      occurrencesLabel: "tillfällen",
+      ofMonthLabel: "i"
     }
   });
   
\ No newline at end of file