Initial support for Pocket l10n using Fluent strings in Bedrock #11541

stevejalim · 2022-04-26T15:19:08Z

One-line summary

This changeset lays in a skeleton l10n directory and subdirs, giving us somewhere to put Fluent files as we mark up Pocket templates for l10n.

It also marks up the pocket/about.html page (and the related nav, mobile nav and footer template partials) with Fluent strings.

This marking up of the about page also shows we can pull in brand names from the default mozorg l10n files.

In general, strings in pocket pages are namespaced with pocket- and don't clash with existing strings

Issue / Bugzilla link

#11519

Testing

Pull this branch
Start the site in Pocket Mode - either npm run in-pocket-mode or make run-pocket
Go to /about/ and confirm that

the page shows only English strings, with no Fluent placeholders visible.
all hyperlinks work as you'd expect
the mobile and desktop navs work as you'd expect
(You can compare with https://getpocket.com/en/about/)

codecov · 2022-04-26T15:35:44Z

Codecov Report

Merging #11541 (17b8136) into main (7eda526) will decrease coverage by 0.03%.
The diff coverage is 42.85%.

❗ Current head 17b8136 differs from pull request most recent head 6cddf6f. Consider uploading reports for the commit 6cddf6f to get more accurate results

@@            Coverage Diff             @@
##             main   #11541      +/-   ##
==========================================
- Coverage   77.13%   77.09%   -0.04%     
==========================================
  Files         144      144              
  Lines        7578     7584       +6     
==========================================
+ Hits         5845     5847       +2     
- Misses       1733     1737       +4

Impacted Files	Coverage Δ
bedrock/pocket/urls.py	`0.00% <ø> (ø)`
bedrock/settings/base.py	`92.68% <ø> (ø)`
lib/l10n_utils/fluent.py	`95.62% <ø> (ø)`
bedrock/settings/__init__.py	`73.68% <42.85%> (-7.57%)`	⬇️

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 7eda526...6cddf6f. Read the comment docs.

l10n-pocket/configs/vendor.toml

pmac · 2022-04-27T15:58:04Z

Just needs a rebase now I think

pmac · 2022-04-27T20:11:28Z

Looking good now. Don't need the .gitkeep file anymore. Otherwise I think this is an excellent start. I'll let people more used to marking up for FTL do the real review though.

alexgibson

I know this is only a draft still, but I thought it might be worth making sure we're setting off on the right foot for the FTL strings. Making sure things are good early on will likely make future updates smoother 👍

l10n-pocket/en/footer.ftl

l10n-pocket/en/nav.ftl

l10n-pocket/en/pocket/about.ftl

l10n/en/brands.ftl

alexgibson

Looks good, just a couple of small nits / suggestions to fix up

bedrock/pocket/templates/pocket/about.html

bedrock/pocket/templates/pocket/includes/footer.html

l10n-pocket/en/pocket/about.ftl

alexgibson

Update looks good, just one outlier spotted r+wc

Although it sounds like we may want a separate brands.ftl file for Pocket now too?

l10n-pocket/en/pocket/about.ftl

…via Makefile commands

Setting the SITE_MODE env var to Mozorg or Pocket will now switch the site into serving only the URLs for that particular mode. When in Pocket mode, its pages are served from the root path, not from the 'externalpages' namespace/module name The default behaviour, for now, remains as is: all URLs will be served, and Pocket URLs are served as 'external/pocket/*`

There's more work to be done to wire it all up - the views aren't aware of the Fluent side, yet

Note how we get the brands.ftl from main l10n to _always_ be used in Pocket mode, regardless of locale.

…onym. Has no semantic impact to change it.

…; need to go via the template-specific FTL file

…reaase scope to tune them without triggering new translations

…ittle for translation

The -brand-name-read-it-later-inc string is moved from l10n/en/brands.ftl into the new Pocket-specific one, and can be used as proof that the new brands file is being loaded, because the correct Read It Later, Inc string appears at the bottom of the about page. Also improve some of the brand-meets-product phrasing, to help with translation - eg Pocket Premium, Pocket for Firefox

lib/l10n_utils/fluent.py

l10n-pocket/en/brands.ftl

alexgibson

r++

This means we can do without the override that forces the loading of brands when in Pocket mode. We still need it for non-en locales, but at least now it behaves the same as for Mozorg mode

stevejalim · 2022-05-03T17:02:11Z

@pmac over to you for a final review, then we can merge this and unblock the rest of #11519 🎉

bedrock/pocket/urls.py

bedrock/settings/__init__.py

pmac

Just a couple more suggestions, but ready to go I think. r+wc
🦀

stevejalim added the Blocked label Apr 26, 2022

stevejalim commented Apr 26, 2022

View reviewed changes

l10n-pocket/configs/vendor.toml Show resolved Hide resolved

stevejalim force-pushed the 11519-mark-up-pocket-pages-with-fluent-syntax branch from f87f317 to 72e2437 Compare April 27, 2022 19:34

stevejalim force-pushed the 11519-mark-up-pocket-pages-with-fluent-syntax branch from 72e2437 to 33dd465 Compare April 27, 2022 21:18

stevejalim mentioned this pull request Apr 28, 2022

Port the Pocket homepage to Bedrock #11513

Closed

3 tasks

stevejalim changed the title ~~Skeleton structure for Pocket l10n / Fluent strings in bedrock~~ Initial support for Pocket l10n using Fluent strings in Bedrock Apr 28, 2022

stevejalim removed the Blocked label Apr 28, 2022

stevejalim marked this pull request as draft April 28, 2022 11:02

stevejalim requested review from alexgibson, nathan-barrett, pmac and craigcook April 28, 2022 12:07

alexgibson requested changes Apr 28, 2022

View reviewed changes

stevejalim requested review from alexgibson and maureenlholland April 28, 2022 12:07

stevejalim marked this pull request as ready for review April 28, 2022 12:13

stevejalim marked this pull request as draft April 28, 2022 12:23

stevejalim marked this pull request as ready for review April 28, 2022 13:15

stevejalim mentioned this pull request Apr 28, 2022

Mark up Pocket pages with Fluent syntax #11519

Closed

21 tasks

alexgibson requested changes Apr 28, 2022

View reviewed changes

alexgibson reviewed Apr 28, 2022

View reviewed changes

l10n-pocket/en/pocket/about.ftl Outdated Show resolved Hide resolved

stevejalim requested a review from alexgibson April 28, 2022 15:48

alexgibson approved these changes Apr 28, 2022

View reviewed changes

l10n-pocket/en/pocket/about.ftl Outdated Show resolved Hide resolved

stevejalim force-pushed the 11519-mark-up-pocket-pages-with-fluent-syntax branch from 797e4b4 to 75cc1a2 Compare May 3, 2022 12:48

stevejalim requested a review from alexgibson May 3, 2022 12:53

stevejalim added 2 commits May 3, 2022 14:06

Support running in Mozorg or Pocket modes in dev or prod via Docker, …

4df16a8

…via Makefile commands

stevejalim added 15 commits May 3, 2022 14:06

First pass at marking up a Pocket template for Fluent

07d260f

There's more work to be done to wire it all up - the views aren't aware of the Fluent side, yet

Enable Fluent string replacement for Pocket About page

c64d537

Note how we get the brands.ftl from main l10n to _always_ be used in Pocket mode, regardless of locale.

Switch to looking up Pocket paths via named URLs

9bd8a37

Fix slip in Fluent markup

6686983

Update README for l10n-pocket with info about namespacing

0227514

Markup spacing nitfix

114fcc5

Improve markup of HTML: remove ids from strings; snake_case variables

094bb7f

Switch BETA to title case, to avoid translation confusion with an acr…

b710170

…onym. Has no semantic impact to change it.

Fixup: two missing curly quotes

1251860

Nitfix: snake_case for all FTL variables

4c36b58

Fix up broken FTL markup: brands can't be used directly in a template…

3d74eb1

…; need to go via the template-specific FTL file

Refactor attributes for hyperlinks to reduce risk of breakage and inc…

38a787f

…reaase scope to tune them without triggering new translations

Collapse all press-link attrs into a single variable, to make less br…

d442955

…ittle for translation

Add 'es' locale, for mapping to non-Spain versions of Spanish

5928f36

stevejalim force-pushed the 11519-mark-up-pocket-pages-with-fluent-syntax branch from 75cc1a2 to 5928f36 Compare May 3, 2022 13:08

alexgibson reviewed May 3, 2022

View reviewed changes

lib/l10n_utils/fluent.py Outdated Show resolved Hide resolved

l10n-pocket/en/brands.ftl Outdated Show resolved Hide resolved

Drop 'Pocket for Firefox' as a dedicated brand name -- unnecessary

1efdeed

alexgibson approved these changes May 3, 2022

View reviewed changes

Ensure l10n-pocket/en/brands.ftl is disovered by default in Pocket mode

12183d5

This means we can do without the override that forces the loading of brands when in Pocket mode. We still need it for non-en locales, but at least now it behaves the same as for Mozorg mode

Update Pocket l10n README now the two modes do not share l10n files

17b8136

pmac reviewed May 3, 2022

View reviewed changes

bedrock/pocket/urls.py Show resolved Hide resolved

pmac reviewed May 3, 2022

View reviewed changes

bedrock/settings/__init__.py Outdated Show resolved Hide resolved

pmac reviewed May 3, 2022

View reviewed changes

bedrock/settings/__init__.py Outdated Show resolved Hide resolved

pmac approved these changes May 3, 2022

View reviewed changes

stevejalim added 2 commits May 3, 2022 18:29

Typo fixup

bbe665e

Explicitly redefine FLUENT_PATHS, to avoid pain later

6cddf6f

stevejalim merged commit 1df8b3d into main May 3, 2022

stevejalim deleted the 11519-mark-up-pocket-pages-with-fluent-syntax branch May 3, 2022 17:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Initial support for Pocket l10n using Fluent strings in Bedrock #11541

Initial support for Pocket l10n using Fluent strings in Bedrock #11541

stevejalim commented Apr 26, 2022 •

edited by alexgibson

Loading

codecov bot commented Apr 26, 2022 •

edited

Loading

pmac commented Apr 27, 2022

pmac commented Apr 27, 2022

alexgibson left a comment

alexgibson left a comment

alexgibson left a comment

alexgibson left a comment

stevejalim commented May 3, 2022

pmac left a comment

Initial support for Pocket l10n using Fluent strings in Bedrock #11541

Initial support for Pocket l10n using Fluent strings in Bedrock #11541

Conversation

stevejalim commented Apr 26, 2022 • edited by alexgibson Loading

One-line summary

Issue / Bugzilla link

Testing

codecov bot commented Apr 26, 2022 • edited Loading

Codecov Report

pmac commented Apr 27, 2022

pmac commented Apr 27, 2022

alexgibson left a comment

Choose a reason for hiding this comment

alexgibson left a comment

Choose a reason for hiding this comment

alexgibson left a comment

Choose a reason for hiding this comment

alexgibson left a comment

Choose a reason for hiding this comment

stevejalim commented May 3, 2022

pmac left a comment

Choose a reason for hiding this comment

stevejalim commented Apr 26, 2022 •

edited by alexgibson

Loading

codecov bot commented Apr 26, 2022 •

edited

Loading