Skip to content

Conversation

YAGA29
Copy link

@YAGA29 YAGA29 commented Feb 22, 2025

Fixed a few typos, missing translation and formatting issues in french fr.json
Harmonization with en.json file

Fixed a few typos and formatting.
Harmonization with en.json file
Copy link
Contributor

@necouchman necouchman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@YAGA29 Thank you for submitting this PR and helping out with these translations. I've noted a few specifics, but, generally:

  • You don't need to add items to the translation that aren't actually being translated, as Guacamole will automatically pull from the default (English) translation.
  • I'm unsure about the addition of the space before every colon (:). As we don't do this in other translations, is there some specific reason to do it in the French translation?

Also, please re-base this PR against the apache:patch branch - the changes for 1.6.0 are already pretty well fixed, and this will not go into that release.

Comment on lines +7 to +9
"NAME" : "Apache Guacamole",
"VERSION" : "${project.version}",

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please do not put these lines in here - the translations will inherit from the default (English) translation, and this is both not required and will cause problems.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok thanks, I'll delete these lines in fr.json file.

Comment on lines +46 to +49
"FIELD_HEADER_PASSWORD" : "Mot de passe : ",
"FIELD_HEADER_PASSWORD_AGAIN" : "Répéter mot de passe : ",
"FIELD_HEADER_RECORDING_WRITE_EXISTING" : "Autoriser l'écriture dans le fichier d'enregistrement existant : ",
"FIELD_HEADER_TYPESCRIPT_WRITE_EXISTING" : "Autoriser l'écriture dans le fichier TypeScript existant : ",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the reason for the additional space before the : in these translations?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In French, the rule is to add a non-breaking space before colon and a space after colon. https://fr.wikipedia.org/wiki/Ponctuation

I don't know if we can use a nbsp in the translation file.

But that's just a small detail. Please let me know what you prefer, I can remove the space before every colon.

Comment on lines +987 to +998
"FIELD_OPTION_QUALITY_LEVEL_0" : "0",
"FIELD_OPTION_QUALITY_LEVEL_1" : "1",
"FIELD_OPTION_QUALITY_LEVEL_2" : "2",
"FIELD_OPTION_QUALITY_LEVEL_3" : "3",
"FIELD_OPTION_QUALITY_LEVEL_4" : "4",
"FIELD_OPTION_QUALITY_LEVEL_5" : "5",
"FIELD_OPTION_QUALITY_LEVEL_6" : "6",
"FIELD_OPTION_QUALITY_LEVEL_7" : "7",
"FIELD_OPTION_QUALITY_LEVEL_8" : "8",
"FIELD_OPTION_QUALITY_LEVEL_9" : "9",
"FIELD_OPTION_QUALITY_LEVEL_EMPTY" : "",

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no need to add these to the translation file - it will inherit from the English translation, if no translation is being done.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok thanks, I'll delete these lines in fr.json file.

Comment on lines +965 to +976
"FIELD_OPTION_COMPRESS_LEVEL_0" : "0",
"FIELD_OPTION_COMPRESS_LEVEL_1" : "1",
"FIELD_OPTION_COMPRESS_LEVEL_2" : "2",
"FIELD_OPTION_COMPRESS_LEVEL_3" : "3",
"FIELD_OPTION_COMPRESS_LEVEL_4" : "4",
"FIELD_OPTION_COMPRESS_LEVEL_5" : "5",
"FIELD_OPTION_COMPRESS_LEVEL_6" : "6",
"FIELD_OPTION_COMPRESS_LEVEL_7" : "7",
"FIELD_OPTION_COMPRESS_LEVEL_8" : "8",
"FIELD_OPTION_COMPRESS_LEVEL_9" : "9",
"FIELD_OPTION_COMPRESS_LEVEL_EMPTY" : "",

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no need to add items that are not being translated.

Copy link
Author

@YAGA29 YAGA29 Feb 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok thanks, I'll delete these lines in fr.json file.

@YAGA29
Copy link
Author

YAGA29 commented Feb 25, 2025

@YAGA29 Thank you for submitting this PR and helping out with these translations. I've noted a few specifics, but, generally:

@necouchman Thank you for your feedback. My responses below.

  • You don't need to add items to the translation that aren't actually being translated, as Guacamole will automatically pull from the default (English) translation.

Ok perfect, I'll remove these items.

  • I'm unsure about the addition of the space before every colon (:). As we don't do this in other translations, is there some specific reason to do it in the French translation?

In French, the rule is to add a non-breaking space before colon and a space after colon. https://fr.wikipedia.org/wiki/Ponctuation

I don't know if we can use a nbsp in the translation file.

But that's just a small detail. Please let me know what you prefer, I can remove the space before every colon.

Also, please re-base this PR against the apache:patch branch - the changes for 1.6.0 are already pretty well fixed, and this will not go into that release.

Ok perfect, I'll do that by the end of the week.

@mike-jumper
Copy link
Contributor

I don't know if we can use a nbsp in the translation file.

If non-breaking spaces are needed, I think you will need to use Unicode characters to represent them. In Unicode, the character for a non-breaking space is U+00A0, which would be \u00a0 in a JSON string.

@YAGA29
Copy link
Author

YAGA29 commented Mar 23, 2025

@necouchman

Hi Nick,

I have taken into account all your comments and re-based this PR against the apache:patch branch as requested.
with the title "GUACAMOLE-2034 : Fix few typos, missing translation and formatting issue…"

Regards,

@YAGA29
Copy link
Author

YAGA29 commented Mar 23, 2025

I don't know if we can use a nbsp in the translation file.

If non-breaking spaces are needed, I think you will need to use Unicode characters to represent them. In Unicode, the character for a non-breaking space is U+00A0, which would be \u00a0 in a JSON string.

Hi Mike,

Sorry for not responding sooner. Thanks for your input but unfortunately \u00a0 in a JSON translation file display   in the webpage.

Given that the rules before the colon (:) are slightly different between Swiss French, Canadian French, and French, I have used a compromise with a \u202F (Narrow No-Break Space) that displays correctly.

I have corrected other typos and, as requested by Nick, re-based this PR against the apache:patch branch with the title "GUACAMOLE-2034 : Fix few typos, missing translation and formatting issue…".

Regards

@mike-jumper mike-jumper deleted the branch apache:patch June 23, 2025 01:18
@necouchman
Copy link
Contributor

@mike-jumper Can you re-open this one?

@mike-jumper
Copy link
Contributor

Yep, and I'll check around for others (though if you know of 'em offhand, please ping me). The process should be just briefly recreating the staging/1.6.0 branch so GitHub will let me reopen and change the merge base.

@mike-jumper mike-jumper reopened this Sep 22, 2025
@mike-jumper mike-jumper changed the base branch from staging/1.6.0 to patch September 22, 2025 23:27
@necouchman
Copy link
Contributor

@YAGA29 In addition to continuing to work through the items @mike-jumper was pointing out, this now has a conflict that must be resolved prior to merge.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants