includes/index.tmpl - Issue 29727563: Fixes #35 - Progressively enhance install button with appropriate links and text

Delta Between Two Patch Sets: includes/index.tmpl

Issue 29727563: Fixes #35 - Progressively enhance install button with appropriate links and text (Closed) Base URL: https://hg.adblockplus.org/web.adblockplus.org

Left Patch Set: Addressed comments #10 Created April 6, 2018, 1:21 p.m.

Right Patch Set: Addressed comments #21 Created April 16, 2018, 4 p.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Left: Side by side diff | Download
Right: Side by side diff | Download

LEFT	RIGHT
1 title=Adblock Plus \| The world's # 1 free ad blocker	1 title=Adblock Plus \| The world's # 1 free ad blocker

2 description=Adblock Plus, the most popular ad blocker on Firefox, Chrome, Safari , Android and iOS. Block pop-ups and annoying ads on websites like Facebook and YouTube.	2 description=Adblock Plus, the most popular ad blocker on Firefox, Chrome, Safari , Android and iOS. Block pop-ups and annoying ads on websites like Facebook and YouTube.

3	3

4 <head>	4 <head>

5 <link rel="stylesheet" href="/css/index.css">	5 <link rel="stylesheet" href="/css/index.css">

6 <link rel="chrome-webstore-item" href="https://chrome.google.com/webstore/deta il/cfhdojbkjhnklbpkdaibdccddilifddb">	6 <link rel="chrome-webstore-item" href="https://chrome.google.com/webstore/deta il/cfhdojbkjhnklbpkdaibdccddilifddb">

7 </head>	7 </head>

8	8

9 <? include hero-download ?>	9 <? include hero-download ?>

10 <? include as-mentioned ?>	10 <? include as-mentioned ?>

11 <? include features ?>	11 <? include features ?>

12 <? include abb-cross-promotion ?>	12 <? include abb-cross-promotion ?>

13 <? include footnote ?>	13 <? include footnote ?>

14	14

15 <script id="hero-download-button-template" type="text/template">	15 {% for browser in browsers %}
juliandoucette 2018/04/06 16:29:16 I'm not certain that "Install for" should always c I'm not certain that "Install for" should always come before browser name when translated. Please confirm with Tamara. I'm not certain that browser name should always be separable from "Install for" when translated (e.g. some languages add prefixes and suffixes to nouns). Please confirm with Tamara. --- Suggest: If browser name should not always appear after "Install for" then you may use a fixed variable inside "Install for" so that the translator may place it before or after. e.g. "Install for <fix><span id="browser-name">browser</span></fix>". (This would require that you output each browser name separately so that you can insert it into #browser-name appropriately.) Suggest: If browser name is not always separable from "install for" then you may place the browser name inside "Install for" to avoid confusion e.g. the translator forgetting that the instance of browser name on the homepage should have a prefix or suffix based on the text that appears before or after it in a separate string. e.g. "Install for $browser" for each browser. (This may be a little annoying because we must translate "Install for $browser" and "Agree and Install for $browser" for each browser (presumably) - creating more work for translators entering translations into crowdin and adding more output (strings in our template) to our HTML. (Suggestion #2 also covers suggestion #1. A fixed string is not necessary if the translator may place the browser name themselves.) ire 2018/04/09 09:24:01 Done. Show quoted text On 2018/04/06 16:29:16, juliandoucette wrote: > I'm not certain that "Install for" should always come before browser name when > translated. Please confirm with Tamara. > > I'm not certain that browser name should always be separable from "Install > for" when translated (e.g. some languages add prefixes and suffixes to nouns). > Please confirm with Tamara. > > --- > > Suggest: If browser name should not always appear after "Install for" then you > may use a fixed variable inside "Install for" so that the translator may place > it before or after. > > e.g. "Install for <fix><span id="browser-name">browser</span></fix>". (This > would require that you output each browser name separately so that you can > insert it into #browser-name appropriately.) > > Suggest: If browser name is not always separable from "install for" then you > may place the browser name inside "Install for" to avoid confusion e.g. the > translator forgetting that the instance of browser name on the homepage should > have a prefix or suffix based on the text that appears before or after it in a > separate string. > > e.g. "Install for $browser" for each browser. (This may be a little annoying > because we must translate "Install for $browser" and "Agree and Install for > $browser" for each browser (presumably) - creating more work for translators > entering translations into crowdin and adding more output (strings in our > template) to our HTML. > > (Suggestion #2 also covers suggestion #1. A fixed string is not necessary if the > translator may place the browser name themselves.) Done. juliandoucette 2018/04/09 13:01:02 You didn't say whether or not you determined my se Show quoted text On 2018/04/09 09:24:01, ire wrote: > Done. You didn't say whether or not you determined my second use case and suggestion to relevant? (Here is said use case and suggestion) Show quoted text > I'm not certain that browser name should always be separable from "Install > for" when translated (e.g. some languages add prefixes and suffixes to nouns). > Please confirm with Tamara. > Suggest: If browser name is not always separable from "install for" then you > may place the browser name inside "Install for" to avoid confusion e.g. the > translator forgetting that the instance of browser name on the homepage should > have a prefix or suffix based on the text that appears before or after it in a > separate string. > e.g. "Install for $browser" for each browser. (This may be a little annoying > because we must translate "Install for $browser" and "Agree and Install for > $browser" for each browser (presumably) - creating more work for translators > entering translations into crowdin and adding more output (strings in our > template) to our HTML. ire 2018/04/12 08:05:46 I didn't think it would be an issue since we would Show quoted text On 2018/04/09 13:01:02, juliandoucette wrote: > On 2018/04/09 09:24:01, ire wrote: > > Done. > > You didn't say whether or not you determined my second use case and suggestion > to relevant? > > (Here is said use case and suggestion) > > > I'm not certain that browser name should always be separable from "Install > > for" when translated (e.g. some languages add prefixes and suffixes to nouns). > > Please confirm with Tamara. > > > Suggest: If browser name is not always separable from "install for" then you > > may place the browser name inside "Install for" to avoid confusion e.g. the > > translator forgetting that the instance of browser name on the homepage > should > > have a prefix or suffix based on the text that appears before or after it in a > > separate string. > > > e.g. "Install for $browser" for each browser. (This may be a little annoying > > because we must translate "Install for $browser" and "Agree and Install for > > $browser" for each browser (presumably) - creating more work for translators > > entering translations into crowdin and adding more output (strings in our > > template) to our HTML. I didn't think it would be an issue since we would be swapping out the "browser" string. They way I see it, even if the language changes things or compounds the words, swapping out "browser" shouldn't change anything as it's just the name. However, I have messaged Tamara to confirm, she hasn't gotten back to me yet. juliandoucette 2018/04/16 11:46:37 From Tamara in the email thread "RE: translation o Show quoted text On 2018/04/12 08:05:46, ire wrote: > I didn't think it would be an issue since we would be swapping out the "browser" > string. They way I see it, even if the language changes things or compounds the > words, swapping out "browser" shouldn't change anything as it's just the name. > However, I have messaged Tamara to confirm, she hasn't gotten back to me yet. From Tamara in the email thread "RE: translation of "[Agree and] Install for ${browser}" from abp.org sync meeting": I do agree that use case 2 would be better. Hopefully both easier to translate and to implement. Nothing else to add from my side. :) Detail: Here was my explanation of the two use cases to her: Show quoted text > My explanation in the code review may not be clear (sorry). > > In use case 1 I am talking about translating "Agree and Install for <fix>browser</fix>" and each browser name "chrome", "firefox", ... separately. And then inserting the browser name into the place of <fix>browser</fix> dynamically. > > In use case 2 I am talking about translating this string for each browser separately e.g. "Agree and Install for Chrome", "Agree and Install for Firefox"... > > Ire seems to prefer use case 1 (I do too at first glance). But I think use case 2 may be more appropriate for you & other translators because it may be more straightforward and thus less vulnerable to misinterpretation and error. > > Do you agree with my conclusion about use case 2? And/or do you have anything to add?
	16 <script id="download-label-{{ browser.id }}" type="text/template">

16 {% if locale in ["en", "de", "fr"] %}	17 {% if locale in ["en", "de", "fr"] %}

17 {{ "Agree and Install for" \| translate("agree-and-install-for-browser", "but ton label") }}	18 {{ "Agree and Install for " + browser.name \| translate("agree-and-install-fo r-" + browser.id, "button label") }}

18 {% else %}	19 {% else %}

19 {{ "Install for" \| translate("install-for-browser", "button label") }}	20 {{ "Install for " + browser.name \| translate("install-for-" + browser.id, "b utton label") }}

20 {% endif %}	21 {% endif %}

21 {% for browser in browsers %}

22 <span class="show-on-{{ browser.id }}">{{ browser.name \| translate(browser.i d + "-name") }}</span>

23 {% endfor %}

24 </script>	22 </script>

	23 {% endfor %}

25	24

26 <script src="/js/vendor/bowser.js"></script>	25 <script src="/js/vendor/bowser.js"></script>

27 <script src="/js/index.js"></script>	26 <script src="/js/index.js"></script>

LEFT	RIGHT