diff --git a/.gitignore b/.gitignore index 6c1f05c..092b1fe 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ node_modules/ .sass-cache extension/ yarn-error.log +src/locales/_build \ No newline at end of file diff --git a/package.json b/package.json index 2cd37bc..88dd9e4 100644 --- a/package.json +++ b/package.json @@ -34,8 +34,8 @@ }, "devDependencies": { "@11ty/eleventy": "^0.7.1", - "@lingui/cli": "^2.7.0", - "@lingui/macro": "^2.7.0", + "@lingui/cli": "^2.8.3", + "@lingui/macro": "^2.8.3", "babel-core": "^6.26.3", "babel-eslint": "^7.2.3", "babel-minify": "^0.2.0", @@ -64,7 +64,7 @@ }, "dependencies": { "@emmetio/codemirror-plugin": "^0.5.4", - "@lingui/react": "^2.7.0", + "@lingui/react": "^2.7.4", "code-blast-codemirror": "chinchang/code-blast-codemirror#web-maker", "codemirror": "^5.37.0", "copy-webpack-plugin": "^4.5.1", diff --git a/src/components/HelpModal.jsx b/src/components/HelpModal.jsx index cd8595a..cebbe1a 100644 --- a/src/components/HelpModal.jsx +++ b/src/components/HelpModal.jsx @@ -1,6 +1,7 @@ import { h } from 'preact'; import Modal from './Modal'; import { Button } from './common'; +import { Trans } from '@lingui/macro'; export function HelpModal(props) { return ( @@ -12,47 +13,51 @@ export function HelpModal(props) {

- Made with 💖&{' '} - 🙌 by{' '} - - Kushagra Gour - + + Made with 💖&{' '} + 🙌 by{' '} + + Kushagra Gour + +

- Read the documentation + Read the documentation. - .

- Tweet out your feature requests, comments & suggestions to{' '} - - @webmakerApp - + + Tweet out your feature requests, comments & suggestions to{' '} + + @webmakerApp + + .

- Like this extension? Please{' '} - - rate it here - - . + + Like this extension? Please{' '} + + rate it here + + . +

{' '} - Review Web Maker + Review Web Maker {' '} - Chat + Chat {' '} - Report a bug + Report a bug

-

See awesome libraries used

+

+ See awesome libraries used +

diff --git a/src/components/KeyboardShortcutsModal.jsx b/src/components/KeyboardShortcutsModal.jsx index 764cdf5..4b63e8d 100644 --- a/src/components/KeyboardShortcutsModal.jsx +++ b/src/components/KeyboardShortcutsModal.jsx @@ -1,95 +1,124 @@ import { h } from 'preact'; import Modal from './Modal'; +import { Trans } from '@lingui/macro'; export function KeyboardShortcutsModal({ show, closeHandler }) { return ( -

Keyboard Shortcuts

+

+ Keyboard Shortcuts +

-

Global

+

+ Global +

{/*

Ctrl/⌘ + Shift + ? See keyboard shortcuts

*/}

Ctrl/⌘ + Shift + 5 - Refresh preview + + Refresh preview +

Ctrl/⌘ + S - Save current creations + + Save current creations +

Ctrl/⌘ + O - Open list of saved creations + Open list of saved creations

Ctrl + L - Clear console (works when console input is focused) + Clear console (works when console input is focused)

Esc - Close saved creations panel & modals + Close saved creations panel & modals

-

Editor

+

+ Editor +

Ctrl/⌘ + F - Find + + Find +

Ctrl/⌘ + G - Select next match + + Select next match +

Ctrl/⌘ + Shift + G - Select previous match + + Select previous match +

Ctrl/⌘ + Opt/Alt + F - Find & replace + + Find & replace +

Shift + Tab - Realign code + + Realign code +

Ctrl/⌘ + ] - Indent code right + + Indent code right +

Ctrl/⌘ + [ - Indent code left + + Indent code left +

Tab - Emmet code completion{' '} + Emmet code completion{' '} - Read more + Read more

Ctrl/⌘ + / - Single line comment + + Single line comment +

Ctrl + Shift + F - Run Prettier + + Run Prettier +

diff --git a/src/components/MainHeader.jsx b/src/components/MainHeader.jsx index a314a57..0cb40b1 100644 --- a/src/components/MainHeader.jsx +++ b/src/components/MainHeader.jsx @@ -1,6 +1,6 @@ import { h } from 'preact'; import { Button } from './common'; -import { Trans, t } from '@lingui/macro'; +import { Trans, NumberFormat, t } from '@lingui/macro'; import { I18n } from '@lingui/react'; const DEFAULT_PROFILE_IMG = @@ -23,7 +23,7 @@ export function MainHeader(props) { )}