Skip to content
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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ core/resource/i18n/en-US.json
core/resource/i18n/es-ES.json
core/resource/i18n/fr-FR.json
core/resource/i18n/it-IT.json
core/resource/i18n/jp-JP.json
core/resource/i18n/ja-JP.json
core/resource/i18n/multistoreLanguages.json
core/resource/i18n/nl-NL.json
core/resource/i18n/pl-PL.json
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fixed null value of search input - @AdKamil (#3778)
- Sorting fixed on category page - @AdKamil (#3785)
- Mount app in 'beforeResolve' if it's not dispatched in 'onReady' - @gibkigonzo (#3669)
- change translation from jp-JP to ja-JP - @gibkigonzo (#3824)

## [1.10.4] - 18.10.2019

Expand Down
2 changes: 1 addition & 1 deletion config/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@
"i18n": {
"defaultCountry": "US",
"defaultLanguage": "EN",
"availableLocale": ["en-US","de-DE","fr-FR","es-ES","nl-NL", "jp-JP", "ru-RU", "it-IT", "pt-BR", "pl-PL", "cs-CZ"],
"availableLocale": ["en-US","de-DE","fr-FR","es-ES","nl-NL", "ja-JP", "ru-RU", "it-IT", "pt-BR", "pl-PL", "cs-CZ"],
"defaultLocale": "en-US",
"currencyCode": "USD",
"currencySign": "$",
Expand Down
6 changes: 5 additions & 1 deletion core/i18n/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,11 @@ const loadDateLocales = async (lang: string = 'en'): Promise<void> => {
const separatorIndex = localeCode.indexOf('-')
if (separatorIndex) {
localeCode = separatorIndex ? localeCode.substr(0, separatorIndex) : localeCode
await import(/* webpackChunkName: "dayjs-locales" */ `dayjs/locale/${localeCode}`)
try {
await import(/* webpackChunkName: "dayjs-locales" */ `dayjs/locale/${localeCode}`)
} catch (err) {
Logger.debug('Unable to load translation from dayjs')()
}
}
}
}
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion docs/guide/cookbook/setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -1259,7 +1259,7 @@ At [`vue-storefront/config/default.json`](https://github.com/DivanteLtd/vue-stor
"i18n": {
"defaultCountry": "US",
"defaultLanguage": "EN",
"availableLocale": ["en-US","de-DE","fr-FR","es-ES","nl-NL", "jp-JP", "ru-RU", "it-IT", "pt-BR", "pl-PL", "cs-CZ"],
"availableLocale": ["en-US","de-DE","fr-FR","es-ES","nl-NL", "ja-JP", "ru-RU", "it-IT", "pt-BR", "pl-PL", "cs-CZ"],
"defaultLocale": "en-US",
"currencyCode": "USD",
"currencySign": "$",
Expand Down