grassrootseconomics
/
openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into light-txq

This commit is contained in:
Robert Habermeier 2017-02-10 17:21:38 +01:00
parent 2c43b02e13 48ae38eaf9
commit c7d83bd88a
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -1624,7 +1624,7 @@ dependencies = [
[[package]]
name = "parity-ui-precompiled"
version = "1.4.0"
source = "git+https://github.com/ethcore/js-precompiled.git#086ef689513b478463289c5b5845fb6a232f17ec"
source = "git+https://github.com/ethcore/js-precompiled.git#8ffd65aa7cd10a2e440bd55970cd68d8d07589fd"
dependencies = [
"parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
]

2
js/package.json
View File

@ -1,6 +1,6 @@
{
"name": "parity.js",
"version": "0.3.78",
"version": "0.3.79",
"main": "release/index.js",
"jsnext:main": "src/index.js",
"author": "Parity Team <admin@parity.io>",

7
js/src/i18n/store.js
View File

@ -19,22 +19,25 @@ import { action, observable, transaction } from 'mobx';
import { addLocaleData } from 'react-intl';
import de from 'react-intl/locale-data/de';
import en from 'react-intl/locale-data/en';
import nl from 'react-intl/locale-data/nl';
import store from 'store';
import { DEFAULT_LOCALE, DEFAULT_LOCALES, LS_STORE_KEY } from './constants';
import languages from './languages';
import deMessages from './de';
import enMessages from './en';
import nlMessages from './nl';
let instance = null;
const LANGUAGES = flatten({ languages });
const MESSAGES = {
de: Object.assign(flatten(deMessages), LANGUAGES),
en: Object.assign(flatten(enMessages), LANGUAGES)
en: Object.assign(flatten(enMessages), LANGUAGES),
nl: Object.assign(flatten(nlMessages), LANGUAGES)
};
addLocaleData([...de, ...en]);
addLocaleData([...de, ...en, ...nl]);
export default class Store {
@observable locale = DEFAULT_LOCALE;