Merge pull request #1166 from wetneb/master

Change default reconciliation service to Wikidata

main/webapp/modules/core/langs/translation-default.json

@@ -350,7 +350,7 @@
 		"as-property": "As Property",
 		"contact-service": "Contacting reconciliation service",
 		"error-contact": "Error contacting recon service",
-		"fb-recon": "Freebase Query-based Reconciliation",
+		"wd-recon-lang": "en",
 		"recon-col": "Reconcile column",
 		"pick-service": "Pick a Service or Extension on Left",
 		"add-recon-srv": "Add Namespaced Reconciliation Service",

main/webapp/modules/core/langs/translation-en.json

@@ -350,7 +350,7 @@
 		"as-property": "As Property",
 		"contact-service": "Contacting reconciliation service",
 		"error-contact": "Error contacting recon service",
-		"fb-recon": "Freebase Query-based Reconciliation",
+		"wd-recon-lang": "en",
 		"recon-col": "Reconcile column",
 		"pick-service": "Pick a Service or Extension on Left",
 		"add-recon-srv": "Add Namespaced Reconciliation Service",

main/webapp/modules/core/langs/translation-es.json

@@ -350,7 +350,7 @@
 		"as-property": "Como propiedad",
 		"contact-service": "Contactando al servicio",
 		"error-contact": "Error contactando al servicio",
-		"fb-recon": "Freebase basado en consulta",
+		"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",

main/webapp/modules/core/langs/translation-fr.json

@@ -350,7 +350,7 @@
 		"as-property": "Comme propriété",
 		"contact-service": "Connexion au service de réconciliation",
 		"error-contact": "Erreur lors de la connexion au service de réconciliation",
-		"fb-recon": "Réconciliation basée sur des requêtes Freebase",
+		"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",

main/webapp/modules/core/langs/translation-it.json

@@ -350,7 +350,7 @@
 		"as-property": "Come Proprietà",
 		"contact-service": "Contattando il servizio di riconciliazione",
 		"error-contact": "Errore durante il contatto del servizio di riconciliazione",
-		"fb-recon": "Riconciliazione Freebase basata su query",
+		"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",

main/webapp/modules/core/langs/translation-jp.json

@@ -350,7 +350,7 @@
 		"as-property": "プロパティ",
 		"contact-service": "名寄せサービスにコンタクト中",
 		"error-contact": "名寄せサービスのコンタクトにエラー",
-		"fb-recon": "Freebase Query-based Reconciliation",
+		"wd-recon-lang": "jp",
 		"recon-col": "カラムを名寄せ",
 		"pick-service": "左からサービスかエクステンションを選択",
 		"add-recon-srv": "名前空間名寄せサービスを追加",

main/webapp/modules/core/langs/translation-zh.json

@@ -350,7 +350,7 @@
         "as-property": "作为属性",
         "contact-service": "正在访问搭配服务",
         "error-contact": "在访问搭配服务时出现异常",
-        "fb-recon": "基于query的Freebase搭配",
+        "wd-recon-lang": "zh",
         "recon-col": "搭配列",
         "pick-service": "在左侧选择一个服务或扩展",
         "add-recon-srv": "添加具命名空间的搭配服务",

main/webapp/modules/core/scripts/reconciliation/recon-manager.js

@@ -140,10 +140,7 @@ ReconciliationManager.save = function(f) {
 };
 
 (function() {
-  ReconciliationManager.customServices.push({
+  var lang = $.i18n._('core-recon')["wd-recon-lang"];
-    "name" : $.i18n._('core-recon')["fb-recon"],
-    "ui" : { "handler" : "ReconFreebaseQueryPanel" }
-  });
 
   $.ajax({
     async: false,
@@ -151,15 +148,13 @@ ReconciliationManager.save = function(f) {
       name: "reconciliation.standardServices" 
     }),
     success: function(data) {
-      if (data.value && data.value != "null") {
+      if (data.value && data.value != "null" && data.value != "[]") {
         ReconciliationManager.standardServices = JSON.parse(data.value);
         ReconciliationManager._rebuildMap();
       } else {
-      // FIXME: Standard recon service needs to be replaced
+         ReconciliationManager.registerStandardService(
-//        ReconciliationManager.registerStandardService(
+	      "https://tools.wmflabs.org/openrefine-wikidata/"+lang+"/api"
-//            "http://reconcile.freebaseapps.com/reconcile"
+              );
-//            "http://standard-reconcile.freebaseapps.com/reconcile"
-//            );
       }
     },
     dataType: "json"