Fix #14596: Remove pocket-mode

Author: robhudson

.github/workflows/fluent_linter.yml

@@ -3,15 +3,13 @@ on:
   push:
     paths:
       - "l10n/en/**.ftl"
-      - "l10n-pocket/en/**.ftl"
       - ".github/l10n/*"
       - ".github/workflows/fluent_linter.yml"
     branches:
       - main
   pull_request:
     paths:
       - "l10n/en/**.ftl"
-      - "l10n-pocket/en/**.ftl"
       - ".github/l10n/*"
       - ".github/workflows/fluent_linter.yml"
     branches:
@@ -33,7 +31,3 @@ jobs:
       - name: Lint mozilla.org files
         run: |
           moz-fluent-lint l10n/en --config .github/l10n/linter_config.yml
-      - name: Lint Pocket files
-        if: always() # This step should run even if the previous one fails
-        run: |
-          moz-fluent-lint l10n-pocket/en --config .github/l10n/linter_config.yml

.github/workflows/integration_tests.yml

@@ -17,9 +17,6 @@ on:
       mozorg_service_hostname:
         description: The root URL of the Mozorg service to run tests against
         required: true
-      pocket_service_hostname:
-        description: The root URL of the Pocket service to run tests against
-        required: true
 jobs:
   notify-of-test-run-start:
     runs-on: ubuntu-latest
@@ -64,7 +61,6 @@ jobs:
 
     env:
       BASE_URL: ${{ github.event.inputs.mozorg_service_hostname }}
-      BASE_POCKET_URL: ${{ github.event.inputs.pocket_service_hostname }}
       BROWSER_NAME: ${{ matrix.BROWSER_NAME }}
       CI_JOB_ID: ${{ github.run_id }}
       DRIVER: ${{ matrix.DRIVER }}

.github/workflows/send_mozorg_fluent_strings_to_l10n_org.yml

@@ -21,4 +21,4 @@ jobs:
       - uses: actions/checkout@v4
       - name: Run PR-opening script
         shell: bash
-        run: SITE_MODE=Mozorg FLUENT_REPO_AUTH=${{ secrets.FLUENT_REPO_AUTH }} bin/open-ftl-pr.sh
+        run: FLUENT_REPO_AUTH=${{ secrets.FLUENT_REPO_AUTH }} bin/open-ftl-pr.sh

.github/workflows/send_pocket_fluent_strings_to_l10n_org.yml

@@ -74,7 +74,7 @@ repos:
     hooks:
       - id: fluent_linter
         files: \.ftl$
-        args: [--config, .github/l10n/linter_config.yml, l10n/en/, l10n/en-US/, l10n-pocket/en/]
+        args: [--config, .github/l10n/linter_config.yml, l10n/en/, l10n/en-US/]
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v3.1.0
     hooks:

.pre-commit-config.yaml

@@ -87,7 +87,6 @@ COPY manage.py LICENSE newrelic.ini ./
 COPY ./docker ./docker
 COPY ./bedrock ./bedrock
 COPY ./l10n ./l10n
-COPY ./l10n-pocket ./l10n-pocket
 COPY ./media ./media
 
 

Dockerfile

@@ -2,7 +2,6 @@ DC_CI = "bin/docker-compose.sh"
 DC = $(shell which docker) compose
 DOCKER = $(shell which docker)
 TEST_DOMAIN = www.mozilla.org
-POCKET_MODE = Pocket
 
 # Check if 'uv' exists and set the command accordingly
 ifneq (, $(shell which uv 2>/dev/null))
@@ -71,20 +70,12 @@ pull: .env
 
 rebuild: clean build
 
-# Run in Mozorg-only mode, using Bedrock to serve ONLY Mozorg pages
 run: .docker-build-pull
 	${DC} up assets app
 
 run-prod: .docker-build-pull
 	${DC} up release-local
 
-# Run in Pocket-only mode, using Bedrock to serve ONLY Pocket pages _at the root path_
-run-pocket: .docker-build-pull
-	-SITE_MODE=${POCKET_MODE} ${DC} up assets app
-
-run-pocket-prod: .docker-build-pull
-	-SITE_MODE=${POCKET_MODE} ${DC} up release-local
-
 stop:
 	${DC} stop
 
@@ -213,4 +204,4 @@ install-custom-git-hooks:
 uninstall-custom-git-hooks:
 	rm .git/hooks/post-merge
 
-.PHONY: all clean build pull docs livedocs build-docs lint run stop kill run-shell shell test test-image rebuild build-ci test-ci fresh-data djshell run-prod run-pocket run-pocket-prod build-prod test-cdn compile-requirements check-requirements install-local-python-deps preflight clean-local-deps install-custom-git-hooks uninstall-custom-git-hooks run-local-task-queue
+.PHONY: all clean build pull docs livedocs build-docs lint run stop kill run-shell shell test test-image rebuild build-ci test-ci fresh-data djshell run-prod build-prod test-cdn compile-requirements check-requirements install-local-python-deps preflight clean-local-deps install-custom-git-hooks uninstall-custom-git-hooks run-local-task-queue

Makefile

@@ -70,10 +70,7 @@ def normalize_language(language):
     if not language:
         return None
 
-    if settings.IS_POCKET_MODE:
-        lang_code = language.lower()
-    else:
-        lang_code = language
+    lang_code = language
 
     if lang_code in settings.LANGUAGE_URL_MAP_WITH_FALLBACKS:
         return settings.LANGUAGE_URL_MAP_WITH_FALLBACKS[lang_code]

bedrock/base/i18n.py

@@ -20,7 +20,6 @@
 from lib.l10n_utils import translation
 
 
-@override_settings(IS_MOZORG_MODE=True, IS_POCKET_MODE=False)
 @pytest.mark.parametrize(
     "lang_code, expected",
     (
@@ -68,81 +67,6 @@ def test_normalize_language_mozorg_mode(lang_code, expected):
     assert normalize_language(lang_code) == expected
 
 
-@override_settings(
-    IS_MOZORG_MODE=False,
-    IS_POCKET_MODE=True,
-    LANGUAGE_URL_MAP_WITH_FALLBACKS={
-        # patch in what we set in settings.__init__
-        "de": "de",
-        "en": "en",
-        "es": "es",
-        "es-la": "es-la",
-        "fr-ca": "fr-ca",
-        "fr": "fr",
-        "it": "it",
-        "ja": "ja",
-        "ko": "ko",
-        "nl": "nl",
-        "pl": "pl",
-        "pt-br": "pt-br",
-        "pt": "pt",
-        "ru": "ru",
-        "zh-cn": "zh-cn",
-        "zh-tw": "zh-tw",
-    },
-)
-@pytest.mark.parametrize(
-    "lang_code, expected",
-    (
-        (None, None),
-        ("", None),  # General normalization
-        ("de", "de"),
-        ("de-DE", "de"),
-        ("DE", "de"),
-        ("en", "en"),
-        ("en-US", "en"),
-        ("EN", "en"),
-        ("es", "es"),
-        ("ES", "es"),
-        ("es-la", "es-la"),
-        ("es-LA", "es-la"),
-        ("ES-LA", "es-la"),
-        ("fr-ca", "fr-ca"),
-        ("fr-CA", "fr-ca"),
-        ("FR-CA", "fr-ca"),
-        ("fr", "fr"),
-        ("FR", "fr"),
-        ("it", "it"),
-        ("IT", "it"),
-        ("ja", "ja"),
-        ("JA", "ja"),
-        ("ko", "ko"),
-        ("KO", "ko"),
-        ("nl", "nl"),
-        ("NL", "nl"),
-        ("pl", "pl"),
-        ("PL", "pl"),
-        ("pt-br", "pt-br"),
-        ("pt-BR", "pt-br"),
-        ("PT-BR", "pt-br"),
-        ("pt", "pt"),
-        ("PT", "pt"),
-        ("pt-PT", "pt"),
-        ("PT-PT", "pt"),
-        ("ru", "ru"),
-        ("RU", "ru"),
-        ("zh-cn", "zh-cn"),
-        ("zh-CN", "zh-cn"),
-        ("ZH-CN", "zh-cn"),
-        ("zh-tw", "zh-tw"),
-        ("zh-TW", "zh-tw"),
-        ("ZH-TW", "zh-tw"),
-    ),
-)
-def test_normalize_language_pocket_mode(lang_code, expected):
-    assert normalize_language(lang_code) == expected
-
-
 @pytest.mark.parametrize(
     "path, expected",
     (

bedrock/base/tests/test_i18n.py

@@ -11,7 +11,7 @@
 from bedrock.cms.decorators import prefer_cms
 from bedrock.cms.tests import decorator_test_views
 from bedrock.mozorg.util import page
-from bedrock.urls.mozorg_mode import urlpatterns as mozorg_urlpatterns
+from bedrock.urls import urlpatterns as mozorg_urlpatterns
 
 from .factories import SimpleRichTextPageFactory
 

bedrock/cms/tests/test_decorators.py

@@ -75,8 +75,8 @@ def get_doc(self, doc_name, locale):
             doc = self.get(name=doc_name, locale=locale)
 
         all_locales = list(self.filter(name=doc_name).values_list("locale", flat=True))
-        if "en" in all_locales and settings.IS_MOZORG_MODE:
-            # legal-docs now uses "en" but the Mozorg site needs en-US. (Pocket needs "en")
+        if "en" in all_locales:
+            # legal-docs now uses "en" but the Mozorg site needs en-US.
             all_locales[all_locales.index("en")] = "en-US"
 
         # filter locales not active on the site

bedrock/legal_docs/models.py

@@ -31,7 +31,6 @@ def test_legal_doc_exists(self):
         self.assertEqual(doc["content"], "You're not wrong Walter...")
         self.assertEqual(doc["active_locales"], ["en-US"])
 
-    @override_settings(IS_MOZORG_MODE=True)
     def test_legal_doc_exists_en_locale__mozorg_mode(self):
         """Should return the content of the "en" file and say the active locale is "en-US" if in Mozorg Mode"""
         LegalDoc.objects.create(
@@ -43,18 +42,6 @@ def test_legal_doc_exists_en_locale__mozorg_mode(self):
         self.assertEqual(doc["content"], "You're not wrong Walter...")
         self.assertEqual(doc["active_locales"], ["en-US"])
 
-    @override_settings(IS_MOZORG_MODE=False, PROD_LANGUAGES=["en", "de", "hi-IN"])
-    def test_legal_doc_exists_en_locale__pocket_mode(self):
-        """Should return the content of the "en" file and say the active locale is "en" if in Pocket Mode"""
-        LegalDoc.objects.create(
-            name="the_dude_exists",
-            locale="en",
-            content="You're not wrong Walter...",
-        )
-        doc = views.load_legal_doc("the_dude_exists", "en")
-        self.assertEqual(doc["content"], "You're not wrong Walter...")
-        self.assertEqual(doc["active_locales"], ["en"])
-
     def test_legal_doc_exists_snake_case_convert(self):
         """Should return the content of the file if it exists in snake case."""
         LegalDoc.objects.create(

bedrock/legal_docs/tests/test_base.py

@@ -2,7 +2,6 @@
 # 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/.
 
-from django.conf import settings
 from django.http import Http404
 from django.views.generic import TemplateView
 
@@ -55,16 +54,10 @@ def get_legal_doc(self):
 
     def render_to_response(self, context, **response_kwargs):
         response_kwargs.setdefault("content_type", self.content_type)
-        _ftl_files = []
-        if settings.IS_MOZORG_MODE:
-            _ftl_files = [
-                "mozorg/about/legal",
-                "privacy/index",
-            ]
-        elif settings.IS_POCKET_MODE:
-            _ftl_files = [
-                "pocket/legal",
-            ]
+        _ftl_files = [
+            "mozorg/about/legal",
+            "privacy/index",
+        ]
         return l10n_utils.render(
             self.request,
             self.get_template_names()[0],