Skip to content

Commit 61f4ece

Browse files
albert-githubalbert-github
committed
Unifying output in respect to min/max/def values.
The representation in the the doxywizard of some values was not correct, they should be represented as "code", as such `minmaxdef` is replaced by minmaxdefcode`and consequently `minmaxdef` became obsolete. Analogous for `defvaltxt` and `defvalcode`.
1 parent c7f4ebf commit 61f4ece

11 files changed

Lines changed: 5 additions & 24 deletions

File tree

‎addon/doxywizard/expert.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ QString Expert::getDocsForNode(const QDomElement &child) const
855855
QString minval = child.attribute(SA("minval"));
856856
QString maxval = child.attribute(SA("maxval"));
857857
QString defval = child.attribute(SA("defval"));
858-
docs+=m_messages[SA("minmaxdef")].arg(minval).arg(maxval).arg(defval);
858+
docs+=m_messages[SA("minmaxdefcode")].arg(minval).arg(maxval).arg(defval);
859859
}
860860
else if (type==SA("bool"))
861861
{

‎src/config.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4428,10 +4428,8 @@ This setting is not only used for dot files but also for msc temporary files.
44284428
<option type='obsolete' orgtype='bool' id='DOT_MULTI_TARGETS'/>
44294429
</group>
44304430
<generator>
4431-
<message name='minmaxdef'><![CDATA[Minimum value: {0}, maximum value: {1}, default value: {2}.]]></message>
4432-
<message name='minmaxdefcode'><![CDATA[ Minimum value: <code>{0}</code>, maximum value: <code>{1}</code>, default value: <code>{2}</code>.]]></message>
4431+
<message name='minmaxdefcode'><![CDATA[Minimum value: <code>{0}</code>, maximum value: <code>{1}</code>, default value: <code>{2}</code>.]]></message>
44334432
<message name='possible'><![CDATA[Possible values are: ]]></message>
4434-
<message name='defvaltxt'><![CDATA[The default value is: {0}.]]></message>
44354433
<message name='defvalcode'><![CDATA[The default value is: <code>{0}</code>.]]></message>
44364434
<message name='defdir'><![CDATA[The default directory is: <code>{0}</code>.]]></message>
44374435
<message name='deffile'><![CDATA[The default file is: <code>{0}</code>.]]></message>

‎src/configgen.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,9 @@ def prepCDocs(node):
191191
elif (type == 'int'):
192192
minval = node.getAttribute('minval')
193193
maxval = node.getAttribute('maxval')
194-
doc += "<br/>" + messages['minmaxdef'].format(minval, maxval, defval)
194+
doc += "<br/>" + messages['minmaxdefcode'].format(minval, maxval, defval)
195195
elif (type == 'bool'):
196-
doc += "<br/>" + messages['defvaltxt'].format("YES" if (defval == "1") else "NO")
196+
doc += "<br/>" + messages['defvalcode'].format("YES" if (defval == "1") else "NO")
197197
elif (type == 'list'):
198198
if format == 'string':
199199
values = collectValues(node)

‎src/i18n/config_de.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1825,10 +1825,8 @@
18251825
</option>
18261826
</group>
18271827
<generator>
1828-
<message name="minmaxdef"><![CDATA[Mindestwert: {0}, Höchstwert: {1}, Standardwert: {2}.]]></message>
1829-
<message name="minmaxdefcode"><![CDATA[ Mindestwert: <code>{0}</code>, Höchstwert: <code>{1}</code>, Standardwert: <code>{2}</code>, ]]></message>
1828+
<message name="minmaxdefcode"><![CDATA[Mindestwert: <code>{0}</code>, Höchstwert: <code>{1}</code>, Standardwert: <code>{2}</code>.]]></message>
18301829
<message name="possible"><![CDATA[Mögliche Werte sind: ]]></message>
1831-
<message name="defvaltxt"><![CDATA[Der Standardwert ist: {0}.]]></message>
18321830
<message name="defvalcode"><![CDATA[Der Standardwert ist: <code>{0}</code>.]]></message>
18331831
<message name="defdir"><![CDATA[Das Standardverzeichnis ist: <code>{0}</code>.]]></message>
18341832
<message name="deffile"><![CDATA[Die Standarddatei ist: <code>{0}</code>.]]></message>

‎src/i18n/config_es.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1826,10 +1826,8 @@
18261826
</option>
18271827
</group>
18281828
<generator>
1829-
<message name='minmaxdef'><![CDATA[Valor mínimo: {0}, valor máximo: {1}, valor predeterminado: {2}.]]></message>
18301829
<message name='minmaxdefcode'><![CDATA[Valor mínimo: <code>{0}</code>, valor máximo: <code>{1}</code>, valor predeterminado: <code>{2}</code>.]]></message>
18311830
<message name='possible'><![CDATA[Los valores posibles son:]]></message>
1832-
<message name='defvaltxt'><![CDATA[El valor predeterminado es: {0}.]]></message>
18331831
<message name='defvalcode'><![CDATA[El valor predeterminado es: <code>{0}</code>.]]></message>
18341832
<message name='defdir'><![CDATA[El directorio predeterminado es: <code>{0}</code>.]]></message>
18351833
<message name='deffile'><![CDATA[El archivo predeterminado es: <code>{0}</code>.]]></message>

‎src/i18n/config_fr.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1825,10 +1825,8 @@
18251825
</option>
18261826
</group>
18271827
<generator>
1828-
<message name='minmaxdef'><![CDATA[Valeur minimum : {0}, valeur maximum : {1}, valeur par défaut : {2}.]]></message>
18291828
<message name='minmaxdefcode'><![CDATA[Valeur minimum : <code>{0}</code>, valeur maximum : <code>{1}</code>, valeur par défaut : <code>{2}</code>.]]></message>
18301829
<message name='possible'><![CDATA[Les valeurs possibles sont :]]></message>
1831-
<message name='defvaltxt'><![CDATA[La valeur par défaut est : {0}.]]></message>
18321830
<message name='defvalcode'><![CDATA[La valeur par défaut est : <code>{0}</code>.]]></message>
18331831
<message name='defdir'><![CDATA[Le répertoire par défaut est : <code>{0}</code>.]]></message>
18341832
<message name='deffile'><![CDATA[Le fichier par défaut est : <code>{0}</code>.]]></message>

‎src/i18n/config_ja.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1824,10 +1824,8 @@
18241824
</option>
18251825
</group>
18261826
<generator>
1827-
<message name='minmaxdef'><![CDATA[最小値: {0}, 最大値: {1}, デフォルト値: {2}。]]></message>
18281827
<message name='minmaxdefcode'><![CDATA[最小値: <code>{0}</code>, 最大値: <code>{1}</code>, デフォルト値: <code>{2}</code>。]]></message>
18291828
<message name='possible'><![CDATA[可能な値は:]]></message>
1830-
<message name='defvaltxt'><![CDATA[デフォルト値は {0} です。]]></message>
18311829
<message name='defvalcode'><![CDATA[デフォルト値は <code>{0}</code> です。]]></message>
18321830
<message name='defdir'><![CDATA[デフォルトのディレクトリは <code>{0}</code> です。]]></message>
18331831
<message name='deffile'><![CDATA[デフォルトのファイルは <code>{0}</code> です。]]></message>

‎src/i18n/config_ko.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1823,10 +1823,8 @@
18231823
</option>
18241824
</group>
18251825
<generator>
1826-
<message name='minmaxdef'><![CDATA[최소값: {0}, 최대값: {1}, 기본값: {2}.]]></message>
18271826
<message name='minmaxdefcode'><![CDATA[최소값: <code>{0}</code>, 최대값: <code>{1}</code>, 기본값: <code>{2}</code>.]]></message>
18281827
<message name='possible'><![CDATA[가능한 값:]]></message>
1829-
<message name='defvaltxt'><![CDATA[기본값은 {0}입니다.]]></message>
18301828
<message name='defvalcode'><![CDATA[기본값은 <code>{0}</code>입니다.]]></message>
18311829
<message name='defdir'><![CDATA[기본 디렉토리는 <code>{0}</code>입니다.]]></message>
18321830
<message name='deffile'><![CDATA[기본 파일은 <code>{0}</code>입니다.]]></message>
@@ -1840,5 +1838,4 @@
18401838
<message name='andtxt'><![CDATA[그리고]]></message>
18411839
<message name='notetxt'><![CDATA[참고:]]></message>
18421840
<message name='seealsotxt'><![CDATA[참조:]]></message>
1843-
</generator>
18441841
</doxygenconfig>

‎src/i18n/config_ru.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2396,10 +2396,8 @@ doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
23962396
</option>
23972397
</group>
23982398
<generator>
2399-
<message name='minmaxdef'><![CDATA[Минимальное значение: {0}, максимальное значение: {1}, значение по умолчанию: {2}.]]></message>
24002399
<message name='minmaxdefcode'><![CDATA[Минимальное значение: <code>{0}</code>, максимальное значение: <code>{1}</code>, значение по умолчанию: <code>{2}</code>.]]></message>
24012400
<message name='possible'><![CDATA[Возможные значения:]]></message>
2402-
<message name='defvaltxt'><![CDATA[Значение по умолчанию: {0}.]]></message>
24032401
<message name='defvalcode'><![CDATA[Значение по умолчанию: <code>{0}</code>.]]></message>
24042402
<message name='defdir'><![CDATA[Каталог по умолчанию: <code>{0}</code>.]]></message>
24052403
<message name='deffile'><![CDATA[Файл по умолчанию: <code>{0}</code>.]]></message>

‎src/i18n/config_zh_CN.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1821,10 +1821,8 @@
18211821
</option>
18221822
</group>
18231823
<generator>
1824-
<message name='minmaxdef'><![CDATA[最小值：{0}，最大值：{1}，默认值：{2}。]]></message>
18251824
<message name='minmaxdefcode'><![CDATA[最小值：<code>{0}</code>，最大值：<code>{1}</code>，默认值：<code>{2}</code>。]]></message>
18261825
<message name='possible'><![CDATA[可能的值有：]]></message>
1827-
<message name='defvaltxt'><![CDATA[默认值为：{0}。]]></message>
18281826
<message name='defvalcode'><![CDATA[默认值为：<code>{0}</code>。]]></message>
18291827
<message name='defdir'><![CDATA[默认目录为：<code>{0}</code>。]]></message>
18301828
<message name='deffile'><![CDATA[默认文件为：<code>{0}</code>。]]></message>

0 commit comments

Comments
 (0)