From e6ed8ee509f5899b0a43446350a362d938b45766 Mon Sep 17 00:00:00 2001 From: Allen Boone Date: Thu, 28 May 2015 15:17:31 -0400 Subject: [PATCH] locale exposed to editor --- .gitignore | 2 + locales/zz-ZZ/editor.json | 142 ------------------------------------- locales/zz-ZZ/runtime.json | 91 ------------------------ red/api/locales.js | 10 ++- red/i18n.js | 19 ++++- 5 files changed, 27 insertions(+), 237 deletions(-) delete mode 100644 locales/zz-ZZ/editor.json delete mode 100644 locales/zz-ZZ/runtime.json diff --git a/.gitignore b/.gitignore index 77abb30b2..5415d9f4f 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ flows*.json nodes/node-red-nodes/ node_modules public +locales/zz-ZZ +nodes/core/locales/zz-ZZ diff --git a/locales/zz-ZZ/editor.json b/locales/zz-ZZ/editor.json deleted file mode 100644 index a30fe6815..000000000 --- a/locales/zz-ZZ/editor.json +++ /dev/null @@ -1,142 +0,0 @@ -{ - "workspace": { - "label": { - "name": "[G'Nameฏูİı｜]" - } - }, - "menu": { - "label": { - "sidebar": "[G'Sidebarฏูİı｜]", - "displayStatus": "[G'Ｄｉｓｐｌａy node statusฏูİı｜]", - "import": "[G'Importฏูİı｜]", - "export": "[G'Exportฏูİı｜]", - "clipboard": "[G'Clipboardฏูİı｜]", - "library": "[G'Libraryฏูİı｜]", - "configurationNodes": "[G'Ｃｏｎｆｉｇuration nodesฏูİı｜]", - "subflows": "[G'Subflowsฏูİı｜]", - "createSubflow": "[G'Ｃｒｅａte subflowฏูİı｜]", - "selectionToSubflow": "[G'Ｓｅｌｅｃｔｉon to subflowฏูİı｜]", - "workspaces": "[G'Ｗorkspacesฏูİı｜]", - "add": "[G'Addฏูİı｜]", - "rename": "[G'Renameฏูİı｜]", - "delete": "[G'Deleteฏูİı｜]", - "keyboardShortcuts": "[G'Ｋｅｙｂｏａrd Shortcutsฏูİı｜]", - "login": "[G'Loginฏูİı｜]", - "logout": "[G'Logoutฏูİı｜]" - } - }, - "notification": { - "nodeAdded": "[G'Ｎｏｄｅ ａｄｄｅd to palette:ฏูİı｜]", - "nodeAdded_plural": "[G'Ｎｏｄｅｓ ａｄｄed to paletteฏูİı｜]", - "nodeRemoved": "[G'Ｎｏｄｅ ｒｅｍｏｖed from palette:ฏูİı｜]", - "nodeRemoved_plural": "[G'Ｎｏｄｅｓ ｒｅｍｏved from palette:ฏูİı｜]", - "nodeEnabled": "[G'Ｎｏｄe enabled:ฏูİı｜]", - "nodeEnabled_plural": "[G'Ｎｏｄｅs enabled:ฏูİı｜]", - "nodeDisabled": "[G'Ｎｏｄｅ disabled:ฏูİı｜]", - "nodeDisabled_plural": "[G'Ｎｏｄｅs disabled:ฏูİı｜]", - "lostConnectionError": "[G'Ｅｒｒｏｒ: Ｌｏｓｔ ｃonnection to serverฏูİı｜]", - "importUnrecognised": "[G'Ｉｍｐｏｒｔｅｄ unrecognised ฏูİı｜]", - "loggedInAs": "[G'Ｌｏｇged in as ฏูİı｜]", - "invalidFilename": "[G'Ｉｎｖａｌid filenameฏูİı｜]", - "savedType": "[G'Ｓａｖｅd __type__ฏูİı｜]", - "saveFailed": "[G'Ｓａｖe failed: ฏูİı｜]", - "noNodesSelected": "[G'Ｃａｎｎｏｔ ｃｒｅａｔe subflow: no nodes selectedฏูİı｜]", - "multipleInputsToSelection": "[G'Ｃａｎｎｏｔ ｃｒｅａｔｅ subflow: multiple inputs to selectionฏูİı｜]", - "cannotAddSubflowToItself": "[G'Ｅｒｒｏｒ: Ｃａｎｎｏt add subflow to itselfฏูİı｜]", - "cannotAddCircularReference": "[G'Ｅｒｒｏｒ: Ｃａｎｎｏｔ ａdd subflow - circular reference detectedฏูİı｜]", - "nodeCopied": "[G'__ｃｏｕｎｔ__ ｎｏde copiedฏูİı｜]", - "nodeCopied_plural": "[G'__ｃｏｕｎｔ__ ｎｏｄes copiedฏูİı｜]", - "undeployedChanges": "[G'Ｗａｒｎｉｎｇ: ｎｏｄｅ has undeployed changesฏูİı｜]", - "nodeActionDisabled": "[G'Ｗａｒｎｉｎｇ: ｎｏｄｅ actions disabled within subflowฏูİı｜]", - "error": "[G'Error: ฏูİı｜]" - }, - "error": { - "apiSubflowOnly": "[G'ｔｈｉｓ ａｐｉ ｉｓ ｓｕbflow only. called with:ฏูİı｜]", - "invalidFlow": "[G'Ｉｎｖａlid flow: ฏูİı｜]", - "cannotAddSubflowToItself": "[G'Ｃａｎｎｏｔ ａｄｄ subflow to itselfฏูİı｜]", - "cannotAddCircularReference": "[G'Ｃａｎｎｏｔ ａｄｄ ｓｕbflow - circular reference detectedฏูİı｜]" - }, - "dialog": { - "cancel": "[G'Cancelฏูİı｜]", - "login": "[G'Loginฏูİı｜]", - "loginFailed": "[G'Ｌｏgin failedฏูİı｜]", - "ok": "[G'Okฏูİı｜]", - "delete": "[G'Deleteฏูİı｜]", - "close": "[G'Closeฏูİı｜]", - "nodes": "[G' Nodes:ฏูİı｜]", - "selectToCopy": "[G'Ｓｅｌｅｃｔ ｔｈｅ ｔｅｘt above and copy to the clipboard with Ctrl-C.ฏูİı｜]", - "pasteNodesHere": "[G'Ｐａｓｔｅ nodes hereฏูİı｜]", - "importNodes": "[G'Ｉｍport nodesฏูİı｜]", - "exportNodesClipboard": "[G'Ｅｘｐｏｒｔ ｎｏｄes to clipboardฏูİı｜]", - "renameSheet": "[G'Ｒｅname sheetฏูİı｜]", - "confirmDelete": "[G'Ｃｏｎｆirm deleteฏูİı｜]" - }, - "deploy": { - "deploy": "[G'Deployฏูİı｜]", - "full": "[G'Fullฏูİı｜]", - "modifiedFlows": "[G'Ｍｏｄｉfied Flowsฏูİı｜]", - "modifiedNodes": "[G'Ｍｏｄｉfied Nodesฏูİı｜]", - "fullDesc": "[G'Ｄｅｐｌｏｙｓ ｅｖｅrything in the workspaceฏูİı｜]", - "modifiedFlowsDesc": "[G'Ｏｎｌｙ ｄｅｐｌｏｙｓ flows that contain changed nodesฏูİı｜]", - "modifiedNodesDesc": "[G'Ｏｎｌｙ ｄｅｐｌｏｙs nodes that have changedฏูİı｜]", - "confirmDeploy": "[G'Ｃｏｎｆirm deployฏูİı｜]", - "cancelDeploy": "[G'Cancelฏูİı｜]", - "undeployedChanges": "[G'Ｙｏｕ ｈａｖｅ ｕｎｄｅｐloyed changes.\n\nLeaving this page will lose these changes.ฏูİı｜]", - "successfulDeploy": "[G'Ｓｕｃｃｅｓｓfully Deployedฏูİı｜]", - "error": "[G'Error: ฏูİı｜]", - "noResponseError": "[G'ｎｏ ｒｅｓｐｏｎse from serverฏูİı｜]" - }, - "editor": { - "savedNodes": "[G'Ｓａved nodesฏูİı｜]", - "configEdit": "[G'editฏูİı｜]", - "configAdd": "[G'addฏูİı｜]", - "configDelete": "[G'Deleteฏูİı｜]", - "editFlow": "[G'Ｅdit flow ฏูİı｜]", - "nodesUse": "[G'__ｃｏｕｎｔ__ ｎｏｄｅ uses this configฏูİı｜]", - "nodesUse_plural": "[G'__ｃｏｕｎｔ__ ｎｏｄｅs use this configฏูİı｜]", - "addNewConfig": "[G'Ａｄｄ ｎｅｗ __ｔｙｐe__ config nodeฏูİı｜]", - "editConfig": "[G'Ｅｄｉｔ __ｔｙｐｅ__ ｃonfig nodeฏูİı｜]", - "addNewType": "[G'Ａｄｄ ｎｅｗ __type__...ฏูİı｜]", - "subflow": "[G'Subflow: ฏูİı｜]", - "subflowInstances": "[G'Ｔｈｅｒｅ ｉｓ __ｃｏｕｎt__ instance of this subflowฏูİı｜]", - "subflowInstances_plural": "[G'Ｔｈｅｒｅ ａｒｅ __ｃｏｕnt__ instances of this subflowฏูİı｜]" - }, - "keyboard": { - "selectAll": "[G'Ｓｅｌｅｃt all nodesฏูİı｜]", - "selectAllConnected": "[G'Ｓｅｌｅｃｔ ａｌｌ connected nodesฏูİı｜]", - "addRemoveNode": "[G'Ａｄｄ/ｒｅｍｏｖｅ node from selectionฏูİı｜]", - "deleteSelected": "[G'Ｄｅｌｅｔｅ ｓｅｌected nodes or linkฏูİı｜]", - "importNode": "[G'Ｉｍport nodesฏูİı｜]", - "exportNode": "[G'Ｅｘｐｏｒｔ ｓelected nodesฏูİı｜]", - "toggleSidebar": "[G'Ｔｏｇｇle sidebarฏูİı｜]", - "deleteNode": "[G'Ｄｅｌｅｔｅ ｓｅｌected nodes or linkฏูİı｜]", - "copyNode": "[G'Ｃｏｐｙ ｓｅlected nodesฏูİı｜]", - "cutNode": "[G'Ｃｕｔ ｓｅｌected nodesฏูİı｜]", - "pasteNode": "[G'Ｐａste nodesฏูİı｜]" - }, - "library": { - "openLibrary": "[G'Ｏｐｅｎ Library...ฏูİı｜]", - "saveToLibrary": "[G'Ｓａｖｅ ｔｏ Library...ฏูİı｜]", - "typeLibrary": "[G'__ｔｙｐｅ__ ｌibraryฏูİı｜]", - "unnamedType": "[G'Ｕｎｎａｍed __type__ฏูİı｜]", - "saveToLibrary": "[G'Ｓａｖｅ to Libraryฏูİı｜]", - "exportToLibrary": "[G'Ｅｘｐｏｒｔ ｎｏdes to libraryฏูİı｜]" - }, - "palette": { - "noInfo": "[G'ｎｏ ｉｎｆｏｒｍation availableฏูİı｜]", - "popOverError": "[G'Ｅｒｒｏｒ ｇｅｎｅｒａting pop-over label for '__type__'.ฏูİı｜]" - }, - "tabInfo": { - "node": "[G'Nodeฏูİı｜]", - "type": "[G'Typeฏูİı｜]", - "id": "[G'IDฏูİı｜]", - "subflow": "[G'Subflowฏูİı｜]", - "name": "[G'nameฏูİı｜]", - "instances": "[G'instancesฏูİı｜]", - "properties": "[G'Ｐropertiesฏูİı｜]", - "blank": "[G'blankฏูİı｜]" - }, - "workspaces": { - "subflow": "[G'Subflow: ฏูİı｜]" - } -} diff --git a/locales/zz-ZZ/runtime.json b/locales/zz-ZZ/runtime.json deleted file mode 100644 index c3b3a3528..000000000 --- a/locales/zz-ZZ/runtime.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "runtime": { - "welcome": "[G'Ｗｅｌｃｏｍe to Node-REDฏูİı｜]", - "version": "[G'__ｃｏｍｐｏｎｅｎｔ__ ｖersion: __version__ฏูİı｜]", - "paths": { - "settings": "[G'Ｓｅｔｔｉｎｇｓ ｆile : __path__ฏูİı｜]" - } - }, - - "server": { - "loading": "[G'Ｌｏａｄｉｎｇ palette nodesฏูİı｜]", - "errors": "[G'Ｆａｉｌｅｄ ｔｏ ｒｅｇister __count__ node typeฏูİı｜]", - "errors_plural": "[G'Ｆａｉｌｅｄ ｔｏ ｒｅｇister __count__ node typesฏูİı｜]", - "errors-help": "[G'Ｒｕｎ ｗｉｔｈ -ｖ for detailsฏูİı｜]", - "missing-modules": "[G'Ｍｉｓｓｉｎｇ node modules:ฏูİı｜]", - "removing-modules": "[G'Ｒｅｍｏｖｉｎｇ ｍodules from configฏูİı｜]", - "added-types": "[G'Ａｄｄｅｄ node types:ฏูİı｜]", - "removed-types": "[G'Ｒｅｍｏｖｅd node types:ฏูİı｜]", - "install": { - "invalid": "[G'Ｉｎｖａｌｉd module nameฏูİı｜]", - "installing": "[G'Ｉｎｓｔａｌｌｉｎg module: __name__ฏูİı｜]", - "installed": "[G'Ｉｎｓｔａｌｌｅｄ module: __name__ฏูİı｜]", - "install-failed": "[G'Ｉｎｓｔall failedฏูİı｜]", - "install-failed-long": "[G'Ｉｎｓｔａｌｌａｔｉｏn of module __name__ failed:ฏูİı｜]", - "install-failed-not-found": "[G'$ｔ(ｉｎｓｔａｌｌ-ｆａｉled-long) module not foundฏูİı｜]", - - "uninstalling": "[G'Ｕｎｉｎｓｔａｌｌing module: __name__ฏูİı｜]", - "uninstall-failed": "[G'Ｕｎｉｎｓtall failedฏูİı｜]", - "uninstall-failed-long": "[G'Ｕｎｉｎｓｔａｌｌ ｏf module __name__ failed:ฏูİı｜]", - "uninstalled": "[G'Ｕｎｉｎｓｔａｌｌed module: __name__ฏูİı｜]" - } - }, - - "api": { - "flows": { - "error-save": "[G'Ｅｒｒｏｒ ｓａｖｉng flows: __message__ฏูİı｜]" - }, - "library": { - "error-load-entry": "[G'Ｅｒｒｏｒ ｌｏａｄｉｎg library entry '__path__': __message__ฏูİı｜]", - "error-save-entry": "[G'Ｅｒｒｏｒ ｓａｖｉｎｇ library entry '__path__': __message__ฏูİı｜]", - "error-load-flow": "[G'Ｅｒｒｏｒ ｌｏａｄｉｎg flow '__path__': __message__ฏูİı｜]", - "error-save-flow": "[G'Ｅｒｒｏｒ ｓａｖｉｎｇ flow '__path__': __message__ฏูİı｜]" - }, - "nodes": { - "enabled": "[G'Ｅｎａｂｌｅd node types:ฏูİı｜]", - "disabled": "[G'Ｄｉｓａｂｌｅd node types:ฏูİı｜]", - "error-enable": "[G'Ｆａｉｌｅｄ ｔｏ enable node:ฏูİı｜]" - } - }, - - "comms": { - "error": "[G'Ｃｏｍｍｕｎｉｃａｔｉon channel error: __message__ฏูİı｜]", - "error-server": "[G'Ｃｏｍｍｕｎｉｃａｔｉon server error: __message__ฏูİı｜]", - "error-send": "[G'Ｃｏｍｍｕｎｉｃａｔion send error: __message__ฏูİı｜]" - }, - - "nodes": { - "credentials": { - "error":"[G'Ｅｒｒｏｒ ｌｏａｄｉｎg credentials: __message__ฏูİı｜]", - "not-registered": "[G'Ｃｒｅｄｅｎｔｉａｌ ｔype '__type__' is not registeredฏูİı｜]" - }, - "flows": { - "registered-missing": "[G'Ｍｉｓｓｉｎｇ ｔｙｐe registered: __type__ฏูİı｜]", - "error": "[G'Ｅｒｒｏｒ ｌｏａｄing flows: __message__ฏูİı｜]", - "starting-modified-nodes": "[G'Ｓｔａｒｔｉｎｇ modified nodesฏูİı｜]", - "starting-modified-flows": "[G'Ｓｔａｒｔｉｎｇ modified flowsฏูİı｜]", - "starting-flows": "[G'Ｓｔａｒting flowsฏูİı｜]", - "started-modified-nodes": "[G'Ｓｔａｒｔｅｄ ｍodified nodesฏูİı｜]", - "started-modified-flows": "[G'Ｓｔａｒｔｅｄ ｍodified flowsฏูİı｜]", - "started-flows": "[G'Ｓｔａrted flowsฏูİı｜]", - "stopping-modified-nodes": "[G'Ｓｔｏｐｐｉｎｇ modified nodesฏูİı｜]", - "stopping-modified-flows": "[G'Ｓｔｏｐｐｉｎｇ modified flowsฏูİı｜]", - "stopping-flows": "[G'Ｓｔｏｐping flowsฏูİı｜]", - "stopped-modified-nodes": "[G'Ｓｔｏｐｐｅｄ ｍodified nodesฏูİı｜]", - "stopped-modified-flows": "[G'Ｓｔｏｐｐｅｄ ｍodified flowsฏูİı｜]", - "stopped-flows": "[G'Ｓｔｏpped flowsฏูİı｜]", - "stopped": "[G'Stoppedฏูİı｜]", - "missing-types": "[G'Ｗａｉｔｉｎｇ ｆｏｒ ｍissing types to be registered:ฏูİı｜]" - - } - }, - - "storage": { - "localfilesystem": { - "user-dir": "[G'Ｕｓｅｒ ｄｉｒｅｃtory : __path__ฏูİı｜]", - "flows-file": "[G'Ｆｌｏｗｓ ｆｉle : __path__ฏูİı｜]", - "create": "[G'Ｃｒｅａｔｉｎｇ new flow fileฏูİı｜]" - } - } - -} diff --git a/red/api/locales.js b/red/api/locales.js index 6fc2069ce..9f49d4bda 100644 --- a/red/api/locales.js +++ b/red/api/locales.js @@ -19,8 +19,12 @@ module.exports = { get: function(req,res) { var namespace = req.params[0]; namespace = namespace.replace(/\.json$/,""); - var lang = req.query["lang"]||"en-US"; // TODO: determine requested lang - var catalog = i18n.catalog(namespace,lang); - res.json(catalog||{}); + var lang = i18n.determineLangFromHeaders(req.acceptedLanguages); + var prevLang = i18n.i.lng(); + i18n.i.setLng(lang, function(){ + var catalog = i18n.catalog(namespace,lang); + res.json(catalog||{}); + }); + i18n.i.setLng(prevLang); } } diff --git a/red/i18n.js b/red/i18n.js index 1165a854b..5f5941f4a 100644 --- a/red/i18n.js +++ b/red/i18n.js @@ -101,12 +101,29 @@ function getCatalog(namespace,lang) { return result; } +function determineLangFromHeaders(acceptedLanguages){ + var lang = "en-US"; + + var supportedLanguages = ['en-US', 'es', 'fr', 'it', 'de', 'pt-BR', 'zh', 'zh-TW', 'ko', 'ja', 'zz-ZZ']; // TODO: pull this value from settings + for (var i=0;i