mirror of
https://github.com/richard-loafle/fuse-angular.git
synced 2025-01-10 12:35:07 +00:00
Fixed Calendar day view weird characters issue
+ Added TranslateModule to the NavigationModule so the translate pipe can work + Small tweaks
This commit is contained in:
parent
535dbdfe57
commit
30825e7927
|
@ -3,6 +3,8 @@ import { CommonModule } from '@angular/common';
|
||||||
import { RouterModule } from '@angular/router';
|
import { RouterModule } from '@angular/router';
|
||||||
import { MatIconModule, MatRippleModule } from '@angular/material';
|
import { MatIconModule, MatRippleModule } from '@angular/material';
|
||||||
|
|
||||||
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
|
|
||||||
import { FuseNavigationComponent } from './navigation.component';
|
import { FuseNavigationComponent } from './navigation.component';
|
||||||
import { FuseNavVerticalItemComponent } from './vertical/nav-item/nav-vertical-item.component';
|
import { FuseNavVerticalItemComponent } from './vertical/nav-item/nav-vertical-item.component';
|
||||||
import { FuseNavVerticalCollapseComponent } from './vertical/nav-collapse/nav-vertical-collapse.component';
|
import { FuseNavVerticalCollapseComponent } from './vertical/nav-collapse/nav-vertical-collapse.component';
|
||||||
|
@ -17,6 +19,8 @@ import { FuseNavHorizontalCollapseComponent } from './horizontal/nav-collapse/na
|
||||||
|
|
||||||
MatIconModule,
|
MatIconModule,
|
||||||
MatRippleModule,
|
MatRippleModule,
|
||||||
|
|
||||||
|
TranslateModule.forChild()
|
||||||
],
|
],
|
||||||
exports : [
|
exports : [
|
||||||
FuseNavigationComponent
|
FuseNavigationComponent
|
||||||
|
|
|
@ -12,6 +12,7 @@ export class FuseTranslationLoaderService
|
||||||
{
|
{
|
||||||
constructor(private translate: TranslateService)
|
constructor(private translate: TranslateService)
|
||||||
{
|
{
|
||||||
|
console.log('...FuseTranslationLoaderService constructor...');
|
||||||
}
|
}
|
||||||
|
|
||||||
public loadTranslations(...args: Locale[]): void
|
public loadTranslations(...args: Locale[]): void
|
||||||
|
|
|
@ -16,10 +16,10 @@ import { locale as navigationTurkish } from './navigation/i18n/tr';
|
||||||
export class AppComponent
|
export class AppComponent
|
||||||
{
|
{
|
||||||
constructor(
|
constructor(
|
||||||
|
private translate: TranslateService,
|
||||||
private fuseNavigationService: FuseNavigationService,
|
private fuseNavigationService: FuseNavigationService,
|
||||||
private fuseSplashScreen: FuseSplashScreenService,
|
private fuseSplashScreen: FuseSplashScreenService,
|
||||||
private translate: TranslateService,
|
private fuseTranslationLoader: FuseTranslationLoaderService
|
||||||
private translationLoader: FuseTranslationLoaderService
|
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
// Add languages
|
// Add languages
|
||||||
|
@ -28,10 +28,10 @@ export class AppComponent
|
||||||
// Set the default language
|
// Set the default language
|
||||||
this.translate.setDefaultLang('en');
|
this.translate.setDefaultLang('en');
|
||||||
|
|
||||||
|
// Set the navigation translations
|
||||||
|
this.fuseTranslationLoader.loadTranslations(navigationEnglish, navigationTurkish);
|
||||||
|
|
||||||
// Use a language
|
// Use a language
|
||||||
this.translate.use('en');
|
this.translate.use('en');
|
||||||
|
|
||||||
// Set the navigation translations
|
|
||||||
this.translationLoader.loadTranslations(navigationEnglish, navigationTurkish);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -180,6 +180,14 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.cal-hour-segment {
|
||||||
|
|
||||||
|
&:after,
|
||||||
|
&::after {
|
||||||
|
content: '' !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#calendar {
|
#calendar {
|
||||||
|
|
|
@ -34,11 +34,11 @@ export class FuseMailComponent implements OnInit, OnDestroy
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private mailService: MailService,
|
private mailService: MailService,
|
||||||
private translationLoader: FuseTranslationLoaderService
|
private fuseTranslationLoader: FuseTranslationLoaderService
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
this.searchInput = new FormControl('');
|
this.searchInput = new FormControl('');
|
||||||
this.translationLoader.loadTranslations(english, turkish);
|
this.fuseTranslationLoader.loadTranslations(english, turkish);
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnInit()
|
ngOnInit()
|
||||||
|
|
Loading…
Reference in New Issue
Block a user