Merge pull request pnp#217 from ytterstrom/master

Include the swedish characters ÅÄÖ in people directory
Crimson1st · Dec 19, 2018 · f7d7134 · f7d7134
2 parents 811262e + c492b1a
commit f7d7134
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 3 deletions.
diff --git a/solution/src/webparts/peopleDirectory/PeopleDirectoryWebPart.ts b/solution/src/webparts/peopleDirectory/PeopleDirectoryWebPart.ts
@@ -23,6 +23,7 @@ export default class PeopleDirectoryWebPart extends BaseClientSideWebPart<IPeopl
         spHttpClient: this.context.spHttpClient,
         title: this.properties.title,
         displayMode: this.displayMode,
+        locale: this.getLocaleId(),
         onTitleUpdate: (newTitle: string) => {
           // after updating the web part title in the component
           // persist it in web part properties
@@ -37,7 +38,9 @@ export default class PeopleDirectoryWebPart extends BaseClientSideWebPart<IPeopl
   protected get dataVersion(): Version {
     return Version.parse('1.0');
   }
-
+  protected getLocaleId() : string {
+    return this.context.pageContext.cultureInfo.currentUICultureName;
+  }
   protected getPropertyPaneConfiguration(): IPropertyPaneConfiguration {
     return {
       pages: []

diff --git a/solution/src/webparts/peopleDirectory/components/IndexNavigation/IIndexNavigationProps.ts b/solution/src/webparts/peopleDirectory/components/IndexNavigation/IIndexNavigationProps.ts
@@ -10,6 +10,10 @@ export interface IIndexNavigationProps {
    * Current search query. Empty, if not searching.
    */
   searchQuery: string;
+    /**
+   * Current locale
+   */
+  locale: string;
   /**
    * Event handler for selecting a tab
    */
@@ -22,4 +26,4 @@ export interface IIndexNavigationProps {
    * Event handler for clearing the search query
    */
   onSearchClear: () => void;
-}
+}
diff --git a/solution/src/webparts/peopleDirectory/components/IndexNavigation/IndexNavigation.tsx b/solution/src/webparts/peopleDirectory/components/IndexNavigation/IndexNavigation.tsx
@@ -22,6 +22,9 @@ export class IndexNavigation extends React.Component<IIndexNavigationProps, {}>
   public render(): React.ReactElement<IIndexNavigationProps> {
     // build the list of alphabet letters A..Z
     const az = Array.apply(null, { length: 26 }).map((x: string, i: number): string => { return String.fromCharCode(65 + i); });
+    if (this.props.locale === "sv-SE") {
+      az.push('Å', 'Ä', 'Ö');
+    }
     // for each letter, create a PivotItem component
     const indexes: JSX.Element[] = az.map(index => <PivotItem linkText={index} itemKey={index} key={index} />);
     // as the last tab in the navigation, add the Search option

diff --git a/solution/src/webparts/peopleDirectory/components/PeopleDirectory/IPeopleDirectoryProps.ts b/solution/src/webparts/peopleDirectory/components/PeopleDirectory/IPeopleDirectoryProps.ts
@@ -23,6 +23,10 @@ export interface IPeopleDirectoryProps {
    * be able to edit the page title or not.
    */
   displayMode: DisplayMode;
+   /**
+   * Current locale
+   */
+  locale: string;
   /**
    * Event handler for changing the web part title
    */

diff --git a/solution/src/webparts/peopleDirectory/components/PeopleDirectory/PeopleDirectory.tsx b/solution/src/webparts/peopleDirectory/components/PeopleDirectory/PeopleDirectory.tsx
@@ -232,7 +232,8 @@ export class PeopleDirectory extends React.Component<IPeopleDirectoryProps, IPeo
           searchQuery={searchQuery}
           onIndexSelect={this._handleIndexSelect}
           onSearch={this._handleSearch}
-          onSearchClear={this._handleSearchClear} />
+          onSearchClear={this._handleSearchClear}
+          locale={this.props.locale} />
         {loading &&
           // if the component is loading its data, show the spinner
           <Spinner size={SpinnerSize.large} label={strings.LoadingSpinnerLabel} />