diff options
6 files changed, 99 insertions, 45 deletions
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/projectCommands.js b/bundles/org.eclipse.orion.client.ui/web/orion/projectCommands.js index 055891e..25678ab 100644 --- a/bundles/org.eclipse.orion.client.ui/web/orion/projectCommands.js +++ b/bundles/org.eclipse.orion.client.ui/web/orion/projectCommands.js @@ -11,9 +11,9 @@ *******************************************************************************/ /*global window define orion XMLHttpRequest confirm*/ /*jslint sub:true*/ -define(['i18n!orion/navigate/nls/messages', 'orion/webui/littlelib', 'orion/commands', 'orion/Deferred', 'orion/webui/dialogs/DirectoryPrompterDialog', +define(['i18n!orion/projects/nls/messages', 'i18n!orion/navigate/nls/messages', 'orion/webui/littlelib', 'orion/commands', 'orion/Deferred', 'orion/webui/dialogs/DirectoryPrompterDialog', 'orion/commandRegistry', 'orion/i18nUtil', 'orion/webui/dialogs/ImportDialog'], - function(messages, lib, mCommands, Deferred, DirectoryPrompterDialog, mCommandRegistry, i18nUtil, ImportDialog){ + function(messages, navigateMessages, lib, mCommands, Deferred, DirectoryPrompterDialog, mCommandRegistry, i18nUtil, ImportDialog){ var projectCommandUtils = {}; var selectionListenerAdded = false; @@ -116,7 +116,7 @@ define(['i18n!orion/navigate/nls/messages', 'orion/webui/littlelib', 'orion/comm actionComment = handler.actionComment; } } else { - actionComment = "Getting content from " + handler.type; + actionComment = messages["gettingContentFrom"] + handler.type; } progress.showWhile(handler.initDependency(dependency, params, project), actionComment).then(function(dependency){ projectClient.addProjectDependency(project, dependency).then(function(){ @@ -148,8 +148,8 @@ define(['i18n!orion/navigate/nls/messages', 'orion/webui/littlelib', 'orion/comm } var connectDependencyCommand = new mCommands.Command({ - name: "Connect", - tooltip: "Fetch content", + name: messages["connect"], + tooltip: messages["fetchContent"], id: "orion.project.dependency.connect", //$NON-NLS-0$ callback: function(data) { var item = forceSingleItem(data.items); @@ -185,14 +185,14 @@ define(['i18n!orion/navigate/nls/messages', 'orion/webui/littlelib', 'orion/comm var disconnectDependencyCommand = new mCommands.Command({ - name: "Disconnect from project", - tooltip: "Do not treat this folder as a part of the project", + name: messages["disconnectFromProject"], + tooltip: messages["doNotTreatThisFolder"], imageClass: "core-sprite-delete", //$NON-NLS-0$ id: "orion.project.dependency.disconnect", //$NON-NLS-0$ callback: function(data) { var item = forceSingleItem(data.items); progress.progress(projectClient.removeProjectDependency(item.Project, item.Dependency), - i18nUtil.formatMessage("Removing ${0} from project ${1}", item.Dependency.Name, item.Project.Name)).then(function(resp){ + i18nUtil.formatMessage(messages["removing${0}FromProject${1}"], item.Dependency.Name, item.Project.Name)).then(function(resp){ explorer.changedItem(); }); }, @@ -232,13 +232,13 @@ define(['i18n!orion/navigate/nls/messages', 'orion/webui/littlelib', 'orion/comm dependencyTypes = dependencyTypes || []; var addFolderCommand = new mCommands.Command({ - name: "Add External Folder", - tooltip: "Add an external folder from workspace", + name: messages["addExternalFolder"], + tooltip: messages["addAnExternalFolderFrom"], id: "orion.project.addFolder", //$NON-NLS-0$ callback: function(data) { var item = forceSingleItem(data.items); - var dialog = new DirectoryPrompterDialog.DirectoryPrompterDialog({ title : messages["Choose a Folder"], + var dialog = new DirectoryPrompterDialog.DirectoryPrompterDialog({ title : navigateMessages["Choose a Folder"], serviceRegistry : serviceRegistry, fileClient : fileClient, func : function(targetFolder) { @@ -302,8 +302,8 @@ define(['i18n!orion/navigate/nls/messages', 'orion/webui/littlelib', 'orion/comm commandService.addCommand(addFolderCommand); var initProjectCommand = new mCommands.Command({ - name: "Init Basic Project", - tooltip: "Convert this folder into a project", + name: messages["initBasicProject"], + tooltip: messages["convertThisFolderIntoA"], id: "orion.project.initProject", //$NON-NLS-0$ callback: function(data) { var item = forceSingleItem(data.items); @@ -380,7 +380,7 @@ define(['i18n!orion/navigate/nls/messages', 'orion/webui/littlelib', 'orion/comm } }, errorHandler); - progress.showWhile(searchLocallyDeferred, "Searching your workspace for matching content").then(function(resp){ + progress.showWhile(searchLocallyDeferred, messages["searchingYourWorkspaceForMatching"]).then(function(resp){ if(resp) { projectClient.addProjectDependency(item, resp).then(function(){ explorer.changedItem(); @@ -440,7 +440,7 @@ define(['i18n!orion/navigate/nls/messages', 'orion/webui/littlelib', 'orion/comm actionComment = handler.actionComment; } } else { - actionComment = "Getting content from " + handler.type; + actionComment = messages["gettingContentFrom"] + handler.type; } progress.showWhile(handler.initProject(params, {WorkspaceLocation: item.Location}), actionComment).then(function(project){ explorer.changedItem(item, true); @@ -486,14 +486,14 @@ define(['i18n!orion/navigate/nls/messages', 'orion/webui/littlelib', 'orion/comm } var addReadmeCommand = new mCommands.Command({ - name: "Create Readme", - tooltip: "Create README.md file in this project", + name: messages["createReadme"], + tooltip: messages["createREADME.mdFileInThis"], id: "orion.project.create.readme", callback: function(data){ var item = forceSingleItem(data.items); progress.progress(fileClient.createFile(item.Project.ContentLocation, "README.md"), "Creating README.md").then(function(readmeMeta){ if(item.Project){ - progress.progress(fileClient.write(readmeMeta.Location, "# " + item.Project.Name), "Writing sample readme").then(function(){ + progress.progress(fileClient.write(readmeMeta.Location, "# " + item.Project.Name), messages["writingSampleReadme"]).then(function(){ explorer.changedItem(); }); } else { @@ -517,17 +517,17 @@ define(['i18n!orion/navigate/nls/messages', 'orion/webui/littlelib', 'orion/comm commandService.addCommand(addReadmeCommand); var createBasicProjectCommand = new mCommands.Command({ - name: "Create a basic project", - tooltip: "Create an empty project", + name: messages["createABasicProject"], + tooltip: messages["createAnEmptyProject"], id: "orion.project.create.basic", - parameters : new mCommandRegistry.ParametersDescription([new mCommandRegistry.CommandParameter("name", "text", "Name: ")]), + parameters : new mCommandRegistry.ParametersDescription([new mCommandRegistry.CommandParameter("name", "text", messages["name:"])]), callback: function(data){ var name = data.parameters.valueFor("name"); if(!name){ return; } var item = forceSingleItem(data.items); - progress.progress(projectClient.createProject(item.Location, {Name: name}), "Creating project " + name).then(function(project){ + progress.progress(projectClient.createProject(item.Location, {Name: name}), messages["creatingProject"] + name).then(function(project){ explorer.changedItem(item, true); }); }, @@ -540,17 +540,17 @@ define(['i18n!orion/navigate/nls/messages', 'orion/webui/littlelib', 'orion/comm commandService.addCommand(createBasicProjectCommand); var createZipProjectCommand = new mCommands.Command({ - name: "Create a project from a zipped folder", - tooltip: "Create project and fill it with data from local file", + name: messages["createAProjectFromA"], + tooltip: messages["createProjectAndFillIt"], id: "orion.project.create.fromfile", - parameters : new mCommandRegistry.ParametersDescription([new mCommandRegistry.CommandParameter("name", "text", "Name: ")]), + parameters : new mCommandRegistry.ParametersDescription([new mCommandRegistry.CommandParameter("name", "text", messages["name:"])]), callback: function(data){ var name = data.parameters.valueFor("name"); if(!name){ return; } var item = forceSingleItem(data.items); - progress.progress(projectClient.createProject(item.Location, {Name: name}), "Creating project " + name).then(function(projectInfo){ + progress.progress(projectClient.createProject(item.Location, {Name: name}), messages["creatingProject"] + name).then(function(projectInfo){ progress.progress(fileClient.read(projectInfo.ContentLocation, true)).then(function(projectMetadata){ var dialog = new ImportDialog.ImportDialog({ importLocation: projectMetadata.ImportLocation, diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/projects/nls/messages.js b/bundles/org.eclipse.orion.client.ui/web/orion/projects/nls/messages.js new file mode 100644 index 0000000..c53a75c --- /dev/null +++ b/bundles/org.eclipse.orion.client.ui/web/orion/projects/nls/messages.js @@ -0,0 +1,20 @@ +/******************************************************************************* + * @license + * Copyright (c) 2013 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials are made + * available under the terms of the Eclipse Public License v1.0 + * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution + * License v1.0 (http://www.eclipse.org/org/documents/edl-v10.html). + * + ******************************************************************************/ +define(['orion/i18n!orion/projects/nls/messages', 'orion/projects/nls/root/messages'], function(bundle, root) { + var result = { + root:root + }; + Object.keys(bundle).forEach(function(key) { + if (typeof result[key] === 'undefined') { + result[key] = bundle[key]; + } + }); + return result; +});
\ No newline at end of file diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/projects/nls/root/messages.js b/bundles/org.eclipse.orion.client.ui/web/orion/projects/nls/root/messages.js new file mode 100644 index 0000000..a7441d6 --- /dev/null +++ b/bundles/org.eclipse.orion.client.ui/web/orion/projects/nls/root/messages.js @@ -0,0 +1,34 @@ +define({ + "listingProjects": "Listing projects", + "gettingWorkspaceInformation": "Getting workspace information", + "clickToEdit": "Click to edit", + "savingProject": "Saving project ", + "projectInformation": "Project Information", + "description": "Description", + "site": "Site", + "gettingAdditionalProjectInformation": "Getting additional project information", + "associatedContent": "Associated Content", + "(disconnected)": " (disconnected)", + "projects": "Projects", + "thereAreNoProjectsIn": "There are no projects in your workspace, use ${0} to add projects", + "gettingContentFrom": "Getting content from ", + "connect": "Connect", + "fetchContent": "Fetch content", + "disconnectFromProject": "Disconnect from project", + "doNotTreatThisFolder": "Do not treat this folder as a part of the project", + "removing${0}FromProject${1}": "Removing ${0} from project ${1}", + "addExternalFolder": "Add External Folder", + "addAnExternalFolderFrom": "Add an external folder from workspace", + "initBasicProject": "Init Basic Project", + "convertThisFolderIntoA": "Convert this folder into a project", + "searchingYourWorkspaceForMatching": "Searching your workspace for matching content", + "createReadme": "Create Readme", + "createREADME.mdFileInThis": "Create README.md file in this project", + "writingSampleReadme": "Writing sample readme", + "createABasicProject": "Create a basic project", + "createAnEmptyProject": "Create an empty project", + "name:": "Name: ", + "creatingProject": "Creating project ", + "createAProjectFromA": "Create a project from a zipped folder", + "createProjectAndFillIt": "Create project and fill it with data from local file" +});
\ No newline at end of file diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/projects/projectEditor.js b/bundles/org.eclipse.orion.client.ui/web/orion/projects/projectEditor.js index 0de527c..879eb10 100644 --- a/bundles/org.eclipse.orion.client.ui/web/orion/projects/projectEditor.js +++ b/bundles/org.eclipse.orion.client.ui/web/orion/projects/projectEditor.js @@ -9,8 +9,8 @@ ******************************************************************************/ /*global define document setTimeout*/ -define(['orion/markdownView', 'orion/URITemplate', 'orion/webui/littlelib', 'orion/projectCommands', 'orion/commandRegistry', 'orion/URITemplate', 'orion/PageLinks'], - function(mMarkdownView, URITemplate, lib, mProjectCommands, mCommandRegistry, URITemplate, PageLinks) { //$NON-NLS-0$ +define(['i18n!orion/projects/nls/messages', 'orion/markdownView', 'orion/URITemplate', 'orion/webui/littlelib', 'orion/projectCommands', 'orion/commandRegistry', 'orion/URITemplate', 'orion/PageLinks'], + function(messages, mMarkdownView, URITemplate, lib, mProjectCommands, mCommandRegistry, URITemplate, PageLinks) { //$NON-NLS-0$ function ProjectEditor(options){ this.serviceRegistry = options.serviceRegistry; this.fileClient = options.fileClient; @@ -69,7 +69,7 @@ define(['orion/markdownView', 'orion/URITemplate', 'orion/webui/littlelib', 'ori } span.appendChild(document.createTextNode(this.projectData[property] || " ")); - td.title = "Click to edit"; + td.title = messages["clickToEdit"]; span.style.position = "absolute"; td.onclick = showInput.bind(this); @@ -83,7 +83,7 @@ define(['orion/markdownView', 'orion/URITemplate', 'orion/webui/littlelib', 'ori if(event.keyCode === 13){ var properties = {}; properties[property] = event.target.value; - this.progress.progress(this.projectClient.changeProjectProperties(this.projectData, properties), "Saving project " + this.projectData.Name).then( + this.progress.progress(this.projectClient.changeProjectProperties(this.projectData, properties), messages["savingProject"] + this.projectData.Name).then( function(newProjectData){ if(newProjectData){ this.projectData = newProjectData; @@ -119,7 +119,7 @@ define(['orion/markdownView', 'orion/URITemplate', 'orion/webui/littlelib', 'ori table.appendChild(tr); var td = document.createElement("th"); td.colSpan = 2; - td.appendChild(document.createTextNode("Project Information")); + td.appendChild(document.createTextNode(messages["projectInformation"])); tr.appendChild(td); tr = document.createElement("tr"); @@ -147,7 +147,7 @@ define(['orion/markdownView', 'orion/URITemplate', 'orion/webui/littlelib', 'ori table.appendChild(tr); td = document.createElement("td"); b = document.createElement("b"); - b.appendChild(document.createTextNode("Description")); + b.appendChild(document.createTextNode(messages["description"])); td.appendChild(b); td.width = "20%"; tr.appendChild(td); @@ -172,7 +172,7 @@ define(['orion/markdownView', 'orion/URITemplate', 'orion/webui/littlelib', 'ori table.appendChild(tr); td = document.createElement("td"); b = document.createElement("b"); - b.appendChild(document.createTextNode("Site")); + b.appendChild(document.createTextNode(messages["site"])); td.appendChild(b); td.width = "20%"; tr.appendChild(td); @@ -199,7 +199,7 @@ define(['orion/markdownView', 'orion/URITemplate', 'orion/webui/littlelib', 'ori if(!projectHandler || !projectHandler.getAdditionalProjectProperties){ return; } - this.progress.progress(projectHandler.getAdditionalProjectProperties(this.parentFolder, this.projectData), "Getting additional project information").then(function(additionalProperties){ + this.progress.progress(projectHandler.getAdditionalProjectProperties(this.parentFolder, this.projectData), messages["gettingAdditionalProjectInformation"]).then(function(additionalProperties){ if(!additionalProperties || !additionalProperties.length || additionalProperties.length === 0){ return; } @@ -261,7 +261,7 @@ define(['orion/markdownView', 'orion/URITemplate', 'orion/webui/littlelib', 'ori var tr = document.createElement("tr"); table.appendChild(tr); var td = document.createElement("th"); - td.appendChild(document.createTextNode("Associated Content")); + td.appendChild(document.createTextNode(messages["associatedContent"])); tr.appendChild(td); td = document.createElement("th"); tr.appendChild(td); @@ -285,7 +285,7 @@ define(['orion/markdownView', 'orion/URITemplate', 'orion/webui/littlelib', 'ori } }, function(){ lib.empty(td); - td.appendChild(document.createTextNode(dependency.Name + " (disconnected)")); + td.appendChild(document.createTextNode(dependency.Name + messages["(disconnected)"])); lib.empty(span); this.commandService.renderCommands(this.dependencyActions, span, {Dependency: dependency, disconnected: true, Project: this.projectData}, this, "tool"); }.bind(this)); diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/projects/projectExplorer.js b/bundles/org.eclipse.orion.client.ui/web/orion/projects/projectExplorer.js index 9125379..664229f 100644 --- a/bundles/org.eclipse.orion.client.ui/web/orion/projects/projectExplorer.js +++ b/bundles/org.eclipse.orion.client.ui/web/orion/projects/projectExplorer.js @@ -9,8 +9,8 @@ ******************************************************************************/ /*globals define window document*/ -define(['orion/Deferred', 'orion/URITemplate', 'orion/webui/littlelib', 'orion/explorers/explorer'], - function(Deferred, URITemplate, lib, mExplorer){ +define(['i18n!orion/projects/nls/messages', 'orion/Deferred', 'orion/URITemplate', 'orion/webui/littlelib', 'orion/explorers/explorer'], + function(messages, Deferred, URITemplate, lib, mExplorer){ function ProjectsRenderer(options){ this._init(options); @@ -25,7 +25,7 @@ define(['orion/Deferred', 'orion/URITemplate', 'orion/webui/littlelib', 'orion/e var row = document.createElement('tr'); //$NON-NLS-0$ var cell = document.createElement("th"); - cell.appendChild(document.createTextNode("Projects")); + cell.appendChild(document.createTextNode(messages["projects"])); row.appendChild(cell); var cell = document.createElement("th"); @@ -50,7 +50,7 @@ define(['orion/Deferred', 'orion/URITemplate', 'orion/webui/littlelib', 'orion/e td.colSpan = this.oneColumn ? 1 : 3; var noProjects = document.createElement("div"); //$NON-NLS-0$ noProjects.classList.add("noFile"); //$NON-NLS-0$ - noProjects.textContent = "There are no projects in your workspace, use ${0} to add projects"; + noProjects.textContent = messages["thereAreNoProjectsIn"]; var plusIcon = document.createElement("span"); //$NON-NLS-0$ plusIcon.classList.add("core-sprite-addcontent"); //$NON-NLS-0$ plusIcon.classList.add("icon-inline"); //$NON-NLS-0$ diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/projects/projectView.js b/bundles/org.eclipse.orion.client.ui/web/orion/projects/projectView.js index 61e18e8..17272df 100644 --- a/bundles/org.eclipse.orion.client.ui/web/orion/projects/projectView.js +++ b/bundles/org.eclipse.orion.client.ui/web/orion/projects/projectView.js @@ -9,10 +9,10 @@ ******************************************************************************/ /*global define document window*/ -define(['orion/projects/projectExplorer', +define(['i18n!orion/projects/nls/messages', 'orion/projects/projectExplorer', 'orion/selection', 'orion/URITemplate', - 'orion/webui/littlelib'], function(mProjectExplorer, Selection, URITemplate, lib) { + 'orion/webui/littlelib'], function(messages, mProjectExplorer, Selection, URITemplate, lib) { function ProjectView(options){ this.progress = options.progress; this.fileClient = options.fileClient; @@ -33,14 +33,14 @@ define(['orion/projects/projectExplorer', return; } if(parent){ - _self.progress.progress(_self.projectClient.readAllProjects(parent), "Listing projects").then(function(projects){ + _self.progress.progress(_self.projectClient.readAllProjects(parent), messages["listingProjects"]).then(function(projects){ _self.projectExplorer.loadProjects(projects); lib.empty(_self.projectExplorer.newActionsSpan); _self.commandService.renderCommands(mProjectExplorer.newActionsScope, _self.projectExplorer.newActionsSpan, parent, _self.projectExplorer, "tool"); //$NON-NLS-0$ }); } else { - _self.progress.progress(_self.fileClient.loadWorkspace(), "Getting workspace information").then(function(workspace){ - _self.progress.progress(_self.projectClient.readAllProjects(parent), "Listing projects").then(function(projects){ + _self.progress.progress(_self.fileClient.loadWorkspace(), messages["gettingWorkspaceInformation"]).then(function(workspace){ + _self.progress.progress(_self.projectClient.readAllProjects(parent), messages["listingProjects"]).then(function(projects){ _self.projectExplorer.loadProjects(projects); lib.empty(_self.projectExplorer.newActionsSpan); _self.commandService.renderCommands(mProjectExplorer.newActionsScope, _self.projectExplorer.newActionsSpan, parent, _self.projectExplorer, "tool"); //$NON-NLS-0$ |