diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/merges/show.html.slim | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/merges/show.html.slim b/app/views/merges/show.html.slim index 579995ebf..b5d7e9d2d 100644 --- a/app/views/merges/show.html.slim +++ b/app/views/merges/show.html.slim @@ -7,7 +7,8 @@ .col-lg-6.col-md-6.col-sm-12.col-xs-12 = definition_list t('metadatas'), { @merge.class.human_attribute_name(:referentials) => @merge.referentials.map(&:name).join(', '), + @merge.class.human_attribute_name(:operator) => @merge.creator, @merge.class.human_attribute_name(:status) => @merge.status, - @merge.class.human_attribute_name(:created_at) => @merge.created_at, - @merge.class.human_attribute_name(:started_at) => @merge.started_at, - @merge.class.human_attribute_name(:ended_at) => @merge.ended_at } + @merge.class.human_attribute_name(:created_at) => l(@merge.created_at), + @merge.class.human_attribute_name(:started_at) => l(@merge.started_at), + @merge.class.human_attribute_name(:ended_at) => l(@merge.ended_at) } |