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.

Sign up for GitHub

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

Updates from bedrock #404

Merged
merged 3 commits into from
May 29, 2024
Merged

Updates from bedrock #404

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
486295d
Updates from bedrock
MozmarRobot May 24, 2024
3bcffcc
Updates from bedrock
MozmarRobot May 27, 2024
9e87557
Updates from bedrock
MozmarRobot May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions en/brands.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@
-brand-name-mozilla-account = Mozilla account
-brand-name-mozilla-accounts = Mozilla accounts
-brand-name-mozilla-social = Mozilla.social
-brand-name-mozilla-ai = Mozilla AI
-brand-name-mozilla-ventures = Mozilla Ventures
-brand-name-gecko = Gecko

## Mozilla projects (short names)
Expand Down
32 changes: 32 additions & 0 deletions en/mozorg/home-new.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,46 @@ home-product-firefox-browsing = Private & secure browsing
home-cta-get-firefox = Get { -brand-name-firefox }
home-product-pocket-articles = The web’s most intriguing articles
home-cta-get-pocket = Get { -brand-name-pocket}

# Obsolete string (expires: 2024-07-16)
home-product-relay-masks = Easy-to-use email & phone masks

home-product-relay-hide-your = Hide your phone number and email from spammers
home-cta-get-relay = Get { -brand-name-relay }
home-product-vpn-trust = A VPN you can trust
home-cta-get-vpn = Get { -brand-name-mozilla-vpn }

# Obsolete string (expires 2024-07-23)
home-product-monitor-data = Data breach alerts

home-product-monitor-protect-your = Protectr your private info from data brokers
Copy link
Contributor

Choose a reason for hiding this comment

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

"Protectr" is supposed to be "Protect"?

Screen Shot 2024-05-25 at 14 52 36

Copy link
Contributor

Choose a reason for hiding this comment

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

(Given the string id says "protect-your" I assume that it was indeed intended to be "Protect".)

I've opened mozilla/bedrock#14602 for this, incl. the random whitespace.

Copy link
Contributor

Choose a reason for hiding this comment

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

mozilla/bedrock#14602 is merged :)

home-cta-get-monitor = Get { -brand-name-monitor }
home-product-fakespot-detect = Detect fake shopping reviews
home-cta-get-fakespot = Get { -brand-name-fakespot }


home-mozilla-takes-bets = “{ -brand-name-mozilla } is taking bets to show the world there’s a business to be made with trustworthy AI. That includes putting things like human rights, data protection and transparency at the core of how these complex systems work.”

# Politico is a brand name for a news organization
home-politico-cite = Politico

home-join-us-in-shaping = Join us in shaping trustworthy AI
home-work-on-ai = { -brand-name-mozilla }’s work with AI isn’t just a new thing—we’ve spent years funding, building and advocating for AI that’s open, fair and developed responsibly. Our focus is on creating AI that serves the people, prioritizes transparency and supports the public good, not corporate agendas.
Copy link
Contributor

Choose a reason for hiding this comment

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

Use M dash.

Copy link
Contributor

Choose a reason for hiding this comment

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

This:

"work with AI isn’t just a new thing—we’ve spent years funding"

already is U+2014 EM DASH

@peiying2 Do you mean another occurence?

Copy link
Contributor

Choose a reason for hiding this comment

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

The only inconsistent thing here is that while this sentence uses the dash correctly — without the spaces on both sides (at it should be IIRC), the other string on L64 has spaces around it. So the only thing I see here wrt dashes would be making these two occurrences more consistent: mozilla/bedrock#14602 (comment)

Copy link
Contributor

Choose a reason for hiding this comment

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

OTOH the "correct" (non)spacing produces some ugly line breaks at times:

Screenshot 2024-05-25 at 20 24 02

so the question is whether to give up and just have spaces around it?

Copy link
Contributor

Choose a reason for hiding this comment

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

I've asked the copy writing team for clarification on spaces and em dashes. It seems we are doing it a couple different ways currently and since we are trying to go a little more colloquial with our tone, that might be true of our grammar too so I don't feel confident making a call myself.

Copy link
Contributor

Choose a reason for hiding this comment

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

Oh, it was hard to see it. I agree with @janbrasna that there should be a space before and after the M dash, but it has been inconsistent throughout. If there is a branding or style guide somewhere, let me know. For now, I will take this as is and move forward.

Copy link
Contributor

Choose a reason for hiding this comment

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

I talked to someone in brand and they said spaces around the dash are the way to go.

They also said they don't have a style guide.

home-read-more = Read more

# Obsolete string (expires: 2024-07-16)
home-is-mozilla-a-corporation = Is { -brand-name-mozilla } a corporation or a non-profit? Actually, both.

# Obsolete string (expires: 2024-07-16)
home-mozilla-consists-of = { -brand-name-mozilla } consists of two organizations. The { -brand-name-mozilla-corporation } is wholly owned by the non-profit 501(c) { -brand-name-mozilla-foundation }. Which means we aren’t beholden to any shareholders — only to our mission.

home-so-what-is-mozilla = So, what is { -brand-name-mozilla }?

# Variables
# $ventures - link to https://mozilla.vc/
# $mozai - link to https://www.mozilla.ai/
home-at-its-core = At its core, { -brand-name-mozilla } is an activist organization led by the { -brand-name-mozilla-foundation } that makes change in the world through a variety of ventures including { -brand-name-mozilla-corporation }, MZLA, <a {$ventures}>{ -brand-name-mozilla-ventures }</a> and <a {$mozai}>{ -brand-name-mozilla-ai }</a>. How are we different? Because we’re mission-driven, it means we have the freedom to make all of our decisions based on what’s best for the internet and for everyone online, not based on the demands of shareholders — we don’t actually have any of those.

home-learn-about-mofo = Learn about the { -brand-name-mozilla-foundation }

home-join-the-fight = Join the fight for a healthy internet
Expand All @@ -57,3 +83,9 @@ home-featured-product = Featured product

# HTML for visual formatting. "Blur" here is used as a metaphor for hiding or obscuring something.
home-feature-blur-your-location = Blur your location & activity using <span>{ -brand-name-mozilla-vpn }</span>

Copy link
Contributor

Choose a reason for hiding this comment

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

remove an extra line break


# Mozilla Foundation donation promo
home-mofo-build-our-movement = Build our movement
home-mofo-donate-to-mofo-today = Donate to { -brand-name-mozilla-foundation } today to ensure the internet remains open and accessible to all.
home-mofo-donate = Donate
5 changes: 5 additions & 0 deletions en/navigation_v2.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ navigation-v2-sign-up-for-new-accounts = Sign up for new accounts without handin
navigation-v2-mdn-plus = { -brand-name-mdn-plus}
navigation-v2-new-features-and-tools = New features and tools for a customized { -brand-name-mdn} experience
navigation-v2-view-all-products = View all Products
navigation-v2-fakespot = { -brand-name-fakespot }
navigation-v2-use-ai-to-detect = Use AI to detect fake reviews and scams

## Who We Are menu

Expand Down Expand Up @@ -79,3 +81,6 @@ navigation-v2-webassembly = { -brand-name-webassembly }
navigation-v2-learn-more-about-the-new = Learn more about the new, low-level, assembly-like language.
navigation-v2-mozilla-innovation-projects = { -brand-name-mozilla } Innovation Projects
navigation-v2-discover-ways-to-bring = Discover ways to bring bright ideas to life.
navigation-v2-mozilla-ai = { -brand-name-mozilla-ai }

navigation-v2-mozilla-ventures = { -brand-name-mozilla-ventures }
Copy link
Contributor

Choose a reason for hiding this comment

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

I wonder whether these two should be removed for now as not to surprise anyone — the menu items were not actually added in the end.

Copy link
Contributor

Choose a reason for hiding this comment

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

@stephaniehobson who can make this decision? Should we keep them and they will show up eventually?

Copy link

Choose a reason for hiding this comment

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

For now, it doesn't seem like they're going to be added to the nav anytime soon, so I'm going to remove them from our codebase for now. Thanks for the call-out @janbrasna !