Skip to content

Fix for issue #4581 #4585

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

Merged
merged 2 commits into from
Jul 14, 2025
Merged

Fix for issue #4581 #4585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03152e1
Registered missing locales and set formatDate to EEEEE
AnXh3L0 Jul 14, 2025
bd0b6e2
Perform review of branch fix/date-picker
evilaliv3 Jul 14, 2025
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
9 changes: 9 additions & 0 deletions client/app/src/services/helper/locale-provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ import localeLo from '@angular/common/locales/lo';
import localeLoExtra from '@angular/common/locales/extra/lo';
import localeLt from '@angular/common/locales/lt';
import localeLtExtra from '@angular/common/locales/extra/lt';
import localeLv from '@angular/common/locales/lv';
import localeLvExtra from '@angular/common/locales/extra/lv';
import localeMg from '@angular/common/locales/mg';
import localeMgExtra from '@angular/common/locales/extra/mg';
import localeMk from '@angular/common/locales/mk';
Expand Down Expand Up @@ -145,6 +147,10 @@ import localeZhHk from '@angular/common/locales/zh-Hant-HK';
import localeZhHkExtra from '@angular/common/locales/extra/zh-Hant-HK';
import localeZhTw from '@angular/common/locales/zh-Hant';
import localeZhTwExtra from '@angular/common/locales/extra/zh-Hant';
import localeHy from '@angular/common/locales/hy';
import localeHyExtra from '@angular/common/locales/extra/hy';
import localeKl from '@angular/common/locales/kl';
import localeKlExtra from '@angular/common/locales/extra/kl';

// Registering all locales using your original codes
export function registerLocales(): void {
Expand Down Expand Up @@ -185,6 +191,7 @@ export function registerLocales(): void {
registerLocaleData(localeKy, 'ky', localeKyExtra);
registerLocaleData(localeLo, 'lo', localeLoExtra);
registerLocaleData(localeLt, 'lt', localeLtExtra);
registerLocaleData(localeLv, 'lv', localeLvExtra);
registerLocaleData(localeMg, 'mg', localeMgExtra);
registerLocaleData(localeMk, 'mk', localeMkExtra);
registerLocaleData(localeMs, 'ms', localeMsExtra);
Expand Down Expand Up @@ -220,4 +227,6 @@ export function registerLocales(): void {
registerLocaleData(localeZhCn, 'zh_CN', localeZhCnExtra); // Using 'zh_CN'
registerLocaleData(localeZhHk, 'zh_HK', localeZhHkExtra); // Using 'zh_HK'
registerLocaleData(localeZhTw, 'zh_TW', localeZhTwExtra); // Using 'zh_TW'
registerLocaleData(localeHy, 'hy', localeHyExtra);
registerLocaleData(localeKl, 'kl', localeKlExtra);
}
4 changes: 2 additions & 2 deletions client/app/src/shared/services/custom-datepicker-i18n.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export class CustomDatepickerI18n extends NgbDatepickerI18n {
this.translationService.currentLocale$.subscribe(locale => {
if (locale === 'crh') {
this.locale = 'tk';
} else if (locale === 'dv') {
} else if (locale === 'ba' || locale === 'dv' || locale.startsWith('ug')) {
Copy link
Member

Choose a reason for hiding this comment

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

As noted there are other languages that requires specific handling like: "ba", "ug", "ug@cyrl", "ug@latin"

this.locale = 'en';
} else {
this.locale = locale;
Expand All @@ -34,7 +34,7 @@ export class CustomDatepickerI18n extends NgbDatepickerI18n {
// Ora e sempre resistenza!
const targetDate = new Date(baseDate);
targetDate.setDate(baseDate.getDate() + (weekday - 3));
return formatDate(targetDate, 'EEE', this.locale);
return formatDate(targetDate, 'EEEEEE', this.locale);
}

// Full month name using Angular's formatDate
Expand Down
Loading