🌐 N°7932 Translations - British English #677

larhip · 2024-11-07T15:34:23Z

Base information

Question	Answer
Combodo ticket?	N°7932
Type of change?	Translations

Symptom (bug) / Objective (enhancement)

New language files for British English

Checklist before requesting a review

I have performed a self-review of my code
I have tested all changes I made on an iTop instance
I have added a unit test, otherwise I have explained why I couldn't
Is the PR clear and detailed enough so anyone can understand digging in the code?

Hipska · 2024-11-07T15:53:01Z

@larhip You branched from support/3.2, then you should also select this as base branch on the PR.

larhip · 2024-11-07T15:57:41Z

@Hipska thanks for the hint!
I was sitting at my screen thinking "What the hell is the problem?"
Every time I tried to change the base branch from develop to support 3.2, there were a lot more changes and commits than I expected.
But the only problem was related to the fact that I selected 3.2.0 instead of 3.2.

Thanks again for the hint :-)

Hipska · 2024-11-07T16:00:48Z

dictionaries/en_gb.dictionary.itop.core.php

+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>


I think this part can be removed from each file?

I have created the translation with the support of a little script. This script copies the original English files and checks every file line by line.

From my point of view it would be a good idea to have the same content and line numbering in en an en_gb files, wouldn't it?

Hmm not sure, for example the EN GB could have other @author references than the EN US versions, so line numbers will be hard to match anyway.

Yes, it's good to include only the copyright and license line. That said, it's not bad if files contain more information on licenses. I will apply the suggested modifications as they make sense.

dictionaries/en_gb.dictionary.itop.core.php

datamodels/2.x/combodo-db-tools/dictionaries/en_gb.dict.combodo-db-tools.php

jf-cbd · 2024-11-08T09:46:07Z

Accepted in functional review, thanks for the contribution @larhip ! We'll see in technical review if some changes are needed.

Hipska

Almost good regarding the copyright and license! Didn't check the actual translations yet, will do that at a later time.

Didn't realise there are so many inconsistencies in these dict files. But when starting from scratch for a new language, we should better get them all right and aligned from the start 😉

datamodels/2.x/authent-cas/dictionaries/en_gb.dict.authent-cas.php

datamodels/2.x/authent-external/dictionaries/en_gb.dict.authent-external.php

datamodels/2.x/itop-attachments/dictionaries/en_gb.dict.itop-attachments.php

datamodels/2.x/itop-oauth-client/dictionaries/en_gb.dict.itop-oauth-client.php

datamodels/2.x/itop-portal-base/dictionaries/en_gb.dict.itop-portal-base.php

dictionaries/ui/layouts/navigation-menu/en_gb.dictionary.itop.navigation-menu.php

dictionaries/ui/pages/errorpage/en_gb.dictionary.itop.errorpage.php

dictionaries/ui/pages/notifications-center/en_gb.dictionary.itop.notifications-center.php

dictionaries/ui/pages/oauth.landing/en_gb.dictionary.itop.oauth.landing.php

dictionaries/ui/pages/preferences/en_gb.dictionary.itop.preferences.php

Hipska · 2024-11-08T09:58:23Z

datamodels/2.x/itop-bridge-cmdb-services/dictionaries/en_gb.dict.itop-bridge-cmdb-services.php

+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+* @author       Benjamin Planque <[email protected]>


Did @BenGrenoble create this translation?

No. Its must be a copy past from another dict file.

@larhip please fix 😉

For sure it is a copy of the English dictionary file :-)
As I wrote previously I did not create those translations all by hand but used a script which copies all en files an go through every line to check whether there is the need to change it in British English.

This makes it pretty easy for me to update all translations (I.e. with a new version of iTop).

As soon as I will change all those requested change by you @Hipska it will become a lot more work to create new translations with a new version.

In this case it would be great to have a feedback from the iTop maintainer which means Combodo. @BenGrenoble maybe you as PO could give us your opinion or make a decision between more or less “automated” British English translations and perfectly clean files (which is currently not the case for EN US)?

Don’t get me wrong: for me both is absolutely fine, but in case of preferring clean files (even if this is not the case for en.dict.*) there might be a higher risk that British English will be not that good maintained in case of new translations.

hope you got my point 😊

I would not worry for new translations (dict items) as you are stating, since Combodo maintainers run an automated tool to copy these new items to the other languages and marks them to be translating by adding ~~ suffix, so everybody knows its a dict item that still needs to be translated.

You're right we will run an automated script on these dict.
For me it's ok if the names or the legal informations in the headers are not modified. As long as the format of the file is ok and the translation are good.
We've the history of the commit and @jf-cbd will double check while integrating the PR.

jf-cbd · 2024-11-15T09:23:16Z

Accepted in technical review. I'll perform the necessary edits.

jf-cbd · 2024-11-15T16:13:07Z

Hello @larhip, I don't have the rights to push on your branch, so I made one with your modifications and some editions. Could you please merge my branch in your branch so I can accept the PR please ?

larhip · 2024-11-16T12:28:09Z

Hey @jf-cbd ,
Thanks a a lot for your efforts!

Since my fork is done in an organization (itomig-de/iTop instead of larhip/iTop) it is somehow impossible to allow you to modify this PR, we discussed that already in the past with Guillaume. It seems to be a restriction of GitHub.
Anyhow, your modifications are merged now, so you should be able to accept this PR.

Thanks again! :-)

jf-cbd · 2024-11-18T08:13:49Z

Hey @larhip, thanks for the explanation :)
I did a last update to make some tests pass. May you please merge once more ? After this, I'll accept the PR.
Thanks !

larhip · 2024-11-18T08:24:46Z

@jf-cbd modifications merged :-)

larhip changed the base branch from develop to support/3.2.0 November 7, 2024 15:34

larhip changed the base branch from support/3.2.0 to develop November 7, 2024 15:35

larhip changed the base branch from develop to support/3.2.0 November 7, 2024 15:35

larhip force-pushed the feature/translations_en_gb branch from 82bcf68 to 8c254ca Compare November 7, 2024 15:43

larhip changed the base branch from support/3.2.0 to develop November 7, 2024 15:44

larhip force-pushed the feature/translations_en_gb branch from 8c254ca to f8587d2 Compare November 7, 2024 15:46

larhip changed the base branch from develop to support/3.2.0 November 7, 2024 15:47

larhip added 2 commits November 7, 2024 16:50

Create en-gb dict files

b7feaed

Translation into EN GB

d8a7d0c

larhip force-pushed the feature/translations_en_gb branch from f8587d2 to d8a7d0c Compare November 7, 2024 15:50

larhip changed the base branch from support/3.2.0 to support/3.2 November 7, 2024 15:55

larhip marked this pull request as ready for review November 7, 2024 15:57

Hipska suggested changes Nov 7, 2024

View reviewed changes

Hipska reviewed Nov 7, 2024

View reviewed changes

datamodels/2.x/combodo-db-tools/dictionaries/en_gb.dict.combodo-db-tools.php Outdated Show resolved Hide resolved

datamodels/2.x/combodo-db-tools/dictionaries/en_gb.dict.combodo-db-tools.php Outdated Show resolved Hide resolved

steffunky added the translation label Nov 8, 2024

Hipska suggested changes Nov 8, 2024

View reviewed changes

Hipska reviewed Nov 8, 2024

View reviewed changes

BenGrenoble changed the title ~~🌐 Translations - British English~~ 🌐 N°7932 Translations - British English Nov 12, 2024

📄 Make the license more concise (and add https when needed)

396a844

jf-cbd self-assigned this Nov 15, 2024

✅ Update test for EN GB language

857f874

jf-cbd merged commit 596e26a into Combodo:support/3.2 Nov 18, 2024
1 check passed

larhip deleted the feature/translations_en_gb branch November 19, 2024 19:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

🌐 N°7932 Translations - British English #677

🌐 N°7932 Translations - British English #677

larhip commented Nov 7, 2024

Hipska commented Nov 7, 2024 •

edited

Loading

larhip commented Nov 7, 2024 •

edited

Loading

Hipska Nov 7, 2024

larhip Nov 7, 2024

Hipska Nov 8, 2024

jf-cbd Nov 15, 2024

jf-cbd commented Nov 8, 2024

Hipska left a comment •

edited

Loading

Hipska Nov 8, 2024

BenGrenoble Nov 12, 2024

Hipska Nov 12, 2024 •

edited

Loading

larhip Nov 12, 2024

Hipska Nov 12, 2024

BenGrenoble Nov 13, 2024

jf-cbd commented Nov 15, 2024

jf-cbd commented Nov 15, 2024 •

edited

Loading

larhip commented Nov 16, 2024

jf-cbd commented Nov 18, 2024

larhip commented Nov 18, 2024

🌐 N°7932 Translations - British English #677

🌐 N°7932 Translations - British English #677

Conversation

larhip commented Nov 7, 2024

Base information

Symptom (bug) / Objective (enhancement)

Checklist before requesting a review

Hipska commented Nov 7, 2024 • edited Loading

larhip commented Nov 7, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jf-cbd commented Nov 8, 2024

Hipska left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Hipska Nov 12, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jf-cbd commented Nov 15, 2024

jf-cbd commented Nov 15, 2024 • edited Loading

larhip commented Nov 16, 2024

jf-cbd commented Nov 18, 2024

larhip commented Nov 18, 2024

Hipska commented Nov 7, 2024 •

edited

Loading

larhip commented Nov 7, 2024 •

edited

Loading

Hipska left a comment •

edited

Loading

Hipska Nov 12, 2024 •

edited

Loading

jf-cbd commented Nov 15, 2024 •

edited

Loading