Skip to content
This repository has been archived by the owner on Jan 17, 2023. It is now read-only.

Fix Color reference in Email Tabs experiment #3985

Merged
merged 4 commits into from
Nov 13, 2018
Merged

Conversation

devinreams
Copy link

Fixes #3984

@flodolo
Copy link
Collaborator

flodolo commented Nov 13, 2018

There's a risk that we already have wrong translations around. The only way to fix that would be to change the string ID.

@codecov-io
Copy link

codecov-io commented Nov 13, 2018

Codecov Report

Merging #3985 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #3985   +/-   ##
=======================================
  Coverage   78.58%   78.58%           
=======================================
  Files         102      102           
  Lines        2807     2807           
=======================================
  Hits         2206     2206           
  Misses        601      601

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6e3142a...ed72fb7. Read the comment docs.

@devinreams
Copy link
Author

There's a risk that we already have wrong translations around.

@flodolo Yes, I saw just a few translations came in from Pontoon but I could easily find/replace that instead of prompting re-translations since its just a product name swap out. What do you think?

@flodolo
Copy link
Collaborator

flodolo commented Nov 13, 2018

@flodolo Yes, I saw just a few translations came in from Pontoon but I could easily find/replace that instead of prompting re-translations since its just a product name swap out. What do you think?

That works for me. Let me know if there are some that you don't feel comfortable in touching

@SoftVision-PaulOiegas
Copy link

Just checked locally and it looks ok on the front end.

@pdehaan
Copy link
Contributor

pdehaan commented Nov 13, 2018

And the few other instances in the other locales: Already fixed!
$ git grep "emailtabsLegalnotice = " locales/*/experiments.ftl | grep "Firefox Color"

locales/cy/experiments.ftl:emailtabsLegalnotice = Wrth fynd ymlaen, rydych chi'n cytuno ar y termau <terms-link> terms </ terms-link> a <privacy-link> privacy </ privacy-link> polisïau Prawf Peilot a'r polisi preifatrwydd <modal-link> Firefox Color </ modal -link>.
locales/de/experiments.ftl:emailtabsLegalnotice = Indem Sie fortfahren, stimmen Sie den <terms-link>Nutzungsbedingungen</terms-link> und der <privacy-link>Datenschutzerklärung</privacy-link> von Test Pilot sowie der <modal-link>Datenschutzerklärung von Firefox Color</modal-link> zu.
locales/en-CA/experiments.ftl:emailtabsLegalnotice = By proceeding, you agree to the <terms-link>terms</terms-link> and <privacy-link>privacy</privacy-link> policies of Test Pilot and the <modal-link>Firefox Color privacy policy</modal-link>.
locales/en-US/experiments.ftl:emailtabsLegalnotice = By proceeding, you agree to the <terms-link>terms</terms-link> and <privacy-link>privacy</privacy-link> policies of Test Pilot and the <modal-link>Firefox Color privacy policy</modal-link>.
locales/es-AR/experiments.ftl:emailtabsLegalnotice = Al continuar, acepta los términos <terms-link> </terms-link> y <privacy-link> las políticas de privacidad </privacy-link> de Test Pilot y la <modal-link> política de privacidad de Firefox Color  </modal -link>.
locales/ka/experiments.ftl:emailtabsLegalnotice = გაგრძელების შემთხვევაში, თქვენ ეთანხმებით Test Pilot-ის <terms-link>გამოყენების პირობებსა</terms-link> და <privacy-link>პირადულობის</privacy-link> დებულებებს, აგრეთვე <modal-link>Firefox Color-ის პირადულობის დებულებას</modal-link>.
locales/ms/experiments.ftl:emailtabsLegalnotice = Dengan meneruskan, anda bersetuju dengan <terms-link>terma</terms-link> dan polisi <privacy-link>privasi</privacy-link> Test Pilot dan <modal-link>polisi privasi Firefox Color</modal-link>.
locales/nl/experiments.ftl:emailtabsLegalnotice = Door verder te gaan, gaat u akkoord met de <terms-link>voorwaarden</terms-link> en beleidsregels voor <privacy-link>privacy</privacy-link> van Test Pilot en het <modal-link>privacybeleid van Firefox Color</modal-link>.

And now I'm noticing some odd closing tags like </ modal -link> in some cases. Not sure how to check globally for those, or if they're even broken in the front end for those locales.

@devinreams
Copy link
Author

That works for me. Let me know if there are some that you don't feel comfortable in touching

@flodolo Some translators were kind enough to catch our mistake and change it in the translation, the rest are confidently replaced in this PR. ⭐️

Just checked locally and it looks ok on the front end.

Thanks for the help @SoftVision-PaulOiegas and @flodolo. 🏅

@flodolo
Copy link
Collaborator

flodolo commented Nov 13, 2018

@flodolo Some translators were kind enough to catch our mistake and change it in the translation, the rest are confidently replaced in this PR. ⭐️

Yes, they are also the ones who spotted it in the first place, I'm just the messenger.

@devinreams
Copy link
Author

And now I'm noticing some odd closing tags like </ modal -link> in some cases. Not sure how to check globally for those, or if they're even broken in the front end for those locales.

@pdehaan Yeah I saw those too. They don't seem to cause issues as confirmed with es-AR 😅

screen shot 2018-11-13 at 11 21 45 am

@devinreams devinreams merged commit aa6303a into master Nov 13, 2018
@devinreams devinreams deleted the 3984-color-typo branch November 13, 2018 18:27
@pdehaan
Copy link
Contributor

pdehaan commented Nov 13, 2018

And now I'm noticing some odd closing tags like </ modal -link> in some cases. Not sure how to check globally for those, or if they're even broken in the front end for those locales.

Possibly closer to a solution, although very ignorant greppin' on my part:

$ git grep "<modal-link>" locales/*/experiments.ftl | grep -v "</modal-link>"

# `</ terms-link>`, `</ privacy-link>`, and `</ modal -link>`:
1. locales/cy/experiments.ftl:emailtabsLegalnotice = Wrth fynd ymlaen, rydych chi'n cytuno ar y termau <terms-link> terms </ terms-link> a <privacy-link> privacy </ privacy-link> polisïau Prawf Peilot a'r polisi preifatrwydd <modal-link> Email Tabs </ modal -link>.

# `</ terms-link>`, `</ privacy-link>`, and `</ modal -link>`:
2. locales/cy/experiments.ftl:pricewiseLegalnotice = Drwy barhau, rydych chi'n cytuno i<terms-link>delerau</ terms-link> a pholisiau<privacy-link> preifatrwydd</ privacy-link> Test Pilot a pholisi preifatrwydd <modal-link>Price Wise</ modal -link>.

# Empty `<terms-link> </terms-link>`, and `</modal -link>`:
3. locales/es-AR/experiments.ftl:emailtabsLegalnotice = Al continuar, acepta los términos <terms-link> </terms-link> y <privacy-link> las políticas de privacidad </privacy-link> de Test Pilot y la <modal-link> política de privacidad de Email Tabs  </modal -link>.

# Empty `<terms-link> </terms-link>`, and `</ modal-link>`:
4. locales/es-AR/experiments.ftl:pricewiseLegalnotice = Al continuar, estás aceptando los términos <terms-link> </terms-link> y <privacy-link> privacidad </privacy-link> de las políticas de Test Pilot y la <modal-link> política de privacidad de Price Wise </ modal-link>.

# Invalid `<terms-link>términos</>`, and `<privacy-link>privacidad</terms-link>`, and `<modal-link>Políticas de privacidad de Notes</privacy-link>`:
5. locales/es-MX/experiments.ftl:notesLegalnoticeWithlinks = Al proceder, aceptas los <terms-link>términos</> y las políticas de <privacy-link>privacidad</terms-link> de Test Pilot y la <modal-link>Políticas de privacidad de Notes</privacy-link>.

# `</ terms-link>`, `</ privacy-link>`, and `</ modal -link>`:
6. locales/nl/experiments.ftl:pricewiseLegalnotice = Door verder te gaan, gaat u akkoord met de <terms-link>voorwaarden</ terms-link> en beleidsregels voor <privacy-link>privacy</ privacy-link> van Test Pilot en het <modal-link>privacybeleid van Price Wise</ modal -link>.

UPDATE: Submitted as #3986

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

Successfully merging this pull request may close these issues.

5 participants