From abe07bc9784cce5aa93ffa2831ca18abc8e8c046 Mon Sep 17 00:00:00 2001 From: Come_744 Date: Sat, 30 Nov 2019 00:40:22 +0100 Subject: [PATCH] Translation work Closes issues #48 and #44 - Add all translation keys into admin.component.html - Add missing translation keys needed for admin component to en.json and fr.json - Minor corrections into fr.json - Add missing keys from fr.json to en.json - Translate keys of en.json - Format admin.component.html with tabs --- src/app/pages/admin/admin.component.html | 250 ++++++++++++++--------- src/assets/i18n/en.json | 93 +++++---- src/assets/i18n/fr.json | 23 ++- 3 files changed, 227 insertions(+), 139 deletions(-) diff --git a/src/app/pages/admin/admin.component.html b/src/app/pages/admin/admin.component.html index db4f9c73..781e4cf8 100644 --- a/src/app/pages/admin/admin.component.html +++ b/src/app/pages/admin/admin.component.html @@ -1,100 +1,164 @@
-

Nom du sondage

- -

Informations du sondage

- - - - - - - -

Paramètres

-

Visibilité des réponses

-
- - - -
-

Votes

-
- - -
-
- - - - -
+

Nom du sondage

- - -

Commentaires

- - -

Archivage

-
- - -
-

Accés au sondage

-
- - - -
-

Tout supprimer

- - -

Liens d'accès au sondage

-

Coté administrateur·ice

- - - -

Côté sondé·es

- - - -

Recevoir les liens par mail

- - - + +

{{"admin.info_section_title"|translate}}

-
- {{"admin.deletion"|translate}} - {{"admin.deletion_desc"|translate}} - {{"admin.deletion_btn"|translate}} + + -
-
- {{"admin.link"|translate}} - {{"admin.link_admin"|translate}} - {{"admin.link_admin_desc"|translate}} - {{"admin.link_admin_btn"|translate}} - {{"admin.copy_link"|translate}} + + - {{"admin.polled_people"|translate}} - {{"admin.polled_people_desc"|translate}} - {{"admin.polled_people_btn"|translate}} - {{"admin.email_links"|translate}} - {{"admin.email_links_desc"|translate}} - {{"admin.email_links_key"|translate}} - {{"admin.email_links_btn"|translate}} -
+ + + +

{{"admin.settings_section_title"|translate}}

+

{{"visibility.title"|translate}}

+ +
+ + + +
+ +

{{"visibility.votes"|translate}}

+
+ + +
+
+ + + + +
+ + + + +

{{"admin.comments_deletion_title"|translate}}

+ + + +

{{"admin.archiving_title"|translate}}

+
+ + +
+ +

{{"visibility.access"|translate}}

+
+ + + +
+ +

{{"admin.deletion"|translate}}

+ + + + +

{{"admin.link"|translate}}

+

{{"admin.link_admin"|translate}}

+ + + + + +

{{"admin.polled_people"|translate}}

+ + + + +

{{"admin.email_links"|translate}}

+ + + + +
+ {{"admin.deletion"|translate}} + {{"admin.deletion_desc"|translate}} + {{"admin.deletion_btn"|translate}} +
+ +
+ {{"admin.link"|translate}} + {{"admin.link_admin"|translate}} + {{"admin.link_admin_desc"|translate}} + {{"admin.link_admin_btn"|translate}} + {{"admin.copy_link"|translate}} + + {{"admin.polled_people"|translate}} + {{"admin.polled_people_desc"|translate}} + {{"admin.polled_people_btn"|translate}} + {{"admin.email_links"|translate}} + {{"admin.email_links_desc"|translate}} + {{"admin.email_links_key"|translate}} + {{"admin.email_links_btn"|translate}} +
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 87e7dac9..010f9ae6 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -33,13 +33,15 @@ }, "dates": { "title": "Config especially for the dates", - "hours_different": "I want to put slots for each day", + "hours_different": "I want to put", + "hours_each_day": "slots for each day", "multiple": { "identical": "same", "different": "possibly different" }, "add": "Add a date choice", "add_time": "Add a time span", + "empty": "Empty", "count_dates": "choices of dates", "count_time": "choices of hour span", "add_interval": "Add a date interval", @@ -66,49 +68,60 @@ "visibility": { "top_txt": "A few settings...", "title": "Visibility of answers", - "visibility_want": "Je veux que", - "visibility_link": "Ceux avec le lien", - "visibility_nobody": "personne ne", - "visibility_see": "puisse voir les réponses au sondage.", + "visibility_want": "I want that", + "visibility_link": "anybody having the link", + "visibility_nobody": "nobody", + "visibility_see": "can see answers to the pool", "votes": "Votes", - "votes_possible": "Les réponses possibles seront :", - "votes_possible_single": "Uniquement « oui »", - "votes_possible_normal": "« oui » ou « peut-être »", - "votes_possible_full": "« oui » ou « peut-être » ou « non »", - "archiving": "Les personnes sondées pourront voter jusqu’au ", - "archiving_start": "Elles", - "archiving_can": "auront", - "archiving_can_not": "n'auront pas", - "archiving_end": "la possibilité de modifier", - "modfiy_their": "leur vote", - "modfiy_everyone": "tous les votes", - "access": "Accès au sondage", - "access_url": "Les votants pourront y accéder via cette adresse :", + "votes_possible": "Possible answers will be", + "votes_possible_single": "only \"yes\"", + "votes_possible_normal": "\"yes\" or \"maybe\"", + "votes_possible_full": "\"yes\" or \"maybe\" or \"no\"", + "archiving": "Polled people will be able to vote up to", + "archiving_start": "They", + "archiving_can": "will", + "archiving_can_not": "will not", + "archiving_end": "be able to edit", + "modfiy_their": "their vote", + "modfiy_everyone": "all the votes", + "access": "Access to the poll", + "access_url": "Pooled people will be able to access it via this address:", "access_url_key": "URL", - "see_pass": "voir", - "access_instructions": "peut contenir des lettres, chiffres et des tirets", - "access_want": "Je", - "access_want_yes": "souhaite", - "access_want_no": "n'ai pas besoin", - "access_protect": "qu’il soit protégé par un mot de passe.", - "validate_btn": "Créer ce sondage !" + "see_pass": "see", + "access_instructions": "may contain letters, numbers and dashes", + "access_want": "I", + "access_want_yes": "want", + "access_want_no": "do not need", + "access_protect": "it to be protected by a password", + "validate_btn": "Create this poll!" }, "admin": { - "deletion": "Tout supprimer", - "deletion_desc": "Dans le cas où vous voudriez tout supprimer, ce bouton est fait pour vous :", - "deletion_btn": "Supprimer le sondage", - "link": "Liens d’accès au sondage", - "link_admin": "Coté administrateur·ice", - "link_admin_desc": "Pour accéder au sondage et à tous ses paramètres :", - "link_admin_btn": "Voir le sondage coté administrateur·ice", - "copy_link": "Copier le lien", - "polled_people": "Côté sondé·es", - "polled_people_desc": "Pour accéder au sondage et à tous ses paramètres : https://framadate.org/urladmindusondage", - "polled_people_btn": "Voir le sondage", - "email_links": "Recevoir les liens par mail", - "email_links_desc": "Pour être sur de retrouver ces liens, nous pouvons vous les envoyer sur votre mail", - "email_links_key": "mail", - "email_links_btn": "Envoyer les liens du sondage" + "choose_title": "The pool title is", + "description": "and its description is", + "info_section_title": "Pool informations", + "settings_section_title": "Settings", + "votes_deletion_desc": "To start over from scratch, I can delete them all", + "votes_deletion_btn": "Delete all the votes", + "comments_deletion_title": "Comments", + "comments_deletion_desc": "If I wish, I can delete all the comments", + "comments_deletion_btn": "Delete all the comments", + "archiving_title": "Archiving", + "archiving_desc": "This poll will no longer be editable from", + "deletion": "Delete all", + "deletion_desc": "In the case you want do delete everything, this button is for you:", + "deletion_btn": "Delete the poll", + "link": "Links to access the survey", + "link_admin": "Administrator's side", + "link_admin_desc": "To access the poll and all its settings", + "link_admin_btn": "To see the poll as an administrator", + "copy_link": "Copy the link", + "polled_people": "Polled side", + "polled_people_desc": "To access the poll and all its settings", + "polled_people_btn": "See the poll", + "email_links": "Receive the links by email", + "email_links_desc": "To be sure to find these links, they can be sent to you by email", + "email_links_key": "email", + "email_links_btn": "Send the links to the poll" }, "pollGraphic": { "choiceColorblind": "I am", diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index d978c3df..0e33e332 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -26,13 +26,13 @@ }, "choose_title": "Dont le titre sera", "choose_title_placeholder": "titre", - "name": "Je peux aussi préciser mon nom si je le souhaite", + "name": "Je peux aussi préciser mon nom si je le souhaite :", "name_placeholder": "mon nom", "description": "et la description serait", "description_placeholder": "description" }, "dates": { - "title": "Config spécialement pour les dates ", + "title": "Config spécialement pour les dates", "hours_different": "Je souhaite mettre des créneaux horaires", "hours_each_day": "pour chaque journée", "multiple": { @@ -69,7 +69,7 @@ "top_txt": "Un peu de paramétrage…", "title": "Visibilité des réponses", "visibility_want": "Je veux que", - "visibility_link": "Tout le monde", + "visibility_link": "tout ceux qui ont le lien", "visibility_nobody": "seulement moi", "visibility_see": "puisse voir les réponses au sondage.", "votes": "Votes", @@ -77,7 +77,7 @@ "votes_possible_single": "Uniquement « oui »", "votes_possible_normal": "« oui » ou « peut-être »", "votes_possible_full": "« oui » ou « peut-être » ou « non »", - "archiving": "Les personnes sondées pourront voter jusqu’au ", + "archiving": "Les personnes sondées pourront voter jusqu’au", "archiving_start": "Elles", "archiving_can": "auront", "archiving_can_not": "n'auront pas", @@ -85,7 +85,7 @@ "modfiy_their": "leur vote", "modfiy_everyone": "tous les votes", "access": "Accès au sondage", - "access_url": "Les votants pourront y accéder via cette adresse :", + "access_url": "Les votants pourront y accéder via cette adresse :", "access_url_key": "URL", "see_pass": "voir", "access_instructions": "peut contenir des lettres, chiffres et des tirets", @@ -96,6 +96,17 @@ "validate_btn": "Créer ce sondage !" }, "admin": { + "choose_title": "Le titre du sondage est", + "description": "et sa description :", + "info_section_title": "Informations du sondage", + "settings_section_title": "Paramètres", + "votes_deletion_desc": "Pour repartir à zéro, je peux tous les supprimer :", + "votes_deletion_btn": "Supprimer tous les votes", + "comments_deletion_title": "Commentaires", + "comments_deletion_desc": "Si je le souhaite, je peux supprimer l'ensemble des commentaires", + "comments_deletion_btn": "Supprimer tous les commentaires", + "archiving_title": "Archivage", + "archiving_desc": "Ce sondage ne sera plus éditable à partir du", "deletion": "Tout supprimer", "deletion_desc": "Dans le cas où vous voudriez tout supprimer, ce bouton est fait pour vous :", "deletion_btn": "Supprimer le sondage", @@ -105,7 +116,7 @@ "link_admin_btn": "Voir le sondage coté administrateur·ice", "copy_link": "Copier le lien", "polled_people": "Côté sondé·es", - "polled_people_desc": "Pour accéder au sondage et à tous ses paramètres : https://framadate.org/urladmindusondage", + "polled_people_desc": "Pour accéder au sondage et à tous ses paramètres :", "polled_people_btn": "Voir le sondage", "email_links": "Recevoir les liens par mail", "email_links_desc": "Pour être sur de retrouver ces liens, nous pouvons vous les envoyer sur votre mail",