From c2d82eb9ce668fcc170727fc234bed1785649297 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Mon, 2 Mar 2020 13:49:51 -0800 Subject: [PATCH] Don't require translations in coreValidator --- modules/core/validator.js | 8 +------- modules/ui/sections/validation_rules.js | 14 +++++++++----- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/modules/core/validator.js b/modules/core/validator.js index 76e8b3a91..0e21a7647 100644 --- a/modules/core/validator.js +++ b/modules/core/validator.js @@ -4,7 +4,6 @@ import { coreDifference } from './difference'; import { geoExtent } from '../geo/extent'; import { modeSelect } from '../modes/select'; import { utilArrayGroupBy, utilRebind } from '../util'; -import { t } from '../util/locale'; import * as Validations from '../validations/index'; @@ -241,12 +240,7 @@ export function coreValidator(context) { validator.getRuleKeys = function() { - return Object.keys(_rules) - .filter(function(key) { return key !== 'maprules'; }) - .sort(function(key1, key2) { - // alphabetize by localized title - return t('issues.' + key1 + '.title') < t('issues.' + key2 + '.title') ? -1 : 1; - }); + return Object.keys(_rules); }; diff --git a/modules/ui/sections/validation_rules.js b/modules/ui/sections/validation_rules.js index 507e84509..4eedd4a46 100644 --- a/modules/ui/sections/validation_rules.js +++ b/modules/ui/sections/validation_rules.js @@ -18,6 +18,13 @@ export function uiSectionValidationRules(context) { .disclosureContent(renderDisclosureContent) .title(t('issues.rules.title')); + var _ruleKeys = context.validator().getRuleKeys() + .filter(function(key) { return key !== 'maprules'; }) + .sort(function(key1, key2) { + // alphabetize by localized title + return t('issues.' + key1 + '.title') < t('issues.' + key2 + '.title') ? -1 : 1; + }); + function renderDisclosureContent(selection) { var container = selection.selectAll('.issues-rulelist-container') .data([0]); @@ -49,8 +56,7 @@ export function uiSectionValidationRules(context) { .attr('href', '#') .text(t('issues.disable_all')) .on('click', function() { - var keys = context.validator().getRuleKeys(); - context.validator().disableRules(keys); + context.validator().disableRules(_ruleKeys); }); @@ -58,10 +64,8 @@ export function uiSectionValidationRules(context) { container = container .merge(containerEnter); - var ruleKeys = context.validator().getRuleKeys(); - container.selectAll('.issue-rules-list') - .call(drawListItems, ruleKeys, 'checkbox', 'rule', toggleRule, isRuleEnabled); + .call(drawListItems, _ruleKeys, 'checkbox', 'rule', toggleRule, isRuleEnabled); } function drawListItems(selection, data, type, name, change, active) {