Skip to content
Snippets Groups Projects
Verified Commit 24eefeb3 authored by Guillaume Damiens's avatar Guillaume Damiens
Browse files

fix tellform patch issue

parent e7d64d02
No related branches found
No related tags found
1 merge request!37Tx services p19 test
Pipeline #41006 failed
......@@ -452,7 +452,7 @@ diff -Naur tellform/app/models/form_field.server.model.js tellform-patch/app/mod
-
diff -Naur tellform/app/models/form.server.model.js tellform-patch/app/models/form.server.model.js
--- tellform/app/models/form.server.model.js 2019-06-03 15:54:01.650435222 +0200
+++ tellform-patch/app/models/form.server.model.js 2019-06-03 17:39:06.884357630 +0200
+++ tellform-patch/app/models/form.server.model.js 2019-06-03 20:20:28.450567139 +0200
@@ -91,8 +91,8 @@
language: {
type: String,
......@@ -495,7 +495,7 @@ diff -Naur tellform/app/models/form.server.model.js tellform-patch/app/models/fo
buttonText:{
type: String,
- default: 'Go back to Form'
+ default: 'Retour au formulaire
+ default: 'Retour au formulaire'
},
buttons:[ButtonSchema]
},
......@@ -937,7 +937,7 @@ diff -Naur tellform/config/init.js tellform-patch/config/init.js
process.env.NODE_ENV = 'development';
diff -Naur tellform/config/logger.js tellform-patch/config/logger.js
--- tellform/config/logger.js 2019-06-03 15:54:01.650435222 +0200
+++ tellform-patch/config/logger.js 2019-06-03 19:34:46.080340970 +0200
+++ tellform-patch/config/logger.js 2019-06-03 20:19:41.678306270 +0200
@@ -56,7 +56,7 @@
} catch (err) {
if (process.env.NODE_ENV !== 'test') {
......@@ -967,7 +967,8 @@ diff -Naur tellform/config/logger.js tellform-patch/config/logger.js
+ if (!_.includes(validFormats, format)) {
if (process.env.NODE_ENV !== 'test') {
console.log();
console.log(chalk.yellow('Warning: An invalid format was provided. The logger will use the default format of "' + format + '"'));
- console.log(chalk.yellow('Warning: An invalid format was provided. The logger will use the default format of "' + format + '"'));
+ console.log(chalk.yellow('Attetion : un format invalide a été fourni Le format par défaut sera : "' + format + '"'));
console.log();
}
- }
......@@ -1115,6 +1116,22 @@ diff -Naur tellform/public/form_modules/forms/base/services/time-counter.client.
};
this.clockStarted = function(){
diff -Naur tellform/public/form_modules/forms/base/views/submit-form.client.view.html tellform-patch/public/form_modules/forms/base/views/submit-form.client.view.html
--- tellform/public/form_modules/forms/base/views/submit-form.client.view.html 2019-06-03 15:54:01.662435238 +0200
+++ tellform-patch/public/form_modules/forms/base/views/submit-form.client.view.html 2019-06-03 20:19:26.070189906 +0200
@@ -1,12 +1,3 @@
<section class="public-form">
<submit-form-directive myform="myform"></submit-form-directive>
</section>
-
-<!-- User's Google Analytics -->
-<script ng-if="myform.analytics.gaCode">
- window.ga=function(){ga.q.push(arguments)};ga.q=[];ga.l=+new Date;
- ga('create', '{{myform.analytics.gaCode}}', 'auto'); ga('send', 'pageview');
-</script>
-<script ng-if="myform.analytics.gaCode" src="https://www.google-analytics.com/analytics.js" async defer></script>
-
-<!-- End Google Analytics -->
diff -Naur tellform/public/modules/core/controllers/header.client.controller.js tellform-patch/public/modules/core/controllers/header.client.controller.js
--- tellform/public/modules/core/controllers/header.client.controller.js 2019-06-03 15:54:01.662435238 +0200
+++ tellform-patch/public/modules/core/controllers/header.client.controller.js 2019-06-03 19:42:37.122929848 +0200
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment