This is an automated email from the git hooks/post-receive script. New commit to branch feature/41_mentions_legales in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 24c9d344d386e84b6695ccfd468571637f8759fb Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Tue Sep 26 10:55:34 2017 +0200 Renomme le composant 'Privacy' en 'LegalNotices' --- pollen-ui-riot-js/src/main/web/i18n/en.json | 4 ++-- pollen-ui-riot-js/src/main/web/i18n/fr.json | 4 ++-- .../main/web/tag/{Privacy.tag.html => LegalNotices.tag.html} | 11 +++++------ pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 6 +++--- pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html | 2 +- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/i18n/en.json b/pollen-ui-riot-js/src/main/web/i18n/en.json index 329d4b8c..2430db8f 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/en.json +++ b/pollen-ui-riot-js/src/main/web/i18n/en.json @@ -229,7 +229,7 @@ "footer_participate": "Get involved!", "footer_license": "License", "footer_gtu": "GTU", - "footer_privacy": "Privacy policy", + "footer_legalNotices": "Legal Notices", "header_signin": "SignIn", "header_signup": "SignUp", "header_signout": "Disconnect", @@ -612,7 +612,7 @@ "gtu_validation_after" : "", "gtu_change_title": "CGU has change", "gtu_change_action": "Accept", - "privacy_title": "Privacy policy", + "legalNotices_title": "Legal notices", "emailAddressList_emailAddresses": "Email addresses", "emailAddressList_resendValidation": "Send a new validation email", "emailAddressList_validationResent": "An email has been sent to {0}", diff --git a/pollen-ui-riot-js/src/main/web/i18n/fr.json b/pollen-ui-riot-js/src/main/web/i18n/fr.json index 5a4658fb..a37867b8 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/fr.json +++ b/pollen-ui-riot-js/src/main/web/i18n/fr.json @@ -229,7 +229,7 @@ "footer_participate": "Contribuer au projet", "footer_license": "Licence", "footer_gtu": "CGU", - "footer_privacy": "Politique de confidentialité", + "footer_legalNotices": "Mentions légales", "header_signin": "Connexion", "header_signup": "Inscription", "header_signout": "Déconnexion", @@ -614,7 +614,7 @@ "gtu_validation_after" : "", "gtu_change_title": "Changement des CGU", "gtu_change_action": "Accepter", - "privacy_title": "Politique de confidentialité", + "legalNotices_title": "Mentions légales", "emailAddressList_emailAddresses": "Adresses électroniques", "emailAddressList_resendValidation": "Envoyer un nouveau courriel de validation de l'adresse électronique", "emailAddressList_validationResent": "Un courriel a été envoyé à l'adresse {0}", diff --git a/pollen-ui-riot-js/src/main/web/tag/Privacy.tag.html b/pollen-ui-riot-js/src/main/web/tag/LegalNotices.tag.html similarity index 93% rename from pollen-ui-riot-js/src/main/web/tag/Privacy.tag.html rename to pollen-ui-riot-js/src/main/web/tag/LegalNotices.tag.html index 908129f7..87169cec 100644 --- a/pollen-ui-riot-js/src/main/web/tag/Privacy.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/LegalNotices.tag.html @@ -8,17 +8,17 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> -<Privacy> +<LegalNotices> <div class="container" > @@ -34,8 +34,7 @@ <script type="es6"> this.session = require("../js/Session"); - this.installBundle(this.session, "privacy"); - + this.installBundle(this.session, "legalNotices"); </script> <style> @@ -46,4 +45,4 @@ } </style> -</Privacy> +</LegalNotices> diff --git a/pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html b/pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html index 1f97f3ed..53c6f07b 100644 --- a/pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html @@ -30,7 +30,7 @@ require("./SignInAction.tag.js"); require("./SignUp.tag.html"); require("./SignCheck.tag.html"); require("./Home.tag.html"); -require("./Privacy.tag.html"); +require("./LegalNotices.tag.html"); require("./PageChanged.tag.js"); require("./FilterLoginProvider.tag.js"); require("./poll/EditPoll.tag.html"); @@ -69,10 +69,10 @@ require("./popup/GtuChangeModal.tag.html"); </Authorization> </route> - <route path="privacy"> + <route path="legalNotices"> <Authorization> <PageChanged page="privacy"/> - <Privacy/> + <legalNotices/> </Authorization> </route> diff --git a/pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html b/pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html index 8569266d..c8c1d348 100644 --- a/pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html @@ -29,7 +29,7 @@ <a href="http://www.gnu.org/licenses/agpl.html">{__.license}</a> <a if={session.isGtu} href="{session.configuration.endPoint}/v1/gtu" target="_blank">{__.gtu}</a> <a href="http://www.codelutin.com/" target="_blank">Code Lutin</a> - <a if={session.configuration.piwikUrl} href="#privacy">{__.privacy}</a> + <a href="#legalNotices">{__.legalNotices}</a> </div> <script type="es6"> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.