Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend

frontend/client/res/templates/admin/integrations/index.tpl

@@ -3,8 +3,8 @@
 <div class="row">
     <div id="integrations-menu" class="col-sm-3">
     <ul class="list-group">
-    {{#each integrationList}}        
-        <li class="list-group-item"><a href="javascript:" class="integration-link" data-name="{{./this}}">{{./this}}</a></li>        
+    {{#each integrationList}}
+        <li class="list-group-item"><a href="javascript:" class="integration-link" data-name="{{./this}}">{{{translate ./this scope='Integration' category='titles'}}}</a></li>
     {{/each}}
     </ul>
     </div>
@@ -13,7 +13,7 @@
         <h4 id="integration-header" style="margin-top: 0px;"></h4>
         <div id="integration-content">
             {{{content}}}
-        </div>    
+        </div>
     </div>
 </div>
 

frontend/client/src/views/admin/integrations/index.js

@@ -91,7 +91,7 @@ Espo.define('views/admin/integrations/index', 'view', function (Dep) {
                 $('#integration-header').html('');
                 return;
             }
-            $('#integration-header').show().html(this.integration);
+            $('#integration-header').show().html(this.translate(this.integration, 'titles', 'Integration'));
         },
 
         updatePageTitle: function () {