From ebae2c3bece7f390a09502a12ad0576f22dd1c18 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 29 Sep 2016 11:09:06 +0200
Subject: [PATCH] Fix the noscript tag
---
customize.dist/index.html | 10 ++++++----
customize.dist/privacy.html | 2 --
customize.dist/src/fragments/index.html | 8 ++++++--
customize.dist/src/template.html | 2 --
customize.dist/terms.html | 2 --
customize.dist/translations/messages.fr.js | 1 -
customize.dist/translations/messages.js | 3 +--
7 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/customize.dist/index.html b/customize.dist/index.html
index acaed958b..32e09f4f2 100644
--- a/customize.dist/index.html
+++ b/customize.dist/index.html
@@ -57,8 +57,12 @@
<center>
<noscript>
- <p data-localization="main_oops">
- <!-- JS required -->
+ <p>
+ <strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.
+ </p>
+ <hr>
+ <p>
+ <strong>OUPS</strong> Afin de pouvoir réaliser le cryptage depuis votre navigateur, Javascript est <strong>vraiment</strong> requis.
</p>
</noscript>
<h5 id="tryit" data-localization="tryIt"></h5>
@@ -87,8 +91,6 @@
</div>
-
- <div id="bottom-bar"></div>
</body>
</html>
diff --git a/customize.dist/privacy.html b/customize.dist/privacy.html
index b7d4b15cc..b152269da 100644
--- a/customize.dist/privacy.html
+++ b/customize.dist/privacy.html
@@ -74,8 +74,6 @@
</div>
-
- <div id="bottom-bar"></div>
</body>
</html>
diff --git a/customize.dist/src/fragments/index.html b/customize.dist/src/fragments/index.html
index 6ca24310b..d37dca8ba 100644
--- a/customize.dist/src/fragments/index.html
+++ b/customize.dist/src/fragments/index.html
@@ -17,8 +17,12 @@
<center>
<noscript>
- <p data-localization="main_oops">
- <!-- JS required -->
+ <p>
+ <strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.
+ </p>
+ <hr>
+ <p>
+ <strong>OUPS</strong> Afin de pouvoir réaliser le cryptage depuis votre navigateur, Javascript est <strong>vraiment</strong> requis.
</p>
</noscript>
<h5 id="tryit" data-localization="tryIt"></h5>
diff --git a/customize.dist/src/template.html b/customize.dist/src/template.html
index b165c377e..e696d42a5 100644
--- a/customize.dist/src/template.html
+++ b/customize.dist/src/template.html
@@ -20,8 +20,6 @@
<div id="main">
{{main}}
</div>
-
- <div id="bottom-bar"></div>
</body>
</html>
diff --git a/customize.dist/terms.html b/customize.dist/terms.html
index 8db25b6cb..b2c1d4916 100644
--- a/customize.dist/terms.html
+++ b/customize.dist/terms.html
@@ -51,8 +51,6 @@
</div>
-
- <div id="bottom-bar"></div>
</body>
</html>
diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 6f5fc6c8d..18b1a9623 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -135,7 +135,6 @@ define(function () {
out.main_about = 'À propos';
out.main_about_p1 = 'Vous pouvez en apprendre davantage sur notre <a href="/privacy.html" title="">politique de confidentialité</a> et nos <a href="/terms.html">conditions d\'utilisation</a>.';
out.main_about_p2 = 'Si vous avez des questions ou commentaires, vous pouvez <a href="https://twitter.com/cryptpad">nous tweeter</a>, ouvrir une issue sur <a href="https://github.com/xwiki-labs/cryptpad/issues/" title="our issue tracker">Github</a>, venir dire bonjour sur IRC (<a href="http://webchat.freenode.net?channels=%23cryptpad&uio=MT1mYWxzZSY5PXRydWUmMTE9Mjg3JjE1PXRydWUe7" title="freenode webchat">irc.freenode.net</a>), ou <a href="mailto:sftfbsdiAyxjlj/dpn">nous envoyer un email</a>.';
- out.main_oops = '<strong>OUPS</strong> Afin de pouvoir réaliser le cryptage depuis votre navigateur, Javascript est <strong>vraiment</strong> requis.';
out.table_type = 'Type';
out.table_link = 'Lien';
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index f13409b72..8b98346db 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -51,7 +51,7 @@ define(function () {
out.renameConflict = 'Another pad already has that title';
out.forgetButton = 'FORGET';
- out.forgetButtonTitle = 'remove this document from your home page listings';
+ out.forgetButtonTitle = 'Remove this document from your home page listings';
out.forgetPrompt = 'Clicking OK will remove the URL for this pad from localStorage, are you sure?';
out.shareButton = 'SHARE';
@@ -135,7 +135,6 @@ define(function () {
out.main_about = 'About';
out.main_about_p1 = 'You can read more about our <a href="/privacy.html" title="">privacy policy</a> and <a href="/terms.html">terms of service</a>.';
out.main_about_p2 = 'If you have any questions or comments, you can <a href="https://twitter.com/cryptpad">tweet us</a>, open an issue <a href="https://github.com/xwiki-labs/cryptpad/issues/" title="our issue tracker">on github</a>, come say hi on irc (<a href="http://webchat.freenode.net?channels=%23cryptpad&uio=MT1mYWxzZSY5PXRydWUmMTE9Mjg3JjE1PXRydWUe7" title="freenode webchat">irc.freenode.net</a>), or <a href="mailto:sftfbsdiAyxjlj/dpn">send us an email</a>.';
- out.main_oops = '<strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.';
out.table_type = 'Type';
out.table_link = 'Link';