CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-30 17:00:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't require translations in coreValidator

Browse Source
This commit is contained in:
Quincy Morgan
2020-03-02 13:49:51 -08:00
parent 8579031298
commit c2d82eb9ce
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/core/validator.js
View File

@@ -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);
};

14
modules/ui/sections/validation_rules.js
View File

@@ -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) {