From 5e2193e8aa0aa5cea1fa1d20127142d84518ede6 Mon Sep 17 00:00:00 2001 From: Come_744 Date: Thu, 3 Oct 2019 21:20:10 +0200 Subject: [PATCH 1/4] Translation fr->en Notice that even if en.json file is fully translated, translation is still not applied everywhere. --- src/assets/i18n/en.json | 42 ++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index b66a944e..14073764 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -11,7 +11,7 @@ "perfect": "That's perfect", "title": "Create a poll", "letsgo": "Lets go!", - "description": "Planifiez des rendez-vous avec vos amis ou votre famille ou créez un sondage avec du texte, des images ou des liens… un sondage quoi !", + "description": "Shedule appointments with your friends or your family, or create a pool with text, pictures or links… A real survey!", "find_my_polls": "Where are my polls ?", "find_helper": "I am looking for polls linked to my email", "find_button": "Find my polls" @@ -31,34 +31,34 @@ "description_placeholder": "summary of the poll's purpose" }, "dates": { - "title": "Config spécialement pour les dates ", - "hours_different": "Je souhaite mettre des créneaux horaires pour chaque journée", + "title": "Config especially for the dates", + "hours_different": "I want to put slots for each day", "multiple": { - "identical": "identiques", - "different": "possiblement différentes" + "identical": "same", + "different": "possibly different" }, - "add": "Ajouter une plage de dates", - "count_dates": "choix de dates" + "add": "Add a date range", + "count_dates": "choices of dates" }, "choices": { - "title": "Choisir les propositions", - "helper": "vous pouvez utiliser la syntaxe markdown ", - "answer_preset_1": "réponse de démo 1", - "answer_preset_2": "réponse 2", - "answer_preset_3": "la réponse D", - "add": "Ajouter", - "continue": "Voyons ce que ça donne" + "title": "Write the proposals", + "helper": "You can use markdown syntax", + "answer_preset_1": "Demo answer 1", + "answer_preset_2": "answer 2", + "answer_preset_3": "and D, the answer D", + "add": "Add", + "continue": "Let's see how it goes" }, "resume": { - "title": "Et c'est tout pour nous!", - "admins": "Coté administrateur-ice-eux", - "users": "Coté sondés", - "links_mail": "recevoir les liens par e-mail" + "title": "And that's all for us!", + "admins": "Admin side", + "users": "Respondent side", + "links_mail": "Receive links by email" }, "visibility": { - "title": "Visibilité des réponses", + "title": "Visibility of answers", "votes": "Votes", - "archiving": "Archivage", - "access": "Accès au sondage" + "archiving": "Archiving", + "access": "Access to the pool" } } From 0cb0813eb774c7aff4f96d71822dfa2d9e0cd089 Mon Sep 17 00:00:00 2001 From: Come_744 Date: Sat, 5 Oct 2019 19:40:48 +0200 Subject: [PATCH 2/4] Add i18n in navigation --- .../ui/navigation/navigation.component.html | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/app/ui/navigation/navigation.component.html b/src/app/ui/navigation/navigation.component.html index c234b935..c7fa566b 100644 --- a/src/app/ui/navigation/navigation.component.html +++ b/src/app/ui/navigation/navigation.component.html @@ -1,29 +1,29 @@ \ No newline at end of file + From efe0b892186b203dca49939573966eee10d1d772 Mon Sep 17 00:00:00 2001 From: Come_744 Date: Sat, 5 Oct 2019 21:45:51 +0200 Subject: [PATCH 3/4] Stick "Frama" and "date" together --- src/assets/scss/molecules/_logo.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/assets/scss/molecules/_logo.scss b/src/assets/scss/molecules/_logo.scss index 41ee0682..0ea0cae3 100644 --- a/src/assets/scss/molecules/_logo.scss +++ b/src/assets/scss/molecules/_logo.scss @@ -1,3 +1,8 @@ +.logo_first, .logo_second { + padding-left: 0; + padding-right: 0; +} + .logo_first { color: $logo_color; } From c5021a2aa1ff176457852f5419aa76e58dff2fa6 Mon Sep 17 00:00:00 2001 From: Come_744 Date: Mon, 7 Oct 2019 22:02:22 +0200 Subject: [PATCH 4/4] Replaced text by i18n json keys and add i18n attribute Texts have been replaced only when the keys were in the json files. i18n attributes have been added only when keys were not in the json files. --- src/app/app.component.html | 4 ++-- src/app/pages/answers/answers.component.html | 5 +++-- src/app/pages/dates/dates.component.html | 12 ++++++------ .../end-confirmation/end-confirmation.component.html | 8 ++++---- src/app/pages/visibility/visibility.component.html | 8 ++++---- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/app/app.component.html b/src/app/app.component.html index fba0c0fa..8bc75096 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -11,9 +11,9 @@ -

Title

+

{{"Title"|translate}}

- {{ 'Intro' | translate:user }} + {{"Intro"|translate:user}}
diff --git a/src/app/pages/answers/answers.component.html b/src/app/pages/answers/answers.component.html index c1193151..76f80a36 100644 --- a/src/app/pages/answers/answers.component.html +++ b/src/app/pages/answers/answers.component.html @@ -22,9 +22,10 @@ - Voyons ce que ça donne + Voyons ce que ça donne diff --git a/src/app/pages/dates/dates.component.html b/src/app/pages/dates/dates.component.html index 6670e93d..88b6e0fa 100644 --- a/src/app/pages/dates/dates.component.html +++ b/src/app/pages/dates/dates.component.html @@ -1,5 +1,5 @@
- Config spécialement pour les dates + {{"dates.title"|translate}}
@@ -8,8 +8,8 @@ id="multi_hours" [(ngModel)]="config.allowSeveralHours" > - - + +