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.

Sign up for GitHub

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

fix(admin-ui): all Arabic tokens translated (100%) #2287

Merged
merged 3 commits into from
Jul 18, 2023
Merged

fix(admin-ui): all Arabic tokens translated (100%) #2287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77aaf8f
chore(admin-ui): Add basic infrastructure for RTL support
michaelbromley Jul 13, 2023
2e049a0
fix(admin-ui): all Arabic tokens translated (100%)
wpplumber Jul 15, 2023
89fc652
fix(admin-ui): add RTL mock
wpplumber Jul 17, 2023
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
1 change: 1 addition & 0 deletions packages/admin-ui-plugin/src/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export const defaultLanguage = LanguageCode.en;
export const defaultLocale = undefined;

export const defaultAvailableLanguages = [
LanguageCode.ar,
LanguageCode.de,
LanguageCode.en,
LanguageCode.es,
Expand Down
11 changes: 8 additions & 3 deletions packages/admin-ui/i18n-coverage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
{
"generatedOn": "2023-07-12T12:33:44.002Z",
"lastCommit": "4d01ab53b3d078f4cc2478d764d3dc87d61520da",
"generatedOn": "2023-07-15T10:37:14.708Z",
"lastCommit": "77aaf8f4bac72468bdeb28aae858035d2a579ef7",
"translationStatus": {
"ar": {
"tokenCount": 740,
"translatedCount": 740,
"percentage": 100
},
"cs": {
"tokenCount": 740,
"translatedCount": 545,
Expand All @@ -14,7 +19,7 @@
},
"en": {
"tokenCount": 740,
"translatedCount": 739,
"translatedCount": 740,
"percentage": 100
},
"es": {
Expand Down
2 changes: 1 addition & 1 deletion packages/admin-ui/src/lib/core/src/components/app-shell/app-shell.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="app-container">
<div class="app-container" [dir]="direction$ | async">
<div class="left-nav" [class.expanded]="mainNavExpanded$ | async">
<div class="branding">
<a [routerLink]="['/']" *ngIf="!hideVendureBranding"><img src="assets/logo-top.webp" class="logo" style="max-width: 100px" /></a>
Expand Down
4 changes: 4 additions & 0 deletions packages/admin-ui/src/lib/core/src/components/app-shell/app-shell.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { UiLanguageSwitcherDialogComponent } from '../ui-language-switcher-dialo
export class AppShellComponent implements OnInit {
userName$: Observable<string>;
uiLanguageAndLocale$: Observable<[LanguageCode, string | undefined]>;
direction$: Observable<'ltr' | 'rtl'>;
availableLanguages: LanguageCode[] = [];
hideVendureBranding = getAppConfig().hideVendureBranding;
pageTitle$: Observable<string>;
Expand Down Expand Up @@ -50,6 +51,9 @@ export class AppShellComponent implements OnInit {
this.mainNavExpanded$ = this.dataService.client
.uiState()
.stream$.pipe(map(({ uiState }) => uiState.mainNavExpanded));
this.direction$ = this.uiLanguageAndLocale$.pipe(
map(([languageCode]) => (this.i18nService.isRTL(languageCode) ? 'rtl' : 'ltr')),
);
}

selectUiLanguage() {
Expand Down
4 changes: 4 additions & 0 deletions packages/admin-ui/src/lib/core/src/providers/i18n/i18n.service.mock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ export class MockI18nService implements MockOf<I18nService> {
return key as string;
}

isRTL(): boolean {
return false;
}

availableLanguages: LanguageCode[];
setAvailableLanguages: (languages: LanguageCode[]) => void;
_availableLanguages: LanguageCode[];
Expand Down
14 changes: 14 additions & 0 deletions packages/admin-ui/src/lib/core/src/providers/i18n/i18n.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,18 @@ export class I18nService {
translate(key: string | string[], params?: any): string {
return this.ngxTranslate.instant(key, params);
}

/**
* Returns true if the given language code is a right-to-left language.
*/
isRTL(languageCode: LanguageCode): boolean {
const rtlLanguageCodes = [
LanguageCode.ar,
LanguageCode.he,
LanguageCode.fa,
LanguageCode.ur,
LanguageCode.ps,
];
return rtlLanguageCodes.includes(languageCode);
}
}
774 changes: 774 additions & 0 deletions packages/admin-ui/src/lib/static/i18n-messages/ar.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions packages/admin-ui/src/lib/static/vendure-ui-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"authTokenHeaderKey": "vendure-auth-token",
"defaultLanguage": "en",
"availableLanguages": [
"ar",
"en",
"es",
"zh_Hant",
Expand Down