mirrors/TidGi-Desktop
1
Fork 0
mirror of https://github.com/tiddly-gittly/TidGi-Desktop.git synced 2026-04-27 15:50:57 -07:00
Code Issues Projects Releases Packages Wiki Activity

fix: pop dialog when storage UserInfo no found

Browse source
This commit is contained in:
tiddlygit-test 2021-03-21 00:02:29 +08:00
parent 4bddf16ad3
commit ede2e43fa4
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
localization/locales/en/translation.json
View file

@ -110,8 +110,8 @@
"PathPassInCantUse": "The path passed in cannot be used",
"RemoveWorkspace": "Remove workspace",
"WorkspaceFolderRemoved": "Workspace folder is moved",
"GithubUserInfoNoFound": "Github UserInfo No Found",
"GithubUserInfoNoFoundDetail": "Seems you haven't login to Github, so we disable syncing for this wiki.",
"StorageServiceUserInfoNoFound": "Your storage service's UserInfo No Found",
"StorageServiceUserInfoNoFoundDetail": "Seems you haven't login to Your storage service, so we disable syncing for this wiki.",
"RestartMessage": "You need to restart the app for this change to take affect.",
"Later": "Later",
"RestartNow": "Restart Now"

4
localization/locales/zh_CN/translation.json
View file

@ -144,8 +144,8 @@
"RemoveWorkspace": "移除工作区",
"DoNotCare": "不管",
"PathPassInCantUse": "传入的路径无法使用",
"GithubUserInfoNoFound": "找不到 Github 用户信息",
"GithubUserInfoNoFoundDetail": "似乎你尚未登录 Github，因此此 Wiki 的同步暂时禁用，直到你登录以提供有可用于同步的登录信息。",
"StorageServiceUserInfoNoFound": "找不到存储备份服务的用户信息",
"StorageServiceUserInfoNoFoundDetail": "似乎你尚未登录存储备份服务，因此此 Wiki 的同步暂时禁用，直到你登录以提供有可用于同步的登录信息。",
"Later": "稍后",
"RestartMessage": "您需要重新启动本程序才能使此更改生效。",
"RestartNow": "现在重启"

2
src/pages/Preferences/index.tsx
View file

@ -497,7 +497,7 @@ export default function Preferences(): JSX.Element {
secondary={
<>
<span>TiddlyGit supports notifications out of the box. </span>
<span>But for some web apps, to receive notifications, </span>
<span>But for some cases, to receive notifications, </span>
<span>you will need to manually configure additional </span>
<span>web app settings. </span>
<Link

10
src/services/view/index.ts
View file

@ -196,12 +196,12 @@ export class View implements IViewService {
const { rememberLastPageVisited, shareWorkspaceBrowsingData, spellcheck, spellcheckLanguages } = this.preferenceService.getPreferences();
// configure session, proxy & ad blocker
const partitionId = shareWorkspaceBrowsingData ? 'persist:shared' : `persist:${workspace.id}`;
const userInfo = this.authService.get('authing');
if (userInfo !== undefined) {
// user not logined into Github
const userInfo = this.authService.getStorageServiceUserInfo(workspace.storageService);
if (userInfo === undefined) {
// user not login into Github or something else
void dialog.showMessageBox(browserWindow, {
title: i18n.t('Dialog.GithubUserInfoNoFound'),
message: i18n.t('Dialog.GithubUserInfoNoFoundDetail'),
title: i18n.t('Dialog.StorageServiceUserInfoNoFound'),
message: i18n.t('Dialog.StorageServiceUserInfoNoFoundDetail'),
buttons: ['OK'],
cancelId: 0,
defaultId: 0,