summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-02-22 15:36:12 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2023-02-22 15:36:12 +0900
commit0c8d874e3aa71a502ea68e93748cb8a2091b729b (patch)
tree6c72ad42bf9ca57242ea1b37817528f6247291cd /packages
parentlint (diff)
downloadsharkey-0c8d874e3aa71a502ea68e93748cb8a2091b729b.tar.gz
sharkey-0c8d874e3aa71a502ea68e93748cb8a2091b729b.tar.bz2
sharkey-0c8d874e3aa71a502ea68e93748cb8a2091b729b.zip
lint
Diffstat (limited to 'packages')
-rw-r--r--packages/frontend/src/scripts/get-note-menu.ts2
-rw-r--r--packages/frontend/src/scripts/get-user-name.ts2
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/frontend/src/scripts/get-note-menu.ts b/packages/frontend/src/scripts/get-note-menu.ts
index c54be43d19..9da7447bfd 100644
--- a/packages/frontend/src/scripts/get-note-menu.ts
+++ b/packages/frontend/src/scripts/get-note-menu.ts
@@ -200,7 +200,7 @@ export function getNoteMenu(props: {
props.translating.value = true;
const res = await os.api('notes/translate', {
noteId: appearNote.id,
- targetLang: miLocalStorage.getItem('lang') || navigator.language,
+ targetLang: miLocalStorage.getItem('lang') ?? navigator.language,
});
props.translating.value = false;
props.translation.value = res;
diff --git a/packages/frontend/src/scripts/get-user-name.ts b/packages/frontend/src/scripts/get-user-name.ts
index d499ea0203..4daf203e06 100644
--- a/packages/frontend/src/scripts/get-user-name.ts
+++ b/packages/frontend/src/scripts/get-user-name.ts
@@ -1,3 +1,3 @@
export default function(user: { name?: string | null, username: string }): string {
- return user.name || user.username;
+ return user.name === '' ? user.username : user.name ?? user.username;
}