laurent22#10077 - sort notebooks and tags based on locale

packages/app-desktop/gui/TagList.tsx

@@ -2,6 +2,7 @@ import * as React from 'react';
 import { useMemo } from 'react';
 import { AppState } from '../app.reducer';
 import TagItem from './TagItem';
+import Setting from '@joplin/lib/models/Setting';
 
 const { connect } = require('react-redux');
 const { themeStyle } = require('@joplin/lib/theme');
@@ -13,6 +14,7 @@ interface Props {
 }
 
 function TagList(props: Props) {
+ const collatorLocale = Setting.value('locale').slice(0, 2);
  const style = useMemo(() => {
  const theme = themeStyle(props.themeId);
 
@@ -29,13 +31,13 @@ function TagList(props: Props) {
 
  const tags = useMemo(() => {
  const output = props.items.slice();
- const collator = new Intl.Collator(undefined, { numeric: true, sensitivity: 'base' });
+ const collator = new Intl.Collator(collatorLocale, { numeric: true, sensitivity: 'base' });
  output.sort((a: any, b: any) => {
  return collator.compare(a.title, b.title);
  });
 
  return output;
- }, [props.items]);
+ }, [props.items, collatorLocale]);
 
  const tagItems = useMemo(() => {
  const output = [];

packages/lib/BaseApplication.ts

@@ -483,6 +483,11 @@ export default class BaseApplication {
  refreshNotes = true;
  }
 
+ if (action.type === 'SETTING_UPDATE_ONE' && action.key === 'locale') {
+ refreshNotes = true;
+ doRefreshFolders = 'now';
+ }
+
  if (action.type === 'SMART_FILTER_SELECT') {
  refreshNotes = true;
  refreshNotesUseSelectedNoteId = true;

packages/lib/components/shared/side-menu-shared.ts

@@ -2,6 +2,7 @@ import Folder from '../../models/Folder';
 import BaseModel from '../../BaseModel';
 import { FolderEntity, TagEntity } from '../../services/database/types';
 import { getDisplayParentId, getTrashFolderId } from '../../services/trash';
+import Setting from '../../models/Setting';
 
 interface Props {
  folders: FolderEntity[];
@@ -72,7 +73,8 @@ export const renderFolders = (props: Props, renderItem: RenderFolderItem) => {
 
 export const renderTags = (props: Props, renderItem: RenderTagItem) => {
  const tags = props.tags.slice();
- const collator = new Intl.Collator(undefined, { numeric: true, sensitivity: 'base' });
+ const collatorLocale = Setting.value('locale').slice(0, 2);
+ const collator = new Intl.Collator(collatorLocale, { numeric: true, sensitivity: 'base' });
  tags.sort((a, b) => {
  // It seems title can sometimes be undefined (perhaps when syncing
  // and before tag has been decrypted?). It would be best to find

packages/lib/models/Folder.ts

@@ -13,6 +13,7 @@ import syncDebugLog from '../services/synchronizer/syncDebugLog';
 import ResourceService from '../services/ResourceService';
 import { LoadOptions } from './utils/types';
 import { getTrashFolder, getTrashFolderId } from '../services/trash';
+import Setting from './Setting';
 const { substrWithEllipsis } = require('../string-utils.js');
 
 const logger = Logger.create('models/Folder');
@@ -21,6 +22,8 @@ export interface FolderEntityWithChildren extends FolderEntity {
  children?: FolderEntity[];
 }
 
+
+
 export default class Folder extends BaseItem {
  public static tableName() {
  return 'folders';
@@ -298,7 +301,8 @@ export default class Folder extends BaseItem {
  }
 
  public static getNaturalSortingCollator() {
- return new Intl.Collator(undefined, { numeric: true, sensitivity: 'base' });
+ const collatorLocale = Setting.value('locale').slice(0, 2);
+ return new Intl.Collator(collatorLocale, { numeric: true, sensitivity: 'base' });
  }
 
  public static async all(options: FolderLoadOptions = null) {

packages/lib/models/Note.ts

@@ -1119,7 +1119,8 @@ export default class Note extends BaseItem {
  }
 
  public static getNaturalSortingCollator() {
- return new Intl.Collator(undefined, { numeric: true, sensitivity: 'base' });
+ const collatorLocale = Setting.value('locale').slice(0, 2);
+ return new Intl.Collator(collatorLocale, { numeric: true, sensitivity: 'base' });
  }
 
  public static async createConflictNote(sourceNote: NoteEntity, changeSource: number): Promise<NoteEntity> {