Opened 5 years ago

Closed 5 years ago

#16268 closed defect (fixed)

non-en-US Tor Browser bundles still contain Firefox logo and "Firefox ESR" on about-Tor Browser-window

Reported by: gk Owned by: phoul
Priority: Medium Milestone:
Component: Applications/Tor Browser Version:
Severity: Keywords: tbb-branding, MikePerry201507R, TorBrowserTeam201507R, tbb-5.0a4
Cc: arthuredelstein, brade, mcs, mikeperry, phoul Actual Points:
Parent ID: Points:
Reviewer: Sponsor:

Description

#5698 seems to be only fixed for en-US bundles. On non-en-US bundles, like russian ones, the branding is only partly fixed. The Firefox logo and "Firefox ESR" is still visible on on the about-Tor Browser-window. Tested with 5.0a1 on different OSes.

Child Tickets

Attachments (1)

bug16268-patch.txt (1.2 KB) - added by mcs 5 years ago.
a possible fix for the file name mismatch issue

Download all attachments as: .zip

Change History (19)

comment:1 Changed 5 years ago by mcs

To really finish #15836, we need to add code to Torbutton's import-translations.sh to import torbutton-aboutdialogdtd as aboutDialog.dtd and to import torbutton-abouttorproperties as aboutTor.properties. Should I create a patch or is someone else working on this already?

comment:2 in reply to:  1 Changed 5 years ago by gk

Replying to mcs:

To really finish #15836, we need to add code to Torbutton's import-translations.sh to import torbutton-aboutdialogdtd as aboutDialog.dtd and to import torbutton-abouttorproperties as aboutTor.properties. Should I create a patch or is someone else working on this already?

Please do.

comment:3 Changed 5 years ago by mcs

Cc: brade mcs added
Keywords: TorBrowserTeam201506R added
Status: newneeds_review

Here is a fix for review:

https://gitweb.torproject.org/user/brade/torbutton.git/commit/?h=bug16268-01&id=30fa621c363a3b4645321f7770e60376d9bb3505

Kathy and I rewrote part of import-translations.sh to check for missing .dtd and .properties files. We also inverted the locale and file loops because we think that makes sense now that we have 8 .dtd and .properties files. But let us know if you'd prefer a simpler set of changes to import-translations.sh.

One related concern: when we run the revised import-translations.sh script, we end up with undesirable & entities in the aboutDialog.dtd files, e.g.,

<!ENTITY project.start           "&amp;brandShortName; is developed by ">

I know we encountered this before wih Torbutton and/or Tor Launcher, but I do not remember how we fixed it. Maybe there was some Transifex magic involved?

comment:4 Changed 5 years ago by gk

Cc: mikeperry phoul added

mikeperry, phoul: any ideas wrt the &amp; entities?

comment:5 Changed 5 years ago by mikeperry

Keywords: MikePerry201506R added

comment:6 Changed 5 years ago by mikeperry

mcs found an old ticket where something similar happened. It sounds like this may be another/similar transifex transliteration issue... https://trac.torproject.org/projects/tor/ticket/11699#comment:8

comment:7 Changed 5 years ago by mikeperry

Owner: changed from tbb-team to phoul
Status: needs_reviewassigned

comment:8 Changed 5 years ago by phoul

Is there a specific list of languages that this is an issue for?

The previous issue (https://trac.torproject.org/projects/tor/ticket/11699) was that translators were attempting to translate &amp;, which was causing the space break to fail.

Just to clarify: in this case, it appears that completely unwanted "&amp;"s are occurring? Does this only occur in aboutTor.properties & aboutDialog.dtd (that you have observed)?

comment:9 in reply to:  8 Changed 5 years ago by mcs

Replying to phoul:

Is there a specific list of languages that this is an issue for?

It affects many languages, e.g., ar, de, es, ...

Just to clarify: in this case, it appears that completely unwanted "&amp;"s are occurring? Does this only occur in aboutTor.properties & aboutDialog.dtd (that you have observed)?

The problem seems to be confined to aboutDialog.dtd.
If you look at the original en file, you can see that project.start and project.tpoLink contain embedded entities (&brandShortName; and &vendorShortName;):

https://gitweb.torproject.org/torbutton.git/tree/src/chrome/locale/en/aboutDialog.dtd

But if you look at the same file in the translations.git repo, you can see that & has been changed to &amp; e.g.,:

https://gitweb.torproject.org/translation.git/tree/en/aboutdialog.dtd?h=torbutton-aboutdialogdtd
https://gitweb.torproject.org/translation.git/tree/ar/aboutdialog.dtd?h=torbutton-aboutdialogdtd

comment:10 Changed 5 years ago by mikeperry

Keywords: TorBrowserTeam201507R added; TorBrowserTeam201506R removed

Transfer review tickets to next month.

comment:11 Changed 5 years ago by mikeperry

Keywords: MikePerry201507R added; MikePerry201506R removed

comment:12 Changed 5 years ago by mikeperry

Keywords: tbb-5.0a4 added

If we can't get Transifex to fix this in a timely fashion, we can always run a sed scriptlet as a post-process step from import-translations. We should try this for 5.0a4.

comment:13 Changed 5 years ago by mcs

Here is a revised fix that uses sed to fix up a couple of entities:
https://gitweb.torproject.org/user/brade/torbutton.git/commit/?h=bug16268-02&id=d7ff1cc7c2b785a2e44e2a568ae0d66a890f225b
Please review.

Unfortunately, there is another issue now: the en/abouttor.properties file on Transifex has somehow been overwritten with an HTML file. This seems to have happened with this commit but I have no idea how or why:
https://gitweb.torproject.org/translation.git/commit/en/abouttor.properties?h=torbutton-abouttorproperties&id=464794cc65faf5ebf585dcdad70ef27737f9f839

That file is still OK in the Torbutton repo. Should we "touch" the file within the Torbutton repo. so the correct data gets pushed to Transifex? Or is there a way to recover the translated files?

comment:14 Changed 5 years ago by mcs

gk found a file system case sensitivity issue (I should have tested the revised import-translations.sh script on Linux). I have a possible fix that I will attach it to this ticket.

Changed 5 years ago by mcs

Attachment: bug16268-patch.txt added

a possible fix for the file name mismatch issue

comment:15 Changed 5 years ago by gk

Thanks. I merged the fixup but am now so annoyed by transifex that I need to do something else for the moment instead of thinking about the HTML issue. :/

comment:16 Changed 5 years ago by phoul

After investigating, it appears that at some point in the recent past the URL for updating this resource got switched from https://gitweb.torproject.org/torbutton.git/plain/src/chrome/locale/en/aboutTor.properties to https://gitweb.torproject.org/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties, causing this issue.

I have switched the resource back, and am going through the Transifex administrative log to determine when this change occurred, and who made it. If Transifex does not pull in the correct set of strings within the next hour, I will go through and manually re-upload the strings for this resource.

comment:17 Changed 5 years ago by phoul

The new resource has been pulled in successfully, and it doesn't appear that we lost anything. Will know for sure when the next git pull happens.

comment:18 Changed 5 years ago by gk

Resolution: fixed
Status: assignedclosed

Things look good with the updates transaktions. In any case, this ticket can be closed.

Note: See TracTickets for help on using tickets.