From 577758201375c55edda1ca1b1c1a0f1f65f59634 Mon Sep 17 00:00:00 2001 From: Joshua Pan Date: Thu, 1 Mar 2018 22:37:41 -0800 Subject: [PATCH] lint: Tighten placeholder lint rule to exclude links. Fixes #8420. --- tools/linter_lib/custom_check.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tools/linter_lib/custom_check.py b/tools/linter_lib/custom_check.py index ad7a1db6d5..e32a55cb54 100644 --- a/tools/linter_lib/custom_check.py +++ b/tools/linter_lib/custom_check.py @@ -534,18 +534,15 @@ def build_custom_checkers(by_lang): 'description': "The S in Terms of Service is capitalized"}, ]) + comma_whitespace_rule html_rules = whitespace_rules + prose_style_rules + [ - {'pattern': 'placeholder="[^{]', + {'pattern': 'placeholder="[^{](?:(?!\.com).)+$', 'description': "`placeholder` value should be translatable.", 'exclude_line': [('templates/zerver/register.html', 'placeholder="acme"'), ('templates/zerver/register.html', 'placeholder="Acme or Aκμή"'), - ('static/templates/settings/realm-domains-modal.handlebars', - ''), ("static/templates/user-groups-admin.handlebars", '')], 'exclude': set(["static/templates/settings/emoji-settings-admin.handlebars", "static/templates/settings/realm-filter-settings-admin.handlebars", - "static/templates/settings/bot-settings.handlebars", - "templates/zerver/email_log.html"]), + "static/templates/settings/bot-settings.handlebars"]), 'good_lines': [''], 'bad_lines': ['']}, {'pattern': "placeholder='[^{]",