From 54332d747a9bdeead2f5465bc03cb1f9dfeda331 Mon Sep 17 00:00:00 2001
From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com>
Date: Thu, 1 Oct 2020 09:32:20 +0200
Subject: [PATCH] fix: i18n translation
---
angular.json | 9 +++++++-
package.json | 3 ++-
src/app/app.module.ts | 4 ++--
src/app/header/header.component.html | 8 +++----
.../{messages.fr.xlf => messages.en.xlf} | 23 ++++++++++++++++++-
src/styles.scss | 5 +++-
6 files changed, 42 insertions(+), 10 deletions(-)
rename src/locale/{messages.fr.xlf => messages.en.xlf} (58%)
diff --git a/angular.json b/angular.json
index 016e4563b..79beada28 100644
--- a/angular.json
+++ b/angular.json
@@ -14,8 +14,9 @@
"sourceRoot": "src",
"prefix": "app",
"i18n": {
+ "sourceLocale": "fr",
"locales": {
- "fr": "src/locale/messages.fr.xlf"
+ "en": "src/locale/messages.en.xlf"
}
},
"architect": {
@@ -64,6 +65,9 @@
},
"fr": {
"localize": ["fr"]
+ },
+ "en": {
+ "localize": ["en"]
}
}
},
@@ -78,6 +82,9 @@
},
"fr": {
"browserTarget": "pamn:build:fr"
+ },
+ "en": {
+ "browserTarget": "pamn:build:en"
}
}
},
diff --git a/package.json b/package.json
index 6237b578b..e57fe4f56 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,8 @@
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e",
- "release": "standard-version"
+ "release": "standard-version",
+ "translate": "ng xi18n --output-path src/locale --out-file messages.en.xlf"
},
"private": true,
"dependencies": {
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 77f4053fb..51288081b 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,4 +1,4 @@
-import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
+import { LOCALE_ID, NgModule } from '@angular/core';
import { AppRoutingModule } from './app-routing.module';
import { BrowserModule } from '@angular/platform-browser';
@@ -14,7 +14,7 @@ import { HeaderComponent } from './header/header.component';
@NgModule({
declarations: [AppComponent, HeaderComponent, FooterComponent, HomeComponent, StructureListComponent],
imports: [BrowserModule, AppRoutingModule, FlexLayoutModule],
- providers: [CustomBreakPointsProvider],
+ providers: [{ provide: LOCALE_ID, useValue: 'fr' }, CustomBreakPointsProvider],
bootstrap: [AppComponent],
})
export class AppModule {}
diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html
index 50055fc27..ddfb5aa79 100644
--- a/src/app/header/header.component.html
+++ b/src/app/header/header.component.html
@@ -6,10 +6,10 @@
</div>
</div>
<div fxLayout="row" fxLayoutGap="20px">
- <a routerLink="/resources" [routerLinkActive]="'active'">Ressources</a>
- <a routerLink="/projects" [routerLinkActive]="'active'">Projets</a>
+ <a routerLink="/resources" [routerLinkActive]="'active'" i18n>Ressources</a>
+ <a routerLink="/projects" [routerLinkActive]="'active'" i18n>Projets</a>
<a routerLink="/sturctures" [routerLinkActive]="'active'" i18n>Médiateurs numériques</a>
- <span class="ico-mglass orange-icon"></span>
- <a routerLink="/login" [routerLinkActive]="'active'">Se connecter</a>
+ <span class="clickable ico-mglass orange-icon"></span>
+ <a routerLink="/login" [routerLinkActive]="'active'" i18n>Se connecter</a>
</div>
</div>
diff --git a/src/locale/messages.fr.xlf b/src/locale/messages.en.xlf
similarity index 58%
rename from src/locale/messages.fr.xlf
rename to src/locale/messages.en.xlf
index b34a1ca0d..feee2d9f4 100644
--- a/src/locale/messages.fr.xlf
+++ b/src/locale/messages.en.xlf
@@ -1,7 +1,21 @@
<?xml version="1.0" encoding="UTF-8" ?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
- <file source-language="en-US" datatype="plaintext" original="ng2.template">
+ <file source-language="fr" datatype="plaintext" original="ng2.template">
<body>
+ <trans-unit id="144eae2386b91c6e439a7da2b792f36033beb198" datatype="html">
+ <source>Ressources</source>
+ <context-group purpose="location">
+ <context context-type="sourcefile">src/app/header/header.component.html</context>
+ <context context-type="linenumber">9</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="6fa10153ecfdc8fe2a11a7eaeb4ba93ac2d8e038" datatype="html">
+ <source>Projets</source>
+ <context-group purpose="location">
+ <context context-type="sourcefile">src/app/header/header.component.html</context>
+ <context context-type="linenumber">10</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="269fee92b64c6de499c6a432b676e83573b91659" datatype="html">
<source>Médiateurs numériques</source>
<context-group purpose="location">
@@ -9,6 +23,13 @@
<context context-type="linenumber">11</context>
</context-group>
</trans-unit>
+ <trans-unit id="7a5b80bdfff39603e595a2a61d5032115874e412" datatype="html">
+ <source>Se connecter</source>
+ <context-group purpose="location">
+ <context context-type="sourcefile">src/app/header/header.component.html</context>
+ <context context-type="linenumber">13</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="9915a302120305a1048e661fa028815cc83db69d" datatype="html">
<source>Mentions légales</source>
<context-group purpose="location">
diff --git a/src/styles.scss b/src/styles.scss
index 1ffce2da2..70b7cab6e 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -8,7 +8,6 @@ html,
body {
width: 100%;
height: 100%;
-
margin: 0;
padding: 0;
}
@@ -26,6 +25,10 @@ a {
}
}
+.clickable {
+ cursor: pointer;
+}
+
// Containers
.content-container {
margin: 0;
--
GitLab