diff --git a/main/webapp/modules/core/langs/translation-default.json b/main/webapp/modules/core/langs/translation-default.json index ed2f48c33..fc97cf6cf 100644 --- a/main/webapp/modules/core/langs/translation-default.json +++ b/main/webapp/modules/core/langs/translation-default.json @@ -353,18 +353,8 @@ "wd-recon-lang": "en", "recon-col": "Reconcile column", "pick-service": "Pick a Service or Extension on Left", - "add-recon-srv": "Add Namespaced Reconciliation Service", - "namespace": "Namespace", - "ent-type": "Type of Entities (optional)", - "add-std-srv": "Add Standard Reconciliation Service", "enter-url": "Enter the service's URL", - "specify-ns": "Please specify a namespace.", "cell-contains": "Each cell contains:", - "fb-id": "a Freebase ID, e.g., /en/solar_system", - "fb-guid": "a Freebase GUID, e.g., #9202a8c04000641f80000000000354ae", - "fb-key": "a Freebase key in", - "fb-en-ns": "the Wikipedia English namespace", - "this-ns": "this namespace:", "max-candidates" : "Maximum number of candidates to return", "service-title": "Services" }, @@ -658,7 +648,6 @@ "remove-all": "Remove All", "perform-op": "Perform Operations", "add-std-svc": "Add Standard Service", - "add-named-svc": "Add Namespaced Service", "start-recon": "Start Reconciling", "add-service": "Add Service", "dont-reconcile": "Don't Reconcile Cell", diff --git a/main/webapp/modules/core/langs/translation-en.json b/main/webapp/modules/core/langs/translation-en.json index b8a3fef78..e8723ec71 100644 --- a/main/webapp/modules/core/langs/translation-en.json +++ b/main/webapp/modules/core/langs/translation-en.json @@ -353,18 +353,8 @@ "wd-recon-lang": "en", "recon-col": "Reconcile column", "pick-service": "Pick a Service or Extension on Left", - "add-recon-srv": "Add Namespaced Reconciliation Service", - "namespace": "Namespace", - "ent-type": "Type of Entities (optional)", - "add-std-srv": "Add Standard Reconciliation Service", "enter-url": "Enter the service's URL", - "specify-ns": "Please specify a namespace.", "cell-contains": "Each cell contains:", - "fb-id": "a Freebase ID, e.g., /en/solar_system", - "fb-guid": "a Freebase GUID, e.g., #9202a8c04000641f80000000000354ae", - "fb-key": "a Freebase key in", - "fb-en-ns": "the Wikipedia English namespace", - "this-ns": "this namespace:", "max-candidates" : "Maximum number of candidates to return", "service-title": "Services" }, @@ -658,7 +648,6 @@ "remove-all": "Remove All", "perform-op": "Perform Operations", "add-std-svc": "Add Standard Service", - "add-named-svc": "Add Namespaced Service", "start-recon": "Start Reconciling", "add-service": "Add Service", "dont-reconcile": "Don't Reconcile Cell", diff --git a/main/webapp/modules/core/langs/translation-es.json b/main/webapp/modules/core/langs/translation-es.json index 898d50396..c899bd5e0 100644 --- a/main/webapp/modules/core/langs/translation-es.json +++ b/main/webapp/modules/core/langs/translation-es.json @@ -353,18 +353,8 @@ "wd-recon-lang": "es", "recon-col": "Cotejar columna", "pick-service": "Seleccione un servicio o extensión a la izquierda", - "add-recon-srv": "Agregar servicio namespace", - "namespace": "Espacio de nombres", - "ent-type": "Clase de la entidad (opcional)", - "add-std-srv": "Agregar servicio estándar", "enter-url": "Ingrese la uRL del servicio", - "specify-ns": "Por favor especifique un namespace.", "cell-contains": "Cada celda contiene:", - "fb-id": "un ID de Freebase, p. ej., /en/solar_system", - "fb-guid": "un GUID de Freebase GUID, p. ej., #9202a8c04000641f80000000000354ae", - "fb-key": "una llave de Freebase en", - "fb-en-ns": "El namespace de Wikipedia en Inglés", - "this-ns": "este namespace:", "max-candidates" : "Máximo número de candidatos a devolver", "service-title": "Servicios" }, @@ -658,7 +648,6 @@ "remove-all": "Remover todos", "perform-op": "Ejecutar Operaciones", "add-std-svc": "Agregar servicio estándar", - "add-named-svc": "Agregar servicio con espacio de nombres", "start-recon": "Cotejar", "add-service": "Agragar servicio", "dont-reconcile": "No reconciliar celdas", diff --git a/main/webapp/modules/core/langs/translation-fr.json b/main/webapp/modules/core/langs/translation-fr.json index dc7079c97..973df0d87 100644 --- a/main/webapp/modules/core/langs/translation-fr.json +++ b/main/webapp/modules/core/langs/translation-fr.json @@ -353,18 +353,8 @@ "wd-recon-lang": "fr", "recon-col": "Réconcilier la colonne", "pick-service": "Choisir un service ou une extension à gauche", - "add-recon-srv": "Ajouter un service de réconciliation avec un espace de noms", - "namespace": "Espace de noms", - "ent-type": "Type des entités (facultatif)", - "add-std-srv": "Ajouter un service de réconciliation standard", "enter-url": "Indiquer l’URL du service", - "specify-ns": "Merci d’indiquer un espace de nom.", "cell-contains": "Chaque cellule contient :", - "fb-id": "un ID Freebase, par exemple /en/solar_system", - "fb-guid": "un GUID Freebase, par exemple #9202a8c04000641f80000000000354ae", - "fb-key": "une clé Freebase", - "fb-en-ns": "l’espace de noms Wikipedia English", - "this-ns": "cet espace de noms :", "max-candidates" : "Nombre maximal de candidats renvoyés", "service-title": "Services" }, @@ -658,7 +648,6 @@ "remove-all": "Tout supprimer", "perform-op": "Lancer les opérations", "add-std-svc": "Ajouter un service standard", - "add-named-svc": "Ajouter un service avec un espace de noms", "start-recon": "Démarrer la réconciliation", "add-service": "Ajouter un service", "dont-reconcile": "Ne pas réconcilier la cellule", diff --git a/main/webapp/modules/core/langs/translation-it.json b/main/webapp/modules/core/langs/translation-it.json index 8e7f5e6d7..1027e8351 100644 --- a/main/webapp/modules/core/langs/translation-it.json +++ b/main/webapp/modules/core/langs/translation-it.json @@ -353,18 +353,8 @@ "wd-recon-lang": "it", "recon-col": "Riconcilia la colonna", "pick-service": "Seleziona un Servizio o Estensione sulla Sinistra", - "add-recon-srv": "Aggiungi un servizio di riconciliazione con Namespace", - "namespace": "Namespace", - "ent-type": "Tipo di entità (opzionale)", - "add-std-srv": "Aggiungi un Servizio di Riconciliazione Standard", "enter-url": "Inserisci l'URL del servizio", - "specify-ns": "Specifica uno Namespace.", "cell-contains": "Ogni cella contiene:", - "fb-id": "un Freebase ID, es: /en/solar_system", - "fb-guid": "un Freebase GUID, es: #9202a8c04000641f80000000000354ae", - "fb-key": "Una chiave Freebase nel", - "fb-en-ns": "namespace di Wikipedia inglese", - "this-ns": "questo namespace:", "max-candidates" : "Maximum number of candidates to return [TODO - translate]", "service-title": "Servizi" }, @@ -658,7 +648,6 @@ "remove-all": "Rimuovi tutti", "perform-op": "Esegui le operazioni", "add-std-svc": "Aggiungi un servizio standard", - "add-named-svc": "Aggiungi un servizio con namespace", "start-recon": "Inizia la riconciliazione", "add-service": "Aggiungi servizio", "dont-reconcile": "Non riconciliare la cella", diff --git a/main/webapp/modules/core/langs/translation-jp.json b/main/webapp/modules/core/langs/translation-jp.json index 86ca6b8c7..ed39db29d 100644 --- a/main/webapp/modules/core/langs/translation-jp.json +++ b/main/webapp/modules/core/langs/translation-jp.json @@ -353,18 +353,8 @@ "wd-recon-lang": "jp", "recon-col": "カラムを名寄せ", "pick-service": "左からサービスかエクステンションを選択", - "add-recon-srv": "名前空間名寄せサービスを追加", - "namespace": "名前空間", - "ent-type": "エンティティーのタイプ (optional)", - "add-std-srv": "標準的な名寄せサービスを追加", "enter-url": "サービスのURLを入力", - "specify-ns": "名前空間を指定してください。", "cell-contains": "各セルは含む:", - "fb-id": "Freebase ID, e.g., /en/solar_system", - "fb-guid": "Freebase GUID, e.g., #9202a8c04000641f80000000000354ae", - "fb-key": "Freebase key in", - "fb-en-ns": "英語版Wikipediaの名前空間", - "this-ns": "この名前空間:", "max-candidates" : "返却される候補の最大値", "service-title": "サービス" }, @@ -658,7 +648,6 @@ "remove-all": "すべて削除", "perform-op": "操作を実行", "add-std-svc": "標準サービスを追加", - "add-named-svc": "名前空間サービスを追加", "start-recon": "名寄せ開始", "add-service": "サービスを追加", "dont-reconcile": "セルを名寄せしない", diff --git a/main/webapp/modules/core/langs/translation-zh.json b/main/webapp/modules/core/langs/translation-zh.json index 4eaace1ee..0951e4dfd 100644 --- a/main/webapp/modules/core/langs/translation-zh.json +++ b/main/webapp/modules/core/langs/translation-zh.json @@ -353,18 +353,8 @@ "wd-recon-lang": "zh", "recon-col": "搭配列", "pick-service": "在左侧选择一个服务或扩展", - "add-recon-srv": "添加具命名空间的搭配服务", - "namespace": "命名空间", - "ent-type": "实体类型 (可选)", - "add-std-srv": "添加标准搭配服务", "enter-url": "键入一个服务的URL", - "specify-ns": "请指定一个命名空间.", "cell-contains": "各个包含以下内容的单元格:", - "fb-id": "a Freebase ID, e.g., /en/solar_system", - "fb-guid": "a Freebase GUID, e.g., #9202a8c04000641f80000000000354ae", - "fb-key": "a Freebase key in", - "fb-en-ns": "英文维基命名空间", - "this-ns": "该命名空间:", "max-candidates" : "最大候选服务返回数量", "service-title": "Services" @@ -659,7 +649,6 @@ "remove-all": "全部移除", "perform-op": "执行这些操作", "add-std-svc": "添加标准服务", - "add-named-svc": "添加命名空间服务", "start-recon": "开始搭配", "add-service": "添加服务", "dont-reconcile": "不搭配单元格", diff --git a/main/webapp/modules/core/scripts/reconciliation/recon-dialog.html b/main/webapp/modules/core/scripts/reconciliation/recon-dialog.html index f56b8383d..3b3e07be4 100644 --- a/main/webapp/modules/core/scripts/reconciliation/recon-dialog.html +++ b/main/webapp/modules/core/scripts/reconciliation/recon-dialog.html @@ -23,7 +23,6 @@ - @@ -31,4 +30,4 @@ - \ No newline at end of file + diff --git a/main/webapp/modules/core/scripts/reconciliation/recon-dialog.js b/main/webapp/modules/core/scripts/reconciliation/recon-dialog.js index 2e69dc6e4..462b16c44 100644 --- a/main/webapp/modules/core/scripts/reconciliation/recon-dialog.js +++ b/main/webapp/modules/core/scripts/reconciliation/recon-dialog.js @@ -49,12 +49,10 @@ ReconDialog.prototype._createDialog = function() { this._elmts.servicePanelMessage.html($.i18n._('core-recon')["pick-service"]); this._elmts.serviceListTitle.html($.i18n._('core-recon')["service-title"]); this._elmts.addStandardServiceButton.html($.i18n._('core-buttons')["add-std-svc"]+"..."); - this._elmts.addNamespacedServiceButton.html($.i18n._('core-buttons')["add-named-svc"]+"..."); this._elmts.reconcileButton.html($.i18n._('core-buttons')["start-recon"]); this._elmts.cancelButton.html($.i18n._('core-buttons')["cancel"]); this._elmts.addStandardServiceButton.click(function() { self._onAddStandardService(); }); - this._elmts.addNamespacedServiceButton.click(function() { self._onAddNamespacedService(); }); this._elmts.reconcileButton.click(function() { self._onOK(); }); this._elmts.cancelButton.click(function() { self._dismiss(); }); @@ -227,46 +225,4 @@ ReconDialog.prototype._onAddStandardService = function() { elmts.input.focus().select(); }; -ReconDialog.prototype._onAddNamespacedService = function() { - var self = this; - var dialog = $(DOM.loadHTML("core", "scripts/reconciliation/add-namespaced-service-dialog.html")); - var elmts = DOM.bind(dialog); - elmts.dialogHeader.html($.i18n._('core-recon')["add-recon-srv"]); - elmts.or_recon_namespace.html($.i18n._('core-recon')["namespace"]+":"); - elmts.or_recon_entType.html($.i18n._('core-recon')["ent-type"]+":"); - elmts.addButton.html($.i18n._('core-buttons')["add-service"]); - elmts.cancelButton.html($.i18n._('core-buttons')["cancel"]); - - var level = DialogSystem.showDialog(dialog); - var dismiss = function() { - DialogSystem.dismissUntil(level - 1); - }; - - elmts.namespaceInput - .suggest({ filter : '(all type:/type/namespace)' }) - .bind("fb-select", function(e, data) { - elmts.typeInput.focus(); - }); - - elmts.typeInput.suggestT({ filter : '(all type:/type/type)' }); - - elmts.cancelButton.click(dismiss); - elmts.addButton.click(function() { - var namespaceData = elmts.namespaceInput.data("data.suggest"); - var typeData = elmts.typeInput.data("data.suggest"); - if (namespaceData) { - var url = "http://reconcile.freebaseapps.com/namespace_reconcile?namespace=" - + encodeURIComponent(namespaceData.id); - if (typeData) { - url += "&type=" + typeData.id; - } - - ReconciliationManager.registerStandardService(url, function(index) { - self._refresh(index); - }); - } - dismiss(); - }); - elmts.namespaceInput.focus().data("suggest").textchange(); -};