diff --git a/lokalize-scripts/scripts.rc b/lokalize-scripts/scripts.rc new file mode 100644 index 00000000..00a7472f --- /dev/null +++ b/lokalize-scripts/scripts.rc @@ -0,0 +1,14 @@ + \ No newline at end of file diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 6808cf9c..7db18013 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -52,7 +52,7 @@ export function HttpLoaderFactory(http: HttpClient): TranslateHttpLoader { NgxWebstorageModule.forRoot({ prefix: environment.localStorage.key }), SharedModule, TranslateModule.forRoot({ - defaultLanguage: 'fr', + defaultLanguage: 'FR', loader: { provide: TranslateLoader, useFactory: HttpLoaderFactory, @@ -62,7 +62,7 @@ export function HttpLoaderFactory(http: HttpClient): TranslateHttpLoader { provide: MissingTranslationHandler, useClass: MyMissingTranslationHandler, }, - useDefaultLang: false, + useDefaultLang: true, }), ], providers: [Title, TranslateService], diff --git a/src/app/core/components/header/header.component.html b/src/app/core/components/header/header.component.html index d7f209b9..d503fa90 100644 --- a/src/app/core/components/header/header.component.html +++ b/src/app/core/components/header/header.component.html @@ -19,6 +19,8 @@ aria-label="menu" aria-expanded="false" data-target="navbarBasicExample" + [ngClass]="{ 'bg-primary': mobileMenuVisible }" + (click)="mobileMenuVisible = !mobileMenuVisible" > @@ -34,10 +36,15 @@
+ + {{ 'config.find_my_polls' | translate }}
+
+ menu mobile +
diff --git a/src/app/core/components/header/header.component.ts b/src/app/core/components/header/header.component.ts index 9fc1b268..3f160443 100644 --- a/src/app/core/components/header/header.component.ts +++ b/src/app/core/components/header/header.component.ts @@ -17,8 +17,9 @@ export class HeaderComponent implements OnInit { public env = environment; @Input() public appTitle: string = 'FramaDate Funky'; @Input() public appLogo: string; + mobileMenuVisible = false; - constructor(private userService: UserService, private modalService: ModalService) {} + constructor(private userService: UserService) {} public ngOnInit(): void {} } diff --git a/src/app/core/components/sibebar/navigation/navigation.component.html b/src/app/core/components/sibebar/navigation/navigation.component.html index 7ba35756..fa4f467a 100644 --- a/src/app/core/components/sibebar/navigation/navigation.component.html +++ b/src/app/core/components/sibebar/navigation/navigation.component.html @@ -2,9 +2,6 @@
Tous les sondages
- - « inexistentPoll » - -
+
Modules
@@ -34,28 +31,32 @@ Participation
-
-
+
+ + « inexistentPoll » + +
+ Création + Les Dates + Réponses + Visibilité + Résumé + Confirmation + Administration + +
+ + Page démo + Sondage 1 + Sondage 2 + + Sondage 3 (dessins animés) + + Graphique +
Accueil - Création - Les Dates - Réponses - Visibilité - Résumé - Confirmation - Administration - -
- - Page démo - Sondage 1 - Sondage 2 - - Sondage 3 (dessins animés) - - Graphique diff --git a/src/app/core/components/sibebar/navigation/navigation.component.ts b/src/app/core/components/sibebar/navigation/navigation.component.ts index 52c45ba6..cc46e897 100644 --- a/src/app/core/components/sibebar/navigation/navigation.component.ts +++ b/src/app/core/components/sibebar/navigation/navigation.component.ts @@ -3,6 +3,7 @@ import { Observable } from 'rxjs'; import { Poll } from '../../../models/poll.model'; import { MockingService } from '../../../services/mocking.service'; +import { environment } from '../../../../../environments/environment'; @Component({ selector: 'app-navigation', @@ -11,6 +12,7 @@ import { MockingService } from '../../../services/mocking.service'; }) export class NavigationComponent implements OnInit { public _pollsAvailables: Observable = this.mockingService.pollsAvailables; + public devModeEnabled = !environment.production; constructor(private mockingService: MockingService) {} diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index 36dc5e32..34d27688 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -10,10 +10,11 @@ import { HomeComponent } from './components/home/home.component'; import { LogoComponent } from './components/logo/logo.component'; import { NavigationComponent } from './components/sibebar/navigation/navigation.component'; import { throwIfAlreadyLoaded } from './guards/module-import.guard'; +import { SharedModule } from '../shared/shared.module'; @NgModule({ declarations: [FooterComponent, HeaderComponent, HomeComponent, LogoComponent, NavigationComponent], - imports: [CommonModule, FormsModule, RouterModule, TranslateModule], + imports: [CommonModule, FormsModule, RouterModule, TranslateModule, SharedModule], exports: [HeaderComponent, FooterComponent, NavigationComponent, LogoComponent], }) export class CoreModule { diff --git a/src/app/core/enums/language.enum.ts b/src/app/core/enums/language.enum.ts index 0d954327..4dc6dbfe 100644 --- a/src/app/core/enums/language.enum.ts +++ b/src/app/core/enums/language.enum.ts @@ -1,4 +1,15 @@ export enum Language { - FR = 'FR', - EN = 'EN', + FR = 'fr', + // BR = 'br', + // CA = 'ca', + // DE = 'de', + // EL = 'el', + EN = 'en', + // ES = 'es', + // GL = 'gl', + // HU = 'hu', + // IT = 'it', + // NL = 'nl', + // OC = 'oc', + // SV = 'sv', } diff --git a/src/app/core/services/language.service.ts b/src/app/core/services/language.service.ts index 9440e9ca..d3f5ff4c 100644 --- a/src/app/core/services/language.service.ts +++ b/src/app/core/services/language.service.ts @@ -15,7 +15,7 @@ export class LanguageService { } public setLanguage(language: Language): void { - this.translate.use(language.toString().toUpperCase()); + this.translate.use(language.toString()); } public getAvailableLanguages(): string[] { @@ -48,17 +48,19 @@ export class LanguageService { // set default language if (!this.translate.currentLang) { - this.setLanguage(Language.EN); + this.setLanguage(Language.FR); } } private setLanguageFromStorage(): void { + console.log('this.storageService.language', this.storageService.language); if (this.storageService.language && this.translate.getLangs().includes(this.storageService.language)) { this.setLanguage(this.storageService.language); } } private setLanguageFromBrowser(): void { const currentBrowserLanguage: Language = this.translate.getBrowserLang().toUpperCase() as Language; + console.log('currentBrowserLanguage', currentBrowserLanguage); if (this.translate.getLangs().includes(currentBrowserLanguage)) { this.setLanguage(currentBrowserLanguage); } diff --git a/src/app/features/administration/form/form.component.html b/src/app/features/administration/form/form.component.html index afa9fff5..f189ec5d 100644 --- a/src/app/features/administration/form/form.component.html +++ b/src/app/features/administration/form/form.component.html @@ -1,8 +1,8 @@
-

+

{{ 'creation.title' | translate }}

- + {{ 'creation.want' | translate }}