From f838e311157e2d4874568a4671a7764053413612 Mon Sep 17 00:00:00 2001 From: benoit Date: Sun, 20 May 2012 00:16:19 +0200 Subject: [PATCH 1/3] French trad & CSS adjutement --- .gitignore | 4 ++++ css/custom.css | 8 ++++---- welcome.html | 20 ++++++++++---------- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index d68950d..efd1402 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,7 @@ node_modules # Cloud9IDE .settings.xml + +libredocs.esproj/Project.espressostorage + +libredocs.esproj/user.benoit.espressostorage diff --git a/css/custom.css b/css/custom.css index 2caef50..1dfd149 100644 --- a/css/custom.css +++ b/css/custom.css @@ -16,18 +16,18 @@ h1>small { font-size:12px; position:absolute; left:16.8em; top:.5em; white-space #signin { margin-top:5.5em; padding:0 8em 1em 7em; white-space:nowrap; height:2.6em; } #write #signin { position:relative; float:right; top:1em; margin:0; } -.content #welcome { height:29em; } +.content #welcome { height:32em; } #steps { position:absolute; top:22em; } .step, .step.done, .step.done:hover { opacity:.5; position:relative; } .step.active, .step:hover { opacity:1; } -.step.remotestorage { position:absolute; width:20em; left:0; } +.step.remotestorage { position:absolute; width:18em; left:0; } .step.remotestorage img, .step.write img { position:relative; left:20%; } .step.remotestorage img { margin:2em 0; width:12em; } -.step.connect { position:absolute; width:18em; left:21em; } +.step.connect { position:absolute; width:22em; left:22em; } .step.connect #connect { position:absolute; width:15em; } .step.connect #connect-address { position:absolute; margin:4em 0 .5em; width:9.35em; padding-right:6em; height:2.5em; padding-left:3em; background:url('../images/remoteStorage-icon.png') no-repeat .3em center; } .step.connect #connect-button { position:absolute; margin:4.6em -3em 0 0; right:0; } -.step.write { position:absolute; width:20em; left:41em; } +.step.write { position:absolute; width:18em; left:42em; } .step.write img { margin-top:-1em; } .step>h3 { position:absolute; top:7.3em; white-space:nowrap; } .step>p { position:absolute; top:12.5em; } diff --git a/welcome.html b/welcome.html index 259fd4b..5ffc8fc 100644 --- a/welcome.html +++ b/welcome.html @@ -1,8 +1,8 @@
-

Liberate your ideas

-

Write online, from anywhere, with your friends. Easily keep track of your documents instead of being tracked and trapped by the web's monopolies. We neither store your data nor track you. Libre Docs is only the application – your data is stored where you want it to be, using the open remoteStorage protocol.

+

Libérez vos idées

+

Ecrire en ligne, depuis n'importe quel endroit, avec vos amis. Garder facilement la trace de vos documents au lieu d'être suivi et pris au piège par des monopoles du Web. Nous ne stockons pas vos données, ni nous vous traçons. Libre Docs n'est que l'application - vos données sont stockées où vous voulez qu'elles soient, en utilisant le protocole ouvert remoteStorage protocol.

@@ -10,8 +10,8 @@

Liberate your ideas

-

1. get remoteStorage

-

Libre Docs does not host your documents. You do. If you haven't yet, get remoteStorage at 5apps or OwnCube.

+

1. Votre compte remoteStorage

+

Libre Docs n'héberge pas vos documents. Vous, oui. Si vous n'avez pas encore de compte RemoteStorage, Ouvrez en un auprès de 5apps or OwnCube.

@@ -19,17 +19,17 @@

1. get remoteStorage

-

2. connect

-

It's user@server. So user cindy from 5apps.com would type cindy@5apps.com here.

+

2. Connectez-vous

+

Le compte ressemble à user@server. L'utilisateur cindy chez 5apps.com aura un compte cindy@5apps.com.

-

3. write freely!

+

3. Écrire librement !

- Our goal is to create cloud sync for Libre Office (hence the name). - But we started by unhosting Etherpad for you. - Enjoy! + Notre objectif est de créer une synchronisation dans le nuage pour Libre Office (d'où le nom). + Mais, pour vous, nous avons commencé par unhosting Etherpad. + Amusez-vous!

From 6a17e0367348a24b47f4057247a400ee82eee6f5 Mon Sep 17 00:00:00 2001 From: benoit Date: Mon, 21 May 2012 02:31:36 +0200 Subject: [PATCH 2/3] html -> php for Gettext multilingue gestion --- SpecRunner.html => SpecRunner.php | 0 css/custom.css | 13 ++- dialog.html => dialog.php | 7 +- documents.html | 9 -- documents.php | 12 +++ goToStep.html => goToStep.php | 9 +- index.html => index.php | 19 +++- js/load.js | 2 +- js/welcome.js | 2 +- locale/en_US.utf8/LC_MESSAGES/default.mo | Bin 0 -> 4221 bytes locale/en_US.utf8/LC_MESSAGES/default.po | 110 +++++++++++++++++++++ locale/fr_FR.utf8/LC_MESSAGES/default.mo | Bin 0 -> 4629 bytes locale/fr_FR.utf8/LC_MESSAGES/default.po | 119 +++++++++++++++++++++++ localization.php | 12 +++ menu_lang.php | 9 ++ old/handler.js | 2 +- reset.html | 13 --- reset.php | 16 +++ session.php | 8 ++ webodf.html => webodf.php | 9 +- welcome.html | 36 ------- welcome.php | 39 ++++++++ 22 files changed, 368 insertions(+), 78 deletions(-) rename SpecRunner.html => SpecRunner.php (100%) rename dialog.html => dialog.php (92%) delete mode 100644 documents.html create mode 100644 documents.php rename goToStep.html => goToStep.php (54%) rename index.html => index.php (77%) create mode 100644 locale/en_US.utf8/LC_MESSAGES/default.mo create mode 100644 locale/en_US.utf8/LC_MESSAGES/default.po create mode 100644 locale/fr_FR.utf8/LC_MESSAGES/default.mo create mode 100644 locale/fr_FR.utf8/LC_MESSAGES/default.po create mode 100644 localization.php create mode 100644 menu_lang.php delete mode 100644 reset.html create mode 100644 reset.php create mode 100644 session.php rename webodf.html => webodf.php (90%) delete mode 100644 welcome.html create mode 100644 welcome.php diff --git a/SpecRunner.html b/SpecRunner.php similarity index 100% rename from SpecRunner.html rename to SpecRunner.php diff --git a/css/custom.css b/css/custom.css index 1dfd149..510deab 100644 --- a/css/custom.css +++ b/css/custom.css @@ -14,19 +14,22 @@ h1 span#docTitle { position:absolute; left:.08em; width:11em; white-space:nowrap h1+small { float:right; position:relative; top:-2em; right:0em; } h1>small { font-size:12px; position:absolute; left:16.8em; top:.5em; white-space:nowrap; } +#lang { float:right; position:relative; top:-2em; right:3em; } +#lang li {display: inline-block; text-transform: uppercase; margin: 0 .3em; } + #signin { margin-top:5.5em; padding:0 8em 1em 7em; white-space:nowrap; height:2.6em; } #write #signin { position:relative; float:right; top:1em; margin:0; } .content #welcome { height:32em; } #steps { position:absolute; top:22em; } .step, .step.done, .step.done:hover { opacity:.5; position:relative; } .step.active, .step:hover { opacity:1; } -.step.remotestorage { position:absolute; width:18em; left:0; } +.step.remotestorage { position:absolute; width:20em; left:0; } .step.remotestorage img, .step.write img { position:relative; left:20%; } .step.remotestorage img { margin:2em 0; width:12em; } -.step.connect { position:absolute; width:22em; left:22em; } -.step.connect #connect { position:absolute; width:15em; } -.step.connect #connect-address { position:absolute; margin:4em 0 .5em; width:9.35em; padding-right:6em; height:2.5em; padding-left:3em; background:url('../images/remoteStorage-icon.png') no-repeat .3em center; } -.step.connect #connect-button { position:absolute; margin:4.6em -3em 0 0; right:0; } +.step.connect { position:absolute; width:19em; left:23em; } +.step.connect #connect { position:absolute; width:16em; } +.step.connect #connect-address { position:absolute; margin:4em 0 .5em -2em; width:9.35em; padding-right:7em; height:2.5em; padding-left:3em; background:url('../images/remoteStorage-icon.png') no-repeat .3em center; } +.step.connect #connect-button { position:absolute; margin:4.6em -1em 0 0; right:0; } .step.write { position:absolute; width:18em; left:42em; } .step.write img { margin-top:-1em; } .step>h3 { position:absolute; top:7.3em; white-space:nowrap; } diff --git a/dialog.html b/dialog.php similarity index 92% rename from dialog.html rename to dialog.php index 946685f..be4fd78 100644 --- a/dialog.html +++ b/dialog.php @@ -1,6 +1,9 @@ - + - Connecting your remote storage + <?php echo _("Connecting your remote storage"); ?> -

Done. Go back to the main page.

+

back to the main page."); ?>

diff --git a/index.html b/index.php similarity index 77% rename from index.html rename to index.php index 05713e3..2b81ce8 100644 --- a/index.html +++ b/index.php @@ -1,8 +1,14 @@ + - Write with Libre Docs – liberate your ideas + + <?php echo _("Write with Libre Docs – liberate your ideas") ?> @@ -20,14 +26,19 @@ + + + + +
-

Libre Docs molto alpha

+

Libre Docs molto alpha

diff --git a/js/load.js b/js/load.js index c76967e..474ca1b 100644 --- a/js/load.js +++ b/js/load.js @@ -12,7 +12,7 @@ function load() { function htmlLoaded(view, cb){ if(!$('#'+view).length){ - $('#content').load(view+'.html', cb); + $('#content').load(view+'.php', cb); } else { cb(); } diff --git a/js/welcome.js b/js/welcome.js index 578fdd1..c99f40c 100644 --- a/js/welcome.js +++ b/js/welcome.js @@ -79,7 +79,7 @@ define(function() { var libPath = ''; localStorage.setItem('_unhosted$userAddress', userAddress); localStorage.setItem('_unhosted$categories', JSON.stringify(categories)); - window.open(libPath+'/dialog.html'); + window.open(libPath+'/dialog.php'); } function loaded() { diff --git a/locale/en_US.utf8/LC_MESSAGES/default.mo b/locale/en_US.utf8/LC_MESSAGES/default.mo new file mode 100644 index 0000000000000000000000000000000000000000..2f02a7571919d9b63ac24b2e89137cc43970b1a4 GIT binary patch literal 4221 zcmeHK&u<$=6keeGN`XRw3sCeBQeD*S+DTL>PHL*8X%&%@s7Yy&kfQPKv%SrFW;HXL zt#1`44n;x&{tZqX0C7NY1_9!XP!HTVbLD%xiJcIsNIhqi_2=E0dGCAgee=Besqr_s45~Q%}|W2q^sC0SdnnQ26}@6n=jJh2K|jBK+>bsPH>} zqUJXQ3crtm!tYz4@cRLH7x+6+_^D@WG(ecE2EGPJ%XmDAZ?aZ~a6k$Igb^S`;~_pI zE*UT#oWvzHLRbM(7$D4Q2nSHF#>4V?mfqu%5)&6g);?Hp-WuKS+_0%!-tP>Y4G*EX$~zi;V3zV>28UI`yMwp$7&LC(Sb5PMgVDTjxBmV|j`VwLSW z50;G99D8|Qxv05RIl#`~lF|HN?p8dCRyej7aqX~;Xv0+Z6sI~F)q*;QLbwR@sWe4~ z%8zoU1s-;)H5bRz3r##DkzN#_q-+(WS@BI1R!*Mnl{qo&paM^l@OsTyb`gDmawaCC zl}eE`P&=#}SjK*u`t0doDU_e2S*q($-Z7^Jd1bNZLSw6&DZSn3R8x{{f(Q@DLN=OG z$3>SV+QVDdO1*^1x>9R6R(+!~kt}K%Tb6KP@IMX@>TV|;vJvae*_pZXZ_UomH9B!- ziiF%q#}%z!&Fj8qM827%)AV|2%$1HCojSp5)uYOk6zR->bNgoRh6PC+8v99 z$JvFHl!fx;G}osC-H2Z7Q@w5)HL(QCm5`-yy6Ta#t*iQWVC zACUTnv34{qbfFa-DsnhB$gwM+n5v<{IW$YX^tNo12AI$-1H;n! z;sNww4aD2!%#>{kHjrqEZY(%D4HH?K&j)okt-S0L>uH@RH<%|R{E(*O`eX)&WEnsf z>af20Xoy9(62Q3IRD}c^*XZ;tOT;~2B6LY4j-J%yfKDOPy}fnjukZG)apn~oF;Z7` zJ~ZYisBXt$mer4j_{vb4b!%>+xr8f8_&!@{UG2IfOGBQz#<{URyz2UC5-t{f7jBw1 zO|7qOhD#!OEDtY1`E8nQ&CG_abK&d^wPxC_xwEaARtpQmYrK<++54_rRnCW-R%w?h zwA?l=vNk_{>1k=8EIPPP@jJ4BbbA&1i(P11o=YM-Q>#k%3pB!TlhqL9uC82Np2RW} zwWiQOJ#2)VXkBgceA_qk44rpg^kE(P!}ZO};rYorA<|E zq&|F?N2RfeTTPvB)7JbJ&qD%Ycn`O#)@p4daJO3VZZM gar8zpX~{=#6q9#7I(nlxdZRdcqmciE9_)?cU*66>ssI20 literal 0 HcmV?d00001 diff --git a/locale/en_US.utf8/LC_MESSAGES/default.po b/locale/en_US.utf8/LC_MESSAGES/default.po new file mode 100644 index 0000000..f502c78 --- /dev/null +++ b/locale/en_US.utf8/LC_MESSAGES/default.po @@ -0,0 +1,110 @@ +msgid "" +msgstr "" +"Project-Id-Version: LibreDocs\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-05-21 01:03+0100\n" +"PO-Revision-Date: 2012-05-21 01:03+0100\n" +"Last-Translator: Benoît Charpentier \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-KeywordsList: _;_e;gettext;gettext_noop\n" +"X-Poedit-Basepath: /LaBoiteaBen/Github/\n" +"X-Poedit-Language: French\n" +"X-Poedit-Country: France\n" +"X-Poedit-SourceCharset: utf-8\n" +"X-Poedit-SearchPath-0: libredocs\n" + +#: libredocs/dialog.php:6 +msgid "Connecting your remote storage" +msgstr "Connecting your remote storage" + +#: libredocs/documents.php:5 +msgid "+ New document" +msgstr "+ New document" + +#: libredocs/documents.php:10 +msgid "more …" +msgstr "more …" + +#: libredocs/documents.php:11 +msgid "Syncing documents …" +msgstr "Syncing documents …" + +#: libredocs/goToStep.php:8 +msgid "Setting your enroll step in localStorage" +msgstr "Setting your enroll step in localStorage" + +#: libredocs/goToStep.php:16 +msgid "Done. Go back to the main page." +msgstr "Done. Go back to the main page." + +#: libredocs/index.php:11 +msgid "Write with Libre Docs – liberate your ideas" +msgstr "Write with Libre Docs – liberate your ideas" + +#: libredocs/index.php:41 +msgid "Sorry, there are some issues with sign up. Please help us fix them and join our chat room below: " +msgstr "Sorry, there are some issues with sign up. Please help us fix them and join our chat room below: " + +#: libredocs/index.php:50 +msgid "is a free softwareapp by Unhosted for a more open web." +msgstr "is a free softwareapp by Unhosted for a more open web." + +#: libredocs/reset.php:8 +msgid "Clearing localStorage" +msgstr "Clearing localStorage" + +#: libredocs/reset.php:14 +msgid "Cleared your session. Go back to the main page." +msgstr "Cleared your session. Go back to the main page." + +#: libredocs/welcome.php:9 +msgid "Liberate your ideas" +msgstr "Liberate your ideas" + +#: libredocs/welcome.php:10 +msgid "Write online, from anywhere, with your friends. Easily keep track of your documents instead of being tracked and trapped by the web's monopolies. We neither store your data nor track you. Libre Docs is only the application – your data is stored where you want it to be, using the open remoteStorage protocol." +msgstr "Write online, from anywhere, with your friends. Easily keep track of your documents instead of being tracked and trapped by the web's monopolies. We neither store your data nor track you. Libre Docs is only the application – your data is stored where you want it to be, using the open remoteStorage protocol." + +#: libredocs/welcome.php:18 +msgid "get remoteStorage" +msgstr "get remoteStorage" + +#: libredocs/welcome.php:19 +msgid "Libre Docs does not host your documents. You do. If you haven't yet, get remoteStorage at 5apps or OwnCube." +msgstr "Libre Docs does not host your documents. You do. If you haven't yet, get remoteStorage at 5apps or OwnCube." + +#: libredocs/welcome.php:27 +msgid "connect" +msgstr "connect" + +#: libredocs/welcome.php:28 +msgid "It's user@server. So user cindy from 5apps.com would type cindy@5apps.com here." +msgstr "It's user@server. So user cindy from 5apps.com would type cindy@5apps.com here." + +#: libredocs/welcome.php:33 +msgid "write freely!" +msgstr "write freely!" + +#: libredocs/welcome.php:34 +msgid "" +"Our goal is to create cloud sync for Libre Office (hence the name).\n" +" But we started by unhosting Etherpad for you. Enjoy!" +msgstr "" +"Our goal is to create cloud sync for Libre Office (hence the name).\n" +" But we started by unhosting Etherpad for you. Enjoy!" + +#~ msgid "" +#~ "is a free software " +#~ "app by Unhosted for a more open web." +#~ msgstr "" +#~ "is a free software " +#~ "app by Unhosted for a more open web." + +#~ msgid "Connectez-vous" +#~ msgstr "Connectez-vous" + +#~ msgid "Écrire librement !" +#~ msgstr "Écrire librement !" diff --git a/locale/fr_FR.utf8/LC_MESSAGES/default.mo b/locale/fr_FR.utf8/LC_MESSAGES/default.mo new file mode 100644 index 0000000000000000000000000000000000000000..4d65c8afc927713f1ab507ed0e924c8ad8f95a1b GIT binary patch literal 4629 zcmbVP&5s;M74Ja!T0Q~+E`*@xMREr`-Ltz^5@&WZa(2D8R;<@6?>Y$r$*SqDnJI5i zRi~V=gKICU1pZR1hpNISx^j&~_7SF%F6h*(o{Y#L0xc|?mVGnZeGqwC4 zlL?B72iS?^PD3hKgzEfK;pyFP_)yp}Isix5OOMuZT}E{*});R~*WGjfh_ ztOy~DaLjPQT!f>9>m&UC0`18mV*l3D& z8f_I)Si~a4+DYf&a!S|C-0V;mup`s5U&ieYhZ}x!+y+8vDq-Q2Cic8AnJ6a4qb;Mg z%sf92CTd?o46rl0VzhiRb2}bMtDLl#@i~?@r2`Z0DN{Nh)qr{tiEt_0r=h6|WPVgi z+K_{GSaW&ydZUSF#L!D4q*Ph~Xa;{(E`{S~(=_KsI-tN42fSW0gI!ABMmlqo(oR4m z^~JH&F_uZ+pq})!mDTF?X+u;=ln*hQESnx(O)LGS$ zeA=^HZw&PoUe=kqfwJluQ7~kY%gjnXE)+gsa1nRMY9I}3Z?3Igy!7(g+Qqn?6{gC` zjdT{=>ehZeQVqkm;BcC5S7kEbIBwSgz7ZY;Rh*<3`ch{yU`>mG{6@%9x;|o4kNj^OOdnrxV=5On;inFPib4P zfw6YfV0VEP6css?4PxvnASMu+Q$0;pnbJP0&Pf2SD1lk(s=K_62{5NS28x;avOe%( z4Zz!xg&DReIzXWLbTh!wd8jBv^3E*Iy?D{0yeEx-z3Pu#5l;aTZ@a z5MtE{0GP2&NF=;*al30JpSbIXI64OsrN=p0z$sul-CIZg)`YiakryChgf1{2h&heI z?d+Jt&@|Xqfz<3xdDj^q)`1^x9bQc?&DXIbU1^hTotYeHY0;&Q@=I?f`$p!X66vg-)xymdpl~;)tj&FZEeqA9H2F2{e75DR$7c*3yygq+!+5Fs}@EM9ZU2eC##9OZ&i|t`1J6R zENDc1;!wdL8{lZv+F_!Q_vo!E2A$wV!KIA3i@TN`{|W)%6HNvOL=nNa^WL@mgpNlv-ID|B^GsqX>r|99fED((4YYvb439I*F`S zx^j}#5DVTHn7p1=?xNsXW$nU4*5;@jjBL>%TvbR_Iw!dg>)x&;@IVPKdSLhobI*50_Uk64Tz=gsXrfN(9oSIARUH~>q9=whv9k3am!J~&n zc3QQ7TWQDlQ7mCD3G;72*}{ahJRMk;>j`Q3^n`@ce8}EYL(seuD5f=;ZpKM;@NvV%tKb%8GSq`q|V$<9MLJust^FMBS`7kq79&?qm4KtWbP_#tX zg+ji9F{T$#4U>#GW*!0{L4FyEkjZO#(y;CFW8M1SLsd$z4S?r+2^%|yG8>e|_`XLZ znQdT33~-AQ_&;j&%J{^YVtmqgV3_8v0(wJvg9ZzHpiJ>VSrr~zrmW8k@aqs=qU01b zXrCiqA0NYhO(xh2xLVbdwm}1FGsTXDMON~FmP1QO9)1bns}rEjfDfM8GL_`0W{zkp z%xnuOXTK(0%gyJvY2OOH=^+yw9-XPq$pkkEYZOWgY>3jD(b|-%7`}KuqtWTFjmHdi zh3TnG$)aw)0iYm;V~nF^Il;$*%16(40dDXDa~+ihqEq*gGzvGf8E+bj(C|YWJ{SEL D_zLZZ literal 0 HcmV?d00001 diff --git a/locale/fr_FR.utf8/LC_MESSAGES/default.po b/locale/fr_FR.utf8/LC_MESSAGES/default.po new file mode 100644 index 0000000..3df8428 --- /dev/null +++ b/locale/fr_FR.utf8/LC_MESSAGES/default.po @@ -0,0 +1,119 @@ +msgid "" +msgstr "" +"Project-Id-Version: LibreDocs\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-05-21 02:27+0100\n" +"PO-Revision-Date: 2012-05-21 02:27+0100\n" +"Last-Translator: Benoît Charpentier \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-KeywordsList: _;_e;gettext;gettext_noop\n" +"X-Poedit-Basepath: /LaBoiteaBen/Github/\n" +"X-Poedit-SourceCharset: utf-8\n" +"X-Poedit-Language: french\n" +"X-Poedit-Country: FRANCE\n" +"X-Poedit-SearchPath-0: libredocs\n" + +#: libredocs/dialog.php:6 +msgid "Connecting your remote storage" +msgstr "Connexion à votre espace de stockage distant" + +#: libredocs/documents.php:5 +msgid "+ New document" +msgstr "+ Nouveau document" + +#: libredocs/documents.php:10 +msgid "more …" +msgstr "plus …" + +#: libredocs/documents.php:11 +msgid "Syncing documents …" +msgstr "Synchronisation des documents …" + +#: libredocs/goToStep.php:8 +msgid "Setting your enroll step in localStorage" +msgstr "Complèter les paramètres de votre espace de stockage local" + +#: libredocs/goToStep.php:16 +msgid "Done. Go back to the main page." +msgstr "Terminé. Revenir à la page principale." + +#: libredocs/index.php:11 +msgid "Write with Libre Docs – liberate your ideas" +msgstr "Écrire avec Libre Docs – Libérez vos idées" + +#: libredocs/index.php:41 +msgid "Sorry, there are some issues with sign up. Please help us fix them and join our chat room below: " +msgstr "Désolé, remoteStorage rencontre quelques difficultés avec votre inscription, Pour nous aider à les corriger, merci de nous rejoindre dans notre salle de chat ci-dessous :" + +#: libredocs/index.php:50 +msgid "is a free softwareapp by Unhosted for a more open web." +msgstr "est un logiciel libre développé par Unhosted pour un web plus ouvert." + +#: libredocs/reset.php:8 +msgid "Clearing localStorage" +msgstr "Suppression de votre espace de stockage local" + +#: libredocs/reset.php:14 +msgid "Cleared your session. Go back to the main page." +msgstr "Fermé votre session. Revenir à la page principale." + +#: libredocs/welcome.php:9 +msgid "Liberate your ideas" +msgstr "Libérez vos idées" + +#: libredocs/welcome.php:10 +msgid "Write online, from anywhere, with your friends. Easily keep track of your documents instead of being tracked and trapped by the web's monopolies. We neither store your data nor track you. Libre Docs is only the application – your data is stored where you want it to be, using the open remoteStorage protocol." +msgstr "Écrire en ligne, de n'importe où, avec vos amis. Garder facilement la trace de vos documents au lieu d'être suivi et pris au piège par les monopoles du Web. Nous ne stockons pas vos données, ni ne vous traçons. Libre Docs n'est seulement que l'application - vos données sont stockées où vous voulez qu'elles le soient, grâce au protocole ouvert remoteStorage." + +#: libredocs/welcome.php:18 +msgid "get remoteStorage" +msgstr "obtenir un stockage distant" + +#: libredocs/welcome.php:19 +msgid "Libre Docs does not host your documents. You do. If you haven't yet, get remoteStorage at 5apps or OwnCube." +msgstr "Libre Docs n'héberge pas vos documents. Vous, oui. Si vous n'en avez pas encore, obtenez un espace de stockage en ligne auprès de 5apps ou de OwnCube." + +#: libredocs/welcome.php:27 +msgid "connect" +msgstr "connectez-vous" + +#: libredocs/welcome.php:28 +msgid "It's user@server. So user cindy from 5apps.com would type cindy@5apps.com here." +msgstr "Le compte ressemble à user@server. L'utilisateur cindy chez 5apps.com aura un compte cindy@5apps.com." + +#: libredocs/welcome.php:33 +msgid "write freely!" +msgstr "Écrire librement !" + +#: libredocs/welcome.php:34 +msgid "" +"Our goal is to create cloud sync for Libre Office (hence the name).\n" +" But we started by unhosting Etherpad for you. Enjoy!" +msgstr "" +"Notre objectif est de créer une synchronisation dans le nuage pour Libre Office (d'où le nom). \n" +" Mais, pour vous, nous avons commencé par \"unhoster\" Etherpad. Amusez-vous!" + +#~ msgid "" +#~ "is a free software " +#~ "app by Unhosted for a more open web." +#~ msgstr "" +#~ "est un logiciel libre " +#~ "développé par Unhosted pour un web plus " +#~ "ouvert." + +#~ msgid "" +#~ "Sorry, there are some issues with sign up. Please help us fix them and " +#~ "join our chat room below:" +#~ msgstr "" +#~ "Désolé, remoteStorage rencontre quelques problèmes avec votre " +#~ "inscription. Pour nous aider à les corriger, Merci de nous rejoindre dans " +#~ "notre salle de chat ci-dessous :" + +#~ msgid "Connectez-vous" +#~ msgstr "Connectez-vous" + +#~ msgid "Écrire librement !" +#~ msgstr "Écrire librement !" diff --git a/localization.php b/localization.php new file mode 100644 index 0000000..9214e1c --- /dev/null +++ b/localization.php @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/menu_lang.php b/menu_lang.php new file mode 100644 index 0000000..f0422d8 --- /dev/null +++ b/menu_lang.php @@ -0,0 +1,9 @@ + + +
  • en
    • +
  • fr
    • + + + diff --git a/old/handler.js b/old/handler.js index 13ec6dd..2598bf1 100644 --- a/old/handler.js +++ b/old/handler.js @@ -7,7 +7,7 @@ exports.handler = (function() { function serve(req, res, baseDir) { var uripath = url.parse(req.url).pathname - .replace(new RegExp('/$', 'g'), '/index.html'); + .replace(new RegExp('/$', 'g'), '/index.php'); var host = req.headers.host; if(config.redirect && config.redirect[host]) { res.writeHead(302, {'Location': config.redirect[host]}); diff --git a/reset.html b/reset.html deleted file mode 100644 index a030bac..0000000 --- a/reset.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - Clearing localStorage - - - -

    Cleared your session. Go back to the main page.

    - - diff --git a/reset.php b/reset.php new file mode 100644 index 0000000..c81e8d4 --- /dev/null +++ b/reset.php @@ -0,0 +1,16 @@ + + + + + <?php echo _("Clearing localStorage"); ?> + + + +

    back to the main page."); ?>

    + + diff --git a/session.php b/session.php new file mode 100644 index 0000000..54b20fc --- /dev/null +++ b/session.php @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/webodf.html b/webodf.php similarity index 90% rename from webodf.html rename to webodf.php index bbe103a..792295a 100644 --- a/webodf.html +++ b/webodf.php @@ -1,4 +1,7 @@ - + @@ -24,7 +27,7 @@ if(location.hash.length) { return location.hash.split('/')[0].substring(1); } else { - window.location.href = 'welcome.html'; + window.location.href = 'welcome.php'; } } @@ -32,7 +35,7 @@ if(location.hash.length) { return location.hash.substr(location.hash.indexOf('/') + 1); } else { - window.location.href = 'welcome.html'; + window.location.href = 'welcome.php'; } } diff --git a/welcome.html b/welcome.html deleted file mode 100644 index 5ffc8fc..0000000 --- a/welcome.html +++ /dev/null @@ -1,36 +0,0 @@ -
    -
    -
    -

    Libérez vos idées

    -

    Ecrire en ligne, depuis n'importe quel endroit, avec vos amis. Garder facilement la trace de vos documents au lieu d'être suivi et pris au piège par des monopoles du Web. Nous ne stockons pas vos données, ni nous vous traçons. Libre Docs n'est que l'application - vos données sont stockées où vous voulez qu'elles soient, en utilisant le protocole ouvert remoteStorage protocol.

    -
    -
    - -
    - -
    - -

    1. Votre compte remoteStorage

    -

    Libre Docs n'héberge pas vos documents. Vous, oui. Si vous n'avez pas encore de compte RemoteStorage, Ouvrez en un auprès de 5apps or OwnCube.

    -
    - -
    - - - - -

    2. Connectez-vous

    -

    Le compte ressemble à user@server. L'utilisateur cindy chez 5apps.com aura un compte cindy@5apps.com.

    -
    - -
    - -

    3. Écrire librement !

    -

    - Notre objectif est de créer une synchronisation dans le nuage pour Libre Office (d'où le nom). - Mais, pour vous, nous avons commencé par unhosting Etherpad. - Amusez-vous! -

    -
    -
    -
    diff --git a/welcome.php b/welcome.php new file mode 100644 index 0000000..6ef7300 --- /dev/null +++ b/welcome.php @@ -0,0 +1,39 @@ + + +
    +
    +
    +

    +

    Write online, from anywhere, with your friends. Easily keep track of your documents instead of being tracked and trapped by the web's monopolies. We neither store your data nor track you. Libre Docs is only the application – your data is stored where you want it to be, using the open remoteStorage protocol."); ?>

    +
    +
    + +
    + +
    + +

    1.

    +

    5apps or OwnCube."); ?>

    +
    + +
    + + + + +

    2.

    +

    cindy@5apps.com here."); ?>

    +
    + +
    + +

    3.

    +

    cloud sync for Libre Office (hence the name). + But we started by unhosting Etherpad for you. Enjoy!"); ?> +

    +
    +
    +
    \ No newline at end of file From 5e7481fa81042d6693c6e4057b1409249b83c14a Mon Sep 17 00:00:00 2001 From: benoit Date: Wed, 23 May 2012 23:36:13 +0200 Subject: [PATCH 3/3] Test with @jhuet Javascript powered translation --- .gitignore | 1 + SpecRunner.php => SpecRunner.html | 0 closeDialog.html | 21 ++++ css/custom.css | 9 ++ dialog.php | 42 -------- documents.html | 9 ++ documents.php | 12 --- goToStep.php => goToStep.html | 9 +- images/countries/de.png | Bin 0 -> 333 bytes images/countries/en.png | Bin 0 -> 407 bytes images/countries/fr.png | Bin 0 -> 416 bytes images/countries/id.png | Bin 0 -> 328 bytes images/countries/it.png | Bin 0 -> 424 bytes images/countries/ru.png | Bin 0 -> 316 bytes index.php => index.html | 29 +++--- js/data.json | 2 + js/default.js | 104 ++++++++++++++++++++ js/jquery.cookie.js | 41 ++++++++ js/load.js | 4 +- js/locales/en.json | 1 + js/locales/fr.json | 26 +++++ js/remoteStorage-0.5.js | 1 + js/src/lib/couch.js | 76 ++++++++------- js/src/lib/dav.js | 27 +++-- js/src/lib/hardcoded.js | 53 ++++------ js/src/lib/platform.js | 3 - js/src/lib/webfinger.js | 77 ++++----------- js/src/remoteStorage.js | 73 +++++--------- js/welcome.js | 26 ++--- locale/en_US.utf8/LC_MESSAGES/default.mo | Bin 4221 -> 0 bytes locale/en_US.utf8/LC_MESSAGES/default.po | 110 --------------------- locale/fr_FR.utf8/LC_MESSAGES/default.mo | Bin 4629 -> 0 bytes locale/fr_FR.utf8/LC_MESSAGES/default.po | 119 ----------------------- localization.php | 12 --- menu_lang.php | 9 -- old/handler.js | 2 +- openDialog.html | 46 +++++++++ reset.html | 13 +++ reset.php | 16 --- session.php | 8 -- webodf.php => webodf.html | 9 +- welcome.html | 34 +++++++ welcome.php | 39 -------- 43 files changed, 467 insertions(+), 596 deletions(-) rename SpecRunner.php => SpecRunner.html (100%) create mode 100644 closeDialog.html delete mode 100644 dialog.php create mode 100644 documents.html delete mode 100644 documents.php rename goToStep.php => goToStep.html (54%) create mode 100644 images/countries/de.png create mode 100644 images/countries/en.png create mode 100644 images/countries/fr.png create mode 100644 images/countries/id.png create mode 100644 images/countries/it.png create mode 100644 images/countries/ru.png rename index.php => index.html (75%) create mode 100644 js/data.json create mode 100644 js/default.js create mode 100644 js/jquery.cookie.js create mode 100644 js/locales/en.json create mode 100644 js/locales/fr.json create mode 100644 js/remoteStorage-0.5.js delete mode 100644 locale/en_US.utf8/LC_MESSAGES/default.mo delete mode 100644 locale/en_US.utf8/LC_MESSAGES/default.po delete mode 100644 locale/fr_FR.utf8/LC_MESSAGES/default.mo delete mode 100644 locale/fr_FR.utf8/LC_MESSAGES/default.po delete mode 100644 localization.php delete mode 100644 menu_lang.php create mode 100644 openDialog.html create mode 100644 reset.html delete mode 100644 reset.php delete mode 100644 session.php rename webodf.php => webodf.html (90%) create mode 100644 welcome.html delete mode 100644 welcome.php diff --git a/.gitignore b/.gitignore index efd1402..1d841d1 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ .cvsignore Thumbs.db .DS_Store +*.esproj *.py[co] _darcs/* CVS/* diff --git a/SpecRunner.php b/SpecRunner.html similarity index 100% rename from SpecRunner.php rename to SpecRunner.html diff --git a/closeDialog.html b/closeDialog.html new file mode 100644 index 0000000..6270cda --- /dev/null +++ b/closeDialog.html @@ -0,0 +1,21 @@ + + + Closing dialog... + + + + + + Closing dialog... + + diff --git a/css/custom.css b/css/custom.css index 510deab..26e7341 100644 --- a/css/custom.css +++ b/css/custom.css @@ -17,6 +17,15 @@ h1>small { font-size:12px; position:absolute; left:16.8em; top:.5em; white-space #lang { float:right; position:relative; top:-2em; right:3em; } #lang li {display: inline-block; text-transform: uppercase; margin: 0 .3em; } + +#locale { float: right; margin-top: -3em; } +#locale li { float: left; list-style: none; } +#locale img { padding: 0; margin: 0; height: auto!important; } +#locale li a { padding: 1em .5em.5em; margin: 0; } + +#locale a:hover, #locale a.selected { background: rgba(200, 200, 200, 0.7); border-bottom-left-radius: .5em; border-bottom-right-radius: .5em; box-shadow: #fff 0 1px 0; } + + #signin { margin-top:5.5em; padding:0 8em 1em 7em; white-space:nowrap; height:2.6em; } #write #signin { position:relative; float:right; top:1em; margin:0; } .content #welcome { height:32em; } diff --git a/dialog.php b/dialog.php deleted file mode 100644 index be4fd78..0000000 --- a/dialog.php +++ /dev/null @@ -1,42 +0,0 @@ - - - <?php echo _("Connecting your remote storage"); ?> - - - - - - - diff --git a/documents.html b/documents.html new file mode 100644 index 0000000..a39500e --- /dev/null +++ b/documents.html @@ -0,0 +1,9 @@ +
    +
    + New document
    + + +
      +
    + more … +
    Syncing documents …
    +
    diff --git a/documents.php b/documents.php deleted file mode 100644 index 7cb5bf3..0000000 --- a/documents.php +++ /dev/null @@ -1,12 +0,0 @@ -
    -
    - - -
      -
    - -
    -
    diff --git a/goToStep.php b/goToStep.html similarity index 54% rename from goToStep.php rename to goToStep.html index 7730f05..2470509 100644 --- a/goToStep.php +++ b/goToStep.html @@ -1,11 +1,8 @@ - + - <?php echo _("Setting your enroll step in localStorage"); ?> + Setting your enroll step in localStorage -

    back to the main page."); ?>

    +

    Done. Go Retour à la page principale.

    diff --git a/images/countries/de.png b/images/countries/de.png new file mode 100644 index 0000000000000000000000000000000000000000..3dd416cebf3a18b47b706bdeca6bebdb8b1b5bfb GIT binary patch literal 333 zcmV-T0kZyyP)7Q*ZN*?&6c9owf|{-N z)2vp{0ET}Y3uM1)Di(nNOcuzis(L%;_Vs#wWr5W=j+ABjr{>LO1F*6{?!8AusOvhZ zxhM*}_W-#CGF8PnN8k5JfO8I21;{L59!0orTjGA71emtvUW6ww7GMxz*)&Aw(ts>u z5cydnL)S4k4RN}i=ItHl+ focVr-v(xwq>;Q-FqsBI<00000NkvXXu0mjfgF=Qp literal 0 HcmV?d00001 diff --git a/images/countries/en.png b/images/countries/en.png new file mode 100644 index 0000000000000000000000000000000000000000..a148322109c0a2174fbd5ca995eee6aba2e99b57 GIT binary patch literal 407 zcmV;I0cie-P) zFj5+q1eDYJOKyZVtpNicC&M}C<|qFZ1VK1D5aF0{!Vnp!84=?QWrf0Mw1lod;y<0~ z`Y$L;1*LZT9?NA2$C>}BKcDq_O$8+?kQ`?Q+n!=F`GjG-rs~`<625F3@2wUUNK_y< zo7b3519Uns7?1r_r4u=u%?3dbP=QPZ<$nJSra8oLIA=3Iq^iee=6skYo*NA+C~pgD zwacwZ(`?WtJa1Rf>)kPGQ2>xEDOHxW3gCdg1nUBe?jWxa_Hvs=!#-Cn3pnq4``d} zj5CJDINyU7d+U4?3-OB-e^Pl5a_lYfyKvBL{062!pS+$ zcsxT97_UKEt%w`@lkPpfKl&7)_>ZH3>Ds+5Yybk#X&^hlye(cw{5tuP==$RK8_MqK z*(VLm8t?h}?Qr9lJKujK+Ff4(%rua>y2ZGb`-jyS@bzdfNoeoyV&9(+@O2H4X<#b0 zW+@F-?PHU}kT&hy`0iIF-dcdE29&8Rk7Z41n;6vh2_RGwMUmq~0F(wWQnAP_OS1v6 zDq}U130BOwMpmX`QCM=>04U<3h7ho34PZo=F9mUN23^-B0AJ+ed(t*Y0x*U}ZmHXt z6hcS?*{k3vo8 zy$1*iI0TM?ec;0uei(oTm;-+l@DZ2+*_MWSF;WFA)$<(Q?ZziDs>E+|RZn;T0000< KMNUMnLSTZPim$-{ literal 0 HcmV?d00001 diff --git a/images/countries/id.png b/images/countries/id.png new file mode 100644 index 0000000000000000000000000000000000000000..8efa9e860eebe4006b477a90839e92c1ffee1f86 GIT binary patch literal 328 zcmV-O0k{5%P)zK14)vgX&TgZErKqab|8*pR8@ttEJe^|(+)&YgrX>r=eY>FZ0vv= zh9R;nLz<={=(4eY!SQ_`K@e;O8+#9Un+BR=ji));fM?u+y@_3OaLgz5H{cq#XWzn3 aukjbJ>In@8^j9_j0000TBRu4g4*F}Iv2VasGRF7In0Hrlk zlap8KMSz>lgGdsL(!&^87{%1&6!sNB5eC(F9-~wMD5aRFKWG=~Y}+;h*rEu&x<*F; zt(fW@+q%#+?;}9HltEio5un%FaIXuRu6;3sdZ`D=JBfL0VlM$-RVDt%H63Ae;Uzu@Gwu3kw^;4Oj?q3xdmV5n^fY0$hN#wSM>#;peMKu5)E3 ztxpXc2;`hgAQPpO%6*B-8;SCL7qbTDS~{2zxydblGGB+j<@6P6xkQi=fNK4fvaC6+evzPPLi{x@_E6(5pfL z>v9=u&y!(XHtrnoGz| - - <?php echo _("Write with Libre Docs – liberate your ideas") ?> + Write with Libre Docs – liberate your ideas @@ -16,6 +10,7 @@ + + + - - - -
    -

    Libre Docs molto alpha

    +

    Libre Docs molto alpha

    + +
    • Translation Test ||
    + + @@ -64,6 +61,10 @@ + + + + diff --git a/js/data.json b/js/data.json new file mode 100644 index 0000000..99a8091 --- /dev/null +++ b/js/data.json @@ -0,0 +1,2 @@ + + diff --git a/js/default.js b/js/default.js new file mode 100644 index 0000000..1f2380f --- /dev/null +++ b/js/default.js @@ -0,0 +1,104 @@ +var lp = {"locales":[{"id":"en","name":"english"},{"id":"fr","name":"french"}]}; + +lp = $.extend(lp, { + + /** + * Actual user locale + */ + locale: 'en', + + /** + * Translation dictionaries + */ + dictionaries: {}, + + setLocale: function(locale) { + if (!locale) { + locale = $.cookie('locale'); + } + if (!locale) { + locale = window.navigator.language ? window.navigator.language : window.navigator.userLanguage; + } + + if (locale != lp.locale) { + $.cookie('locale', locale); + lp.locale = locale; + + $.each(lp.locales, function(lidx, availableLocale) { + if (locale.indexOf(availableLocale.id) != -1 || !locale.indexOf(availableLocale.name != -1)) { + $('#locale a').removeClass('selected'); + $('#lang-' + availableLocale.id).addClass('selected'); + lp.translateTo(availableLocale.id); + } + } ); + } + }, + + getDictionary: function(locale) { + $.getJSON('js/locales/' + locale + '.json', function(dictionary) { + lp.dictionaries[locale] = dictionary; + lp.translateTo(locale); + } ); + }, + + translateTo: function(locale, $from) { + if (!locale) { + return; + } + + if (typeof lp.dictionaries[locale] == 'undefined') { + lp.getDictionary(locale); + return; + } + + var $toTranslate = $from ? $from.find('.translatable') : $('.translatable'); + $toTranslate.each(function(idxe, element) { + var $element = $(element); + var translation = ''; + + if (typeof lp.dictionaries[locale][$element.data('translatable')] == 'string') { + translation = lp.dictionaries[locale][$element.data('translatable')]; + } else { + translation = $element.data('translatable'); + } + if ($element.html()) { + $element.html(translation); + } + // need i18n +// if ($element.data('text')) { +// $element.data('text', translation); +// } + } ); + }, + + initTranslation: function($from) { + var $toInit = $from ? $from.find('.translatable') : $('.translatable'); + $toInit.each(function(idxe, element) { + var $element = $(element); + $element.data('translatable', $element.html().replace(/"/g, '\'')); + } ); + }, + +} ); + +$(document).ready(function() { + + // Create translations availables + var $locale = $('#locale'); + $.each(lp.locales, function(lidx, locale) { + var $li = $('
  • '); + var $a = $('') + .html('' + locale.name + ' flag') + .click(function() { + lp.setLocale(locale.id); + return false; + } ) + .appendTo($li); + $li.appendTo($locale); + } ); + + + lp.initTranslation(); + lp.setLocale(); + +} ); \ No newline at end of file diff --git a/js/jquery.cookie.js b/js/jquery.cookie.js new file mode 100644 index 0000000..6a3e394 --- /dev/null +++ b/js/jquery.cookie.js @@ -0,0 +1,41 @@ +/** + * jQuery Cookie plugin + * + * Copyright (c) 2010 Klaus Hartl (stilbuero.de) + * Dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html + * + */ +jQuery.cookie = function (key, value, options) { + + // key and at least value given, set cookie... + if (arguments.length > 1 && String(value) !== "[object Object]") { + options = jQuery.extend({}, options); + + if (value === null || value === undefined) { + options.expires = -1; + } + + if (typeof options.expires === 'number') { + var days = options.expires, t = options.expires = new Date(); + t.setDate(t.getDate() + days); + } + + value = String(value); + + return (document.cookie = [ + encodeURIComponent(key), '=', + options.raw ? value : encodeURIComponent(value), + options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE + options.path ? '; path=' + options.path : '', + options.domain ? '; domain=' + options.domain : '', + options.secure ? '; secure' : '' + ].join('')); + } + + // key and possibly options given, get cookie... + options = value || {}; + var result, decode = options.raw ? function (s) { return s; } : decodeURIComponent; + return (result = new RegExp('(?:^|; )' + encodeURIComponent(key) + '=([^;]*)').exec(document.cookie)) ? decode(result[1]) : null; +}; diff --git a/js/load.js b/js/load.js index 474ca1b..a9dc948 100644 --- a/js/load.js +++ b/js/load.js @@ -12,7 +12,7 @@ function load() { function htmlLoaded(view, cb){ if(!$('#'+view).length){ - $('#content').load(view+'.php', cb); + $('#content').load(view+'.html', cb); } else { cb(); } @@ -27,4 +27,4 @@ function loaded(view, doc) { script.loaded(doc); }); }); -} +} \ No newline at end of file diff --git a/js/locales/en.json b/js/locales/en.json new file mode 100644 index 0000000..69a88e3 --- /dev/null +++ b/js/locales/en.json @@ -0,0 +1 @@ +{} diff --git a/js/locales/fr.json b/js/locales/fr.json new file mode 100644 index 0000000..c7f840e --- /dev/null +++ b/js/locales/fr.json @@ -0,0 +1,26 @@ +{ + "Translation Test": + "Test de traduction", + + "Libre Docs": + "Libre Docs", + + "Libre Docs is a free software app by Unhosted for a more open web.": + "Libre Docs est un Logiciel Libre développé par Unhosted pour un web plus ouvert.", + + "Liberate your ideas": + "Libérez vos idées", + + "1. get remoteStorage": + "1. obtenir un stockage distant", + + "2. connect": + "2. connectez-vous", + + "3. write freely!": + "3. Écrivez librement!", + + "+ New document": + "+ Nouveau document" + +} \ No newline at end of file diff --git a/js/remoteStorage-0.5.js b/js/remoteStorage-0.5.js new file mode 100644 index 0000000..207256c --- /dev/null +++ b/js/remoteStorage-0.5.js @@ -0,0 +1 @@ +(function(){function c(c,d,e){a[c]=e;var f=c.substring(0,c.lastIndexOf("/")+1);b[c]=[];for(var g=0;g2?b("That is not a user address. There is more than one @-sign in it"):/^[\.0-9A-Za-z]+$/.test(c[0])?/^[\.0-9A-Za-z\-]+$/.test(c[1])?b(null,["https://"+c[1]+"/.well-known/host-meta","http://"+c[1]+"/.well-known/host-meta"]):b('That is not a user address. There are non-dotalphanumeric symbols after the @-sign: "'+c[1]+'"'):b('That is not a user address. There are non-dotalphanumeric symbols before the @-sign: "'+c[0]+'"')}function c(b,f,g){var h=b.shift();h?a.ajax({url:h,success:function(a){e(a,function(e,h){e?d(a,function(a,d){a?c(b,f,g):g(null,d)}):g(null,h)})},error:function(a){c(b,f,g)},timeout:f}):g("could not fetch xrd")}function d(b,c){a.parseXml(b,function(a,b){if(a)c(a);else if(b&&b.Link){var d={};if(b.Link&&b.Link["@"])b.Link["@"].rel&&(d[b.Link["@"].rel]=b.Link["@"]);else for(var e=0;e2)e("That is not a user address. There is more than one @-sign in it");else if(!/^[\.0-9A-Za-z]+$/.test(f[0]))e('That is not a user address. There are non-dotalphanumeric symbols before the @-sign: "'+f[0]+'"');else if(!/^[\.0-9A-Za-z\-]+$/.test(f[1]))e('That is not a user address. There are non-dotalphanumeric symbols after the @-sign: "'+f[1]+'"');else{while(f[1].indexOf(".")!=-1){if(b[f[1]]){blueprint=b[f[1]],e(null,{api:blueprint.api,auth:blueprint.authPrefix+a+blueprint.authSuffix,template:blueprint.templatePrefix+a+blueprint.templateSuffix});return}f[1]=f[1].substring(f[1].indexOf(".")+1)}new Date0){a=location.hash.split("&");for(var c=0;c 2) { cb('That is not a user address. There is more than one @-sign in it'); } else { - if(!(/^[\.0-9a-z\-\_]+$/.test(parts[0]))) { + if(!(/^[\.0-9A-Za-z]+$/.test(parts[0]))) { cb('That is not a user address. There are non-dotalphanumeric symbols before the @-sign: "'+parts[0]+'"'); - } else if(!(/^[\.0-9a-z\-]+$/.test(parts[1]))) { + } else if(!(/^[\.0-9A-Za-z\-]+$/.test(parts[1]))) { cb('That is not a user address. There are non-dotalphanumeric symbols after the @-sign: "'+parts[1]+'"'); } else { cb(null, [ @@ -90,9 +90,8 @@ define( return; } var links = {}; - for(var i=0; iPHL*8X%&%@s7Yy&kfQPKv%SrFW;HXL zt#1`44n;x&{tZqX0C7NY1_9!XP!HTVbLD%xiJcIsNIhqi_2=E0dGCAgee=Besqr_s45~Q%}|W2q^sC0SdnnQ26}@6n=jJh2K|jBK+>bsPH>} zqUJXQ3crtm!tYz4@cRLH7x+6+_^D@WG(ecE2EGPJ%XmDAZ?aZ~a6k$Igb^S`;~_pI zE*UT#oWvzHLRbM(7$D4Q2nSHF#>4V?mfqu%5)&6g);?Hp-WuKS+_0%!-tP>Y4G*EX$~zi;V3zV>28UI`yMwp$7&LC(Sb5PMgVDTjxBmV|j`VwLSW z50;G99D8|Qxv05RIl#`~lF|HN?p8dCRyej7aqX~;Xv0+Z6sI~F)q*;QLbwR@sWe4~ z%8zoU1s-;)H5bRz3r##DkzN#_q-+(WS@BI1R!*Mnl{qo&paM^l@OsTyb`gDmawaCC zl}eE`P&=#}SjK*u`t0doDU_e2S*q($-Z7^Jd1bNZLSw6&DZSn3R8x{{f(Q@DLN=OG z$3>SV+QVDdO1*^1x>9R6R(+!~kt}K%Tb6KP@IMX@>TV|;vJvae*_pZXZ_UomH9B!- ziiF%q#}%z!&Fj8qM827%)AV|2%$1HCojSp5)uYOk6zR->bNgoRh6PC+8v99 z$JvFHl!fx;G}osC-H2Z7Q@w5)HL(QCm5`-yy6Ta#t*iQWVC zACUTnv34{qbfFa-DsnhB$gwM+n5v<{IW$YX^tNo12AI$-1H;n! z;sNww4aD2!%#>{kHjrqEZY(%D4HH?K&j)okt-S0L>uH@RH<%|R{E(*O`eX)&WEnsf z>af20Xoy9(62Q3IRD}c^*XZ;tOT;~2B6LY4j-J%yfKDOPy}fnjukZG)apn~oF;Z7` zJ~ZYisBXt$mer4j_{vb4b!%>+xr8f8_&!@{UG2IfOGBQz#<{URyz2UC5-t{f7jBw1 zO|7qOhD#!OEDtY1`E8nQ&CG_abK&d^wPxC_xwEaARtpQmYrK<++54_rRnCW-R%w?h zwA?l=vNk_{>1k=8EIPPP@jJ4BbbA&1i(P11o=YM-Q>#k%3pB!TlhqL9uC82Np2RW} zwWiQOJ#2)VXkBgceA_qk44rpg^kE(P!}ZO};rYorA<|E zq&|F?N2RfeTTPvB)7JbJ&qD%Ycn`O#)@p4daJO3VZZM gar8zpX~{=#6q9#7I(nlxdZRdcqmciE9_)?cU*66>ssI20 diff --git a/locale/en_US.utf8/LC_MESSAGES/default.po b/locale/en_US.utf8/LC_MESSAGES/default.po deleted file mode 100644 index f502c78..0000000 --- a/locale/en_US.utf8/LC_MESSAGES/default.po +++ /dev/null @@ -1,110 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: LibreDocs\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-21 01:03+0100\n" -"PO-Revision-Date: 2012-05-21 01:03+0100\n" -"Last-Translator: Benoît Charpentier \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Poedit-KeywordsList: _;_e;gettext;gettext_noop\n" -"X-Poedit-Basepath: /LaBoiteaBen/Github/\n" -"X-Poedit-Language: French\n" -"X-Poedit-Country: France\n" -"X-Poedit-SourceCharset: utf-8\n" -"X-Poedit-SearchPath-0: libredocs\n" - -#: libredocs/dialog.php:6 -msgid "Connecting your remote storage" -msgstr "Connecting your remote storage" - -#: libredocs/documents.php:5 -msgid "+ New document" -msgstr "+ New document" - -#: libredocs/documents.php:10 -msgid "more …" -msgstr "more …" - -#: libredocs/documents.php:11 -msgid "Syncing documents …" -msgstr "Syncing documents …" - -#: libredocs/goToStep.php:8 -msgid "Setting your enroll step in localStorage" -msgstr "Setting your enroll step in localStorage" - -#: libredocs/goToStep.php:16 -msgid "Done. Go back to the main page." -msgstr "Done. Go back to the main page." - -#: libredocs/index.php:11 -msgid "Write with Libre Docs – liberate your ideas" -msgstr "Write with Libre Docs – liberate your ideas" - -#: libredocs/index.php:41 -msgid "Sorry, there are some issues with sign up. Please help us fix them and join our chat room below: " -msgstr "Sorry, there are some issues with sign up. Please help us fix them and join our chat room below: " - -#: libredocs/index.php:50 -msgid "is a free softwareapp by Unhosted for a more open web." -msgstr "is a free softwareapp by Unhosted for a more open web." - -#: libredocs/reset.php:8 -msgid "Clearing localStorage" -msgstr "Clearing localStorage" - -#: libredocs/reset.php:14 -msgid "Cleared your session. Go back to the main page." -msgstr "Cleared your session. Go back to the main page." - -#: libredocs/welcome.php:9 -msgid "Liberate your ideas" -msgstr "Liberate your ideas" - -#: libredocs/welcome.php:10 -msgid "Write online, from anywhere, with your friends. Easily keep track of your documents instead of being tracked and trapped by the web's monopolies. We neither store your data nor track you. Libre Docs is only the application – your data is stored where you want it to be, using the open remoteStorage protocol." -msgstr "Write online, from anywhere, with your friends. Easily keep track of your documents instead of being tracked and trapped by the web's monopolies. We neither store your data nor track you. Libre Docs is only the application – your data is stored where you want it to be, using the open remoteStorage protocol." - -#: libredocs/welcome.php:18 -msgid "get remoteStorage" -msgstr "get remoteStorage" - -#: libredocs/welcome.php:19 -msgid "Libre Docs does not host your documents. You do. If you haven't yet, get remoteStorage at 5apps or OwnCube." -msgstr "Libre Docs does not host your documents. You do. If you haven't yet, get remoteStorage at 5apps or OwnCube." - -#: libredocs/welcome.php:27 -msgid "connect" -msgstr "connect" - -#: libredocs/welcome.php:28 -msgid "It's user@server. So user cindy from 5apps.com would type cindy@5apps.com here." -msgstr "It's user@server. So user cindy from 5apps.com would type cindy@5apps.com here." - -#: libredocs/welcome.php:33 -msgid "write freely!" -msgstr "write freely!" - -#: libredocs/welcome.php:34 -msgid "" -"Our goal is to create cloud sync for Libre Office (hence the name).\n" -" But we started by unhosting Etherpad for you. Enjoy!" -msgstr "" -"Our goal is to create cloud sync for Libre Office (hence the name).\n" -" But we started by unhosting Etherpad for you. Enjoy!" - -#~ msgid "" -#~ "is a free software " -#~ "app by Unhosted for a more open web." -#~ msgstr "" -#~ "is a free software " -#~ "app by Unhosted for a more open web." - -#~ msgid "Connectez-vous" -#~ msgstr "Connectez-vous" - -#~ msgid "Écrire librement !" -#~ msgstr "Écrire librement !" diff --git a/locale/fr_FR.utf8/LC_MESSAGES/default.mo b/locale/fr_FR.utf8/LC_MESSAGES/default.mo deleted file mode 100644 index 4d65c8afc927713f1ab507ed0e924c8ad8f95a1b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4629 zcmbVP&5s;M74Ja!T0Q~+E`*@xMREr`-Ltz^5@&WZa(2D8R;<@6?>Y$r$*SqDnJI5i zRi~V=gKICU1pZR1hpNISx^j&~_7SF%F6h*(o{Y#L0xc|?mVGnZeGqwC4 zlL?B72iS?^PD3hKgzEfK;pyFP_)yp}Isix5OOMuZT}E{*});R~*WGjfh_ ztOy~DaLjPQT!f>9>m&UC0`18mV*l3D& z8f_I)Si~a4+DYf&a!S|C-0V;mup`s5U&ieYhZ}x!+y+8vDq-Q2Cic8AnJ6a4qb;Mg z%sf92CTd?o46rl0VzhiRb2}bMtDLl#@i~?@r2`Z0DN{Nh)qr{tiEt_0r=h6|WPVgi z+K_{GSaW&ydZUSF#L!D4q*Ph~Xa;{(E`{S~(=_KsI-tN42fSW0gI!ABMmlqo(oR4m z^~JH&F_uZ+pq})!mDTF?X+u;=ln*hQESnx(O)LGS$ zeA=^HZw&PoUe=kqfwJluQ7~kY%gjnXE)+gsa1nRMY9I}3Z?3Igy!7(g+Qqn?6{gC` zjdT{=>ehZeQVqkm;BcC5S7kEbIBwSgz7ZY;Rh*<3`ch{yU`>mG{6@%9x;|o4kNj^OOdnrxV=5On;inFPib4P zfw6YfV0VEP6css?4PxvnASMu+Q$0;pnbJP0&Pf2SD1lk(s=K_62{5NS28x;avOe%( z4Zz!xg&DReIzXWLbTh!wd8jBv^3E*Iy?D{0yeEx-z3Pu#5l;aTZ@a z5MtE{0GP2&NF=;*al30JpSbIXI64OsrN=p0z$sul-CIZg)`YiakryChgf1{2h&heI z?d+Jt&@|Xqfz<3xdDj^q)`1^x9bQc?&DXIbU1^hTotYeHY0;&Q@=I?f`$p!X66vg-)xymdpl~;)tj&FZEeqA9H2F2{e75DR$7c*3yygq+!+5Fs}@EM9ZU2eC##9OZ&i|t`1J6R zENDc1;!wdL8{lZv+F_!Q_vo!E2A$wV!KIA3i@TN`{|W)%6HNvOL=nNa^WL@mgpNlv-ID|B^GsqX>r|99fED((4YYvb439I*F`S zx^j}#5DVTHn7p1=?xNsXW$nU4*5;@jjBL>%TvbR_Iw!dg>)x&;@IVPKdSLhobI*50_Uk64Tz=gsXrfN(9oSIARUH~>q9=whv9k3am!J~&n zc3QQ7TWQDlQ7mCD3G;72*}{ahJRMk;>j`Q3^n`@ce8}EYL(seuD5f=;ZpKM;@NvV%tKb%8GSq`q|V$<9MLJust^FMBS`7kq79&?qm4KtWbP_#tX zg+ji9F{T$#4U>#GW*!0{L4FyEkjZO#(y;CFW8M1SLsd$z4S?r+2^%|yG8>e|_`XLZ znQdT33~-AQ_&;j&%J{^YVtmqgV3_8v0(wJvg9ZzHpiJ>VSrr~zrmW8k@aqs=qU01b zXrCiqA0NYhO(xh2xLVbdwm}1FGsTXDMON~FmP1QO9)1bns}rEjfDfM8GL_`0W{zkp z%xnuOXTK(0%gyJvY2OOH=^+yw9-XPq$pkkEYZOWgY>3jD(b|-%7`}KuqtWTFjmHdi zh3TnG$)aw)0iYm;V~nF^Il;$*%16(40dDXDa~+ihqEq*gGzvGf8E+bj(C|YWJ{SEL D_zLZZ diff --git a/locale/fr_FR.utf8/LC_MESSAGES/default.po b/locale/fr_FR.utf8/LC_MESSAGES/default.po deleted file mode 100644 index 3df8428..0000000 --- a/locale/fr_FR.utf8/LC_MESSAGES/default.po +++ /dev/null @@ -1,119 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: LibreDocs\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-21 02:27+0100\n" -"PO-Revision-Date: 2012-05-21 02:27+0100\n" -"Last-Translator: Benoît Charpentier \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Poedit-KeywordsList: _;_e;gettext;gettext_noop\n" -"X-Poedit-Basepath: /LaBoiteaBen/Github/\n" -"X-Poedit-SourceCharset: utf-8\n" -"X-Poedit-Language: french\n" -"X-Poedit-Country: FRANCE\n" -"X-Poedit-SearchPath-0: libredocs\n" - -#: libredocs/dialog.php:6 -msgid "Connecting your remote storage" -msgstr "Connexion à votre espace de stockage distant" - -#: libredocs/documents.php:5 -msgid "+ New document" -msgstr "+ Nouveau document" - -#: libredocs/documents.php:10 -msgid "more …" -msgstr "plus …" - -#: libredocs/documents.php:11 -msgid "Syncing documents …" -msgstr "Synchronisation des documents …" - -#: libredocs/goToStep.php:8 -msgid "Setting your enroll step in localStorage" -msgstr "Complèter les paramètres de votre espace de stockage local" - -#: libredocs/goToStep.php:16 -msgid "Done. Go back to the main page." -msgstr "Terminé. Revenir à la page principale." - -#: libredocs/index.php:11 -msgid "Write with Libre Docs – liberate your ideas" -msgstr "Écrire avec Libre Docs – Libérez vos idées" - -#: libredocs/index.php:41 -msgid "Sorry, there are some issues with sign up. Please help us fix them and join our chat room below: " -msgstr "Désolé, remoteStorage rencontre quelques difficultés avec votre inscription, Pour nous aider à les corriger, merci de nous rejoindre dans notre salle de chat ci-dessous :" - -#: libredocs/index.php:50 -msgid "is a free softwareapp by Unhosted for a more open web." -msgstr "est un logiciel libre développé par Unhosted pour un web plus ouvert." - -#: libredocs/reset.php:8 -msgid "Clearing localStorage" -msgstr "Suppression de votre espace de stockage local" - -#: libredocs/reset.php:14 -msgid "Cleared your session. Go back to the main page." -msgstr "Fermé votre session. Revenir à la page principale." - -#: libredocs/welcome.php:9 -msgid "Liberate your ideas" -msgstr "Libérez vos idées" - -#: libredocs/welcome.php:10 -msgid "Write online, from anywhere, with your friends. Easily keep track of your documents instead of being tracked and trapped by the web's monopolies. We neither store your data nor track you. Libre Docs is only the application – your data is stored where you want it to be, using the open remoteStorage protocol." -msgstr "Écrire en ligne, de n'importe où, avec vos amis. Garder facilement la trace de vos documents au lieu d'être suivi et pris au piège par les monopoles du Web. Nous ne stockons pas vos données, ni ne vous traçons. Libre Docs n'est seulement que l'application - vos données sont stockées où vous voulez qu'elles le soient, grâce au protocole ouvert remoteStorage." - -#: libredocs/welcome.php:18 -msgid "get remoteStorage" -msgstr "obtenir un stockage distant" - -#: libredocs/welcome.php:19 -msgid "Libre Docs does not host your documents. You do. If you haven't yet, get remoteStorage at 5apps or OwnCube." -msgstr "Libre Docs n'héberge pas vos documents. Vous, oui. Si vous n'en avez pas encore, obtenez un espace de stockage en ligne auprès de 5apps ou de OwnCube." - -#: libredocs/welcome.php:27 -msgid "connect" -msgstr "connectez-vous" - -#: libredocs/welcome.php:28 -msgid "It's user@server. So user cindy from 5apps.com would type cindy@5apps.com here." -msgstr "Le compte ressemble à user@server. L'utilisateur cindy chez 5apps.com aura un compte cindy@5apps.com." - -#: libredocs/welcome.php:33 -msgid "write freely!" -msgstr "Écrire librement !" - -#: libredocs/welcome.php:34 -msgid "" -"Our goal is to create cloud sync for Libre Office (hence the name).\n" -" But we started by unhosting Etherpad for you. Enjoy!" -msgstr "" -"Notre objectif est de créer une synchronisation dans le nuage pour Libre Office (d'où le nom). \n" -" Mais, pour vous, nous avons commencé par \"unhoster\" Etherpad. Amusez-vous!" - -#~ msgid "" -#~ "is a free software " -#~ "app by Unhosted for a more open web." -#~ msgstr "" -#~ "est un logiciel libre " -#~ "développé par Unhosted pour un web plus " -#~ "ouvert." - -#~ msgid "" -#~ "Sorry, there are some issues with sign up. Please help us fix them and " -#~ "join our chat room below:" -#~ msgstr "" -#~ "Désolé, remoteStorage rencontre quelques problèmes avec votre " -#~ "inscription. Pour nous aider à les corriger, Merci de nous rejoindre dans " -#~ "notre salle de chat ci-dessous :" - -#~ msgid "Connectez-vous" -#~ msgstr "Connectez-vous" - -#~ msgid "Écrire librement !" -#~ msgstr "Écrire librement !" diff --git a/localization.php b/localization.php deleted file mode 100644 index 9214e1c..0000000 --- a/localization.php +++ /dev/null @@ -1,12 +0,0 @@ - \ No newline at end of file diff --git a/menu_lang.php b/menu_lang.php deleted file mode 100644 index f0422d8..0000000 --- a/menu_lang.php +++ /dev/null @@ -1,9 +0,0 @@ - - -
  • en
    • -
  • fr
    • - - - diff --git a/old/handler.js b/old/handler.js index 2598bf1..13ec6dd 100644 --- a/old/handler.js +++ b/old/handler.js @@ -7,7 +7,7 @@ exports.handler = (function() { function serve(req, res, baseDir) { var uripath = url.parse(req.url).pathname - .replace(new RegExp('/$', 'g'), '/index.php'); + .replace(new RegExp('/$', 'g'), '/index.html'); var host = req.headers.host; if(config.redirect && config.redirect[host]) { res.writeHead(302, {'Location': config.redirect[host]}); diff --git a/openDialog.html b/openDialog.html new file mode 100644 index 0000000..04b4631 --- /dev/null +++ b/openDialog.html @@ -0,0 +1,46 @@ + + + Opening dialog... + + + + + + Opening dialog... + + diff --git a/reset.html b/reset.html new file mode 100644 index 0000000..a030bac --- /dev/null +++ b/reset.html @@ -0,0 +1,13 @@ + + + + + Clearing localStorage + + + +

    Cleared your session. Go back to the main page.

    + + diff --git a/reset.php b/reset.php deleted file mode 100644 index c81e8d4..0000000 --- a/reset.php +++ /dev/null @@ -1,16 +0,0 @@ - - - - - <?php echo _("Clearing localStorage"); ?> - - - -

    back to the main page."); ?>

    - - diff --git a/session.php b/session.php deleted file mode 100644 index 54b20fc..0000000 --- a/session.php +++ /dev/null @@ -1,8 +0,0 @@ - \ No newline at end of file diff --git a/webodf.php b/webodf.html similarity index 90% rename from webodf.php rename to webodf.html index 792295a..bbe103a 100644 --- a/webodf.php +++ b/webodf.html @@ -1,7 +1,4 @@ - + @@ -27,7 +24,7 @@ function getCurrDocOwner() { if(location.hash.length) { return location.hash.split('/')[0].substring(1); } else { - window.location.href = 'welcome.php'; + window.location.href = 'welcome.html'; } } @@ -35,7 +32,7 @@ function getCurrDocLink() { if(location.hash.length) { return location.hash.substr(location.hash.indexOf('/') + 1); } else { - window.location.href = 'welcome.php'; + window.location.href = 'welcome.html'; } } diff --git a/welcome.html b/welcome.html new file mode 100644 index 0000000..f6a1f99 --- /dev/null +++ b/welcome.html @@ -0,0 +1,34 @@ +
    +
    +
    +

    Liberate your ideas

    +

    Write online, from anywhere, with your friends. Easily keep track of your documents instead of being tracked and trapped by the web's monopolies. We neither store your data nor track you. Libre Docs is only the application – your data is stored where you want it to be, using the open remoteStorage protocol.

    +
    +
    + +
    + +
    + +

    1. get remoteStorage

    +

    Libre Docs does not host your documents. You do. If you haven't yet, get remoteStorage at 5apps or OwnCube.

    +
    + +
    + + + + +

    2. connect

    +

    It's user@server. So user cindy from 5apps.com would type cindy@5apps.com here.

    +
    + +
    + +

    3. write freely!

    +

    Our goal is to create cloud sync for Libre Office (hence the name). + But we started by unhosting Etherpad for you. Enjoy! +

    +
    +
    +
    \ No newline at end of file diff --git a/welcome.php b/welcome.php deleted file mode 100644 index 6ef7300..0000000 --- a/welcome.php +++ /dev/null @@ -1,39 +0,0 @@ - - -
    -
    -
    -

    -

    Write online, from anywhere, with your friends. Easily keep track of your documents instead of being tracked and trapped by the web's monopolies. We neither store your data nor track you. Libre Docs is only the application – your data is stored where you want it to be, using the open remoteStorage protocol."); ?>

    -
    -
    - -
    - -
    - -

    1.

    -

    5apps or OwnCube."); ?>

    -
    - -
    - - - - -

    2.

    -

    cindy@5apps.com here."); ?>

    -
    - -
    - -

    3.

    -

    cloud sync for Libre Office (hence the name). - But we started by unhosting Etherpad for you. Enjoy!"); ?> -

    -
    -
    -
    \ No newline at end of file