Skip to content

Commit

Permalink
Merge 6ce5feb into 25010bb
Browse files Browse the repository at this point in the history
  • Loading branch information
py7hon committed Jul 7, 2018
2 parents 25010bb + 6ce5feb commit 0fc9267
Show file tree
Hide file tree
Showing 2 changed files with 80 additions and 42 deletions.
90 changes: 48 additions & 42 deletions src/locale/chooseLocale.js
Original file line number Diff line number Diff line change
@@ -1,42 +1,48 @@
import { addLocaleData } from 'react-intl';
import jaLocaleData from 'react-intl/locale-data/ja';
import ja from '@/locale/ja';
import enLocaleData from 'react-intl/locale-data/en';
import en from '@/locale/en';
import Storage from '@/utils/Storage';
import * as LocaleActions from '@/actions/locale';

const chooseLocale = (language, dispatch) => {
const cachedLang = Storage.get('lang');
let lang;
let messages;

if (!cachedLang) {
lang = language.split('-')[0];
} else {
lang = cachedLang;
}

switch (lang) {
case 'en':
addLocaleData(enLocaleData);
lang = 'en';
messages = en;
break;
default:
addLocaleData(jaLocaleData);
lang = 'ja';
messages = ja;
}

Storage.set('lang', lang);

dispatch(
LocaleActions.setLocale({
lang,
messages
})
);
};

export default chooseLocale;
import { addLocaleData } from 'react-intl';
import idLocaleData from 'react-intl/locale-data/id';
import id from '@/locale/id';
import jaLocaleData from 'react-intl/locale-data/ja';
import ja from '@/locale/ja';
import enLocaleData from 'react-intl/locale-data/en';
import en from '@/locale/en';
import Storage from '@/utils/Storage';
import * as LocaleActions from '@/actions/locale';

const chooseLocale = (language, dispatch) => {
const cachedLang = Storage.get('lang');
let lang;
let messages;

if (!cachedLang) {
lang = language.split('-')[0];
} else {
lang = cachedLang;
}

switch (lang) {
case 'en':
addLocaleData(enLocaleData);
lang = 'en';
messages = en;
break;
addLocaleData(idLocaleData);
lang = 'id';
messages = id;
break;
default:
addLocaleData(jaLocaleData);
lang = 'ja';
messages = ja;
}

Storage.set('lang', lang);

dispatch(
LocaleActions.setLocale({
lang,
messages
})
);
};

export default chooseLocale;
32 changes: 32 additions & 0 deletions src/locale/id.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
const id = {
Debut: 'Debut',
'Yesterday x rank': 'Kemarin #{rank}',
'x rank': '#{rank}',
'Redirect to pixiv': 'Dialihkan ke pixiv',
'Add to Bookmarks': 'Tambahkan ke Bookmarks',
Download: 'Unduh',
Tweet: 'Tweet',
Comments: 'Komentar',
'No Comments': 'Tidak ada komentar',
'An Error Occurred': 'Terjadi kesalahan',
'Communication Error Occurred': 'Kesalahan Komunikasi Terjadi',
'Web Browser does not support localStorage':
'Browser Web tidak mendukung localStorage',
'pixiv ID or Email Address is Blank': 'pixiv ID atau Alamat Email Kosong',
'Password is Blank': 'Kata Sandi Kosong',
'Wait a Moment': 'Tunggu sebentar',
Login: 'Masuk',
Logout: 'Keluar',
'Email Address / pixiv ID': 'Alamat Email / Pixiv ID',
Password: 'Kata Sandi',
Nickname: 'Nama panggilan',
'An error occurred. Check the URL or wait for a while and access again.':
'Terjadi kesalahan. Periksa URL atau tunggu beberapa saat dan akses lagi.',
'Failed to Load': 'Gagal untuk memuat',
Tags: 'Tags',
'Redirecting to pixiv.net': 'Mengarahkan ke pixiv.net',
Language: 'Bahasa',
Ranking: 'Rangking'
};

export default id;

0 comments on commit 0fc9267

Please sign in to comment.