Skip to content

Commit

Permalink
- Support Arabic, FrCanadian/Belgian in User Interface (#3271) (#3274)
Browse files Browse the repository at this point in the history 
* - Support Arabic, FrCanadian/Belgian in User Interface (#3271)

* test: fix test cases which derived from Intl

* refactor: remove unrelated update

---------

Co-authored-by: Natixe <[email protected]>
  • Loading branch information
@Keith-CY @Natixe
Keith-CY and Natixe authored Dec 13, 2024
1 parent f5942d7 commit 992ccad
Show file tree
Hide file tree
Showing 15 changed files with 1,716 additions and 19 deletions.
2 changes: 1 addition & 1 deletion packages/neuron-ui/.storybook/electron.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const sendSyncValues = {
'get-locale': ('zh', 'fr', 'es'),
'get-locale': ('zh', 'fr', 'es', 'ar'),
'get-version': '0.103.1',
}

Expand Down
1,330 changes: 1,330 additions & 0 deletions packages/neuron-ui/src/locales/ar.json
View file

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions packages/neuron-ui/src/locales/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -470,10 +470,13 @@
},
"locale": {
"en": "English",
"en-US": "English(United States)",
"zh": "中文(简体)",
"zh-TW": "中文(繁體)",
"en-US": "English (United States)",
"zh": "中文 (简体)",
"zh-TW": "中文 (繁體)",
"ar": "العربية",
"fr": "Français",
"fr-CA": "Français (Canada)",
"fr-BE": "Français (Belgique)",
"es": "Español"
},
"data": {
Expand Down
9 changes: 6 additions & 3 deletions packages/neuron-ui/src/locales/es.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -453,10 +453,13 @@
},
"locale": {
"en": "English",
"en-US": "English(United States)",
"zh": "中文(简体)",
"zh-TW": "中文(繁體)",
"en-US": "English (United States)",
"zh": "中文 (简体)",
"zh-TW": "中文 (繁體)",
"ar": "العربية",
"fr": "Français",
"fr-CA": "Français (Canada)",
"fr-BE": "Français (Belgique)",
"es": "Español"
},
"data": {
Expand Down
9 changes: 6 additions & 3 deletions packages/neuron-ui/src/locales/fr.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -460,10 +460,13 @@
},
"locale": {
"en": "English",
"en-US": "English(United States)",
"zh": "中文(简体)",
"zh-TW": "中文(繁體)",
"en-US": "English (United States)",
"zh": "中文 (简体)",
"zh-TW": "中文 (繁體)",
"ar": "العربية",
"fr": "Français",
"fr-CA": "Français (Canada)",
"fr-BE": "Français (Belgique)",
"es": "Español"
},
"data": {
Expand Down
9 changes: 6 additions & 3 deletions packages/neuron-ui/src/locales/zh-tw.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -464,10 +464,13 @@
},
"locale": {
"en": "English",
"en-US": "English(United States)",
"zh": "中文(简体)",
"zh-TW": "中文(繁體)",
"en-US": "English (United States)",
"zh": "中文 (简体)",
"zh-TW": "中文 (繁體)",
"ar": "العربية",
"fr": "Français",
"fr-CA": "Français (Canada)",
"fr-BE": "Français (Belgique)",
"es": "Español"
},
"data": {
Expand Down
9 changes: 6 additions & 3 deletions packages/neuron-ui/src/locales/zh.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -463,10 +463,13 @@
},
"locale": {
"en": "English",
"en-US": "English(United States)",
"zh": "中文(简体)",
"zh-TW": "中文(繁體)",
"en-US": "English (United States)",
"zh": "中文 (简体)",
"zh-TW": "中文 (繁體)",
"ar": "العربية",
"fr": "Français",
"fr-CA": "Français (Canada)",
"fr-BE": "Français (Belgique)",
"es": "Español"
},
"data": {
Expand Down
41 changes: 41 additions & 0 deletions packages/neuron-ui/src/tests/calendar/index.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,24 @@ describe('Get Local Month Short Names', () => {
expect(getLocalMonthShortNames('fr')).toEqual(names)
})

it('Arabic', () => {
const names = [
'يناير',
'فبراير',
'مارس',
'أبريل',
'مايو',
'يونيو',
'يوليو',
'أغسطس',
'سبتمبر',
'أكتوبر',
'نوفمبر',
'ديسمبر',
]
expect(getLocalMonthShortNames('ar')).toEqual(names)
})

it('Spanish', () => {
const names = ['ene', 'feb', 'mar', 'abr', 'may', 'jun', 'jul', 'ago', 'sept', 'oct', 'nov', 'dic']
expect(getLocalMonthShortNames('es')).toEqual(names)
Expand Down Expand Up @@ -157,6 +175,24 @@ describe('Get Local Month Names', () => {
expect(getLocalMonthNames('fr')).toEqual(names)
})

it('Arabic', () => {
const names = [
'يناير',
'فبراير',
'مارس',
'أبريل',
'مايو',
'يونيو',
'يوليو',
'أغسطس',
'سبتمبر',
'أكتوبر',
'نوفمبر',
'ديسمبر',
]
expect(getLocalMonthNames('ar')).toEqual(names)
})

it('Spanish', () => {
const names = [
'enero',
Expand Down Expand Up @@ -197,6 +233,11 @@ describe('Get Local Week Names', () => {
expect(getLocalWeekNames('fr')).toEqual(names)
})

it('Arabic', () => {
const names = ['ح', 'ن', 'ث', 'ر', 'خ', 'ج', 'س']
expect(getLocalWeekNames('ar')).toEqual(names)
})

it('Traditional Chinese', () => {
const names = ['日', '一', '二', '三', '四', '五', '六']
expect(getLocalWeekNames('zh-TW')).toEqual(names)
Expand Down
2 changes: 1 addition & 1 deletion packages/neuron-ui/src/utils/const.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export const DEFAULT_SUDT_FIELDS = {
CKBSymbol: 'CKB',
CKBDecimal: '8',
}
export const LOCALES = ['zh', 'zh-TW', 'en', 'en-US', 'fr', 'es'] as const
export const LOCALES = ['zh', 'zh-TW', 'en', 'en-US', 'ar', 'fr', 'fr-CA', 'fr-BE', 'es'] as const

// address property
export const SHORT_ADDR_LENGTH = 46
Expand Down
4 changes: 4 additions & 0 deletions packages/neuron-ui/src/utils/i18n.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,18 @@ import en from 'locales/en.json'
import zhTW from 'locales/zh-tw.json'
import fr from 'locales/fr.json'
import es from 'locales/es.json'
import ar from 'locales/ar.json'

i18n.use(initReactI18next).init({
resources: {
en,
fr,
ar,
es,
zh,
'zh-TW': zhTW,
'fr-CA': fr,
'fr-BE': fr,
},
lng: getLocale(),
fallbackLng: {
Expand Down
2 changes: 1 addition & 1 deletion packages/neuron-wallet/electron-builder.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ mac:
gatekeeperAssess: false
entitlements: assets/entitlements.plist
entitlementsInherit: assets/entitlements.plist
electronLanguages: ["en", "zh", "zh_CN", "zh_TW"]
electronLanguages: ["en", "zh", "zh_CN", "zh_TW", "ar", "fr"]
target:
- target: default
arch:
Expand Down
Loading

2 comments on commit 992ccad

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Packaging for test is done in 12312136980

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Packaging for test is done in 12312138506

Please sign in to comment.