Merge remote-tracking branch 'origin/master'

atlas/js/templates/detail_page/DetailPageLayoutView_tmpl.html

@@ -56,7 +56,7 @@
                 <li role="classification"><a href="#tab-tagTable" aria-controls="tab-tagTable" role="tab" data-toggle="tab">数据模型</a></li>
                 <li role="audit" class="tab"><a href="#tab-audit" aria-controls="tab-audit" role="tab" data-toggle="tab">审计日志</a></li>
                 <li role="raudits" class="tab replicationTab" style="display:none"><a href="#tab-raudit" aria-controls="tab-raudit" role="tab" data-toggle="tab">导入/导出审计</a></li>
-                <li role="schema" class="tab schemaTable" style="display:none"><a href="#tab-schema" aria-controls="tab-schema" role="tab" data-toggle="tab">Schema</a></li>
+                <li role="schema" class="tab schemaTable" style="display:none"><a href="#tab-schema" aria-controls="tab-schema" role="tab" data-toggle="tab">模式</a></li>
                 <li role="profile" class="tab profileTab" style="display:none"><a href="#tab-profile" aria-controls="tab-profile" role="tab" data-toggle="tab">概述</a></li>
                 {{#if isTasksEnabled}}
                 <li role="pendingTask" class="tab"><a href="#tab-pendingTask" aria-controls="tab-pendingTask" role="tab" data-toggle="tab">任务</a></li>
@@ -151,4 +151,4 @@
         </div>
     </div>
 </div>
-</div>
+</div>

atlas/js/templates/graph/RelationshipLayoutView_tmpl.html

@@ -25,12 +25,12 @@
     </div>
     <div class="pull-right" data-id="zoomControl">
         <div class="btn-group pull-right">
-            <button type="button" id="zoom_in" class="btn btn-action btn-gray btn-sm lineageZoomButton" title="方大" data-id="refreshBtn"> <i class="fa fa-search-plus"></i></button>
+            <button type="button" id="zoom_in" class="btn btn-action btn-gray btn-sm lineageZoomButton" title="放大" data-id="refreshBtn"> <i class="fa fa-search-plus"></i></button>
             <button type="button" id="zoom_out" class="btn btn-action btn-gray btn-sm lineageZoomButton" title="缩小" data-id="refreshBtn"> <i class="fa fa-search-minus"></i></button>
         </div>
         <div class="btn-group pull-right" style="padding: 4px 15px;">
             <span class="entity-status active" title="活跃的实体"><i class="fa fa-long-arrow-right fa-fw" aria-hidden="true"></i>活跃</span>
-            <span class="entity-status deleted" title="被删除的实体"><i class="fa fa-long-arrow-right fa-fw" aria-hidden="true"></i>被删除</span>
+            <span class="entity-status deleted" title="已删除的实体"><i class="fa fa-long-arrow-right fa-fw" aria-hidden="true"></i>已删除</span>
         </div>
     </div>
 </div>

atlas/js/views/detail_page/PendingTaskTableLayoutView.js

@@ -16,9 +16,9 @@ define([ "require", "backbone", "hbs!tmpl/detail_page/PendingTaskTableLayoutView
             }, events;
         },
         initialize: function(options) {
-            _.extend(this, _.pick(options, "guid", "entity", "entityName", "attributeDefs")), 
-            this.pendingTaskCollection = new VEntityList(), this.limit = 25, this.offset = 0, 
-            this.pendingTaskCollection.url = UrlLinks.pendingTaskApiUrl(), this.entityModel = new this.pendingTaskCollection.model(), 
+            _.extend(this, _.pick(options, "guid", "entity", "entityName", "attributeDefs")),
+            this.pendingTaskCollection = new VEntityList(), this.limit = 25, this.offset = 0,
+            this.pendingTaskCollection.url = UrlLinks.pendingTaskApiUrl(), this.entityModel = new this.pendingTaskCollection.model(),
             this.pervOld = [], this.commonTableOptions = {
                 collection: this.pendingTaskCollection,
                 includeFilter: !1,
@@ -44,7 +44,7 @@ define([ "require", "backbone", "hbs!tmpl/detail_page/PendingTaskTableLayoutView
             this.fetchPendingTaskCollection();
         },
         fetchPendingTaskCollection: function() {
-            this.commonTableOptions.atlasPaginationOpts = this.getPaginationOptions(), this.fetchCollection(), 
+            this.commonTableOptions.atlasPaginationOpts = this.getPaginationOptions(), this.fetchCollection(),
             this.pendingTaskCollection.comparator = function(model) {
                 return -model.get("createdBy");
             };
@@ -67,7 +67,7 @@ define([ "require", "backbone", "hbs!tmpl/detail_page/PendingTaskTableLayoutView
                     that.pendingTaskCollection.state.pageSize = that.getPageCount(), that.pendingTaskCollection.fullCollection.reset(response);
                 },
                 complete: function() {
-                    that.$(".fontLoader").hide(), that.$(".tableOverlay").hide(), that.$(".auditTable").show(), 
+                    that.$(".fontLoader").hide(), that.$(".tableOverlay").hide(), that.$(".auditTable").show(),
                     that.renderTableLayoutView();
                 },
                 silent: !0
@@ -142,7 +142,7 @@ define([ "require", "backbone", "hbs!tmpl/detail_page/PendingTaskTableLayoutView
                     })
                 },
                 updatedTime: {
-                    label: "Updated Time",
+                    label: "更新时间",
                     cell: "html",
                     editable: !1,
                     sortable: !1,
@@ -158,4 +158,4 @@ define([ "require", "backbone", "hbs!tmpl/detail_page/PendingTaskTableLayoutView
         }
     });
     return PendingTaskTableLayoutView;
-});
+});