Merge branch 'keepandroidopen:main' into main

Author: natallm

lint_yaml.py

@@ -10,6 +10,10 @@
   3. Locale YAML values should use markdown, not raw HTML tags.
      <strong>, <em>, <i>, and <a href="..."> should be written as
      markdown equivalents (**bold**, *italic*, [text](url)).
+  4. Block-scalar values should not be entirely wrapped in double quotes.
+     This catches the common mistake of converting a YAML quoted string
+     to a block scalar without removing the outer quotes (which become
+     literal characters in block scalars).
 """
 
 import glob
@@ -134,6 +138,77 @@ def check_html_in_locale_values(path):
     return errors
 
 
+def check_quoted_block_scalars(path):
+    """Return a list of error strings for block-scalar values whose content
+    is entirely wrapped in double quotes.
+
+    This catches the common mistake where a translator converts a YAML
+    quoted string like  key: "value"  to a block scalar but forgets to
+    remove the outer quotes:
+
+        key: >-
+          "value"          ← outer quotes are now literal text
+
+    Only checks keys whose raw YAML uses a block scalar indicator (> | >- |-).
+    For locale files, the check compares with the English original to
+    avoid false positives on keys where the quotes ARE the content
+    (e.g. obj_security_q whose English value is '"...just about security?"').
+    """
+    errors = []
+
+    try:
+        with open(path) as fh:
+            data = yaml.safe_load(fh)
+    except yaml.YAMLError:
+        return []  # syntax error already reported
+
+    if not isinstance(data, dict):
+        return []
+
+    # Identify which keys use block scalar syntax in the raw file
+    with open(path) as fh:
+        raw_lines = fh.readlines()
+    block_scalar_keys = set()
+    for line in raw_lines:
+        m = re.match(r"^([a-zA-Z]\w*):\s*[>|][+-]?\s*$", line)
+        if m:
+            block_scalar_keys.add(m.group(1))
+
+    # Load English reference for locale files
+    en_data = {}
+    if "/locales/" in path and not path.endswith("/en.yaml"):
+        try:
+            en_path = path.rsplit("/", 1)[0] + "/en.yaml"
+            with open(en_path) as fh:
+                en_data = yaml.safe_load(fh) or {}
+        except (FileNotFoundError, yaml.YAMLError):
+            pass
+
+    for key, value in data.items():
+        if not isinstance(value, str):
+            continue
+        if key not in block_scalar_keys:
+            continue
+        if len(value) < 3:
+            continue
+        if not (value.startswith('"') and value.endswith('"')):
+            continue
+
+        # For locale files: skip if the English value also starts/ends
+        # with quotes (the quotes are intentional content)
+        if en_data:
+            en_val = en_data.get(key, "")
+            if isinstance(en_val, str) and en_val.startswith('"') and en_val.endswith('"'):
+                continue
+
+        errors.append(
+            f"{path}: key '{key}': block scalar value is wrapped in "
+            f'double quotes — remove the outer quotes'
+        )
+
+    return errors
+
+
 def main():
     files = find_yaml_files()
     if not files:
@@ -145,6 +220,7 @@ def main():
         all_errors.extend(check_syntax(path))
         all_errors.extend(check_escaped_quotes_in_block_scalars(path))
         all_errors.extend(check_html_in_locale_values(path))
+        all_errors.extend(check_quoted_block_scalars(path))
 
     if all_errors:
         print(f"Found {len(all_errors)} error(s):\n")

src/data/regulators.yaml

@@ -3570,12 +3570,12 @@ countries:
       zh-TW: "哥倫比亞"
     items:
       - text:
-          en: Make a report to the [Superintendence of Industry and Commerce](https://servicioslinea.sic.gov.co/servilinea/pqrsf/)
-          es: Presentar una denuncia ante la [Superintendencia de Industria y Comercio](https://servicioslinea.sic.gov.co/servilinea/pqrsf/)
-          pl: Prześlij zgłoszenie do [Nadzoru Przemysłu i Handlu](https://servicioslinea.sic.gov.co/servilinea/pqrsf/)
-          pt-BR: Faça um relato para a [Superintendência de Indústria e Comércio](https://servicioslinea.sic.gov.co/servilinea/pqrsf/)
-          zh-CN: 向[工商业监管局](https://servicioslinea.sic.gov.co/servilinea/pqrsf/)报告
-          zh-TW: 向[工商業監理局](https://servicioslinea.sic.gov.co/servilinea/pqrsf/)報告
+          en: "File a formal antitrust complaint (Prácticas Comerciales Restrictivas) with the [Superintendence of Industry and Commerce (SIC)](https://servicioslinea.sic.gov.co/servilinea/compedesleal/index#) — requires creating an account on the SIC portal"
+          es: "Presentar una denuncia formal por prácticas comerciales restrictivas ante la [Superintendencia de Industria y Comercio (SIC)](https://servicioslinea.sic.gov.co/servilinea/compedesleal/index#) — requiere crear una cuenta en el portal de la SIC"
+          pl: "Złóż formalną skargę antymonopolową (Prácticas Comerciales Restrictivas) do [Nadzoru Przemysłu i Handlu (SIC)](https://servicioslinea.sic.gov.co/servilinea/compedesleal/index#) — wymaga założenia konta na portalu SIC"
+          pt-BR: "Registre uma reclamação formal antitruste (Prácticas Comerciales Restrictivas) na [Superintendência de Indústria e Comércio (SIC)](https://servicioslinea.sic.gov.co/servilinea/compedesleal/index#) — requer criação de conta no portal da SIC"
+          zh-CN: "向[工商业监管局 (SIC)](https://servicioslinea.sic.gov.co/servilinea/compedesleal/index#) 提交正式反垄断投诉——需要在 SIC 门户网站上创建账户"
+          zh-TW: "向[工商業監理局 (SIC)](https://servicioslinea.sic.gov.co/servilinea/compedesleal/index#) 提交正式反壟斷投訴——需要在 SIC 入口網站上建立帳戶"
   - id: peru
     name:
       ar: "بيرو"

src/i18n/locales/be.yaml

@@ -45,7 +45,7 @@ site_problems_header: "Праблемы"
 site_report_issues: "Паведаміць пра праблемы сайта"
 # [en] site_disclaimer: "**Disclaimer:** This website is a community-driven noncommercial undertaking. It is operated solely for informational and educational purposes."
 site_disclaimer: >-
-  "**Заўвага:** Гэты сайт кіруецца супольнасцю. Ён створаны выключна ў інфармацыйных і навучальных мэтах."
+  **Заўвага:** Гэты сайт кіруецца супольнасцю. Ён створаны выключна ў інфармацыйных і навучальных мэтах.
 # [en] site_privacy: "**Privacy:** This site uses no cookies and performs no user tracking or logging."
 site_privacy: "**Прыватнасць:** Гэты сайт не выкарыстоўвае кукі і не адсочвае карыстальнікаў ці аўтарызацыю."
 # [en] site_copyright: "**Copyright:** None. This work is marked"

src/i18n/locales/bn.yaml

@@ -124,10 +124,10 @@ flow_step6: "**২৪ ঘণ্টা অপেক্ষা করুন**"
 flow_step7: "আবার ফিরে এসে আরও ভয়ংকর সব স্ক্রিন বাতিল করুন"
 # [en] flow_step8: "Pick \"allow temporarily\" (7 days) or \"allow indefinitely\""
 flow_step8: >-
-    "অস্থায়ীভাবে অনুমতি দিন" (৭ দিন) অথবা "স্থায়ীভাবে অনুমতি দিন" অপশনটি বেছে নিন"
+    অস্থায়ীভাবে অনুমতি দিন" (৭ দিন) অথবা "স্থায়ীভাবে অনুমতি দিন" অপশনটি বেছে নিন
 # [en] flow_step9: "Confirm, again, that you understand \"the risks\""
 flow_step9: >-
-    "আপনি যে "ঝুঁকি" বুঝতে পারছেন তা আবারও নিশ্চিত করুন"
+    আপনি যে "ঝুঁকি" বুঝতে পারছেন তা আবারও নিশ্চিত করুন
 # [en] flow_summary: "Nine steps. A mandatory 24-hour cooling-off period. *For installing software on a device you own.*"
 flow_summary: "নয়টি ধাপ। বাধ্যতামূলক ২৪ ঘণ্টার ওয়েটিং পিরিয়ড। *শুধুমাত্র আপনার নিজের ডিভাইসে সফটওয়্যার ইন্সটল করার জন্য।*"
 # [en] flow_detail: "Worse: this flow runs entirely through **Google Play Services**, not the Android OS. Google can change it, tighten it, or kill it at any time, with no OS update required and no consent needed. And as of today, it hasn't shipped in any beta, preview, or canary build. It exists only as a blog post and some mockups."

src/i18n/locales/es.yaml

@@ -46,10 +46,10 @@ site_problems_header: "Problemas"
 site_report_issues: "Informar de un problema en el sitio web"
 # [en] site_disclaimer: "**Disclaimer:** This website is a community-driven noncommercial undertaking. It is operated solely for informational and educational purposes."
 site_disclaimer: >-
-  "**Aviso:** Este sitio web es una iniciativa comunitaria sin ánimo de lucro. Se utiliza únicamente con fines informativos y educativos."
+  **Aviso:** Este sitio web es una iniciativa comunitaria sin ánimo de lucro. Se utiliza únicamente con fines informativos y educativos.
 # [en] site_privacy: "**Privacy:** This site uses no cookies and performs no user tracking or logging."
 site_privacy: >-
-  "**Privacidad:** Este sitio web no utiliza cookies ni realiza ningún tipo de seguimiento o registro de los usuarios."
+  **Privacidad:** Este sitio web no utiliza cookies ni realiza ningún tipo de seguimiento o registro de los usuarios.
 # [en] site_copyright: "**Copyright:** None. This work is marked"
 site_copyright: "**Derechos de autor:** Ninguno. Esta obra está bajo la licencia."
 # [en] open_letter_cta: "Read our open letter opposing the Android Developer Verification program"

src/i18n/locales/id.yaml

@@ -210,7 +210,7 @@ act_dev_warn: >-
   Tambahkan [pustaka FreeDroidWarn](https://github.com/woheller69/FreeDroidWarn) ke aplikasi Anda untuk memperingatkan pengguna.
 # [en] act_dev_banner: "Run a website? [Add the countdown banner.](/banner)"
 act_dev_banner: >-
-  "Mengelola situs web? [Tambahkan spanduk hitung mundur.](/banner)"
+  Mengelola situs web? [Tambahkan spanduk hitung mundur.](/banner)
 # [en] act_google_heading: "Google employees"
 act_google_heading: "Karyawan Google"
 # [en] act_google_text: "If you know something about the program's technical implementation or internal rationale, contact [tips@keepandroidopen.org](mailto:tips@keepandroidopen.org) from a *non-work* machine and a *non-Gmail* account. Strict confidence guaranteed."