1
0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 01:36:22 +00:00

refactored code according to review

This commit is contained in:
Hung Nguyen
2018-04-24 18:06:10 +07:00
parent 65d8d7282f
commit d76db726c4
4 changed files with 78 additions and 80 deletions

View File

@@ -1,5 +1,4 @@
module.exports = {
languages: [
const languages = [
{
name: 'Albanian',
locale: 'sq'
@@ -60,6 +59,17 @@ module.exports = {
name: 'Spanish',
locale: 'es-ES'
}
]
]
module.exports = {
getLocales () {
return languages.reduce(function (localeList, locale) {
localeList.push(locale.locale)
return localeList
}, [])
},
getLanguages () {
return languages
}
}

View File

@@ -1,17 +1,12 @@
const path = require('path')
const { remote } = require('electron')
const { app } = remote
const { languages } = require('./Languages.js')
let locales = languages.reduce(function (localeList, locale) {
localeList.push(locale.locale)
return localeList
}, [])
const { getLocales } = require('./Languages.js')
// load package for localization
const i18n = new (require('i18n-2'))({
// setup some locales - other locales default to the first locale
locales: locales,
locales: getLocales(),
extension: '.json',
directory: process.env.NODE_ENV === 'production'
? path.join(app.getAppPath(), './locales')

View File

@@ -15,7 +15,7 @@ import eventEmitter from 'browser/main/lib/eventEmitter'
import { hashHistory } from 'react-router'
import store from 'browser/main/store'
import i18n from 'browser/lib/i18n'
import { languages } from 'browser/lib/Languages'
import { getLocales } from 'browser/lib/Languages'
const path = require('path')
const electron = require('electron')
const { remote } = electron
@@ -153,12 +153,7 @@ class Main extends React.Component {
document.body.setAttribute('data-theme', 'default')
}
let locales = languages.reduce(function (localeList, locale) {
localeList.push(locale.locale)
return localeList
}, [])
if (locales.indexOf(config.ui.language) !== -1) {
if (getLocales().indexOf(config.ui.language) !== -1) {
i18n.setLocale(config.ui.language)
} else {
i18n.setLocale('en')

View File

@@ -10,7 +10,7 @@ import CodeMirror from 'codemirror'
import 'codemirror-mode-elixir'
import _ from 'lodash'
import i18n from 'browser/lib/i18n'
import { languages } from 'browser/lib/Languages'
import { getLanguages } from 'browser/lib/Languages'
const OSX = global.process.platform === 'darwin'
@@ -184,9 +184,7 @@ class UiTab extends React.Component {
ref='uiLanguage'
>
{
languages.map((language) => {
return (<option value={language.locale} key={language.locale}>{i18n.__(language.name)}</option>)
})
getLanguages().map((language) => <option value={language.locale} key={language.locale}>{i18n.__(language.name)}</option>)
}
</select>
</div>