Merge remote-tracking branch 'origin/master'

atlas/js/views/audit/AuditTableLayoutView.js

@@ -137,13 +137,13 @@ define([ "require", "backbone", "hbs!tmpl/audit/AuditTableLayoutView_tmpl", "col
                     }
                 },
                 user: {
-                    label: "Users",
+                    label: "用户",
                     cell: "html",
                     editable: !1,
                     headerCell: that.backgridHeaderClickHandel()
                 },
                 timestamp: {
-                    label: "Timestamp",
+                    label: "时间戳",
                     cell: "html",
                     editable: !1,
                     headerCell: that.backgridHeaderClickHandel(),
@@ -156,7 +156,7 @@ define([ "require", "backbone", "hbs!tmpl/audit/AuditTableLayoutView_tmpl", "col
                     })
                 },
                 action: {
-                    label: "Actions",
+                    label: "操作",
                     cell: "html",
                     editable: !1,
                     headerCell: that.backgridHeaderClickHandel(),

atlas/js/views/business_metadata/BusinessMetadataAttrTableLayoutView.js

@@ -91,7 +91,7 @@ define([ "require", "backbone", "hbs!tmpl/business_metadata/BusinessMetadataAttr
         getBusinessMetadataTableColumns: function() {
             return this.businessMetadataAttr.constructor.getTableCols({
                 name: {
-                    label: "Attribute Name",
+                    label: "属性名称",
                     cell: "html",
                     editable: !1,
                     formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
@@ -101,7 +101,7 @@ define([ "require", "backbone", "hbs!tmpl/business_metadata/BusinessMetadataAttr
                     })
                 },
                 typeName: {
-                    label: "Type Name",
+                    label: "类型名称",
                     cell: "html",
                     editable: !1,
                     formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
@@ -111,12 +111,12 @@ define([ "require", "backbone", "hbs!tmpl/business_metadata/BusinessMetadataAttr
                     })
                 },
                 searchWeight: {
-                    label: "Search Weight",
+                    label: "搜索权重",
                     cell: "String",
                     editable: !1
                 },
                 enableMultipleValue: {
-                    label: "Enable Multivalues",
+                    label: "启用多值",
                     cell: "html",
                     editable: !1,
                     sortable: !1,
@@ -129,7 +129,7 @@ define([ "require", "backbone", "hbs!tmpl/business_metadata/BusinessMetadataAttr
                     })
                 },
                 maxStrLength: {
-                    label: "Max Length",
+                    label: "最大长度",
                     cell: "html",
                     editable: !1,
                     formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
@@ -141,7 +141,7 @@ define([ "require", "backbone", "hbs!tmpl/business_metadata/BusinessMetadataAttr
                     })
                 },
                 applicableEntityTypes: {
-                    label: "Entity Type(s)",
+                    label: "实体类型",
                     cell: "html",
                     editable: !1,
                     formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
@@ -157,7 +157,7 @@ define([ "require", "backbone", "hbs!tmpl/business_metadata/BusinessMetadataAttr
                     })
                 },
                 tool: {
-                    label: "Action",
+                    label: "操作",
                     cell: "html",
                     editable: !1,
                     sortable: !1,

atlas/js/views/business_metadata/BusinessMetadataTableLayoutView.js

@@ -157,7 +157,7 @@ define([ "require", "backbone", "hbs!tmpl/business_metadata/BusinessMetadataTabl
                     alwaysVisible: !0,
                     expand: function(el, model) {
                         el.attr("colspan", "8");
-                        var attrTableHeading = ($("table"), $("tbody"), "<thead><td style='display:table-cell'><b>Attribute</b></td><td style='display:table-cell'><b>Type</b></td><td style='display:table-cell'><b>Search Weight</b></td><td style='display:table-cell'><b>Enable Multivalues</b></td><td style='display:table-cell'><b>Max Length</b></td><td style='display:table-cell'><b>Applicable Type(s)</b></td><td style='display:table-cell'><b>Action</b></td></thead>"), attrRow = "";
+                        var attrTableHeading = ($("table"), $("tbody"), "<thead><td style='display:table-cell'><b>属性</b></td><td style='display:table-cell'><b>类型</b></td><td style='display:table-cell'><b>搜索权重</b></td><td style='display:table-cell'><b>启用多值</b></td><td style='display:table-cell'><b>最大长度</b></td><td style='display:table-cell'><b>适用类型</b></td><td style='display:table-cell'><b>操作</b></td></thead>"), attrRow = "";
                         if (model.attributes && model.attributes.attributeDefs.length) {
                             _.each(model.attributes.attributeDefs, function(attrObj) {
                                 var applicableEntityTypes = "", typeName = attrObj.typeName, multiSelect = "", maxString = "NA";

atlas/js/views/detail_page/DetailPageLayoutView.js

@@ -322,7 +322,7 @@ define([ "require", "backbone", "hbs!tmpl/detail_page/DetailPageLayoutView_tmpl"
                     relationshipGuid: termObj.relationshipGuid
                 },
                 collection: that.glossaryCollection,
-                msg: "<div class='ellipsis-with-margin'>Remove: <b>" + _.escape(termName) + "</b> assignment from <b>" + this.name + "?</b></div>",
+                msg: "<div class='ellipsis-with-margin'>移除 <b>" + _.escape(termName) + "</b> 和 <b>" + this.name + "的关联?</b></div>",
                 titleMessage: Messages.glossary.removeTermfromEntity,
                 isEntityView: !0,
                 buttonText: "移除",
@@ -336,7 +336,7 @@ define([ "require", "backbone", "hbs!tmpl/detail_page/DetailPageLayoutView_tmpl"
         generateTag: function(tagObject) {
             var tagData = "", propagatedTagListData = "";
             _.each(tagObject.self, function(val) {
-                tagData += '<span class="btn btn-action btn-sm btn-icon btn-blue" data-id="tagClick"><span>' + val.typeName + '</span><i class="fa fa-close" data-id="deleteTag" data-type="tag" title="Remove Classification"></i></span>';
+                tagData += '<span class="btn btn-action btn-sm btn-icon btn-blue" data-id="tagClick"><span>' + val.typeName + '</span><i class="fa fa-close" data-id="deleteTag" data-type="tag" title="移除分类"></i></span>';
             }), _.each(tagObject.propagatedMap, function(val, key) {
                 propagatedTagListData += '<span class="btn btn-action btn-sm btn-icon btn-blue"><span data-id="tagClick">' + val.typeName + "</span>" + (val.count > 1 ? '<span class="active" data-id="pTagCountClick">(' + val.count + ")</span>" : "") + "</span>";
             }), "" !== propagatedTagListData ? this.ui.propagatedTagDiv.show() : this.ui.propagatedTagDiv.hide(), 
@@ -346,7 +346,7 @@ define([ "require", "backbone", "hbs!tmpl/detail_page/DetailPageLayoutView_tmpl"
         generateTerm: function(data) {
             var termData = "";
             _.each(data, function(val) {
-                termData += '<span class="btn btn-action btn-sm btn-icon btn-blue" data-id="termClick"><span>' + _.escape(val.displayText) + '</span><i class="' + ("ACTIVE" == val.relationshipStatus ? "fa fa-close" : "") + '" data-id="deleteTerm" data-guid="' + val.guid + '" data-type="term" title="Remove Term"></i></span>';
+                termData += '<span class="btn btn-action btn-sm btn-icon btn-blue" data-id="termClick"><span>' + _.escape(val.displayText) + '</span><i class="' + ("ACTIVE" == val.relationshipStatus ? "fa fa-close" : "") + '" data-id="deleteTerm" data-guid="' + val.guid + '" data-type="term" title="移除术语"></i></span>';
             }), this.ui.termList.find("span.btn").remove(), this.ui.termList.prepend(termData);
         },
         hideLoader: function() {
@@ -397,7 +397,7 @@ define([ "require", "backbone", "hbs!tmpl/detail_page/DetailPageLayoutView_tmpl"
                     Utils.showTitleLoader(that.$(".page-title .fontLoader"), that.$(".entityDetail"));
                 });
             }) : Utils.notifyInfo({
-                content: "There are no available terms that can be associated with this entity"
+                content: "没有可以与实体联系的术语"
             });
         },
         onClickAddTermBtn: function(e) {

atlas/js/views/tag/TagDetailTableLayoutView.js

@@ -109,7 +109,7 @@ define([ "require", "backbone", "hbs!tmpl/tag/TagDetailTableLayoutView_tmpl", "u
             var that = this;
             return this.tagCollection.constructor.getTableCols({
                 typeName: {
-                    label: "Classification",
+                    label: "分类",
                     cell: "html",
                     editable: !1,
                     formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
@@ -123,7 +123,7 @@ define([ "require", "backbone", "hbs!tmpl/tag/TagDetailTableLayoutView_tmpl", "u
                     })
                 },
                 attributes: {
-                    label: "Attributes",
+                    label: "属性",
                     cell: "html",
                     editable: !1,
                     sortable: !1,
@@ -153,7 +153,7 @@ define([ "require", "backbone", "hbs!tmpl/tag/TagDetailTableLayoutView_tmpl", "u
                     })
                 },
                 tool: {
-                    label: "Action",
+                    label: "操作",
                     cell: "html",
                     editable: !1,
                     sortable: !1,