Skip to content

Commit

Permalink
Add language picker in settings and translate some header strings. fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
chinchang committed Nov 3, 2018
1 parent 601d3a7 commit 8b3c8f0
Show file tree
Hide file tree
Showing 5 changed files with 168 additions and 123 deletions.
2 changes: 1 addition & 1 deletion .linguirc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"compileNamespace": "es6",
"compileNamespace": "es",
"localeDir": "src/locales/",
"srcPathDirs": ["src/components"],
"format": "po",
Expand Down
5 changes: 1 addition & 4 deletions src/components/Console.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import { h, Component } from 'preact';
import { PureComponent } from 'preact-compat';

import { Inspector, chromeDark } from 'react-inspector';

import { Trans } from '@lingui/macro';

class LogRow extends Component {
Expand Down Expand Up @@ -56,7 +53,7 @@ export class Console extends Component {
onDblClick={onConsoleHeaderDblClick}
>
<span class="code-wrap__header-label">
Console (<span>{logs.length}</span>)
<Trans>Console</Trans> (<span>{logs.length}</span>)
</span>
<div class="code-wrap__header-right-options">
<a
Expand Down
238 changes: 125 additions & 113 deletions src/components/MainHeader.jsx
Original file line number Diff line number Diff line change
@@ -1,125 +1,137 @@
import { h } from 'preact';
import { Button } from './common';
import { Trans, t } from '@lingui/macro';
import { I18n } from '@lingui/react';

const DEFAULT_PROFILE_IMG =
"data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'%3E%3Cpath fill='#ccc' d='M12,19.2C9.5,19.2 7.29,17.92 6,16C6.03,14 10,12.9 12,12.9C14,12.9 17.97,14 18,16C16.71,17.92 14.5,19.2 12,19.2M12,5A3,3 0 0,1 15,8A3,3 0 0,1 12,11A3,3 0 0,1 9,8A3,3 0 0,1 12,5M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12C22,6.47 17.5,2 12,2Z' /%3E%3C/svg%3E";

export function MainHeader(props) {
return (
<div class="main-header">
<input
type="text"
id="titleInput"
title="Click to edit"
class="item-title-input"
value={props.title}
onBlur={props.titleInputBlurHandler}
/>
<div class="main-header__btn-wrap flex flex-v-center">
<button
id="runBtn"
class="hide btn--dark flex flex-v-center hint--rounded hint--bottom-left"
aria-label="Run preview (Ctrl/⌘ + Shift + 5)"
onClick={props.runBtnClickHandler}
>
<svg style="width: 14px; height: 14px;">
<use xlinkHref="#play-icon" />
</svg>Run
</button>

{!this.props.isFileMode && (
<Button
onClick={props.addLibraryBtnHandler}
data-event-category="ui"
data-event-action="addLibraryButtonClick"
class="btn--dark flex-v-center hint--rounded hint--bottom-left"
aria-label="Add a JS/CSS library"
>
Add library{' '}
<span
id="js-external-lib-count"
style={`display:${props.externalLibCount ? 'inline' : 'none'}`}
class="count-label"
<I18n>
{({ i18n }) => (
<div class="main-header">
<input
type="text"
id="titleInput"
title="Click to edit"
class="item-title-input"
value={props.title}
onBlur={props.titleInputBlurHandler}
/>
<div class="main-header__btn-wrap flex flex-v-center">
<button
id="runBtn"
class="hide btn--dark flex flex-v-center hint--rounded hint--bottom-left"
aria-label="Run preview (Ctrl/⌘ + Shift + 5)"
onClick={props.runBtnClickHandler}
>
{props.externalLibCount}
</span>
</Button>
)}
<svg style="width: 14px; height: 14px;">
<use xlinkHref="#play-icon" />
</svg>
<Trans>Run</Trans>
</button>

<button
class="btn--dark flex flex-v-center hint--rounded hint--bottom-left"
aria-label="Start a new creation"
onClick={props.newBtnHandler}
>
<svg
style="vertical-align:middle;width:14px;height:14px"
viewBox="0 0 24 24"
>
<path d="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" />
</svg>New
</button>
<button
id="saveBtn"
class={`btn--dark flex flex-v-center hint--rounded hint--bottom-left ${
props.isSaving ? 'is-loading' : ''
} ${props.unsavedEditCount ? 'is-marked' : 0}`}
aria-label="Save current creation (Ctrl/⌘ + S)"
onClick={props.saveBtnHandler}
>
<svg
style="vertical-align:middle;width:14px;height:14px"
viewBox="0 0 24 24"
>
<path d="M15,9H5V5H15M12,19A3,3 0 0,1 9,16A3,3 0 0,1 12,13A3,3 0 0,1 15,16A3,3 0 0,1 12,19M17,3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V7L17,3Z" />
</svg>
<svg class="btn-loader" width="15" height="15" stroke="#fff">
<use xlinkHref="#loader-icon" />
</svg>
Save
</button>
<button
id="openItemsBtn"
class={`btn--dark flex flex-v-center hint--rounded hint--bottom-left ${
props.isFetchingItems ? 'is-loading' : ''
}`}
aria-label="Open a saved creation (Ctrl/⌘ + O)"
onClick={props.openBtnHandler}
>
<svg
style="width:14px;height:14px;vertical-align:middle;"
viewBox="0 0 24 24"
>
<path d="M13,9V3.5L18.5,9M6,2C4.89,2 4,2.89 4,4V20A2,2 0 0,0 6,22H18A2,2 0 0,0 20,20V8L14,2H6Z" />
</svg>
<svg class="btn-loader" width="15" height="15" stroke="#fff">
<use xlinkHref="#loader-icon" />
</svg>
Open
</button>
<Button
onClick={props.loginBtnHandler}
data-event-category="ui"
data-event-action="loginButtonClick"
class="hide-on-login btn--dark flex flex-v-center hint--rounded hint--bottom-left"
aria-label="Login/Signup"
>
Login/Signup
</Button>
<Button
onClick={props.profileBtnHandler}
data-event-category="ui"
data-event-action="headerAvatarClick"
aria-label="See profile or Logout"
class="hide-on-logout btn--dark hint--rounded hint--bottom-left"
>
<img
id="headerAvatarImg"
width="20"
src={props.user ? props.user.photoURL || DEFAULT_PROFILE_IMG : ''}
class="main-header__avatar-img"
/>
</Button>
</div>
</div>
{!this.props.isFileMode && (
<Button
onClick={props.addLibraryBtnHandler}
data-event-category="ui"
data-event-action="addLibraryButtonClick"
class="btn--dark flex-v-center hint--rounded hint--bottom-left"
aria-label={i18n._(t`Add a JS/CSS library`)}
>
<Trans>Add library</Trans>{' '}
<span
id="js-external-lib-count"
style={`display:${
props.externalLibCount ? 'inline' : 'none'
}`}
class="count-label"
>
{props.externalLibCount}
</span>
</Button>
)}

<button
class="btn--dark flex flex-v-center hint--rounded hint--bottom-left"
aria-label="Start a new creation"
onClick={props.newBtnHandler}
>
<svg
style="vertical-align:middle;width:14px;height:14px"
viewBox="0 0 24 24"
>
<path d="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" />
</svg>
<Trans>New</Trans>
</button>
<button
id="saveBtn"
class={`btn--dark flex flex-v-center hint--rounded hint--bottom-left ${
props.isSaving ? 'is-loading' : ''
} ${props.unsavedEditCount ? 'is-marked' : 0}`}
aria-label="Save current creation (Ctrl/⌘ + S)"
onClick={props.saveBtnHandler}
>
<svg
style="vertical-align:middle;width:14px;height:14px"
viewBox="0 0 24 24"
>
<path d="M15,9H5V5H15M12,19A3,3 0 0,1 9,16A3,3 0 0,1 12,13A3,3 0 0,1 15,16A3,3 0 0,1 12,19M17,3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V7L17,3Z" />
</svg>
<svg class="btn-loader" width="15" height="15" stroke="#fff">
<use xlinkHref="#loader-icon" />
</svg>
<Trans>Save</Trans>
</button>
<button
id="openItemsBtn"
class={`btn--dark flex flex-v-center hint--rounded hint--bottom-left ${
props.isFetchingItems ? 'is-loading' : ''
}`}
aria-label="Open a saved creation (Ctrl/⌘ + O)"
onClick={props.openBtnHandler}
>
<svg
style="width:14px;height:14px;vertical-align:middle;"
viewBox="0 0 24 24"
>
<path d="M13,9V3.5L18.5,9M6,2C4.89,2 4,2.89 4,4V20A2,2 0 0,0 6,22H18A2,2 0 0,0 20,20V8L14,2H6Z" />
</svg>
<svg class="btn-loader" width="15" height="15" stroke="#fff">
<use xlinkHref="#loader-icon" />
</svg>
<Trans>Open</Trans>
</button>
<Button
onClick={props.loginBtnHandler}
data-event-category="ui"
data-event-action="loginButtonClick"
class="hide-on-login btn--dark flex flex-v-center hint--rounded hint--bottom-left"
aria-label="Login/Signup"
>
<Trans>Login</Trans>/<Trans>Signup</Trans>
</Button>
<Button
onClick={props.profileBtnHandler}
data-event-category="ui"
data-event-action="headerAvatarClick"
aria-label="See profile or Logout"
class="hide-on-logout btn--dark hint--rounded hint--bottom-left"
>
<img
id="headerAvatarImg"
width="20"
src={
props.user ? props.user.photoURL || DEFAULT_PROFILE_IMG : ''
}
class="main-header__avatar-img"
/>
</Button>
</div>
</div>
)}
</I18n>
);
}
16 changes: 16 additions & 0 deletions src/components/Settings.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,22 @@ export default class Settings extends Component {
stopped.
</div>
</p>

<p>
<label class="line">
Language
<select
data-setting="lang"
value={prefs.lang}
onChange={this.updateSetting.bind(this)}
>
<option value="en">English</option>
<option value="hi">Hindi</option>
<option value="ja">Japanese</option>
<option value="sa">Sanskrit</option>
</select>
</label>
</p>
</div>
);
}
Expand Down
30 changes: 25 additions & 5 deletions src/components/app.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@ import {
SHOW_KEYBOARD_SHORTCUTS_EVENT
} from '../commands';
import { commandPaletteService } from '../commandPaletteService';
// import hiTranslations from '../locales/hi/messages';

import { I18nProvider } from '@lingui/react';
const hiTranslations = {};

if (module.hot) {
require('preact/debug');
}
const catalogs = { hi: hiTranslations };

const LocalStorageKeys = {
LOGIN_AND_SAVE_MESSAGE_SEEN: 'loginAndsaveMessageSeen',
ASKED_TO_IMPORT_CREATIONS: 'askedToImportCreations'
Expand Down Expand Up @@ -130,7 +130,8 @@ export default class App extends Component {
lineWrap: true,
infiniteLoopTimeout: 1000,
layoutMode: 2,
isJs13kModeOn: false
isJs13kModeOn: false,
lang: 'en'
};
this.prefs = {};

Expand Down Expand Up @@ -253,6 +254,22 @@ export default class App extends Component {
});
}

getLanguageDefinition() {
console.log('🇯🇲 fetching defninition');
const { lang } = this.state.prefs;
if (!lang || lang === 'en') {
return {};
} else if (lang === 'hi') {
const def = require('../locales/hi/messages');

return { hi: def.default };
} else if (lang === 'ja') {
const def = require('../locales/ja/messages');

return { ja: def.default };
}
}

incrementUnsavedChanges() {
this.setState({ unsavedEditCount: this.state.unsavedEditCount + 1 });

Expand Down Expand Up @@ -1398,7 +1415,10 @@ export default class App extends Component {

render() {
return (
<I18nProvider language="hi" catalogs={catalogs}>
<I18nProvider
language={this.state.prefs.lang}
catalogs={this.getLanguageDefinition()}
>
<div class={this.getRootClasses()}>
<div class="main-container">
<MainHeader
Expand Down

0 comments on commit 8b3c8f0

Please sign in to comment.