clean

edrlab · Oct 5, 2024 · 39dda4d · 39dda4d
1 parent a142f20
commit 39dda4d
Show file tree

Hide file tree

Showing 15 changed files with 14 additions and 20 deletions.
diff --git a/src/main/redux/sagas/win/reader.ts b/src/main/redux/sagas/win/reader.ts
@@ -36,7 +36,6 @@ function* winOpen(action: winActions.reader.openSucess.TAction) {
     const readerWin = action.payload.win;
     const webContents = readerWin.webContents;
     const locale = yield* selectTyped((_state: RootState) => _state.i18n.locale);
-    // HERE
     const reader = yield* selectTyped((_state: RootState) => _state.win.session.reader[identifier]);
     const readerDefaultConfig = yield* selectTyped((_state: RootState) => _state.reader.defaultConfig);
     const keyboard = yield* selectTyped((_state: RootState) => _state.keyboard);

diff --git a/src/main/services/lcp.ts b/src/main/services/lcp.ts
@@ -43,7 +43,7 @@ import { lcpHashesFilePath } from "../di";
 import { lcpActions } from "../redux/actions";
 import { extractCrc32OnZip } from "../tools/crc";
 import { LSDManager } from "./lsd";
-import { translate } from "readium-desktop/common/services/translator";
+import { getTranslator } from "readium-desktop/common/services/translator";
 
 // import { Server } from "@r2-streamer-js/http/server";
 
@@ -84,9 +84,7 @@ export class LcpManager {
     @inject(diSymbolTable["lsd-manager"])
     private readonly lsdManager!: LSDManager;
 
-    private translator = {
-        translate: translate,
-    };
+    private translator = getTranslator();
 
     public async absorbDBToJson() {
         await this.getAllSecrets();

diff --git a/src/renderer/common/components/toast/ToastManager.tsx b/src/renderer/common/components/toast/ToastManager.tsx
@@ -106,7 +106,7 @@ export class ToastManager extends React.Component<IProps, IState> {
 const mapStateToProps = (state: IRendererCommonRootState, _props: IBaseProps) => {
     return {
         toast: state.toast,
-        locale: state.i18n.locale,
+        locale: state.i18n.locale, // refresh
     };
 };
 

diff --git a/src/renderer/library/components/catalog/AboutThoriumButton.tsx b/src/renderer/library/components/catalog/AboutThoriumButton.tsx
@@ -208,7 +208,7 @@ const mapStateToProps = (state: ILibraryRootState, _props: IBaseProps) => {
 
     return {
         // here
-        locale: state.i18n.locale,
+        locale: state.i18n.locale, // refresh
         newVersionURL: state.versionUpdate.newVersionURL,
         newVersion: state.versionUpdate.newVersion,
     };

diff --git a/src/renderer/library/components/catalog/Catalog.tsx b/src/renderer/library/components/catalog/Catalog.tsx
@@ -105,7 +105,7 @@ const mapStateToProps = (state: ILibraryRootState) => ({
     catalog: state.publication.catalog,
     tags: state.publication.tag,
     keyboardShortcuts: state.keyboard.shortcuts,
-    locale: state.i18n.locale,
+    locale: state.i18n.locale, // refresh
 });
 
 const mapDispatchToProps = (dispatch: Dispatch) => ({

diff --git a/src/renderer/library/components/catalog/Header.tsx b/src/renderer/library/components/catalog/Header.tsx
@@ -129,7 +129,7 @@ class Header extends React.Component<IProps, undefined> {
 
 const mapStateToProps = (state: ILibraryRootState) => ({
     location: state.router.location,
-    locale: state.i18n.locale,
+    locale: state.i18n.locale, // refresh
 });
 
 export default connect(mapStateToProps)(withTranslator(Header));
diff --git a/src/renderer/library/components/dialog/FileImport.tsx b/src/renderer/library/components/dialog/FileImport.tsx
@@ -115,7 +115,7 @@ class FileImport extends React.Component<IProps, undefined> {
 const mapStateToProps = (state: ILibraryRootState, _props: IBaseProps) => ({
     open: state.dialog.type === DialogTypeName.FileImport,
     files: (state.dialog.data as DialogType[DialogTypeName.FileImport]).files,
-    locale: state.i18n.locale,
+    locale: state.i18n.locale, // refresh
 });
 
 const mapDispatchToProps = (dispatch: TDispatch, _props: IBaseProps) => {

diff --git a/src/renderer/library/components/dialog/publicationInfos/TagManager.tsx b/src/renderer/library/components/dialog/publicationInfos/TagManager.tsx
@@ -109,7 +109,7 @@ const mapStateToProps = (state: ILibraryRootState) => ({
     pubId: (state.dialog.data as DialogType[DialogTypeName.PublicationInfoLib])?.publication?.identifier,
     publication: (state.dialog.data as DialogType[DialogTypeName.PublicationInfoLib])?.publication,
     location: state.router.location,
-    locale: state.i18n.locale,
+    locale: state.i18n.locale, // refresh
 });
 
 const mapDispatchToProps = (dispatch: TDispatch, _props: IBaseProps) => ({

diff --git a/src/renderer/library/components/layout/LibraryLayout.tsx b/src/renderer/library/components/layout/LibraryLayout.tsx
@@ -344,7 +344,7 @@ const mapStateToProps = (state: ILibraryRootState, _props: IBaseProps) => ({
     location: state.router.location,
     headerLinks: state.opds.browser.header,
     breadcrumb: state.opds.browser.breadcrumb,
-    locale: state.i18n.locale,
+    locale: state.i18n.locale, // refresh
 });
 
 export default connect(mapStateToProps)(withTranslator(LibraryLayout));
diff --git a/src/renderer/library/components/opds/BrowserResult.tsx b/src/renderer/library/components/opds/BrowserResult.tsx
@@ -210,7 +210,7 @@ const mapStateToProps = (state: ILibraryRootState, _props: IBaseProps) => {
         browserData: apiBrowseData?.data,
         location: state.router.location,
         level: state.opds.browser.breadcrumb.length + 1,
-        locale: state.i18n.locale,
+        locale: state.i18n.locale, // refresh
     };
 };
 

diff --git a/src/renderer/library/components/opds/FeedList.tsx b/src/renderer/library/components/opds/FeedList.tsx
@@ -165,7 +165,7 @@ const mapDispatchToProps = (dispatch: TDispatch, _props: IBaseProps) => {
 
 const mapStateToProps = (state: ILibraryRootState) => ({
     location: state.router.location,
-    locale: state.i18n.locale,
+    locale: state.i18n.locale, // refresh
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(withTranslator(FeedList));
diff --git a/src/renderer/library/components/opds/PageNavigation.tsx b/src/renderer/library/components/opds/PageNavigation.tsx
@@ -257,7 +257,7 @@ class PageNavigation extends React.Component<IProps, undefined> {
 const mapStateToProps = (state: ILibraryRootState) => ({
     location: state.router.location,
     keyboardShortcuts: state.keyboard.shortcuts,
-    locale: state.i18n.locale,
+    locale: state.i18n.locale, // refresh
 });
 
 const mapDispatchToProps = (dispatch: TDispatch) => ({

diff --git a/src/renderer/library/components/settings/KeyboardSettings.tsx b/src/renderer/library/components/settings/KeyboardSettings.tsx
@@ -570,7 +570,7 @@ class KeyboardSettings extends React.Component<IProps, IState> {
 const mapStateToProps = (state: ILibraryRootState, _props: IBaseProps) => {
     return {
         keyboardShortcuts: state.keyboard.shortcuts,
-        locale: state.i18n.locale,
+        locale: state.i18n.locale, // refresh
     };
 };
 

diff --git a/src/renderer/library/components/settings/LanguageSettings.tsx b/src/renderer/library/components/settings/LanguageSettings.tsx
@@ -68,7 +68,7 @@ class LanguageSettings extends React.Component<IProps, undefined> {
 
 const mapStateToProps = (state: ILibraryRootState, _props: IBaseProps) => {
     return {
-        locale: state.i18n.locale,
+        locale: state.i18n.locale, // refresh
     };
 };
 

diff --git a/src/renderer/reader/components/Reader.tsx b/src/renderer/reader/components/Reader.tsx
@@ -2880,9 +2880,6 @@ const mapStateToProps = (state: IReaderRootState, _props: IBaseProps) => {
         readerMode: state.mode,
         divinaReadingMode: state.reader.divina.readingMode,
         locale: state.i18n.locale,
-        // HERE
-        // session: state.session.state,
-
         disableRTLFlip: !!state.reader.disableRTLFlip?.disabled,
         r2PublicationHasMediaOverlays: state.reader.info.navigator.r2PublicationHasMediaOverlays,
         ttsState: state.reader.tts.state,