From 0a0c1c45a16d438cdb14d22cdd6f1ebbd67d0545 Mon Sep 17 00:00:00 2001 From: vienai8d <31370233+vienai8d@users.noreply.github.com> Date: Tue, 1 Jan 2019 22:00:30 +0900 Subject: [PATCH 1/6] translate tooltip texts into Japanese --- locales/ja.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/locales/ja.json b/locales/ja.json index 9cfc29867..832bc3088 100644 --- a/locales/ja.json +++ b/locales/ja.json @@ -8,7 +8,10 @@ "to create a new note": "ノートを新規に作成", "Toggle Mode": "モード切替", "Add tag...": "タグを追加...", + "Star": "お気に入り", + "Fullscreen": "全画面", "Trash": "ゴミ箱", + "Info": "情報", "MODIFICATION DATE": "修正日", "Words": "ワード", "Letters": "文字", From 5cf4a0e09d47522f4f727885755a9dc92900fc2a Mon Sep 17 00:00:00 2001 From: vienai8d <31370233+vienai8d@users.noreply.github.com> Date: Wed, 2 Jan 2019 02:49:10 +0900 Subject: [PATCH 2/6] localize StarButton for Japanese --- browser/main/Detail/StarButton.js | 2 +- browser/main/Detail/StarButton.styl | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/browser/main/Detail/StarButton.js b/browser/main/Detail/StarButton.js index d74809cd2..8000970d8 100644 --- a/browser/main/Detail/StarButton.js +++ b/browser/main/Detail/StarButton.js @@ -54,7 +54,7 @@ class StarButton extends React.Component { : '../resources/icon/icon-star.svg' } /> - {i18n.__('Star')} + {i18n.__('Star')} ) } diff --git a/browser/main/Detail/StarButton.styl b/browser/main/Detail/StarButton.styl index d5fd755b7..e9c523e97 100644 --- a/browser/main/Detail/StarButton.styl +++ b/browser/main/Detail/StarButton.styl @@ -21,6 +21,11 @@ opacity 0 transition 0.1s +.tooltip:lang(ja) + @extend .tooltip + right 103px + width 70px + .root--active @extend .root transition 0.15s From caa6c8d4b94045ad2f31f645f63fe77c3db162eb Mon Sep 17 00:00:00 2001 From: vienai8d <31370233+vienai8d@users.noreply.github.com> Date: Wed, 2 Jan 2019 11:01:37 +0900 Subject: [PATCH 3/6] localize FullscreenButton for Japanese --- browser/main/Detail/FullscreenButton.js | 2 +- browser/main/Detail/FullscreenButton.styl | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/browser/main/Detail/FullscreenButton.js b/browser/main/Detail/FullscreenButton.js index ee212603b..3a86a7511 100644 --- a/browser/main/Detail/FullscreenButton.js +++ b/browser/main/Detail/FullscreenButton.js @@ -11,7 +11,7 @@ const FullscreenButton = ({ }) => ( ) diff --git a/browser/main/Detail/FullscreenButton.styl b/browser/main/Detail/FullscreenButton.styl index cc1a8dffa..133577f37 100644 --- a/browser/main/Detail/FullscreenButton.styl +++ b/browser/main/Detail/FullscreenButton.styl @@ -17,6 +17,10 @@ opacity 0 transition 0.1s +.tooltip:lang(ja) + @extend .tooltip + right 35px + body[data-theme="dark"] .control-fullScreenButton topBarButtonDark() \ No newline at end of file From d0f5ec8adae8dae5d00b8a80a62757bab4e20665 Mon Sep 17 00:00:00 2001 From: vienai8d <31370233+vienai8d@users.noreply.github.com> Date: Wed, 2 Jan 2019 11:03:40 +0900 Subject: [PATCH 4/6] fix FullscreenButton --- browser/main/Detail/FullscreenButton.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/browser/main/Detail/FullscreenButton.js b/browser/main/Detail/FullscreenButton.js index 3a86a7511..bd76447ce 100644 --- a/browser/main/Detail/FullscreenButton.js +++ b/browser/main/Detail/FullscreenButton.js @@ -5,15 +5,17 @@ import styles from './FullscreenButton.styl' import i18n from 'browser/lib/i18n' const OSX = global.process.platform === 'darwin' -const hotkey = (OSX ? i18n.__('Command(⌘)') : i18n.__('Ctrl(^)')) + '+B' const FullscreenButton = ({ onClick -}) => ( - -) +}) => { + const hotkey = (OSX ? i18n.__('Command(⌘)') : i18n.__('Ctrl(^)')) + '+B' + return ( + + ) +} FullscreenButton.propTypes = { onClick: PropTypes.func.isRequired From b05ba64db8c1b3c32e22fc520fd939f78e487000 Mon Sep 17 00:00:00 2001 From: vienai8d <31370233+vienai8d@users.noreply.github.com> Date: Wed, 2 Jan 2019 11:07:15 +0900 Subject: [PATCH 5/6] localize TrashButton for Japanese --- browser/main/Detail/TrashButton.js | 2 +- browser/main/Detail/TrashButton.styl | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/browser/main/Detail/TrashButton.js b/browser/main/Detail/TrashButton.js index 473c2d0b1..d26be66ea 100644 --- a/browser/main/Detail/TrashButton.js +++ b/browser/main/Detail/TrashButton.js @@ -11,7 +11,7 @@ const TrashButton = ({ onClick={(e) => onClick(e)} > - {i18n.__('Trash')} + {i18n.__('Trash')} ) diff --git a/browser/main/Detail/TrashButton.styl b/browser/main/Detail/TrashButton.styl index 7c7af8783..a82cfa6b2 100644 --- a/browser/main/Detail/TrashButton.styl +++ b/browser/main/Detail/TrashButton.styl @@ -17,6 +17,10 @@ opacity 0 transition 0.1s +.tooltip:lang(ja) + @extend .tooltip + right 46px + .control-trashButton--in-trash top 60px topBarButtonRight() From e6a927e5afcf5298d2bc679470d04ec2be7be8b3 Mon Sep 17 00:00:00 2001 From: vienai8d <31370233+vienai8d@users.noreply.github.com> Date: Wed, 2 Jan 2019 11:10:07 +0900 Subject: [PATCH 6/6] localize ToggleModeButton for Japanese --- browser/main/Detail/ToggleModeButton.js | 2 +- browser/main/Detail/ToggleModeButton.styl | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/browser/main/Detail/ToggleModeButton.js b/browser/main/Detail/ToggleModeButton.js index 7c026429c..fcbaab345 100644 --- a/browser/main/Detail/ToggleModeButton.js +++ b/browser/main/Detail/ToggleModeButton.js @@ -14,7 +14,7 @@ const ToggleModeButton = ({
onClick('EDITOR_PREVIEW')}>
- {i18n.__('Toggle Mode')} + {i18n.__('Toggle Mode')} ) diff --git a/browser/main/Detail/ToggleModeButton.styl b/browser/main/Detail/ToggleModeButton.styl index 73f5acbd3..2b47b9327 100644 --- a/browser/main/Detail/ToggleModeButton.styl +++ b/browser/main/Detail/ToggleModeButton.styl @@ -40,6 +40,11 @@ opacity 0 transition 0.1s +.tooltip:lang(ja) + @extend .tooltip + left -8px + width 70px + body[data-theme="dark"] .control-fullScreenButton topBarButtonDark()