diff --git a/.classpath b/.classpath
index a48ae9815..b43e703d6 100644
--- a/.classpath
+++ b/.classpath
@@ -13,7 +13,7 @@
-
+
@@ -42,7 +42,7 @@
-
+
@@ -51,8 +51,8 @@
-
-
+
+
@@ -66,8 +66,8 @@
-
-
+
+
@@ -84,5 +84,8 @@
+
+
+
diff --git a/.gitignore b/.gitignore
index 37aee476d..0a0cc8567 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,4 +18,5 @@ broker/core/module/MOD-INF/classes/
broker/core/WEB-INF/lib/
broker/core/data/
broker/core/test-output/
+tmp/
/test-output
diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope
index 899f6d215..c237e4f6b 100644
--- a/.settings/.jsdtscope
+++ b/.settings/.jsdtscope
@@ -1,6 +1,6 @@
-
+
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..b49d8dae4
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,6 @@
+language: java
+jdk:
+ - oraclejdk7
+ - openjdk6
+
+script: ./refine test
diff --git a/README.md b/README.md
new file mode 100644
index 000000000..50fe6f8af
--- /dev/null
+++ b/README.md
@@ -0,0 +1,53 @@
+#OpenRefine
+
+[](https://travis-ci.org/OpenRefine/OpenRefine)
+
+OpenRefine is a power tool that allows you to load data, understand it,
+clean it up, reconcile it to master database, and augment it with data coming from
+Freebase or other web sources. All with the comfort and privacy of
+your own computer.
+
+
+###Where can I get more information?
+
+Look at the OpenRefine web site http://openrefine.org and the wiki http://github.com/OpenRefine/OpenRefine/wiki
+
+###Licensing and legal issues
+
+OpenRefine is open source software and is licensed under the BSD license
+located in the [LICENSE.txt](LICENSE.txt). See that file also for information on open source
+libraries that OpenRefine depends on.
+
+###Credits
+
+This software was created by Metaweb Technologies, Inc. and originally written
+and conceived by David Huynh . Metaweb Technologies, Inc.
+was acquired by Google, Inc. in July 2010 and the product was renamed Google Refine.
+In October 2012, it was renamed OpenRefine as it transitioned to a
+community-supported product.
+
+This is the full list of contributors (in chronological order):
+
+ - David Huynh
+ - Stefano Mazzocchi
+ - Vishal Talwar
+ - Jeff Fry
+ - Will Moffat
+ - James Home
+ - Iain Sproat
+ - Tom Morris
+ - Heather Campbell
+ - Thad Guidry
+ - Paul Makepeace
+ - Tomaž Šolc
+ - Gabriel Sjoberg
+ - Rod Salazar
+ - pxb
+
+We welcome additional contributors if you'd like to help out.
+
+Thank you for your interest.
+
+----
+The OpenRefine Development Team
+http://openrefine.org
diff --git a/build.xml b/build.xml
index 9c0107a80..0dbd25245 100644
--- a/build.xml
+++ b/build.xml
@@ -88,6 +88,9 @@
+
+
+
@@ -136,7 +139,7 @@
-
+
@@ -168,6 +171,16 @@
+
+
+
+
+
+
+
+
@@ -229,7 +242,7 @@
name="OpenRefine"
displayname="OpenRefine ${version}"
icon="${graphics.dir}/icon/openrefine.icns"
- identifier="org.openrefine.refine.Refine"
+ identifier="com.google.refine.Refine"
shortversion="${version}"
mainclassname="com/google/refine/Refine">
@@ -241,8 +254,6 @@
-
-
diff --git a/extensions/freebase/build.xml b/extensions/freebase/build.xml
index 7b88a086f..f40f07905 100644
--- a/extensions/freebase/build.xml
+++ b/extensions/freebase/build.xml
@@ -57,7 +57,7 @@
-
+
diff --git a/extensions/freebase/module/MOD-INF/controller.js b/extensions/freebase/module/MOD-INF/controller.js
index 206e395c9..d3a37f84a 100644
--- a/extensions/freebase/module/MOD-INF/controller.js
+++ b/extensions/freebase/module/MOD-INF/controller.js
@@ -59,6 +59,7 @@ function init() {
RS.registerCommand(module, "import-qa-data", new Packages.com.google.refine.freebase.commands.ImportQADataCommand());
RS.registerCommand(module, "mqlread", new Packages.com.google.refine.freebase.commands.MQLReadCommand());
RS.registerCommand(module, "mqlwrite", new Packages.com.google.refine.freebase.commands.MQLWriteCommand());
+ RS.registerCommand(module, "load-language", new Packages.com.google.refine.freebase.commands.LoadLanguageCommand());
var OR = Packages.com.google.refine.operations.OperationRegistry;
diff --git a/extensions/freebase/module/langs/translation-default.json b/extensions/freebase/module/langs/translation-default.json
new file mode 100644
index 000000000..f40a6d384
--- /dev/null
+++ b/extensions/freebase/module/langs/translation-default.json
@@ -0,0 +1,115 @@
+{
+ "fb-schema-alignment": {
+ "close-confirm": "There are unsaved changes. Close anyway?",
+ "status-warning": "There are unsaved changes.",
+ "assert-link-found": "Assert link when 'true' is found in column",
+ "search-pick-property": "Search for a property or pick one below",
+ "search-property": "Search for a property",
+ "cell": "cell",
+ "cells": "cells",
+ "which-column": "Which column?",
+ "configure": "Configure...",
+ "which-topic": "Which topic?",
+ "what-value": "What value?",
+ "anonymous": "anonymous",
+ "add-property": "add property",
+ "anonymous-node": "Anonymous Node",
+ "freebase-topic": "Freebase Topic",
+ "value": "Value",
+ "skeleton-node": "Schema Alignment Skeleton Node",
+ "text": "text",
+ "int": "int",
+ "float": "float",
+ "double": "double",
+ "boolean": "boolean",
+ "date-time": "date/time",
+ "rawstring": "rawstring",
+ "set-to-cell": "Set to Cell in Column",
+ "cell-content-used": "The cell's content is used ...",
+ "specify-fb-topic": "to specify a Freebase topic, as reconciled",
+ "type-new-topics": "Type new topics as",
+ "literal-value": "as a literal value",
+ "literal-type": "Literal type",
+ "text-language": "Text language",
+ "key-namespace": "as a key in a namespace",
+ "namespace": "Namespace",
+ "generate-anonymous": "Generate an anonymous graph node",
+ "assign-type": "Assign a type to the node",
+ "use-existing-topic": "Use one existing Freebase topic",
+ "value-type": "Value type",
+ "language": "Language",
+ "use-literal-value": "Use a literal value",
+ "column-warning": "You must select at least one column",
+ "new-node-warning": "For creating a new graph node, you need to specify a type for it.",
+ "namespace-warning": "Please specify the namespace.",
+ "anonymous-node-warning": "For generating an anonymous graph node, you need to specify a type for it",
+ "specify-topic-warning": "Please specify which existing Freebase topic to use",
+ "specify-value-warning": "Please specify the value to use"
+ },
+ "fb-interface": {
+ "dialog-header": "Align to Freebase's Schemas",
+ "body-text": "The schema alignment skeleton below specifies how your grid-shaped data will be transformed into graph-shaped data in Freebase's schemas.",
+ "find-more": "Find out more ...",
+ "skeleton": "Skeleton",
+ "mql-preview": "MQL-like Preview",
+ "tripleloader-preview": "TripleLoader Preview"
+ },
+ "fb-dialogs": {
+ "sign-in": "Sign into Freebase",
+ "enable-loading": "to enable loading",
+ "error-new-topic": "Error creating new topic",
+ "error-loading-data": "Error loading data",
+ "add-info-source": "Click here to add a new information source",
+ "dialog-header": "Load Data into Freebase",
+ "no-triples-dataset": "This dataset has no triples",
+ "warning-aligned": "Have you aligned it with Freebase's schemas yet?",
+ "name-of-data": "Name of data load",
+ "source-id": "Source ID (optional)",
+ "bodytext-1": "Note: Your data will only be loaded into",
+ "bodytext-2": "Sandbox is where everyone can experiment with Freebase technologies without disruption to the official",
+ "bodytext-3": "Sandbox gets",
+ "sandbox-link": " Sandbox",
+ "freebase-link": " Freebase",
+ "refreshed-link": " refreshed periodically",
+ "bodytext-4": "In order to load your data into the official Freebase, you must first load it into Sandbox. Then it must pass a Quality Assurance (QA) process before it can be loaded into Freebase proper.",
+ "quality-assurance": "Quality assurance",
+ "bodytext-5": "After loaded into Sandbox, enlist other people's help to double-check this data load's quality so that it can be loaded into Freebase.",
+ "triple-schedule": "triples successfully scheduled for loading",
+ "follow-progress": "Follow the loading progress in the ",
+ "refinery-link": "Freebase Refinery",
+ "signed-as": "Signed in as:",
+ "sign-out": "Sign Out"
+ },
+ "fb-qa": {
+ "header": "QA Data Load?",
+ "bodytext-1": "Other people will be enlisted to help double-check your data load for quality assurance purposes. Their time and labor have a cost.",
+ "bodytext-2": "You yourself should have taken all reasonable measures to eliminate errors from your data load. Your prudence is greatly appreciated.",
+ "tell-more": "Tell me more ...",
+ "ok-button": "Yes, QA Data Load"
+ },
+ "fb-extend": {
+ "add-column": "Add Columns from Freebase Based on Column",
+ "warning-add-properties": "Please add some properties first.",
+ "querying-freebase": "Querying Freebase ...",
+ "remove-column": "Remove this column",
+ "add-constraints": "Add constraints to this column",
+ "mql-constraints": "Enter MQL query constraints as JSON",
+ "warning-valid-json": "Please ensure that the JSON you enter is valid.",
+ "warning-json-obj": "The JSON you enter must be an object, that is, it is of this form { ... }.",
+ "add-property": "Add Property",
+ "suggested-properties": "Suggested Properties",
+ "constraint": "Constraint"
+ },
+ "fb-buttons": {
+ "save": "Save",
+ "save-load": "Save & Load",
+ "close": "Close",
+ "reset": "Reset",
+ "cancel": "Cancel",
+ "align-now": "Align Now",
+ "settings": "Settings",
+ "preview": "Preview",
+ "load-sandbox": "Load to Sandbox",
+ "ok": "Ok"
+ }
+}
\ No newline at end of file
diff --git a/extensions/freebase/module/langs/translation-en.json b/extensions/freebase/module/langs/translation-en.json
new file mode 100644
index 000000000..2c9584b83
--- /dev/null
+++ b/extensions/freebase/module/langs/translation-en.json
@@ -0,0 +1,125 @@
+{
+ "fb-schema-alignment": {
+ "close-confirm": "There are unsaved changes. Close anyway?",
+ "status-warning": "There are unsaved changes.",
+ "assert-link-found": "Assert link when 'true' is found in column",
+ "search-pick-property": "Search for a property or pick one below",
+ "search-property": "Search for a property",
+ "cell": "cell",
+ "cells": "cells",
+ "which-column": "Which column?",
+ "configure": "Configure...",
+ "which-topic": "Which topic?",
+ "what-value": "What value?",
+ "anonymous": "anonymous",
+ "add-property": "add property",
+ "anonymous-node": "Anonymous Node",
+ "freebase-topic": "Freebase Topic",
+ "value": "Value",
+ "skeleton-node": "Schema Alignment Skeleton Node",
+ "text": "text",
+ "int": "int",
+ "float": "float",
+ "double": "double",
+ "boolean": "boolean",
+ "date-time": "date/time",
+ "rawstring": "rawstring",
+ "set-to-cell": "Set to Cell in Column",
+ "cell-content-used": "The cell's content is used ...",
+ "specify-fb-topic": "to specify a Freebase topic, as reconciled",
+ "type-new-topics": "Type new topics as",
+ "literal-value": "as a literal value",
+ "literal-type": "Literal type",
+ "text-language": "Text language",
+ "key-namespace": "as a key in a namespace",
+ "namespace": "Namespace",
+ "generate-anonymous": "Generate an anonymous graph node",
+ "assign-type": "Assign a type to the node",
+ "use-existing-topic": "Use one existing Freebase topic",
+ "value-type": "Value type",
+ "language": "Language",
+ "use-literal-value": "Use a literal value",
+ "column-warning": "You must select at least one column",
+ "new-node-warning": "For creating a new graph node, you need to specify a type for it.",
+ "namespace-warning": "Please specify the namespace.",
+ "anonymous-node-warning": "For generating an anonymous graph node, you need to specify a type for it.",
+ "specify-topic-warning": "Please specify which existing Freebase topic to use",
+ "specify-value-warning": "Please specify the value to use"
+ },
+ "fb-interface": {
+ "dialog-header": "Align to Freebase's Schemas",
+ "body-text": "The schema alignment skeleton below specifies how your grid-shaped data will be transformed into graph-shaped data in Freebase's schemas.",
+ "find-more": "Find out more ...",
+ "skeleton": "Skeleton",
+ "mql-preview": "MQL-like Preview",
+ "tripleloader-preview": "TripleLoader Preview"
+ },
+ "fb-dialogs": {
+ "sign-in": "Sign into Freebase",
+ "enable-loading": "to enable loading",
+ "error-new-topic": "Error creating new topic",
+ "error-loading-data": "Error loading data",
+ "add-info-source": "Click here to add a new information source",
+ "dialog-header": "Load Data into Freebase",
+ "no-triples-dataset": "This dataset has no triples",
+ "warning-aligned": "Have you aligned it with Freebase's schemas yet?",
+ "name-of-data": "Name of data load",
+ "source-id": "Source ID (optional)",
+ "bodytext-1": "Note: Your data will only be loaded into",
+ "bodytext-2": "Sandbox is where everyone can experiment with Freebase technologies without disruption to the official",
+ "bodytext-3": "Sandbox gets",
+ "sandbox-link": " Sandbox",
+ "freebase-link": " Freebase",
+ "refreshed-link": " refreshed periodically",
+ "bodytext-4": "In order to load your data into the official Freebase, you must first load it into Sandbox. Then it must pass a Quality Assurance (QA) process before it can be loaded into Freebase proper.",
+ "quality-assurance": "Quality assurance",
+ "bodytext-5": "After loaded into Sandbox, enlist other people's help to double-check this data load's quality so that it can be loaded into Freebase.",
+ "triple-schedule": "triples successfully scheduled for loading",
+ "follow-progress": "Follow the loading progress in the ",
+ "refinery-link": "Freebase Refinery",
+ "signed-as": "Signed in as:",
+ "sign-out": "Sign Out"
+ },
+ "fb-qa": {
+ "header": "QA Data Load?",
+ "bodytext-1": "Other people will be enlisted to help double-check your data load for quality assurance purposes. Their time and labor have a cost.",
+ "bodytext-2": "You yourself should have taken all reasonable measures to eliminate errors from your data load. Your prudence is greatly appreciated.",
+ "tell-more": "Tell me more ...",
+ "ok-button": "Yes, QA Data Load"
+ },
+ "fb-extend": {
+ "add-column": "Add Columns from Freebase Based on Column",
+ "warning-add-properties": "Please add some properties first.",
+ "querying-freebase": "Querying Freebase ...",
+ "remove-column": "Remove this column",
+ "add-constraints": "Add constraints to this column",
+ "mql-constraints": "Enter MQL query constraints as JSON",
+ "warning-valid-json": "Please ensure that the JSON you enter is valid.",
+ "warning-json-obj": "The JSON you enter must be an object, that is, it is of this form { ... }.",
+ "add-property": "Add Property",
+ "suggested-properties": "Suggested Properties",
+ "constraint": "Constraint"
+ },
+ "fb-menu": {
+ "freebase": "Freebase",
+ "set-api-key": "Set Freebase API Key",
+ "align-schema": "Align to Freebase's schemas...",
+ "load": "Load into Freebase...",
+ "browse-data-load": "Browse data load details...",
+ "import-qa": "Import QA data",
+ "add-columns": "Add columns from Freebase ...",
+ "warning-load": "You have not tried to load the data in this project into Freebase yet."
+ },
+ "fb-buttons": {
+ "save": "Save",
+ "save-load": "Save & Load",
+ "close": "Close",
+ "reset": "Reset",
+ "cancel": "Cancel",
+ "align-now": "Align Now",
+ "settings": "Settings",
+ "preview": "Preview",
+ "load-sandbox": "Load to Sandbox",
+ "ok": "Ok"
+ }
+}
\ No newline at end of file
diff --git a/extensions/freebase/module/langs/translation-it.json b/extensions/freebase/module/langs/translation-it.json
new file mode 100644
index 000000000..dfc7aa1b3
--- /dev/null
+++ b/extensions/freebase/module/langs/translation-it.json
@@ -0,0 +1,125 @@
+{
+ "fb-schema-alignment": {
+ "close-confirm": "Ci sono cambiamenti non salvati. Chiudere comunque?",
+ "status-warning": "Ci sono cambiamenti non salvati.",
+ "assert-link-found": "Assert link when 'true' is found in column",
+ "search-pick-property": "Cerca una proprietà o scegline una dalle seguenti",
+ "search-property": "Cerca una proprietà",
+ "cell": "cella",
+ "cells": "celle",
+ "which-column": "Quale colonna?",
+ "configure": "Configura...",
+ "which-topic": "Quale topic?",
+ "what-value": "Quale valore?",
+ "anonymous": "anonimo",
+ "add-property": "aggiungi proprietà",
+ "anonymous-node": "Nodo Anonimo",
+ "freebase-topic": "Topic Freebase",
+ "value": "Valore",
+ "skeleton-node": "Schema Alignment Skeleton Node",
+ "text": "testo",
+ "int": "int",
+ "float": "float",
+ "double": "double",
+ "boolean": "boolean",
+ "date-time": "data/ora",
+ "rawstring": "rawstring",
+ "set-to-cell": "Set to Cell in Column",
+ "cell-content-used": "Il contenuto della cella è usato ...",
+ "specify-fb-topic": "per specificare un topic Freebase, come riconciliato",
+ "type-new-topics": "Inserisci il nuovo topic come",
+ "literal-value": "come un valore letterale",
+ "literal-type": "Tipo letterale",
+ "text-language": "Lingua di testo",
+ "key-namespace": "come una chiave nel namespace",
+ "namespace": "Namespace",
+ "generate-anonymous": "Genera un nodo anonimo nel grafo",
+ "assign-type": "Assegna un tipo al nodo",
+ "use-existing-topic": "Usa un topic Freebase esistente",
+ "value-type": "Tipo valore",
+ "language": "Lingua",
+ "use-literal-value": "Usa un valore letterale",
+ "column-warning": "Devi selezionare almeno una colonna",
+ "new-node-warning": "Per creare un nuovo nodo nel grafo, devi specificarne un tipo.",
+ "namespace-warning": "Specifica il namespace.",
+ "anonymous-node-warning": "Per generare un nodo anonimo nel grafo, devi specificarne un tipo.",
+ "specify-topic-warning": "Per favore specifica quale topic esistente di Freebase usare",
+ "specify-value-warning": "Per favore specifica il valore da usare"
+ },
+ "fb-interface": {
+ "dialog-header": "Allinea con gli schemi Freebase",
+ "body-text": "Lo scheletro per l'allineamento della schema specifica come i tuoi dati in formato tabellare saranno trasformati in un formato a grafo con lo schema di Freebase.",
+ "find-more": "Per saperne di più ...",
+ "skeleton": "Scheletro",
+ "mql-preview": "Anteprima MQL-like",
+ "tripleloader-preview": "Anteprima TripleLoader"
+ },
+ "fb-dialogs": {
+ "sign-in": "Accedi a Freebase",
+ "enable-loading": "per abilitare il caricamento",
+ "error-new-topic": "Errore nella creazione di un nuovo topic",
+ "error-loading-data": "Errore durante il caricamento dei dati",
+ "add-info-source": "Clicca qui per aggiungere una nuova sorgente di informazioni",
+ "dialog-header": "Carica i dati in Freebase",
+ "no-triples-dataset": "Questo dataset non ha triple",
+ "warning-aligned": "Hai già effettuato l'allineamento con lo schema Freebase?",
+ "name-of-data": "Nome del caricamento dati",
+ "source-id": "ID sorgente (opzionale)",
+ "bodytext-1": "Nota: i tuoi dati saranno caricati solamente in",
+ "bodytext-2": "Sandbox è dove chiunque può sperimentare le tecnologie Freebase senza creare danni all'ufficiale",
+ "bodytext-3": "Sandbox viene",
+ "sandbox-link": " Sandbox",
+ "freebase-link": " Freebase",
+ "refreshed-link": " aggiornata periodicamente",
+ "bodytext-4": "Per caricare i tuoi data su Freebase ufficiale, devi prima caricarli nel Sandbox. Successivamente, devono passare un processo di analisi qualitativa prima di essere caricati su Freebase.",
+ "quality-assurance": "Analisi qualitativa",
+ "bodytext-5": "Dopo essere caricati nella Sandbox, viene chiesto l'aiuto di altre persone per controllare due volte la qualità di questi dati in modo da poter poi essere caricati in Freebase.",
+ "triple-schedule": "triple pianificate con successo per il caricamento",
+ "follow-progress": "Segui il processo di caricamento nel ",
+ "refinery-link": "Freebase Refinery",
+ "signed-as": "Accesso effettuato come:",
+ "sign-out": "Esci"
+ },
+ "fb-qa": {
+ "header": "Caricamento dati con analisi qualitativa?",
+ "bodytext-1": "Alcune persone verranno incaricate per controllare i tuoi dati allo scopo di verificarne la qualità. Il loro tempo e lavoro ha un costo.",
+ "bodytext-2": "Tu stesso dovresti aver già effettuato la maggior parte dei controlli per assicurarti di aver rimosso errori dai dati. La tua prudenza è enormemente apprezzata.",
+ "tell-more": "Dimmi di più ...",
+ "ok-button": "Si, Caricamento dati con analisi qualitativa"
+ },
+ "fb-extend": {
+ "add-column": "Aggiungi colonne da Freebase basandoti sulla colonna",
+ "warning-add-properties": "Prima aggiungi delle proprietà.",
+ "querying-freebase": "Interrogando Freebase ...",
+ "remove-column": "Rimuovi questa colonna",
+ "add-constraints": "Aggiungi vincoli a questa colonna",
+ "mql-constraints": "Inserisci i vincoli per la query MQL come JSON",
+ "warning-valid-json": "Assicurati che l'oggetto JSON inserito sia valido.",
+ "warning-json-obj": "Il JSON che inserisci deve essere un oggetto, cioè in questa forma: { ... }.",
+ "add-property": "Aggiungi Proprietà",
+ "suggested-properties": "Proprietà suggerite",
+ "constraint": "Vincoli"
+ },
+ "fb-menu": {
+ "freebase": "Freebase",
+ "set-api-key": "Imposta l'API Key Freebase",
+ "align-schema": "Allinea con lo schema Freebase...",
+ "load": "Carica in Freebase...",
+ "browse-data-load": "Vedi i dettagli per il caricamento dati...",
+ "import-qa": "Importa dati con controllo qualità",
+ "add-columns": "Aggiungi colonne da Freebase ...",
+ "warning-load": "Non hai ancora provato a caricare i dati di questo progetto in Freebase."
+ },
+ "fb-buttons": {
+ "save": "Salva",
+ "save-load": "Salva & Carica",
+ "close": "Chiudi",
+ "reset": "Reset",
+ "cancel": "Cancella",
+ "align-now": "Allinea adesso",
+ "settings": "Settings",
+ "preview": "Anteprima",
+ "load-sandbox": "Carica nella Sandbox",
+ "ok": "Ok"
+ }
+}
\ No newline at end of file
diff --git a/extensions/freebase/module/scripts/dialogs/confirm-qa-dialog.html b/extensions/freebase/module/scripts/dialogs/confirm-qa-dialog.html
index d691dee41..e5ce6d108 100644
--- a/extensions/freebase/module/scripts/dialogs/confirm-qa-dialog.html
+++ b/extensions/freebase/module/scripts/dialogs/confirm-qa-dialog.html
@@ -1,17 +1,12 @@
-
QA Data Load?
+
-
Other people will be enlisted to help double-check
- your data load for quality assurance purposes. Their time and labor
- have a cost.
-
-
You yourself should have taken all reasonable measures
- to eliminate errors from your data load. Your prudence is greatly appreciated.
-
\ No newline at end of file
diff --git a/extensions/freebase/module/scripts/dialogs/extend-data-preview-dialog.html b/extensions/freebase/module/scripts/dialogs/extend-data-preview-dialog.html
index f92e09fb9..6db8cb87c 100644
--- a/extensions/freebase/module/scripts/dialogs/extend-data-preview-dialog.html
+++ b/extensions/freebase/module/scripts/dialogs/extend-data-preview-dialog.html
@@ -3,16 +3,16 @@
-
Add Property
+
Preview
-
+
-
Suggested Properties
+
@@ -20,7 +20,7 @@
\ No newline at end of file
diff --git a/extensions/freebase/module/scripts/dialogs/extend-data-preview-dialog.js b/extensions/freebase/module/scripts/dialogs/extend-data-preview-dialog.js
index 2ed89a01c..fafaca07c 100644
--- a/extensions/freebase/module/scripts/dialogs/extend-data-preview-dialog.js
+++ b/extensions/freebase/module/scripts/dialogs/extend-data-preview-dialog.js
@@ -41,15 +41,23 @@ function ExtendDataPreviewDialog(column, columnIndex, rowIndices, onDone) {
var self = this;
this._dialog = $(DOM.loadHTML("freebase", "scripts/dialogs/extend-data-preview-dialog.html"));
this._elmts = DOM.bind(this._dialog);
- this._elmts.dialogHeader.text("Add Columns from Freebase Based on Column " + column.name);
+
+ this._elmts.dialogHeader.text($.i18n._('fb-extend')["add-column"]);
+ this._elmts.fb_add_property.html($.i18n._('fb-extend')["add-property"]);
+ this._elmts.suggested_properties.text($.i18n._('fb-extend')["suggested-properties"]);
+
+ this._elmts.resetButton.text($.i18n._('fb-buttons')["reset"]);
+ this._elmts.okButton.html(' '+$.i18n._('fb-buttons')["ok"]+' ');
+ this._elmts.cancelButton.text($.i18n._('fb-buttons')["cancel"]);
+
this._elmts.resetButton.click(function() {
self._extension.properties = [];
self._update();
});
-
+
this._elmts.okButton.click(function() {
if (self._extension.properties.length === 0) {
- alert("Please add some properties first.");
+ alert($.i18n._('fb-extend')["warning-add-properties"]);
} else {
DialogSystem.dismissUntil(self._level - 1);
self._onDone(self._extension);
@@ -157,7 +165,7 @@ ExtendDataPreviewDialog.prototype._show = function(properties) {
};
ExtendDataPreviewDialog.prototype._update = function() {
- this._elmts.previewContainer.empty().text("Querying Freebase ...");
+ this._elmts.previewContainer.empty().text($.i18n._('fb-extend')["querying-freebase"]);
var self = this;
var params = {
@@ -234,7 +242,7 @@ ExtendDataPreviewDialog.prototype._renderPreview = function(data) {
$('')
.text("remove")
.addClass("action")
- .attr("title", "Remove this column")
+ .attr("title", $.i18n._('fb-extend')["remove-column"])
.click(function() {
self._removeProperty(column.path);
}).appendTo(th);
@@ -242,7 +250,7 @@ ExtendDataPreviewDialog.prototype._renderPreview = function(data) {
$('')
.text("constrain")
.addClass("action")
- .attr("title", "Add constraints to this column")
+ .attr("title", $.i18n._('fb-extend')["add-constraints"])
.click(function() {
self._constrainProperty(column.path);
}).appendTo(th);
@@ -329,14 +337,14 @@ ExtendDataPreviewDialog.prototype._constrainProperty = function(path) {
var frame = DialogSystem.createDialog();
frame.width("500px");
- var header = $('').addClass("dialog-header").text("Constrain " + path.join(" > ")).appendTo(frame);
+ var header = $('').addClass("dialog-header").text(" " + path.join(" > ")).appendTo(frame);
var body = $('').addClass("dialog-body").appendTo(frame);
var footer = $('').addClass("dialog-footer").appendTo(frame);
body.html(
'
' +
'' +
@@ -352,8 +360,8 @@ ExtendDataPreviewDialog.prototype._constrainProperty = function(path) {
}
footer.html(
- '' +
- ''
+ '' +
+ ''
);
var footerElmts = DOM.bind(footer);
@@ -367,7 +375,7 @@ ExtendDataPreviewDialog.prototype._constrainProperty = function(path) {
try {
var o = JSON.parse(bodyElmts.textarea[0].value);
if (o === undefined) {
- alert("Please ensure that the JSON you enter is valid.");
+ alert($.i18n._('fb-extend')["warning-valid-json"]);
return;
}
@@ -375,7 +383,7 @@ ExtendDataPreviewDialog.prototype._constrainProperty = function(path) {
o = o[0];
}
if (!$.isPlainObject(o)) {
- alert("The JSON you enter must be an object, that is, it is of this form { ... }.");
+ alert($.i18n._('fb-extend')["warning-json-obj"]);
return;
}
diff --git a/extensions/freebase/module/scripts/dialogs/freebase-loading-dialog.html b/extensions/freebase/module/scripts/dialogs/freebase-loading-dialog.html
index 0eb1d1033..c478b4441 100644
--- a/extensions/freebase/module/scripts/dialogs/freebase-loading-dialog.html
+++ b/extensions/freebase/module/scripts/dialogs/freebase-loading-dialog.html
@@ -1,44 +1,40 @@
Note: Your data will only be loaded into
- Sandbox.
- Sandbox is where everyone can experiment with Freebase technologies without disruption
- to the official Freebase. Sandbox gets
- refreshed periodically.
+
+ .
+ .
+ .
-
In order to load your data into the official Freebase, you must first load it
- into Sandbox. Then it must pass a Quality Assurance (QA) process before it can
- be loaded into Freebase proper.
- Find out more ...
+
+
-
Quality assurance
+
-
After loaded into Sandbox, enlist other people's help to double-check
- this data load's quality so that it can be loaded into Freebase.
-
- The schema alignment skeleton below specifies how your grid-shaped data will be
- transformed into graph-shaped data in Freebase's schemas.
- Find out more ...
+
\ No newline at end of file
diff --git a/extensions/freebase/module/scripts/dialogs/schema-alignment/ui-link.js b/extensions/freebase/module/scripts/dialogs/schema-alignment/ui-link.js
index bf71e4e2b..07e112f8c 100644
--- a/extensions/freebase/module/scripts/dialogs/schema-alignment/ui-link.js
+++ b/extensions/freebase/module/scripts/dialogs/schema-alignment/ui-link.js
@@ -239,7 +239,7 @@ SchemaAlignmentDialog.UILink.prototype._showPropertySuggestPopup = function(elmt
var divConditional = $('
')
.addClass("schema-alignment-link-menu-section")
- .html("Assert link when 'true' is found in column ").appendTo(menu);
+ .html($.i18n._('fb-schema-alignment')["assert-link-found"]+" ").appendTo(menu);
var conditionalSelect = $('
Create a project by importing data. What kinds of data files can I import?
-
TSV, CSV, *SV, Excel (.xls and .xlsx), JSON, XML, RDF as XML, and
- Google Data documents are all supported. Support for other formats can
- be added with OpenRefine extensions.
-
- Click on the first JSON { } node corresponding to the first record to load.
-
+
\ No newline at end of file
diff --git a/main/webapp/modules/core/scripts/index/parser-interfaces/json-parser-ui.html b/main/webapp/modules/core/scripts/index/parser-interfaces/json-parser-ui.html
index 0572216f9..5f00d98ac 100644
--- a/main/webapp/modules/core/scripts/index/parser-interfaces/json-parser-ui.html
+++ b/main/webapp/modules/core/scripts/index/parser-interfaces/json-parser-ui.html
@@ -3,25 +3,25 @@
- Click on the first XML element corresponding to the first record to load.
+
\ No newline at end of file
diff --git a/main/webapp/modules/core/scripts/index/parser-interfaces/xml-parser-ui.html b/main/webapp/modules/core/scripts/index/parser-interfaces/xml-parser-ui.html
index 3aff4f11b..f441246ee 100644
--- a/main/webapp/modules/core/scripts/index/parser-interfaces/xml-parser-ui.html
+++ b/main/webapp/modules/core/scripts/index/parser-interfaces/xml-parser-ui.html
@@ -3,26 +3,26 @@
\ No newline at end of file
diff --git a/main/webapp/modules/core/scripts/preferences.js b/main/webapp/modules/core/scripts/preferences.js
index dd5ef742f..b6045892b 100644
--- a/main/webapp/modules/core/scripts/preferences.js
+++ b/main/webapp/modules/core/scripts/preferences.js
@@ -44,8 +44,8 @@ function PreferenceUI(tr, key, value) {
var td2 = tr.insertCell(2);
- $('