YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #289 from YunoHost/fix-action-description

Browse source 
[fix] action description
This commit is contained in:
Alexandre Aubin 2020-04-06 14:37:39 +02:00 • committed by GitHub
commit 3c234f73df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/js/yunohost/controllers/apps.js
View file

@ -302,10 +302,11 @@
formatYunoHostStyleArguments(action.arguments, c.params);
// Multilingual description
action.description = (typeof action.description[y18n.locale] !== 'undefined') ?
action.description[y18n.locale] :
action.description['en']
;
if (action.description && Array.isArray(action.description))
action.description = (typeof action.description[y18n.locale] !== 'undefined') ?
action.description[y18n.locale] :
action.description['en']
;
});

2
src/views/app/app_actions.ms
View file

@ -17,7 +17,9 @@
<h2 class="panel-title">{{name}}</h2>
</div>
<div class="panel-body">
{{#if description}}
<p>{{description}}</p>
{{/if}}
{{#if arguments}}
{{#arguments}}
<div class="form-group">