Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(Locale): add Chinese #273

Merged
merged 4 commits into from
Apr 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .storybook/preview.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
import { app } from '@storybook/vue3';

import Qui from '../src/qComponents';
// custom localization
import messages from './locales';
// default localization
import { localeEn, localeRu } from '../src/qComponents';

app.use(Qui, {
localization: {
locale: 'en',
messages
messages: {
en: { ...localeEn, ...messages.en },
ru: { ...localeRu, ...messages.ru }
}
}
});

Expand Down
20 changes: 14 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,12 @@ In main.js:

```js
import { createApp } from 'vue';
import { createQui, QButton, QProgressIndicatior } from '@qvant/qui-max';
import {
createQui,
QButton,
QProgressIndicatior,
localeRu, // import default messages for different locales
} from '@qvant/qui-max';

// import required styles
import '@qvant/qui-max/css/main';
Expand All @@ -111,13 +116,16 @@ import '@qvant/qui-max/css/q-progress-indicatior';

const Qui = createQui({
localization: {
// Russian language by default, you can set `en` for English
locale: 'en',
// English language by default, but we have two more locales out-of-the-box: 'ru' | 'zh'
// set 'ru' - for Russian, set 'zh' - for Chinese
locale: 'ru',
messages: {
// rewrite default texts, see the source: src/qComponents/constants/locales
en: {
ru: {
// import and merge default messages for different locale
...localeRu,
// rewrite default texts, see the source: src/qComponents/constants/locales or set your custom messages
QDatepicker: {
placeholder: 'Pick your birthday!'
placeholder: 'Выберите дату рождения'
}
}
},
Expand Down
4 changes: 2 additions & 2 deletions src/qComponents/QDatePicker/src/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
isAfter,
isBefore
} from 'date-fns';
import { ru, enGB as en } from 'date-fns/locale';
import { ru, enGB as en, zhHK as zh } from 'date-fns/locale';
import { isString } from 'lodash-es';

import type { Nullable } from '#/helpers';
Expand Down Expand Up @@ -46,7 +46,7 @@ const checkDisabled = (
return disabled.some(Boolean);
};

const locales: Record<string, Locale> = { ru, en };
const locales: Record<string, Locale> = { ru, en, zh };

const formatToLocalReadableString = (
value: Date,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ import {
Locale
} from 'date-fns';
import { throttle } from 'lodash-es';
import { ru, enGB as en } from 'date-fns/locale';
import { ru, enGB as en, zhHK as zh } from 'date-fns/locale';

import { getConfig } from '@/qComponents/config';
import { notNull } from '@/qComponents/helpers';
Expand All @@ -73,7 +73,7 @@ import {
import type { DateTableInterface, DateTableState } from './types';
import checkDisabled from './checkDisabled';

const locales: Record<string, Locale> = { ru, en };
const locales: Record<string, Locale> = { ru, en, zh };

export default defineComponent({
name: 'QDatePickerDateTable',
Expand Down
9 changes: 7 additions & 2 deletions src/qComponents/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ import 'focus-visible';

import { setMessages, setI18n } from './locale';
import { setConfig } from './config';
import { en as localeEn, ru as localeRu } from './constants/locales';
import {
en as localeEn,
ru as localeRu,
zh as localeZh
} from './constants/locales';
import QBreadcrumbs from './QBreadcrumbs';
import QButton from './QButton';
import QCascader from './QCascader';
Expand Down Expand Up @@ -186,7 +190,8 @@ export {
QTextarea,
QUpload,
localeEn,
localeRu
localeRu,
localeZh
};

export * from './QBreadcrumbs';
Expand Down