Page MenuHomeWildfire Games

Untranslated strings
ClosedPublic

Authored by Stan on Jun 4 2018, 11:44 AM.

Details

Summary

As reported by wes-fole-dog on IRC some strings are untranslated. He proposed the following fix that he can not upload himself because he doesn't use JavaScript and the captcha won't let him register.

He also included the swedish translation in the patch. I guess transifex doesn't allow him to register either. I don't know if we have a swedish translation team.

Test Plan

Check everything is alright and there a no more strings that needs to be translated

Diff Detail

Repository
rP 0 A.D. Public Repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Stan created this revision.Jun 4 2018, 11:44 AM
Vulcan added a subscriber: Vulcan.Jun 4 2018, 11:47 AM

Successful build - Chance fights ever on the side of the prudent.

Linter detected issues:
Executing section Default...
Executing section Source...
Executing section JS...
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 2.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/mod/gui/modmod/modmod.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/mod/gui/modmod/modmod.js
| 367| 367| 
| 368| 368| 	g_ModsEnabled.sort((folder1, folder2) =>
| 369| 369| 		dependencies[folder1].indexOf(g_Mods[folder2].name) != -1 ? 1 :
| 370|    |-		dependencies[folder2].indexOf(g_Mods[folder1].name) != -1 ? -1 : 0);
|    | 370|+			dependencies[folder2].indexOf(g_Mods[folder1].name) != -1 ? -1 : 0);
| 371| 371| 
| 372| 372| 	displayModList("modsEnabledList", g_ModsEnabled);
| 373| 373| }

Link to build: https://jenkins.wildfiregames.com/job/differential/625/display/redirect

elexis removed a reviewer: elexis.Jun 4 2018, 4:07 PM

This diff contains different unrelated things, also it doesn't fix the main task of the ticket which was updating messages.json for the moved directories.

I don't know if the transifex commandline client can send these swedish translations (*.po files). They certainly can't be committed to the svn repository as they are regenerated and overwritten by the bot frequently.

The *.pot files may not be edited at all, I don't know if they were edited here or just regenerated and included in the patch.

gui/credits/ is updated for first time contributions so as to keep a complete list of authors.

binaries/data/l10n/messages.json
12 ↗(On Diff #6720)

Why?

binaries/data/mods/mod/gui/modmod/modmod.js
386 ↗(On Diff #6720)

yes (may want to check if we have a similar string already)

source/tools/i18n/extractors/extractors.py
126 ↗(On Diff #6720)

Is it debug code that should be removed? Is it noisy? Could test, but uploading a sample log were good.

source/tools/i18n/updateTemplates.py
115 ↗(On Diff #6720)

What's happening her?

Stan added a subscriber: elexis.Jun 8 2018, 9:59 AM

On IRC today see (http://irclogs.wildfiregames.com/2018-06/2018-06-08-QuakeNet-%230ad-dev.log) wes-fole-dog answered some of the comments.

In D1560#62992, @elexis wrote:

gui/credits/ is updated for first time contributions so as to keep a complete list of authors.

He doesn't want to be credited, he said so explicitly.

@Itms Don't know if you saw my previous messages but wes-fole-dogcannot register because we use google recaptcha (Long story on the irc logs here). Is there a way you can create manually an
account so he can takeover his own patch ?

binaries/data/l10n/messages.json
12 ↗(On Diff #6720)

wes-fole-dog excluded certain directories in messages.json because from what he remembers they needed to be excluded in order for the correct templates to be generated.

binaries/data/mods/mod/gui/modmod/modmod.js
386 ↗(On Diff #6720)

<wes-fole-dog> Ok

source/tools/i18n/extractors/extractors.py
126 ↗(On Diff #6720)

wes-fole-dog says it is medium to quite a lot of verbosity but that he likes the messages.

source/tools/i18n/updateTemplates.py
115 ↗(On Diff #6720)

wes-fole-dog thinks he changed it into printing what files are generated (*.pot).

vladislavbelov added inline comments.
source/tools/i18n/extractors/extractors.py
126 ↗(On Diff #6720)

Why is the different formatting, style and types? '%...' % (...) here and '{...}'.format(...) below. u'...' vs '...', "..." vs '...'.

source/tools/i18n/updateTemplates.py
114 ↗(On Diff #6720)

Why it was changed?

Itms requested changes to this revision.Dec 27 2018, 10:11 PM
  • The changes to our maintenance scripts seem unwanted/unneeded.
  • The changes to the Swedish pot files must be done from Transifex, else they will be overwritten.
  • The changes to the po files are unneeded, they will be performed by the autobuilder.
  • The changes to our code look good, but they probably need to be rebased now.

@Stan If you have some spare time for this, that is nice, but if you don't it would be more productive to set the ticket back to unassigned and add a "simple" tag to it. A release blocker like this one should easily attract a new contributor, and they will have something to build upon in this diff. 🙂

This revision now requires changes to proceed.Dec 27 2018, 10:11 PM

(I was wondering if one couldn't push the changes from the modified *po file to transifex using the commandline thing)

Itms added a comment.Dec 27 2018, 11:14 PM
In D1560#67463, @elexis wrote:

(I was wondering if one couldn't push the changes from the modified *po file to transifex using the commandline thing)

Yeah it's possible! But one still has to create an account on Transifex, which might not have been wanted by the user who submitted this patch. And I guess now it is due for a rebase first.

Stan updated this revision to Diff 7079.Dec 28 2018, 12:17 PM

Here is the old diff with translations in case someone wants to extract them:

No changes, just simplified the diff.

Successful build - Chance fights ever on the side of the prudent.

Linter detected issues:
Executing section Default...
Executing section Source...
Executing section JS...
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 2.
|----|    | /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/mod/gui/modmod/modmod.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/differential/binaries/data/mods/mod/gui/modmod/modmod.js
| 351| 351| 
| 352| 352| 	g_ModsEnabled.sort((folder1, folder2) =>
| 353| 353| 		dependencies[folder1].indexOf(g_Mods[folder2].name) != -1 ? 1 :
| 354|    |-		dependencies[folder2].indexOf(g_Mods[folder1].name) != -1 ? -1 : 0);
|    | 354|+			dependencies[folder2].indexOf(g_Mods[folder1].name) != -1 ? -1 : 0);
| 355| 355| 
| 356| 356| 	displayModList("modsEnabledList", g_ModsEnabled);
| 357| 357| }

Link to build: https://jenkins.wildfiregames.com/job/differential/835/

Itms accepted this revision.Dec 28 2018, 2:04 PM

I'm committing this with the indentation fixed. I tested the pot generation and the missing strings are correctly extracted.

binaries/data/mods/public/l10n/messages.json
79 ↗(On Diff #7079)

The indentation is wrong in this whole file

This revision is now accepted and ready to land.Dec 28 2018, 2:04 PM
This revision was automatically updated to reflect the committed changes.