Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 1239386 - Add donations to Thunderbird start page. #4181

Closed
wants to merge 37 commits into from

Conversation

mkmelin
Copy link
Contributor

@mkmelin mkmelin commented Jun 8, 2016

Description

Add a request to donate to the Thunderbird start page.

Bugzilla link

https://bugzilla.mozilla.org/show_bug.cgi?id=1239386

Testing

Checklist

  • Requires l10n changes.
  • [- ] Related functional & integration tests passing.

@flodolo flodolo added the L10N label Jun 8, 2016
@flodolo
Copy link
Contributor

flodolo commented Jun 8, 2016

This page is currently localized, you need to use a l10n_has_tag construct to display the old content while new strings are translated.
http://bedrock.readthedocs.io/en/latest/l10n.html?highlight=l10n_has_tag#staging-copy-changes

@mkmelin
Copy link
Contributor Author

mkmelin commented Jun 8, 2016

Added l10n_has_tag. Is there anything else to do? And at what point can those be removed? Let's say if localizers don't pick it up within a reasonable time (as an example).

<div>
<section>
<h2>{{ _('Contribute to Thunderbird') }}</h2>
<p>{{ _('To ensure that Thunderbird continues to improve, as it has for the last ten years, active contributors <a href="%s">recently organized</a> to focus on the future.')|format('https://blog.mozilla.org/thunderbird/2014/11/thunderbird-reorganizes-at-2014-toronto-summit/') }}
{{ _('Now is a great time for you to <a href="%s" class="iconic">get involved</a>.')|format('https://wiki.mozilla.org/Thunderbird#Contributing') }}
{{ _('Now is a great time for you to <a href="%s">get involved</a>.')|format('https://wiki.mozilla.org/Thunderbird#Contributing') }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, this count as a string change.

mkmelin and others added 6 commits June 8, 2016 22:37
Fix Bug 1255518 - Firefox download buttons: drop support for OS X 10.6-10.8, take 2
…-css-support

[fix bug 1264749] Deprecate CSS support for IE 8.
…ribute-tasks

Add functional tests for /contribute tasks
…otype-a-gtm-update

[fix bug 1279222] Update GTM on homepage prototpye A.
@mkmelin
Copy link
Contributor Author

mkmelin commented Jun 10, 2016

So we're good to go?

@@ -11,6 +11,43 @@
<header>
<h1>{{ self.title() }}</h1>
</header>
{% if false and l10n_has_tag('thunderbird_startpage_donate_2016_06') %}
Copy link
Member

@alexgibson alexgibson Jun 23, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The content is not visible as you seem to have left a false and in the conditional here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, leftover from testing

@alexgibson
Copy link
Member

alexgibson commented Jun 23, 2016

Aside from the two comments this change looks fine to me r+wc. If it's something you are comfortable with, can you please squash your commits? If not, please let me know and I can take care of it when merging.

Also sorry this one slipped under the radar, the week prior to an all hands is always pretty hectic 🇬🇧

@alexgibson alexgibson self-assigned this Jun 23, 2016
craigcook and others added 15 commits June 23, 2016 17:59
…ge-layout

[fix bug 1281951] patent page title formatting
Fix bug 1280217: FSA Major free text should pass to basket
…redesigned-download-page

[fix bug 1278184] Implement improved /new redesigned download page
…redesigned-firstrun-page

[fix bug 1278190] Implement improved /firstrun redesigned page
Bug 1239386 - update to use if l10n_has_tag('thunderbird_startpage_donate_2016_06')

Bug 1239386 - add back class attr, the css needed for it, and don't conditionally display the donate link

Remove debug (if false) and make donate link go to /thunderbird/ also in the menu.
@mkmelin
Copy link
Contributor Author

mkmelin commented Jun 27, 2016

Please go ahead with the squash.

@alexgibson
Copy link
Member

@mkmelin - it looks like something has gone a little wrong here, you now have 37 commits in this PR many of which should not be included. Is this something you can fix? Please let me know if not and I'll see if I can salvage the PR.

@alexgibson
Copy link
Member

alexgibson commented Jun 27, 2016

Hi @mkmelin - I squashed your commits and moved them to another PR. Thanks for the patch!

Closing this in favor of #4195

@alexgibson alexgibson closed this Jun 27, 2016
@flodolo flodolo removed the L10N label Jun 27, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants