| ... |
... |
@@ -1,10 +1,10 @@ |
| 1 |
1 |
{{velocity}} |
| 2 |
2 |
## If the translation key exists, use its value, otherwise use to the provided fallback value. |
| 3 |
3 |
#macro (translateOrElse $translationKey $fallback) |
| 4 |
|
- #if($services.localization.get($translationKey)) |
|
4 |
+ #if($services.localization.get($translationKey)) |
| 5 |
5 |
$services.rendering.escape($services.localization.render($translationKey), 'xwiki/2.1')## |
| 6 |
6 |
#else |
| 7 |
|
- $fallback## |
|
7 |
+ $services.rendering.escape($fallback, 'xwiki/2.1')## |
| 8 |
8 |
#end |
| 9 |
9 |
#end |
| 10 |
10 |
|
| ... |
... |
@@ -17,7 +17,7 @@ |
| 17 |
17 |
#set ($discard = $wikiMacroMap.put($macroObject.id, [$macroDocument.documentReference.toString(), $macroObject.visibility])) |
| 18 |
18 |
#end |
| 19 |
19 |
|={{translation key='help.macroList.id'/}}|={{translation key='help.macroList.name'/}}|={{translation key='help.macroList.categories'/}}|={{translation key='help.macroList.description'/}}|={{translation key='help.macroList.visibility'/}} |
| 20 |
|
-#foreach ($descriptor in $services.rendering.getMacroDescriptors('xwiki/2.1')) |
|
20 |
+#foreach ($descriptor in $collectiontool.sort($services.rendering.getMacroDescriptors('xwiki/2.1'), 'id.id:asc')) |
| 21 |
21 |
#set ($wikiMacroData = $wikiMacroMap.get($descriptor.id.id)) |
| 22 |
22 |
#if ("$!wikiMacroData" != '') |
| 23 |
23 |
#set ($displayId = "[[$services.rendering.escape($services.rendering.escape($descriptor.id, 'xwiki/2.1'), 'xwiki/2.1')>>$wikiMacroData.get(0)]]") |