Commit 8f8dd533 authored by Rieks Joosten's avatar Rieks Joosten

Merge branch 'TEv1-glossary-enhancements' into terminology-rieks

# Conflicts:
#	docs/terms/legal-system.md
parents 31b742d2 800a6d8a
Pipeline #17260 passed with stage
in 2 minutes and 55 seconds
// Purpose: resolve all merge conflicts by accepting the CURRENT changes (change $1 to $2 to accept INCOMING changese)
// This is a script that can be run by the Batch Replacer extension of VSCode .
// Press Ctrl-Shift-P as you are editing this script, then search for `Batch Replacer`, and execute it.
// Purpose: resolve all merge conflicts by either
// - uncommenting `with "$1"` to accept _all_ CURRENT changes
// - uncommenting `with "$2"` to accept _all_ INCOMING changese
// If you do not specify the files to work on, the replace will be global (throughout the workspace).
// `filter "document.txt"` - document.txt file in the root folder
......@@ -13,7 +12,7 @@
filter "docs/**/*.md"
replace-regex "^<<<<<<<.*\n((?:.*\n)*)=======\n((?:.*\n)*)>>>>>>>.*\n"
// To accept CURRENT changes
with "$1"
// To accept INCOMING changes
// To accept _all_ CURRENT changes, uncomment the line below
// with "$1"
// To accept _all_ INCOMING changes, uncomment the line below
// with "$2"
......@@ -22,8 +22,6 @@ We may use the phrase %%natural guardianship|guardianship%% to refer to an guard
The %%Guardianship pattern|pattern-guardianship%% provides an overview of how this concept fits in with related concepts.
The %%Guardianship pattern|pattern-guardianship%% provides an overview of how this concept fits in with related concepts.
### Purpose
**Guardianship** is a means by which %%jurisdictions|jurisdiction%% provide assurances to %%parties|party%% (within its scope) that they can enjoy, dispose of and control in pretty much any way they like. The %%legal system|legal-system%% of the %%jurisdiction|jurisdiction%% specifies these rights, and provides ways in which the %%owner|owner%% can exercize them (that provides the assurance).
......
......@@ -14,8 +14,6 @@ A **Legal System** is a system in which rules are defined ([legislature](https:/
The %%Jurisdictions pattern|pattern-jurisdiction%% provides an overview of how this concept fits in with related concepts.
The %%Jurisdictions pattern|pattern-jurisdiction%% provides an overview of how this concept fits in with related concepts.
### Purpose
The ability to distinguish between (non)legal-systems is a very generic enabler to tell which rules (laws, policies, guidelines, etc.) will apply within its %%scope|scope%%, as well as to evaluate the risks that we run when not complying with the rules. Conversely, the %%party|party%% that operates a legal system may provide additional rules to help mitigate such risks.
......
......@@ -143,7 +143,9 @@ async function getGlossaryTerms(files) {
// Get the popup text for the term
let hoverText = await getHoverText(referencePath);
const new_final_url = referencePath.slice(1,-3);
const glossary_file_path = path.resolve(process.cwd(), glossaryPath);
const term_path = path.resolve(process.cwd(), TERMS_DIR, reference);
const new_final_url = getRelativePath(glossary_file_path, term_path);
if (hoverText === undefined) {
var new_text = ('<Term reference="' + new_final_url + '">' +
text + '</Term>');
......@@ -173,7 +175,7 @@ function generateGlossary(data) {
let undefineds = "";
data.forEach(item => {
if (item.title !== undefined) {
if (item.hoverText === undefined) {
if (item.glossaryText === undefined) {
undefineds = undefineds + `\n- [${item.title}](${item.filepath})\n`;
} else {
content = content + `\n\n### **[${item.title}](${item.filepath})**\n${item.glossaryText}\n`;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment