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

Show more Osmose strings in the UI

Browse Source 
Also only add sections where appropriate
This commit is contained in:
SilentSpike
2020-02-03 11:39:40 +00:00
parent 7a00c0a974
commit 010ca30999
4 changed files with 51 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/core.yaml
View File

@@ -830,6 +830,8 @@ en:
osmose:
title: Osmose Issue
elems_title: Issue Elements
fix_title: Fix Guidelines
trap_title: Common Pitfalls
details:
values: Issue Values
tags: Issue Tags

2
dist/locales/en.json vendored
View File

@@ -1034,6 +1034,8 @@
"osmose": {
"title": "Osmose Issue",
"elems_title": "Issue Elements",
"fix_title": "Fix Guidelines",
"trap_title": "Common Pitfalls",
"details": {
"values": "Issue Values",
"tags": "Issue Tags",

2
modules/services/osmose.js
View File

@@ -258,6 +258,8 @@ export default {
// If string exists, value is an object with key 'auto' for string
let { title, detail, trap, fix, example } = item.class[k];
if (title) issueStrings.title = title.auto;
// TODO: Replace \[(.+?)\]\((.+?)\) pattern with <a href="\2">\1</a>
// TODO: Replace `(.+?)` with some sort of code styling
if (detail) issueStrings.detail = detail.auto;
if (trap) issueStrings.trap = trap.auto;
if (fix) issueStrings.fix = fix.auto;

62
modules/ui/osmose_details.js
View File

@@ -10,17 +10,16 @@ import { utilDisplayName, utilEntityOrMemberSelector } from '../util';
export function uiOsmoseDetails(context) {
var _error;
let _error;
const unknown = t('inspector.unknown');
function issueDetail(d) {
var unknown = t('inspector.unknown');
function issueString(d, type) {
if (!d) return unknown;
// Issue description supplied by Osmose
var s = services.osmose.getStrings(d.error_type);
return ('detail' in s) ? s.detail : unknown;
return (type in s) ? s[type] : unknown;
}
@@ -51,22 +50,50 @@ export function uiOsmoseDetails(context) {
descriptionEnter
.append('div')
.attr('class', 'error-details-description-text')
.html(issueDetail);
.html(d => issueString(d, 'detail'));
// Elements (populated later as data is requested)
descriptionEnter
.append('h4')
.attr('class', 'error-details-subtitle')
.text(() => t('QA.osmose.elems_title'));
const detailsDiv = descriptionEnter.append('div');
var elementList = descriptionEnter
.append('ul')
.attr('class', 'error-details-elements');
// Suggested Fix (musn't exist for every issue type)
if (issueString(_error, 'fix') !== unknown) {
descriptionEnter
.append('h4')
.attr('class', 'error-details-subtitle')
.text(() => t('QA.osmose.fix_title'));
descriptionEnter
.append('div')
.attr('class', 'error-details-description-text')
.html(d => issueString(d, 'fix'));
}
// Common Pitfalls (musn't exist for every issue type)
if (issueString(_error, 'trap') !== unknown) {
descriptionEnter
.append('h4')
.attr('class', 'error-details-subtitle')
.text(() => t('QA.osmose.trap_title'));
descriptionEnter
.append('div')
.attr('class', 'error-details-description-text')
.html(d => issueString(d, 'trap'));
}
services.osmose.loadErrorDetail(_error, (err, d) => {
if (d.elems === undefined) return;
// No details to add if there are no associated issue elements
if (!d.elems || d.elems.length === 0) return;
elementList.selectAll('.error_entity_link')
detailsDiv
.append('h4')
.attr('class', 'error-details-subtitle')
.text(() => t('QA.osmose.elems_title'));
detailsDiv
.append('ul')
.attr('class', 'error-details-elements')
.selectAll('.error_entity_link')
.data(d.elems)
.enter()
.append('li')
@@ -122,16 +149,17 @@ export function uiOsmoseDetails(context) {
}
});
// TODO: Show the dynamic subtitle string directly once langs parameter is added
// Things like keys and values are dynamic details
const special = { tags: true, values: true, chars: true, sug_tags: true };
for (const type in special) {
if (type in d) {
descriptionEnter
detailsDiv
.append('h4')
.attr('class', 'error-details-subtitle')
.text(() => t(`QA.osmose.details.${type}`));
descriptionEnter
detailsDiv
.append('ul')
.attr('class', 'error-details-list')
.selectAll('li')