Skip to content

Commit

Permalink
Update /set-as-default/ to /default/
Browse files Browse the repository at this point in the history
  • Loading branch information
alexgibson committed Feb 12, 2025
1 parent 1fdc564 commit 2c809b8
Show file tree
Hide file tree
Showing 17 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion l10n/en/firefox/set-as-default/landing.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at https://mozilla.org/MPL/2.0/.

### URL: https://www-dev.springfield.moz.works/set-as-default/
### URL: https://www-dev.springfield.moz.works/default/

# HTML page title
set-as-default-landing-make-firefox-your-default = Make { -brand-name-firefox } your default browser
Expand Down
2 changes: 1 addition & 1 deletion l10n/en/firefox/set-as-default/thanks.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at https://mozilla.org/MPL/2.0/.

### URL: https://www-dev.springfield.moz.works/set-as-default/thanks/
### URL: https://www-dev.springfield.moz.works/default/thanks/

# HTML page title
set-as-default-thanks-set-as-default-thanks-for-choosing-firefox = Thanks for choosing { -brand-name-firefox }
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -104,17 +104,17 @@ $image-path: '/media/protocol/img';
padding: 0 $spacing-md;

&.mobile .thanks-extra-links-heading {
background-image: url('/media/img/firefox/set-as-default/thanks/mobile.svg');
background-image: url('/media/img/firefox/default/thanks/mobile.svg');
}

&.join .thanks-extra-links-heading {
@include background-size(30px 30px);
background-image: url('/media/img/firefox/set-as-default/thanks/mozilla-logo.svg');
background-image: url('/media/img/firefox/default/thanks/mozilla-logo.svg');
}

&.help .thanks-extra-links-heading {
@include background-size(29px 29px);
background-image: url('/media/img/firefox/set-as-default/thanks/help.svg');
background-image: url('/media/img/firefox/default/thanks/help.svg');
}
}

Expand Down
File renamed without changes
File renamed without changes.
6 changes: 3 additions & 3 deletions media/static-bundles.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
},
{
"files": [
"css/firefox/set-as-default/thanks.scss"
"css/firefox/default/thanks.scss"
],
"name": "firefox-default-thanks"
},
Expand All @@ -142,7 +142,7 @@
},
{
"files": [
"css/firefox/set-as-default/landing.scss"
"css/firefox/default/landing.scss"
],
"name": "firefox-default-landing"
},
Expand Down Expand Up @@ -333,7 +333,7 @@
},
{
"files": [
"js/firefox/set-as-default/thanks.js"
"js/firefox/default/thanks.js"
],
"name": "firefox-default-thanks"
},
Expand Down
2 changes: 1 addition & 1 deletion profiling/hit_popular_pages.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"/en-US/features/",
"/en-US/installer-help/?channel=release&installer_lang=en-US",
"/en-US/releases/",
"/en-US/set-as-default/thanks/",
"/en-US/default/thanks/",
]


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
) %}
<div class="cta-container">
<div class="mzp-c-button-download-container">
<a id="set-as-default-button" href="{{ url('firefox.set-as-default.thanks') }}" class="mzp-c-button mzp-t-product" data-cta-text="Make Firefox your default browser" >
<a id="set-as-default-button" href="{{ url('firefox.default.thanks') }}" class="mzp-c-button mzp-t-product" data-cta-text="Make Firefox your default browser" >
{{ ftl('set-as-default-landing-make-firefox-your-default') }}
</a>
</div>
Expand Down
4 changes: 2 additions & 2 deletions springfield/firefox/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,6 @@ def test_firefox_download_GA(self):
# Issue 13253: Ensure that Firefox can continue to refer to this URL.
class TestFirefoxSetAsDefaultThanks(TestCase):
def test_firefox_set_as_default_thanks(self):
resp = self.client.get("/set-as-default/thanks/", follow=True)
resp = self.client.get("/default/thanks/", follow=True)
assert resp.status_code == 200, "Ensure this URL continues to work, see issue 13253"
assert resp.templates[0].name == "firefox/set-as-default/thanks.html"
assert resp.templates[0].name == "firefox/default/thanks.html"
4 changes: 2 additions & 2 deletions springfield/firefox/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
path("stub_attribution_code/", views.stub_attribution_code, name="firefox.stub_attribution_code"),
# Issue 8432
# Issue 13253: Ensure that Firefox can continue to refer to this URL.
page("set-as-default/thanks/", "firefox/set-as-default/thanks.html", ftl_files="firefox/set-as-default/thanks"),
page("default/thanks/", "firefox/default/thanks.html", ftl_files="firefox/set-as-default/thanks"),
# Default browser campaign
page("set-as-default/", "firefox/set-as-default/landing.html", ftl_files="firefox/set-as-default/landing"),
page("default/", "firefox/default/landing.html", ftl_files="firefox/set-as-default/landing"),
)
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@


class DefaultLandingPage(BasePage):
_URL_TEMPLATE = "/{locale}/firefox/set-as-default/"
_URL_TEMPLATE = "/{locale}/default/"

_set_default_button_locator = (By.ID, "set-as-default-button")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@


class DefaultThanksPage(BasePage):
_URL_TEMPLATE = "/{locale}/firefox/set-as-default/thanks/"
_URL_TEMPLATE = "/{locale}/default/thanks/"

_download_button_locator = (By.ID, "download-button-desktop-release")

Expand Down

0 comments on commit 2c809b8

Please sign in to comment.