CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-06-05 22:46:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix the strings I broke in 3785ffb15

Browse Source
This commit is contained in:
Bryan Housel
2018-12-29 17:30:35 -05:00
parent 3785ffb154
commit 192b4da9e6
4 changed files with 102 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/services/keepRight.js
+1 -1
View File
@@ -103,7 +103,7 @@ function tokenReplacements(d) {
group = '\\' + group + '\\';
}
replacements[i-1] = group;
replacements['var' + i] = group;
}
return replacements;
modules/ui/keepRight_details.js
+19 -12
View File
@@ -1,5 +1,6 @@
import { event as d3_event } from 'd3-selection';
import { dataEn } from '../../data';
import { errorTypes } from '../../data/keepRight.json';
import { t } from '../util/locale';
@@ -47,13 +48,16 @@ export function uiKeepRightDetails(context) {
titleEnter
.append('div')
.text(function() {
var result;
try {
result = t(stringBase + errorType + '.title');
} catch (e) {
result = t(stringBase + parentErrorType + '.title');
var et = dataEn.QA.keepRight.errorTypes[errorType];
var pt = dataEn.QA.keepRight.errorTypes[parentErrorType];
if (et && et.title) {
return t(stringBase + errorType + '.title');
} else if (pt && pt.title) {
return t(stringBase + parentErrorType + '.title');
} else {
return t('inspector.unknown');
}
return result;
});
@@ -70,13 +74,16 @@ export function uiKeepRightDetails(context) {
.append('div')
.attr('class', 'kr_error-details-description-text')
.html(function(d) {
var result;
try {
result = t(stringBase + errorType + '.description', d.replacements);
} catch (e) {
result = t(stringBase + parentErrorType + '.description');
var et = dataEn.QA.keepRight.errorTypes[errorType];
var pt = dataEn.QA.keepRight.errorTypes[parentErrorType];
if (et && et.description) {
return t(stringBase + errorType + '.description', d.replacements);
} else if (pt && pt.description) {
return t(stringBase + parentErrorType + '.description', d.replacements);
} else {
return t('inspector.unknown');
}
return result;
});
description.selectAll('.kr_error_description-id')