From ce371235b3532acb75a34b23afb1746269a9ea83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Eixarch?= Date: Thu, 15 Nov 2012 11:44:31 +0100 Subject: [PATCH 01/34] =?UTF-8?q?Traducci=C3=B3n=20al=20castellano/Spanish?= =?UTF-8?q?=20translation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/es.ini | 77 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 src/locales/es.ini diff --git a/src/locales/es.ini b/src/locales/es.ini new file mode 100644 index 00000000..0dddfec0 --- /dev/null +++ b/src/locales/es.ini @@ -0,0 +1,77 @@ +[en] +index.newPad = Nuevo Pad +index.createOpenPad = o puedes crear/abrir un Pad con el nombre: +pad.toolbar.bold.title = Negrita (Ctrl-B) +pad.toolbar.italic.title = Cursiva (Ctrl-I) +pad.toolbar.underline.title = Subrayado (Ctrl-U) +pad.toolbar.strikethrough.title = Tachado +pad.toolbar.ol.title = Lista ordenada +pad.toolbar.ul.title = Lista desordenada +pad.toolbar.indent.title = Sangrar +pad.toolbar.unindent.title = Desangrar +pad.toolbar.undo.title = Deshacer (Ctrl-Z) +pad.toolbar.redo.title = Rehacer (Ctrl-Y) +pad.toolbar.clearAuthorship.title = Eliminar los colores de los autores +pad.toolbar.import_export.title = Importar/Exportar a diferentes formatos de archivos +pad.toolbar.timeslider.title = Línea de tiempo +pad.toolbar.savedRevision.title = Revisiones guardadas +pad.toolbar.settings.title = Configuración +pad.toolbar.embed.title = Incrustar este pad +pad.toolbar.showusers.title = Mostrar los usuarios de este pad +pad.colorpicker.save = Guardar +pad.colorpicker.cancel = Cancelar +pad.loading = Cargando... +pad.settings.padSettings = Configuración del Pad +pad.settings.myView = Mi vista +pad.settings.stickychat = Chat siempre encima +pad.settings.colorcheck = Color de autoría +pad.settings.linenocheck = Números de línea +pad.settings.fontType = Tipografía: +pad.settings.fontType.normal = Normal +pad.settings.fontType.monospaced = Monoespacio +pad.settings.globalView = Vista global +pad.settings.language = Idioma: +pad.importExport.import_export = Importar/Exportar +pad.importExport.import = Subir cualquier texto o documento +pad.importExport.successful = ¡Operación exitosa! +pad.importExport.export = Exporta el pad actual como +pad.importExport.exporthtml = HTML +pad.importExport.exportplain = Texto plano +pad.importExport.exportword = Microsoft Word +pad.importExport.exportpdf = PDF +pad.importExport.exportopen = ODF (Open Document Format) +pad.importExport.exportdokuwiki = DokuWiki +pad.modals.connected = Conectado. +pad.modals.reconnecting = Reconectando a tu pad.. +pad.modals.forcereconnect = Reconexión forzosa +pad.modals.uderdup = Abrir en otra ventana +pad.modals.userdup.explanation = Este pad parece estar abierto en más de una ventana de tu navegador. +pad.modals.userdup.advice = Reconectar para usar esta ventana. +pad.modals.unauth = No autorizado. +pad.modals.unauth.explanation = Los permisos han cambiado mientras estabas viendo esta página. Intenta reconectar de nuevo. +pad.modals.looping = Desconectado. +pad.modals.looping.explanation = Estamos teniendo problemas con la sincronización en el servidor. +pad.modals.looping.cause = Quizás su conexión fluya a través de un proxy o un cortafuegos incompatible. +pad.modals.initsocketfail = Servidor incalcanzable. +pad.modals.initsocketfail.explanation = No se pudo conectar al sevidor de sincronización. +pad.modals.initsocketfail.cause = Puede ser a causa de tu navegador o de una caída en tu conexión de Internet. +pad.modals.slowcommit = Desconectado. +pad.modals.slowcommit.explanation = El servidor no responde. +pad.modals.slowcommit.cause = Puede deberse a problemas con tu conexión de red. +pad.modals.deleted = Borrado. +pad.modals.deleted.explanation = Este pad ha sido borrado. +pad.modals.disconnected = Has sido desconectado. +pad.modals.disconnected.explanation = Se perdió la conexión con el servidor +pad.modals.disconnected.cause = El servidor podría no estar disponible. Contacte con nosotros si esto continúa sucediendo. +pad.share = Compatir el pad +pad.share.readonly = Sólo lectura +pad.share.link = Enlace +pad.share.emebdcode = Incrustar URL +pad.chat = Chat +pad.chat.title = Abrir el chat para este pad. + +timeslider.pageTitle = {{appTitle}} Línea de tiempo +timeslider.toolbar.returnbutton = Volver al pad +timeslider.toolbar.authors = Autores: +timeslider.toolbar.authorsList = Sin autores +timeslider.exportCurrent = Exportar la versión actual como: From dd845f7731fc4d2e5c88b411b6770a4894b438d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Eixarch?= Date: Thu, 15 Nov 2012 13:41:44 +0100 Subject: [PATCH 02/34] fixed label languague --- src/locales/es.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/es.ini b/src/locales/es.ini index 0dddfec0..a119af1c 100644 --- a/src/locales/es.ini +++ b/src/locales/es.ini @@ -1,4 +1,4 @@ -[en] +[es] index.newPad = Nuevo Pad index.createOpenPad = o puedes crear/abrir un Pad con el nombre: pad.toolbar.bold.title = Negrita (Ctrl-B) From fcee203a1a6ad09899494bb88b384fb42f1adade Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Thu, 15 Nov 2012 15:16:12 +0100 Subject: [PATCH 03/34] Dont include git history in the windows .zip git history is located in .git/objects --- bin/buildForWindows.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/buildForWindows.sh b/bin/buildForWindows.sh index 1d47bff1..2f906238 100755 --- a/bin/buildForWindows.sh +++ b/bin/buildForWindows.sh @@ -52,6 +52,9 @@ echo "download windows node..." cd bin wget "http://nodejs.org/dist/v$NODE_VERSION/node.exe" -O ../node.exe +echo "remove git history to reduce folder size" +rm -rf .git/objects + echo "create the zip..." cd /tmp zip -9 -r etherpad-lite-win.zip etherpad-lite-win From 2c268f6c484c6016a5b1547b540327cca8527c0e Mon Sep 17 00:00:00 2001 From: Sarhan Aissi Date: Thu, 15 Nov 2012 22:11:48 +0100 Subject: [PATCH 04/34] Fix the path of run.sh on README.md In Linux forward slash is used for file path and not backslash --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index baa8b13e..7d3a73f5 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ Additionally, you'll need [node.js](http://nodejs.org). 1. Move to a folder where you want to install Etherpad Lite. Clone the git repository `git clone git://github.com/ether/etherpad-lite.git` 2. Change into the new directory containing the cloned source code `cd etherpad-lite` -Now, run `bin\run.sh` and open in your browser. +Now, run `bin/run.sh` and open in your browser. Update to the latest version with `git pull origin`. The next start with bin/run.sh will update the dependencies. From 716aa13a79a81d4a60f0590841b8bbb583f9a9ee Mon Sep 17 00:00:00 2001 From: Sarhan Aissi Date: Fri, 16 Nov 2012 10:39:38 +0100 Subject: [PATCH 05/34] Fix examples url in settings.html to use ether/ --- src/templates/admin/settings.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/templates/admin/settings.html b/src/templates/admin/settings.html index 880f0eb1..c4f50578 100644 --- a/src/templates/admin/settings.html +++ b/src/templates/admin/settings.html @@ -23,8 +23,8 @@

Etherpad Lite Settings

- Example production settings template - Example development settings template + Example production settings template + Example development settings template From 1321d9e16f9c51e49aa8d062a721a119d11842f4 Mon Sep 17 00:00:00 2001 From: johnyma22 Date: Fri, 16 Nov 2012 20:17:25 +0000 Subject: [PATCH 06/34] Resolve #1171 by not including tests in windows build --- bin/buildForWindows.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/buildForWindows.sh b/bin/buildForWindows.sh index 2f906238..d80b1c28 100755 --- a/bin/buildForWindows.sh +++ b/bin/buildForWindows.sh @@ -57,7 +57,7 @@ rm -rf .git/objects echo "create the zip..." cd /tmp -zip -9 -r etherpad-lite-win.zip etherpad-lite-win +zip -9 -r etherpad-lite-win.zip etherpad-lite-win -x "src/node_modules/jsdom-nocontextifiy/test/*" mv etherpad-lite-win.zip $START_FOLDER echo "clean up..." From 27c5e8691f41bfcab79f88ba388222f9e8747f71 Mon Sep 17 00:00:00 2001 From: johnyma22 Date: Fri, 16 Nov 2012 20:51:08 +0000 Subject: [PATCH 07/34] mheh, better way of handling the buidl for windows script --- bin/buildForWindows.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/buildForWindows.sh b/bin/buildForWindows.sh index d80b1c28..27165bfa 100755 --- a/bin/buildForWindows.sh +++ b/bin/buildForWindows.sh @@ -55,12 +55,16 @@ wget "http://nodejs.org/dist/v$NODE_VERSION/node.exe" -O ../node.exe echo "remove git history to reduce folder size" rm -rf .git/objects +echo "remove windows jsdom-nocontextify/test folder" +rm -rf /tmp/etherpad-lite-win/node_modules/ep_etherpad-lite/node_modules/jsdom-nocontextifiy/test/ +rm -rf /tmp/etherpad-lite-win/src/node_modules/jsdom-nocontextifiy/test/ + echo "create the zip..." cd /tmp -zip -9 -r etherpad-lite-win.zip etherpad-lite-win -x "src/node_modules/jsdom-nocontextifiy/test/*" +zip -9 -r etherpad-lite-win.zip etherpad-lite-win mv etherpad-lite-win.zip $START_FOLDER echo "clean up..." -rm -rf /tmp/etherpad-lite-win +# rm -rf /tmp/etherpad-lite-win echo "Finished. You can find the zip in the Etherpad Lite root folder, it's called etherpad-lite-win.zip" From fbe16da728528ffecd388949a59f6960adcba8aa Mon Sep 17 00:00:00 2001 From: johnyma22 Date: Fri, 16 Nov 2012 20:52:19 +0000 Subject: [PATCH 08/34] dont forget to allow for cleanup --- bin/buildForWindows.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/buildForWindows.sh b/bin/buildForWindows.sh index 27165bfa..c67a3701 100755 --- a/bin/buildForWindows.sh +++ b/bin/buildForWindows.sh @@ -65,6 +65,6 @@ zip -9 -r etherpad-lite-win.zip etherpad-lite-win mv etherpad-lite-win.zip $START_FOLDER echo "clean up..." -# rm -rf /tmp/etherpad-lite-win +rm -rf /tmp/etherpad-lite-win echo "Finished. You can find the zip in the Etherpad Lite root folder, it's called etherpad-lite-win.zip" From cefbd8354d4f2511674a573f76e404e5794a3b8a Mon Sep 17 00:00:00 2001 From: johnyma22 Date: Fri, 16 Nov 2012 21:12:04 +0000 Subject: [PATCH 09/34] fix tiny error of missing space --- bin/installDeps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/installDeps.sh b/bin/installDeps.sh index ac2e68cf..ae4860b3 100755 --- a/bin/installDeps.sh +++ b/bin/installDeps.sh @@ -79,7 +79,7 @@ echo "Ensure jQuery is downloaded and up to date..." DOWNLOAD_JQUERY="true" NEEDED_VERSION="1.7.1" if [ -f "src/static/js/jquery.js" ]; then - if [ $(uname) = "SunOS"]; then + if [ $(uname) = "SunOS" ]; then VERSION=$(cat src/static/js/jquery.js | head -n 3 | ggrep -o "v[0-9]\.[0-9]\(\.[0-9]\)\?"); else VERSION=$(cat src/static/js/jquery.js | head -n 3 | grep -o "v[0-9]\.[0-9]\(\.[0-9]\)\?"); From a39faf936877c4fcf2bfaf9cc2bb23669b87fba4 Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Sat, 17 Nov 2012 14:19:09 +0100 Subject: [PATCH 10/34] Fix #1115 correctly reference session cookie --- src/node/padaccess.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node/padaccess.js b/src/node/padaccess.js index 4388ab94..d8780914 100644 --- a/src/node/padaccess.js +++ b/src/node/padaccess.js @@ -7,7 +7,7 @@ module.exports = function (req, res, callback) { // FIXME: Why is this ever undefined?? if (req.cookies === undefined) req.cookies = {}; - securityManager.checkAccess(req.params.pad, req.cookies.sessionid, req.cookies.token, req.cookies.password, function(err, accessObj) { + securityManager.checkAccess(req.params.pad, req.cookies.sessionID, req.cookies.token, req.cookies.password, function(err, accessObj) { if(ERR(err, callback)) return; //there is access, continue From e131f6007175af34b3e18cf1aaa52bf7907ba2c4 Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Sat, 17 Nov 2012 14:33:01 +0100 Subject: [PATCH 11/34] Serve English strings directly with /locales.ini --- src/locales/en.ini | 2 +- src/node/hooks/i18n.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/locales/en.ini b/src/locales/en.ini index 95b8eadd..6077c1f5 100644 --- a/src/locales/en.ini +++ b/src/locales/en.ini @@ -1,4 +1,4 @@ -[en] +[*] index.newPad = New Pad index.createOpenPad = or create/open a Pad with the name: pad.toolbar.bold.title = Bold (Ctrl-B) diff --git a/src/node/hooks/i18n.js b/src/node/hooks/i18n.js index 6238f2cb..50946c42 100644 --- a/src/node/hooks/i18n.js +++ b/src/node/hooks/i18n.js @@ -5,7 +5,9 @@ var Globalize = require('globalize') var localesPath = __dirname+"/../../locales"; -var localeIndex = '[*]\r\n@import url(locales/en.ini)\r\n'; +// Serve English strings directly with /locales.ini +var localeIndex = fs.readFileSync(localesPath+'/en.ini')+'\r\n'; + exports.availableLangs = {en: 'English'}; fs.readdir(localesPath, function(er, files) { From 5baef07b559bbc6d6cd1410ffd0c8f9e987ef575 Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Sat, 17 Nov 2012 15:28:33 +0100 Subject: [PATCH 12/34] Load l10n.js first but asynchronusly --- src/templates/index.html | 16 +++++++++------- src/templates/pad.html | 17 +++++++++-------- src/templates/timeslider.html | 19 +++++++++---------- 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/src/templates/index.html b/src/templates/index.html index c1214007..9fd33a26 100644 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -33,6 +33,15 @@ + + +