Merge pull request #1497 from freedomofpress/1438-supported-languages

build: package only translations explicitly marked as supported

.github/ISSUE_TEMPLATE/release.md

@@ -21,6 +21,9 @@ SecureDrop maintainers and testers: As you QA this release, please report back y
 ## Release tasks
 
 - [ ] Check if there are any security bug fixes waiting to be pulled into the RC
+- [ ] Check if there are any translations:
+    - [ ] pending merge into `main`
+    - [ ] pending inclusion as a supported language in [`MANIFEST.in`](https://github.com/freedomofpress/securedrop-client/blob/main/MANIFEST.in)
 - [ ] Update changelog
 - [ ] Create test plan
 - [ ] Refresh nightlies

MANIFEST.in

@@ -16,3 +16,16 @@ recursive-include securedrop_client *
 
 recursive-exclude alembic *.pyc
 recursive-exclude securedrop_client *.pyc
+
+
+# --- LOCALIZATION ---
+
+# Translations may appear in the tree before we consider them supported, so
+# don't include any by default.
+prune securedrop_client/locale
+
+# Explicitly include only supported translations, one line for each $LANG, like:
+#
+#     graft securedrop_client/locale/$LANG
+#
+# Please keep this list alphabetized.

Makefile

@@ -205,10 +205,7 @@ docs:  ## Generate browsable documentation and call/caller graphs (requires Doxy
 
 LOCALE_DIR=securedrop_client/locale
 POT=${LOCALE_DIR}/messages.pot
-SUPPORTED_LOCALES_LIST=l10n.txt
 VERSION=$(shell python -c "import securedrop_client; print(securedrop_client.__version__)")
-WEBLATE_API=https://weblate.securedrop.org/api/
-WEBLATE_COMPONENT=securedrop-client
 
 .PHONY: check-strings
 check-strings: ## Check that the translation catalog is up to date with source code
@@ -237,13 +234,3 @@ $(POT): securedrop_client
 		$^
 	@sed -i -e '/^"POT-Creation-Date/d' ${POT}
 
-# List languages 100% translated in Weblate.
-.PHONY: supported-languages
-supported-languages:
-	@wlc \
-		--format json \
-		--url ${WEBLATE_API} \
-		list-translations \
-		| jq -r 'map(select(.component.slug == "${WEBLATE_COMPONENT}" and .translated_percent == 100)) | map("* \(.language.name|tostring) (``\(.translated_percent|tostring)``)") | join("\n")' \
-		> ${SUPPORTED_LOCALES_LIST}
-	@git add ${SUPPORTED_LOCALES_LIST}

requirements/dev-requirements-debian.in

@@ -20,4 +20,3 @@ semgrep
 toml
 types-python-dateutil
 types-setuptools
-wlc

requirements/dev-requirements.in

@@ -21,4 +21,3 @@ sip==4.19.8
 toml
 types-python-dateutil
 types-setuptools
-wlc

securedrop_client/locale/messages.pot

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.1\n"
+"Generated-By: Babel 2.10.1\n"
 
 msgid "{application_name} is already running"
 msgstr ""

securedrop_client/queue.py

@@ -92,7 +92,8 @@ def _check_for_duplicate_jobs(self, job: QueueJob) -> bool:
         stored on self.current_job. We check that the job to be added is not among them.
         """
         in_progress_jobs = [in_progress_job for priority, in_progress_job in self.queue.queue]
-        in_progress_jobs.append(self.current_job)
+        if self.current_job is not None:
+            in_progress_jobs.append(self.current_job)
         if job in in_progress_jobs:
             logger.debug("Duplicate job {}, skipping".format(job))
             return True