fix: do not display {{ identifier }} in description
This commit is contained in:
parent
f9d3428bf3
commit
d26653d95c
8 changed files with 13 additions and 8 deletions
|
|
@ -599,7 +599,7 @@ class CommonFormatter:
|
||||||
force_identifiers: Optional[str],
|
force_identifiers: Optional[str],
|
||||||
*,
|
*,
|
||||||
with_to_phrase: bool=True,
|
with_to_phrase: bool=True,
|
||||||
) -> str():
|
) -> str:
|
||||||
def _get_description(description, identifiers, delete=False, new=[]):
|
def _get_description(description, identifiers, delete=False, new=[]):
|
||||||
if identifiers and "{{ identifier }}" in description:
|
if identifiers and "{{ identifier }}" in description:
|
||||||
if type_ == "variable":
|
if type_ == "variable":
|
||||||
|
|
@ -638,8 +638,11 @@ class CommonFormatter:
|
||||||
if "description" in modified_attributes:
|
if "description" in modified_attributes:
|
||||||
name, previous, new = modified_attributes["description"]
|
name, previous, new = modified_attributes["description"]
|
||||||
if previous:
|
if previous:
|
||||||
|
identifiers = modified_attributes.get("identifiers", [])
|
||||||
|
if not identifiers:
|
||||||
|
identifiers = informations.get("identifiers")
|
||||||
modified_description = _get_description(
|
modified_description = _get_description(
|
||||||
previous[0], modified_attributes.get("identifiers", []), delete=True
|
previous[0], identifiers, delete=True
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
modified_description = None
|
modified_description = None
|
||||||
|
|
|
||||||
|
|
@ -10,5 +10,6 @@ var: # A suffix variable
|
||||||
description: A dynamic family
|
description: A dynamic family
|
||||||
dynamic:
|
dynamic:
|
||||||
variable: _.var
|
variable: _.var
|
||||||
|
|
||||||
var: # A dynamic variable
|
var: # A dynamic variable
|
||||||
...
|
...
|
||||||
|
|
|
||||||
|
|
@ -10,5 +10,6 @@ var: # A suffix variable
|
||||||
description: A dynamic family {{ identifier }}
|
description: A dynamic family {{ identifier }}
|
||||||
dynamic:
|
dynamic:
|
||||||
variable: _.var
|
variable: _.var
|
||||||
|
|
||||||
var: # A dynamic variable {{ identifier }}
|
var: # A dynamic variable {{ identifier }}
|
||||||
...
|
...
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
| Variable | Description
|
| Variable | Description
|
||||||
| **dyn__val1__.var** +
|
| **dyn__val1__.var** +
|
||||||
**dyn__val2__.var** +
|
**dyn__val2__.var** +
|
||||||
`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `basic` `mandatory` | +++A dynamic variable {{ identifier }}.+++ +
|
`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `basic` `mandatory` | +++A dynamic variable __val1__ or __val2__.+++ +
|
||||||
#A dynamic variable.#
|
#A dynamic variable.#
|
||||||
|====
|
|====
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
| Variable | Description |
|
| Variable | Description |
|
||||||
|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------|
|
|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------|
|
||||||
| **<a id="dyn:::identifier:::.var" name="dyn:::identifier:::.var">dyn*val1*.var</a>**<br/>**dyn*val2*.var**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | ~~A dynamic variable {{ identifier }}.~~<br/><ins>A dynamic variable.</ins> |
|
| **<a id="dyn:::identifier:::.var" name="dyn:::identifier:::.var">dyn*val1*.var</a>**<br/>**dyn*val2*.var**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | ~~A dynamic variable *val1* or *val2*.~~<br/><ins>A dynamic variable.</ins> |
|
||||||
|
|
||||||
</details>
|
</details>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,10 +2,10 @@
|
||||||
|
|
||||||
<table>
|
<table>
|
||||||
<thead>
|
<thead>
|
||||||
<tr><th>Variable </th><th>Description </th></tr>
|
<tr><th>Variable </th><th>Description </th></tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr><td><b>dyn<i>val1</i>.var</b><br/><b>dyn<i>val2</i>.var</b><br/><mark><a href='https://rougail.readthedocs.io/en/latest/variable.html#variables-types'>string</a></mark> <mark>basic</mark> <mark>mandatory</mark></td><td><del>A dynamic variable {{ identifier }}.</del><br/><ins>A dynamic variable.</ins></td></tr>
|
<tr><td><b>dyn<i>val1</i>.var</b><br/><b>dyn<i>val2</i>.var</b><br/><mark><a href='https://rougail.readthedocs.io/en/latest/variable.html#variables-types'>string</a></mark> <mark>basic</mark> <mark>mandatory</mark></td><td><del>A dynamic variable <i>val1</i> or <i>val2</i>.</del><br/><ins>A dynamic variable.</ins></td></tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,5 +2,5 @@
|
||||||
|
|
||||||
| Variable | Description |
|
| Variable | Description |
|
||||||
|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------|
|
|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------|
|
||||||
| **<a id="dyn:::identifier:::.var" name="dyn:::identifier:::.var">dyn*val1*.var</a>**<br/>**dyn*val2*.var**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | ~~A dynamic variable {{ identifier }}.~~<br/><ins>A dynamic variable.</ins> |
|
| **<a id="dyn:::identifier:::.var" name="dyn:::identifier:::.var">dyn*val1*.var</a>**<br/>**dyn*val2*.var**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | ~~A dynamic variable *val1* or *val2*.~~<br/><ins>A dynamic variable.</ins> |
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
|
┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
|
||||||
┃[1m [0m[1mVariable [0m[1m [0m┃[1m [0m[1mDescription [0m[1m [0m┃
|
┃[1m [0m[1mVariable [0m[1m [0m┃[1m [0m[1mDescription [0m[1m [0m┃
|
||||||
┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩
|
┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩
|
||||||
│ [1mdyn[0m[1;3mval1[0m[1m.var[0m │ [9mA dynamic variable {{ identifier }}.[0m │
|
│ [1mdyn[0m[1;3mval1[0m[1m.var[0m │ [9mA dynamic variable [0m[3;9mval1[0m[9m or [0m[3;9mval2[0m[9m.[0m │
|
||||||
│ [1mdyn[0m[1;3mval2[0m[1m.var[0m │ [4mA dynamic variable.[0m │
|
│ [1mdyn[0m[1;3mval2[0m[1m.var[0m │ [4mA dynamic variable.[0m │
|
||||||
│ [1;7m string [0m [1;7m basic [0m [1;7m mandatory [0m │ │
|
│ [1;7m string [0m [1;7m basic [0m [1;7m mandatory [0m │ │
|
||||||
└───────────────────────────────────────┴──────────────────────────────────────┘
|
└───────────────────────────────────────┴──────────────────────────────────────┘
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue