Merge remote-tracking branch 'origin/master'

atlas/js/modules/Modal.js

@@ -16,10 +16,10 @@ define([ "require", "backbone", "hbs!tmpl/common/Modal" ], function(require, Bac
         initialize: function(options) {
             this.options = _.extend({
                 title: null,
-                okText: "OK",
+                okText: "确认",
                 focusOk: !0,
                 okCloses: !0,
-                cancelText: "Cancel",
+                cancelText: "取消",
                 allowCancel: !1,
                 allowBackdrop: !0,
                 showFooter: !0,

atlas/js/utils/CommonViewFunction.js

@@ -338,7 +338,7 @@ define([ "require", "utils/Utils", "modules/Modal", "utils/Messages", "utils/Enu
             var modal = new Modal({
                 title: (model ? "更新 " : "创建 ") + title,
                 content: view,
-                cancelText: "Cancel",
+                cancelText: "取消",
                 okCloses: !1,
                 okText: model ? "更新" : "创建",
                 allowCancel: !0

atlas/js/utils/Utils.js

@@ -106,13 +106,13 @@ define([ "require", "utils/Globals", "pnotify", "utils/Messages", "utils/Enums",
             confirm: {
                 confirm: !0,
                 buttons: [ {
-                    text: options.cancelText || "Cancel",
+                    text: options.cancelText || "取消",
                     addClass: "btn-action btn-md cancel",
                     click: function(notice) {
                         options.cancel(notice), notice.remove();
                     }
                 }, {
-                    text: options.okText || "Ok",
+                    text: options.okText || "确认",
                     addClass: "btn-atlas btn-md ok",
                     click: function(notice) {
                         options.ok && options.ok($.extend({}, notice, {

atlas/js/views/audit/AdminAuditTableLayoutView.js

@@ -164,7 +164,7 @@ define([ "require", "backbone", "hbs!tmpl/audit/AdminAuditTableLayoutView_tmpl",
                         return !Enums.serverAudits[model.get("operation")];
                     },
                     expand: function(el, model) {
-                        var operation = model.get("operation"), results = model.get("result") || null, adminText = "No records found", adminTypDetails = null, auditData = {
+                        var operation = model.get("operation"), results = model.get("result") || null, adminText = "没有找到记录！", adminTypDetails = null, auditData = {
                             operation: operation,
                             model: model,
                             results: results,

atlas/js/views/business_metadata/BusinessMetadataAttributeItemView.js

@@ -172,9 +172,9 @@ define([ "require", "backbone", "hbs!tmpl/business_metadata/BusinessMetadataAttr
                 }), modal = new Modal({
                     title: "创建/修改 枚举",
                     content: view,
-                    cancelText: "Cancel",
+                    cancelText: "取消",
                     okCloses: !1,
-                    okText: "Update",
+                    okText: "更新",
                     allowCancel: !0,
                     showFooter: !1
                 }).open();

atlas/js/views/detail_page/DetailPageLayoutView.js

@@ -302,7 +302,7 @@ define([ "require", "backbone", "hbs!tmpl/detail_page/DetailPageLayoutView_tmpl"
                 associatedGuid: that.id != entityGuid ? entityGuid : null,
                 msg: "<div class='ellipsis-with-margin'>确认删除<b>" + _.escape(tagName) + "</b> 与 <b>" + this.name + "的关联?</b></div>",
                 titleMessage: Messages.removeTag,
-                okText: "Remove",
+                okText: "移除",
                 showLoader: that.showLoader.bind(that),
                 hideLoader: that.hideLoader.bind(that),
                 tagName: tagName,
@@ -325,7 +325,7 @@ define([ "require", "backbone", "hbs!tmpl/detail_page/DetailPageLayoutView_tmpl"
                 msg: "<div class='ellipsis-with-margin'>Remove: <b>" + _.escape(termName) + "</b> assignment from <b>" + this.name + "?</b></div>",
                 titleMessage: Messages.glossary.removeTermfromEntity,
                 isEntityView: !0,
-                buttonText: "Remove",
+                buttonText: "移除",
                 showLoader: that.showLoader.bind(that),
                 hideLoader: that.hideLoader.bind(that),
                 callback: function() {

atlas/js/views/entity/CreateEntityLayoutView.js

@@ -29,10 +29,10 @@ define([ "require", "backbone", "hbs!tmpl/entity/CreateEntityLayoutView_tmpl", "
             this.selectStoreCollection = new Backbone.Collection(), this.collection = new VEntityList(), 
             this.entityModel = new VEntity(), this.guid && (this.collection.modelAttrName = "createEntity"), 
             this.asyncReferEntityCounter = 0, this.required = !0, this.guid ? (entityTitle = "编辑实体",
-            okLabel = "Update") : (entityTitle = "创建实体", okLabel = "Create"), this.modal = new Modal({
+            okLabel = "更新") : (entityTitle = "创建实体", okLabel = "创建"), this.modal = new Modal({
                 title: entityTitle,
                 content: this,
-                cancelText: "Cancel",
+                cancelText: "取消",
                 okText: okLabel,
                 allowCancel: !0,
                 okCloses: !1,

atlas/js/views/glossary/AssignTermLayoutView.js

@@ -26,12 +26,12 @@ define([ "require", "backbone", "hbs!tmpl/glossary/AssignTermLayoutView_tmpl", "
                 selectedItem: {}
             };
             var title = "";
-            title = this.isCategoryView || this.isEntityView ? "指定术语给 " + (this.isCategoryView ? "Category" : "entity") : this.isAttributeRelationView ? "指定术语给 " + this.selectedTermAttribute : "指定类别给术语",
+            title = this.isCategoryView || this.isEntityView ? "指定术语给 " + (this.isCategoryView ? "类别" : "实体") : this.isAttributeRelationView ? "指定术语给 " + this.selectedTermAttribute : "指定类别给术语",
             this.modal = new Modal({
                 title: title,
                 content: this,
-                cancelText: "Cancel",
-                okText: "Assign",
+                cancelText: "取消",
+                okText: "关联",
                 allowCancel: !0,
                 showFooter: !this.isAttributeRelationView,
                 mainClass: "wizard-modal",

atlas/js/views/glossary/GlossaryDetailLayoutView.js

@@ -199,7 +199,7 @@ define([ "require", "backbone", "hbs!tmpl/glossary/GlossaryDetailLayoutView_tmpl
             Utils.hideTitleLoader(this.$(".fontLoader"), this.ui.details), data ? (this.ui.title.text(data.name || data.displayText || data.qualifiedName), 
             this.ui.shortDescription.text(data.shortDescription ? data.shortDescription : ""), 
             this.ui.longDescription.text(data.longDescription ? data.longDescription : ""), 
-            this.generateCategories(data.categories), this.generateTerm(data.terms), this.generateTag(data.classifications)) : this.ui.title.text("No Data found");
+            this.generateCategories(data.categories), this.generateTerm(data.terms), this.generateTag(data.classifications)) : this.ui.title.text("没有找到数据");
         },
         generateCategories: function(data) {
             var categories = "";
@@ -290,7 +290,7 @@ define([ "require", "backbone", "hbs!tmpl/glossary/GlossaryDetailLayoutView_tmpl
             CommonViewFunction.deleteTag(_.extend({}, {
                 msg: "<div class='ellipsis-with-margin'>确认删除<b>" + _.escape(tagName) + "</b> 与 <b>" + _.escape(termName) + "的关联?</b></div>",
                 titleMessage: Messages.removeTag,
-                okText: "Remove",
+                okText: "移除",
                 showLoader: that.showLoader.bind(that),
                 hideLoader: that.hideLoader.bind(that),
                 tagName: tagName,
@@ -310,7 +310,7 @@ define([ "require", "backbone", "hbs!tmpl/glossary/GlossaryDetailLayoutView_tmpl
                 titleMessage: Messages.glossary[that.isTermView ? "removeCategoryfromTerm" : "removeTermfromCategory"],
                 isCategoryView: that.isCategoryView,
                 isTermView: that.isTermView,
-                buttonText: "Remove",
+                buttonText: "移除",
                 showLoader: that.hideLoader.bind(that),
                 hideLoader: that.hideLoader.bind(that),
                 callback: function() {

atlas/js/views/glossary/TermRelationAttributeLayoutView.js

@@ -23,9 +23,9 @@ define([ "require", "backbone", "hbs!tmpl/glossary/TermRelationAttributeLayoutVi
             _.extend(this, _.pick(options, "glossaryCollection", "data", "callback", "selectedTermAttribute", "onDeleteAttribute", "editMode"));
             var that = this;
             this.updateObj = $.extend(!0, {}, this.data), this.modal = new Modal({
-                title: (this.editMode ? "Edit attributes" : "Attributes") + " of " + this.selectedTermAttribute,
+                title: (this.editMode ? "修改" : "") + "  " + this.selectedTermAttribute + "的属性",
                 content: this,
-                okText: this.editMode ? "Update" : "ok",
+                okText: this.editMode ? "更新" : "确认",
                 allowCancel: !!this.editMode,
                 okCloses: !0,
                 width: "80%"

atlas/js/views/graph/PropagationPropertyModal.js

@@ -53,11 +53,11 @@ define([ "require", "hbs!tmpl/graph/PropagationPropertyModalView_tmpl", "models/
             this.entityModel = new VRelationship(), this.VEntityModel = new VEntity(), this.modalEdited = !1, 
             this.viewType = "flow";
             var that = this, modalObj = {
-                title: "Enable/Disable Propagation",
+                title: "启用/禁用 传播",
                 content: this,
-                okText: "Update",
+                okText: "更新",
                 okCloses: !1,
-                cancelText: "Cancel",
+                cancelText: "取消",
                 mainClass: "modal-lg",
                 allowCancel: !0
             };
@@ -163,7 +163,7 @@ define([ "require", "hbs!tmpl/graph/PropagationPropertyModalView_tmpl", "models/
                     fromBlockClassification: !1
                 });
             }), classificationTableValue = "<table class='attriTable'><tr><th class='w30'>Classification</th><th>Entity Name</th><th class='w30'>Block Propagatation</th>" + propagationStringValue + "</table>", 
-            this.ui.PropagatedClassificationTable.append(_.isEmpty(propagationStringValue) ? "No Records Found." : classificationTableValue);
+            this.ui.PropagatedClassificationTable.append(_.isEmpty(propagationStringValue) ? "没有找到记录！" : classificationTableValue);
         },
         showLoader: function() {
             this.modal.$el.find("button.ok").showButtonLoader(), this.$(".overlay").removeClass("hide").addClass("show");

atlas/js/views/import/ImportLayoutView.js

@@ -16,10 +16,10 @@ define([ "require", "backbone", "hbs!tmpl/import/ImportLayoutView_tmpl", "module
             _.extend(this, _.pick(options, "callback", "isGlossary"));
             var that = this;
             this.modal = new Modal({
-                title: this.isGlossary ? "Import Glossary Term" : "Import Business Metadata",
+                title: this.isGlossary ? "导入术语" : "导入业务元数据",
                 content: this,
-                cancelText: "Cancel",
-                okText: "Upload",
+                cancelText: "取消",
+                okText: "上传",
                 allowCancel: !0,
                 okCloses: !1,
                 mainClass: "dropzone-modal"
@@ -32,7 +32,7 @@ define([ "require", "backbone", "hbs!tmpl/import/ImportLayoutView_tmpl", "module
         bindEvents: function() {
             var that = this;
             $("body").on("click", ".importBackBtn", function() {
-                var modalTitle = that.isGlossary ? "Import Glossary Term" : "Import Business Metadata";
+                var modalTitle = that.isGlossary ? "导入术语" : "导入业务元数据";
                 that.toggleErrorAndDropZoneView({
                     title: modalTitle,
                     isErrorView: !1

atlas/js/views/schema/SchemaLayoutView.js

@@ -180,7 +180,7 @@ define([ "require", "backbone", "hbs!tmpl/schema/SchemaTableLayoutView_tmpl", "c
                 guid: guid,
                 msg: "<div class='ellipsis-with-margin'>确认删除<b>" + _.escape(tagName) + "</b> 与 <b>" + _.escape(assetName) + "的关联?</b></div>",
                 titleMessage: Messages.removeTag,
-                okText: "Remove",
+                okText: "移除",
                 showLoader: that.showLoader.bind(that),
                 hideLoader: that.hideLoader.bind(that),
                 callback: function() {

atlas/js/views/search/SearchLayoutView.js

@@ -398,7 +398,7 @@ define([ "require", "backbone", "hbs!tmpl/search/SearchLayoutView_tmpl", "utils/
                 }), foundOptions;
             };
             this.ui.termLov.select2({
-                placeholder: "Search Term",
+                placeholder: "搜索术语",
                 allowClear: !0,
                 ajax: {
                     url: UrlLinks.searchApiUrl("attribute"),

atlas/js/views/search/SearchResultLayoutView.js

@@ -738,7 +738,7 @@ define([ "require", "backbone", "table-dragger", "hbs!tmpl/search/SearchResultLa
                 associatedGuid: guid != entityGuid ? entityGuid : null,
                 msg: "<div class='ellipsis-with-margin'>确认删除 <b>" + _.escape(tagName) + "</b> 与 <b>" + _.escape(assetName) + "的关联?</b></div>",
                 titleMessage: Messages.removeTag,
-                okText: "Remove",
+                okText: "移除",
                 showLoader: that.showLoader.bind(that),
                 hideLoader: that.hideLoader.bind(that),
                 callback: function() {
@@ -762,7 +762,7 @@ define([ "require", "backbone", "table-dragger", "hbs!tmpl/search/SearchResultLa
                 msg: "<div class='ellipsis-with-margin'>Remove: <b>" + _.escape(termName) + "</b> assignment from <b>" + _.escape(assetname) + "?</b></div>",
                 titleMessage: Messages.glossary.removeTermfromEntity,
                 isEntityView: !0,
-                buttonText: "Remove",
+                buttonText: "移除",
                 callback: function() {
                     that.fetchCollection();
                 }

atlas/js/views/search/save/SaveModalLayoutView.js

@@ -22,7 +22,7 @@ define([ "require", "backbone", "hbs!tmpl/search/save/SaveModalLayoutView_tmpl",
                 var modal = new Modal({
                     title: (this.selectedModel ? "修改" : "创建") + " 你的常用搜索 " + (this.selectedModel ? "" : ""),
                     content: this,
-                    cancelText: "Cancel",
+                    cancelText: "取消",
                     okCloses: !1,
                     okText: this.selectedModel ? "修改" : "创建",
                     allowCancel: !0

atlas/js/views/site/Statistics.js

@@ -37,12 +37,12 @@ define([ "require", "backbone", "hbs!tmpl/site/Statistics_tmpl", "hbs!tmpl/site/
                     title: "统计信息",
                     content: this,
                     okCloses: !0,
-                    okText: "Close",
+                    okText: "关闭",
                     showFooter: !0,
                     allowCancel: !1,
                     width: "60%",
                     headerButtons: [ {
-                        title: "Refresh Data",
+                        title: "刷新数据",
                         btnClass: "fa fa-refresh",
                         onClick: function() {
                             modal.$el.find(".header-button .fa-refresh").tooltip("hide").prop("disabled", !0).addClass("fa-spin"), 
@@ -105,7 +105,7 @@ define([ "require", "backbone", "hbs!tmpl/site/Statistics_tmpl", "hbs!tmpl/site/
                         data: data
                     }), options && options.update && (that.modal && that.modal.$el.find(".header-button .fa-refresh").prop("disabled", !1).removeClass("fa-spin"), 
                     Utils.notifySuccess({
-                        content: "Metric data is refreshed"
+                        content: "数据已刷新"
                     }));
                 },
                 complete: function() {

atlas/js/views/tag/AddTagModalView.js

@@ -56,13 +56,13 @@ define([ "require", "hbs!tmpl/tag/AddTagModalView_tmpl", "views/tag/AddTimezoneI
             var that = this, modalObj = {
                 title: "Add Classification",
                 content: this,
-                okText: "Add",
-                cancelText: "Cancel",
+                okText: "新增",
+                cancelText: "取消",
                 mainClass: "modal-lg",
                 allowCancel: !0,
                 okCloses: !1
             };
-            this.tagModel && (modalObj.title = "Edit Classification", modalObj.okText = "Update"), 
+            this.tagModel && (modalObj.title = "Edit Classification", modalObj.okText = "修改"),
             this.modal = new Modal(modalObj), this.modal.open(), this.modal.$el.find("button.ok").attr("disabled", !0), 
             this.on("ok", function() {
                 if (this.ui.checkTimeZone.is(":checked") && this.validateValues()) return void (this.hideLoader && this.hideLoader());

atlas/js/views/tag/TagAttributeDetailLayoutView.js

@@ -103,10 +103,10 @@ define([ "require", "backbone", "hbs!tmpl/tag/TagAttributeDetailLayoutView_tmpl"
                     enumDefCollection: that.enumDefCollection
                 });
                 that.modal = new Modal({
-                    title: "Add Attribute",
+                    title: "新增属性",
                     content: view,
-                    cancelText: "Cancel",
-                    okText: "Add",
+                    cancelText: "取消",
+                    okText: "新增",
                     allowCancel: !0,
                     okCloses: !1
                 }).open(), that.modal.$el.find("button.ok").attr("disabled", "true"), view.ui.addAttributeDiv.on("keyup", ".attributeInput", function(e) {
@@ -175,10 +175,10 @@ define([ "require", "backbone", "hbs!tmpl/tag/TagAttributeDetailLayoutView_tmpl"
                     enumDefCollection: enumDefCollection
                 });
                 that.modal = new Modal({
-                    title: "Edit Classification",
+                    title: "编辑分类",
                     content: view,
-                    cancelText: "Cancel",
-                    okText: "Save",
+                    cancelText: "取消",
+                    okText: "保存",
                     allowCancel: !0
                 }).open(), view.ui.description.on("keyup input", function(e) {
                     $(this).val($(this).val().replace(/\s+/g, " ")), that.textAreaChangeEvent(view), 

atlas/js/views/tag/TagDetailTableLayoutView.js

@@ -185,7 +185,7 @@ define([ "require", "backbone", "hbs!tmpl/tag/TagDetailTableLayoutView_tmpl", "u
                 associatedGuid: that.guid != entityGuid ? entityGuid : null,
                 msg: "<div class='ellipsis-with-margin'>确认删除<b>" + _.escape(tagName) + "</b> 与 <b>" + this.entityName + "的关联?</b></div>",
                 titleMessage: Messages.removeTag,
-                okText: "Remove",
+                okText: "移除",
                 showLoader: function() {
                     that.$(".fontLoader").show(), that.$(".tableOverlay").show();
                 },

atlas/js/views/tag/TagLayoutView.js

@@ -245,7 +245,7 @@ define([ "require", "backbone", "hbs!tmpl/tag/TagLayoutView_tmpl", "utils/Utils"
                 }), modal = new Modal({
                     title: "创建一个新的分类",
                     content: view,
-                    cancelText: "Cancel",
+                    cancelText: "取消",
                     okCloses: !1,
                     okText: "创建",
                     allowCancel: !0

atlas/n/js/templates/glossary/GlossaryLayoutView_tmpl.html

@@ -36,14 +36,14 @@
     <div class="col-sm-12">
         <div class="no-padding col-sm-12 term-view">
             <div>
-                <input type="text" class="form-control" data-id="searchTerm" placeholder="{{#if isAssignView}}Search Term{{else}}Search Glossary, Term{{/if}}">
+                <input type="text" class="form-control" data-id="searchTerm" placeholder="{{#if isAssignView}}搜索术语{{else}}搜索术语表以及术语{{/if}}">
             </div>
             <div data-id="termTree" style="margin-top: 5px;padding-bottom: 25px;overflow-x: auto;overflow-y:hidden;">
             </div>
         </div>
         <div class="col-sm-12 no-padding category-view" style="display: none;">
             <div>
-                <input type="text" class="form-control" data-id="searchCategory" placeholder="{{#if isAssignView}}Search Catalog{{else}}Search Glossary, Category{{/if}}">
+                <input type="text" class="form-control" data-id="searchCategory" placeholder="{{#if isAssignView}}搜索目录{{else}}搜索术语表以及类别{{/if}}">
             </div>
             <div data-id="categoryTree" style="margin-top: 5px;padding-bottom: 25px;overflow-x: auto;overflow-y: hidden;">
             </div>