Conflit resolved

This commit is contained in:
MarguoNana 2019-11-12 21:10:58 +01:00
commit 8b728d172f
24 changed files with 711 additions and 432 deletions

View File

@ -24,4 +24,7 @@ Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protrac
## Further help
Before using ng for the first time in this project, use `npm i` to install needed npm modules.
To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).

View File

@ -30,7 +30,11 @@
"styles": [
"src/styles.scss"
],
"scripts": []
"scripts": [
"node_modules/marked/lib/marked.js",
"node_modules/prismjs/prism.js",
"node_modules/prismjs/components/prism-css.min.js"
]
},
"configurations": {
"production": {

198
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "framadate",
"version": "0.0.0",
"name": "framadate-funky-frontend",
"version": "0.1.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -328,8 +328,7 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"aproba": {
"version": "1.2.0",
@ -350,14 +349,12 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@ -372,20 +369,17 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"core-util-is": {
"version": "1.0.2",
@ -502,8 +496,7 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"ini": {
"version": "1.3.5",
@ -515,7 +508,6 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@ -530,7 +522,6 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@ -538,14 +529,12 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"minipass": {
"version": "2.3.5",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@ -564,7 +553,6 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
@ -645,8 +633,7 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"object-assign": {
"version": "4.1.1",
@ -658,7 +645,6 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
@ -744,8 +730,7 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"safer-buffer": {
"version": "2.1.2",
@ -781,7 +766,6 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@ -801,7 +785,6 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@ -845,14 +828,12 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
"dev": true,
"optional": true
"dev": true
}
}
},
@ -1192,6 +1173,22 @@
"webpack-sources": "1.3.0"
}
},
"@ngx-translate/core": {
"version": "11.0.1",
"resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-11.0.1.tgz",
"integrity": "sha512-nBCa1ZD9fAUY/3eskP3Lql2fNg8OMrYIej1/5GRsfcutx9tG/5fZLCv9m6UCw1aS+u4uK/vXjv1ctG/FdMvaWg==",
"requires": {
"tslib": "^1.9.0"
}
},
"@ngx-translate/http-loader": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/@ngx-translate/http-loader/-/http-loader-4.0.0.tgz",
"integrity": "sha512-x8LumqydWD7eX9yQTAVeoCM9gFUIGVTUjZqbxdAUavAA3qVnk9wCQux7iHLPXpydl8vyQmLoPQR+fFU+DUDOMA==",
"requires": {
"tslib": "^1.9.0"
}
},
"@schematics/angular": {
"version": "8.2.1",
"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-8.2.1.tgz",
@ -1250,6 +1247,11 @@
"@types/jasmine": "*"
}
},
"@types/marked": {
"version": "0.6.5",
"resolved": "https://registry.npmjs.org/@types/marked/-/marked-0.6.5.tgz",
"integrity": "sha512-6kBKf64aVfx93UJrcyEZ+OBM5nGv4RLsI6sR1Ar34bpgvGVRoyTgpxn4ZmtxOM5aDTAaaznYuYUH8bUX3Nk3YA=="
},
"@types/minimatch": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
@ -2604,6 +2606,17 @@
"integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
"dev": true
},
"clipboard": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.4.tgz",
"integrity": "sha512-Vw26VSLRpJfBofiVaFb/I8PVfdI1OxKcYShe6fm0sP/DtmiWQNCjhM/okTvdCo0G+lMMm1rMYbk4IK4x1X+kgQ==",
"optional": true,
"requires": {
"good-listener": "^1.2.2",
"select": "^1.1.2",
"tiny-emitter": "^2.0.0"
}
},
"cliui": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
@ -2736,8 +2749,7 @@
"commander": {
"version": "2.20.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
"integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
"dev": true
"integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="
},
"commondir": {
"version": "1.0.1",
@ -3238,6 +3250,12 @@
"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
"dev": true
},
"delegate": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
"integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==",
"optional": true
},
"depd": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
@ -4297,6 +4315,15 @@
}
}
},
"good-listener": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
"integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=",
"optional": true,
"requires": {
"delegate": "^3.1.2"
}
},
"graceful-fs": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz",
@ -4310,9 +4337,9 @@
"dev": true
},
"handlebars": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz",
"integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==",
"version": "4.4.0",
"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.4.0.tgz",
"integrity": "sha512-xkRtOt3/3DzTKMOt3xahj2M/EqNhY988T+imYSlMgs5fVhLN2fmKVVj0LtEGmb+3UUYV5Qmm1052Mm3dIQxOvw==",
"dev": true,
"requires": {
"neo-async": "^2.6.0",
@ -5669,8 +5696,7 @@
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"core-util-is": {
"version": "1.0.2",
@ -5787,8 +5813,7 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"ini": {
"version": "1.3.5",
@ -5830,7 +5855,6 @@
"version": "2.3.5",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@ -5849,7 +5873,6 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
@ -5943,7 +5966,6 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
@ -6029,8 +6051,7 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"safer-buffer": {
"version": "2.1.2",
@ -6066,7 +6087,6 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@ -6130,14 +6150,12 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
"dev": true,
"optional": true
"dev": true
}
}
},
@ -6247,6 +6265,14 @@
"source-map-support": "^0.5.5"
}
},
"katex": {
"version": "0.11.1",
"resolved": "https://registry.npmjs.org/katex/-/katex-0.11.1.tgz",
"integrity": "sha512-5oANDICCTX0NqYIyAiFCCwjQ7ERu3DQG2JFHLbYOf+fXaMoH8eg/zOq5WSYJsKMi/QebW+Eh3gSM+oss1H/bww==",
"requires": {
"commander": "^2.19.0"
}
},
"killable": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
@ -6530,6 +6556,11 @@
"object-visit": "^1.0.0"
}
},
"marked": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz",
"integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg=="
},
"md5.js": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
@ -6934,6 +6965,18 @@
"integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
"dev": true
},
"ngx-markdown": {
"version": "8.2.1",
"resolved": "https://registry.npmjs.org/ngx-markdown/-/ngx-markdown-8.2.1.tgz",
"integrity": "sha512-59LG8rEoOwDsZyyJckp+QDnW/c5wMaRpNkb6TWktlBVTfQKyAYHr6BuSskVbZ4y8nsj54UQg0CDFLBOfUiqOwA==",
"requires": {
"@types/marked": "^0.6.5",
"katex": "^0.11.1",
"marked": "^0.7.0",
"prismjs": "^1.16.0",
"tslib": "^1.9.0"
}
},
"nice-try": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
@ -7794,6 +7837,14 @@
"integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
"dev": true
},
"prismjs": {
"version": "1.17.1",
"resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.17.1.tgz",
"integrity": "sha512-PrEDJAFdUGbOP6xK/UsfkC5ghJsPJviKgnQOoxaDbBjwc8op68Quupwt1DeAFoG8GImPhiKXAvvsH7wDSLsu1Q==",
"requires": {
"clipboard": "^2.0.0"
}
},
"process": {
"version": "0.11.10",
"resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
@ -8579,6 +8630,12 @@
"ajv-keywords": "^3.1.0"
}
},
"select": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
"integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=",
"optional": true
},
"select-hose": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
@ -9711,6 +9768,12 @@
"setimmediate": "^1.0.4"
}
},
"tiny-emitter": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
"integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==",
"optional": true
},
"tmp": {
"version": "0.0.33",
"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@ -11174,8 +11237,7 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"aproba": {
"version": "1.2.0",
@ -11218,8 +11280,7 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"concat-map": {
"version": "0.0.1",
@ -11230,8 +11291,7 @@
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"core-util-is": {
"version": "1.0.2",
@ -11348,8 +11408,7 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"ini": {
"version": "1.3.5",
@ -11361,7 +11420,6 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@ -11384,14 +11442,12 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"minipass": {
"version": "2.3.5",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@ -11410,7 +11466,6 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
@ -11491,8 +11546,7 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"object-assign": {
"version": "4.1.1",
@ -11504,7 +11558,6 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
@ -11590,8 +11643,7 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"safer-buffer": {
"version": "2.1.2",
@ -11627,7 +11679,6 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@ -11647,7 +11698,6 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@ -11691,14 +11741,12 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
"dev": true,
"optional": true
"dev": true
}
}
},

View File

@ -1,47 +1,51 @@
{
"name": "framadate",
"version": "0.0.0",
"scripts": {
"ng": "ng",
"start": "ng serve",
"build": "ng build",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e"
},
"private": true,
"dependencies": {
"@angular/animations": "~8.2.0",
"@angular/common": "~8.2.0",
"@angular/compiler": "~8.2.0",
"@angular/core": "~8.2.0",
"@angular/forms": "~8.2.0",
"@angular/platform-browser": "~8.2.0",
"@angular/platform-browser-dynamic": "~8.2.0",
"@angular/router": "~8.2.0",
"rxjs": "~6.4.0",
"tslib": "^1.10.0",
"zone.js": "~0.9.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.802.1",
"@angular/cli": "~8.2.1",
"@angular/compiler-cli": "~8.2.0",
"@angular/language-service": "~8.2.0",
"@types/node": "~8.9.4",
"@types/jasmine": "~3.3.8",
"@types/jasminewd2": "~2.0.3",
"codelyzer": "^5.0.0",
"jasmine-core": "~3.4.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~4.1.0",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "~2.0.1",
"karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^1.4.0",
"protractor": "~5.4.0",
"ts-node": "~7.0.0",
"tslint": "~5.15.0",
"typescript": "~3.5.3"
}
"name": "framadate-funky-frontend",
"version": "0.1.0",
"scripts": {
"ng": "ng",
"start": "ng serve",
"build": "ng build",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e",
"trans": "ng xi18n --output-path=src/locale --i18n-locale=fr"
},
"private": true,
"dependencies": {
"@angular/animations": "~8.2.0",
"@angular/common": "~8.2.0",
"@angular/compiler": "~8.2.0",
"@angular/core": "~8.2.0",
"@angular/forms": "~8.2.0",
"@angular/platform-browser": "~8.2.0",
"@angular/platform-browser-dynamic": "~8.2.0",
"@angular/router": "~8.2.0",
"@ngx-translate/core": "^11.0.1",
"@ngx-translate/http-loader": "^4.0.0",
"ngx-markdown": "^8.2.1",
"rxjs": "~6.4.0",
"tslib": "^1.10.0",
"zone.js": "~0.9.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.802.1",
"@angular/cli": "~8.2.1",
"@angular/compiler-cli": "~8.2.0",
"@angular/language-service": "~8.2.0",
"@types/node": "~8.9.4",
"@types/jasmine": "~3.3.8",
"@types/jasminewd2": "~2.0.3",
"codelyzer": "^5.0.0",
"jasmine-core": "~3.4.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~4.1.0",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "~2.0.1",
"karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^1.4.0",
"protractor": "~5.4.0",
"ts-node": "~7.0.0",
"tslint": "~5.15.0",
"typescript": "~3.5.3"
}
}

View File

@ -1,17 +1,25 @@
<header style="text-align:center">
<a [routerLink]="'home'" class="home_link" aria-roledescription="home">
<h1>
<span class="logo_first">Frama</span>
<span class="logo_second">date</span>
</h1>
<i i18n>
Ceci est une démo
</i>
</a>
<a [routerLink]="'home'" class="home_link" aria-roledescription="home">
<h1>
<span class="logo_first">Frama</span>
<span class="logo_second">date</span>
</h1>
</a>
<div id="translate_example">
<div class="lang-choices">
<button class="btn btn-info" (click)="switchLanguage('en')">en</button>
<button class="btn btn-info" (click)="switchLanguage('fr')">fr</button>
</div>
<h1 i18n>{{"Title"|translate}}</h1>
<div>
{{"Intro"|translate:user}}
</div>
</div>
</header>
<framadate-navigation></framadate-navigation>
<main>
<router-outlet></router-outlet>
<router-outlet></router-outlet>
</main>
<framadate-debugger></framadate-debugger>

View File

@ -1,10 +1,26 @@
import { Component } from '@angular/core';
import {Component} from '@angular/core';
import {TranslateService} from "@ngx-translate/core";
@Component({
selector: 'app-root',
templateUrl: './app.component.html',
styleUrls: ['./app.component.scss']
selector: 'app-root',
templateUrl: './app.component.html',
styleUrls: ['./app.component.scss']
})
export class AppComponent {
title = 'framadate';
title = 'framadate';
//translation demo:
minutes = 12;
user = {
name: 'Arthur',
age: 42
};
constructor(private translate: TranslateService) {
this.translate.setDefaultLang('fr');
}
switchLanguage(language: string) {
this.translate.use(language);
}
}

View File

@ -21,14 +21,36 @@ import {EndConfirmationComponent} from './pages/end-confirmation/end-confirmatio
import {CreateOrRetrieveComponent} from './pages/create-or-retrieve/create-or-retrieve.component';
import {CalendarComponent} from './calendar/calendar.component';
import localeFr from '@angular/common/locales/fr';
import localeEn from '@angular/common/locales/en';
import {VotingSummaryComponent} from './pages/voting-summary/voting-summary.component';
import {VotingGraphComponent} from './pages/voting-graph/voting-graph.component';
import {VotingChoiceComponent} from './pages/voting-choice/voting-choice.component';
import {PasswordComponent} from './pages/password/password.component';
import {HomeComponent} from './pages/home/home.component';
import {VoteChoiceComponent} from './vote-choice/vote-choice.component';
import {HttpClient, HttpClientModule} from '@angular/common/http';
import { MarkdownModule } from 'ngx-markdown';
import {
MissingTranslationHandler,
MissingTranslationHandlerParams,
TranslateLoader,
TranslateModule,
TranslateService
} from '@ngx-translate/core';
import {TranslateHttpLoader} from '@ngx-translate/http-loader';
export class MyMissingTranslationHandler implements MissingTranslationHandler {
handle(params: MissingTranslationHandlerParams) {
return 'some value';
}
}
registerLocaleData(localeFr, 'fr');
registerLocaleData(localeEn, 'en');
export function HttpLoaderFactory(http: HttpClient) {
return new TranslateHttpLoader(http);
}
@NgModule({
declarations: [
@ -58,10 +80,24 @@ registerLocaleData(localeFr, 'fr');
CommonModule,
BrowserModule,
AppRoutingModule,
MarkdownModule.forRoot(),
TranslateModule.forRoot({
missingTranslationHandler: {
provide: MissingTranslationHandler,
useClass: MyMissingTranslationHandler,
},
// useDefaultLang: false,
loader: {
provide: TranslateLoader,
useFactory: HttpLoaderFactory,
deps: [HttpClient]
}
}),
HttpClientModule,
FormsModule,
RouterModule.forRoot(Routes)
],
providers: [{provide: LOCALE_ID, useValue: "fr-FR"}],
providers: [TranslateService],
bootstrap: [AppComponent]
})
export class AppModule {

View File

@ -1,27 +1,29 @@
<div class="well debug">
<strong>
<h2 i18n>
infos de debug
</h2>
</strong>
<ul>
<li>
étape actuelle {{config.step}} / {{config.stepMax}}
</li>
<li>
formulaire valide : {{formIsValid}}
</li>
<li>
type de formulaire: {{config.pollType}}
</li>
<li>
config:
<pre>
{{config|json}}
</pre>
</li>
</ul>
<strong>
<h2 i18n>
infos de debug
</h2>
<span class="demo">
{{"config.demo"|translate}}
</span>
</strong>
<ul>
<li>
étape actuelle {{config.step}} / {{config.stepMax}}
</li>
<li>
formulaire valide : {{formIsValid}}
</li>
<li>
type de formulaire: {{config.pollType}}
</li>
<li>
config:
<pre>
{{config|json}}
</pre>
</li>
</ul>
</div>
<span i18n>
@ -62,5 +64,5 @@
i18n
(click)="config.sendForm()"
>
Envoyer le formulaire
Envoyer le formulaire
</button>

View File

@ -1,7 +1,7 @@
<div class="answers">
<h1 i18n>
Choisir les propositions
</h1>
<h1 i18n>
Choisir les propositions
</h1>
<p class="subtitle" i18n>
Vous pouvez utiliser la syntaxe markdown

View File

@ -1,2 +1,4 @@
<h1>Ce composant est celui de base pour les pages</h1>
<a [routerLink]="'/step/end'" class="btn btn--primary" i18n="@@confirm">C'est parfait!</a>
<a [routerLink]="'/step/end'" class="btn btn-block" i18n="@@confirm">
{{"config.perfect"|translate}}
</a>

View File

@ -1,56 +1,55 @@
<section class="creation">
<h1 i18n>
Créer un sondage
</h1>
<p
class="description"
i18n
>
Planifiez des rendez-vous avec vos amis ou votre famille ou créez un sondage avec du texte, des images ou des
liens… un sondage quoi !
</p>
<div class="btn-next">
<button
class="btn btn--primary"
[routerLink]="'/home'"
>
<h1>
{{"creation.title"|translate}}
</h1>
<p
class="description"
i18n
>
{{"config.title"|translate}}
</p>
<div class="btn-next">
<a
[routerLink]="'/home'"
>
<span
class="text"
i18n
>
C'est parti
class="text"
i18n
>
{{"config.letsgo"|translate}}
</span>
</button>
</div>
<span class="icon right">
>
</span>
</a>
</div>
</section>
<section class="recuperation">
<h1 i18n>
Mes sondages
</h1>
<form
action="https://framadate.org/find_polls.php"
method="post"
>
<label
class="description"
for="email"
i18n
>
Je cherche les sondages qui correspondent à mon mail :
</label>
<input
type="email"
name="mail"
id="email"
autofocus="autofocus"
/>
<input
type="submit"
class="btn btn--primary btn--outline"
i18n
value="Retrouver mes sondages"
/>
</form>
<h1>
{{"config.find_my_polls"|translate}}
</h1>
<form
action="https://framadate.org/find_polls.php"
method="post"
>
<label
class="description"
for="email"
i18n
>
{{"config.find_helper"|translate}} :
</label>
<input
type="email"
name="mail"
id="email"
autofocus="autofocus"
/>
<input
type="submit"
class="btn btn-block"
i18n-value="'config.find_button'|translate"
/>
</form>
</section>

View File

@ -1,58 +1,56 @@
<div i18n>
Config spécialement pour les dates
{{"dates.title"|translate}}
</div>
<div>
<select
name="multi_hours"
id="multi_hours"
[(ngModel)]="config.allowSeveralHours"
>
<option value="true">possiblement différents</option>
<option value="false">identiques</option>
</select>
<label for="multi_hours">
<label for="multi_hours">
<span i18n>
Je souhaite mettre des créneaux horaires
</span>
<span i18n>
<select
name="multi_hours"
id="multi_hours"
[(ngModel)]="config.allowSeveralHours"
>
<option value="true">{{"dates.multiple.different"|translate}}</option>
<option value="false">{{"dates.multiple.identical"|translate}}</option>
</select>
<span i18n>
pour chaque journée
</span>
</label>
</label>
</div>
<button
class="btn btn--primary"
(click)="addDate()"
i18n
class="btn btn-primary"
(click)="addDate()"
i18n
>
Ajouter une plage de dates
{{"dates.add"|translate}}
</button>
<div class="dates-list">
{{config.dateList.length}}
<span i18n>
choix de Dates
{{config.dateList.length}}
<span i18n>
{{"dates.count_dates"|translate}}
</span>
<div
*ngFor="let choice of config.dateList; index as id"
class="date-choice"
>
<input
type="text"
name="dateChoices[]"
[(ngModel)]="choice.literal"
>
<div
*ngFor="let choice of config.dateList; index as id"
class="date-choice"
>
<input
type="text"
name="dateChoices[]"
[(ngModel)]="choice.literal"
>
<button (click)="config.dateList.splice(id, 1)">X</button>
</div>
<button (click)="config.dateList.splice(id, 1)">X</button>
</div>
</div>
<a
[routerLink]="'/step/end'"
class="btn btn--primary"
[routerLink]="'/step/end'"
class="btn btn-block"
>
C'est parfait!
C'est parfait!
</a>

View File

@ -1,9 +1,6 @@
<h1 i18n>
Et c'est tout pour nous!
{{"resume.title"|translate}}
</h1>
<p>Votre sondage "{{ config.title }}" a bien été crée <br>
Voici les liens d'accès au sondage,conservez les soigneusement
</p>
<h2 i18n>Coté administrateur-ice-eux</h2>
<h2 i18n>Coté sondés</h2>
<h2 i18n>recevoir les liens par e-mail</h2>
<h2 i18n>{{"resume.admins"|translate}}</h2>
<h2 i18n>{{"resume.users"|translate}}</h2>
<h2 i18n>{{"resume.link_mail"|translate}}</h2>

View File

@ -1,80 +1,83 @@
<div class="description">
<router-outlet></router-outlet>
<h1 i18n>
{{"creation.title"|translate}}
</h1>
<span
class="pre-selector"
i18n
>
{{"creation.want"|translate}}
</span>
<select
id="selector"
name="selector"
autofocus="autofocus"
[(ngModel)]="config.pollType"
>
<option value="dates">
{{"creation.kind.date"|translate}}
</option>
<option value="classic">
{{"creation.kind.classic"|translate}}
</option>
</select>
<router-outlet></router-outlet>
<h1 i18n>
Pour commencer
</h1>
<span
class="pre-selector"
i18n
>
Je veux créer un sondage
</span>
<select
id="selector"
name="selector"
autofocus="autofocus"
[(ngModel)]="config.pollType"
>
<option value="dates">
spécial dates
</option>
<option value="classic">
classique
</option>
</select>
<span class="post-selector">
</span>
<div>
<span class="post-selector">
</span>
<label
for="poll_title"
class="title-label"
i18n
>
Dont le titre sera
</label>
<input
type="text"
id="poll_title"
name="poll_title"
[(ngModel)]="config.title"
>
<div>
</div>
<div>
<label for="my_name">
Je peux aussi préciser mon nom si je le souhaite :
</label>
<input
type="text"
name="my_name"
id="my_name"
[(ngModel)]="config.myName"
>
</div>
<div>
<label
for="poll_title"
class="title-label"
i18n
>
{{"creation.choose_title"|translate}}
</label>
<input
type="text"
id="poll_title"
name="poll_title"
placeholder="titre"
[(ngModel)]="config.title"
>
</div>
<label
for="poll_description"
class="title-label"
i18n
>
et la description serait
</label>
<textarea
id="poll_description"
name="poll_description"
[(ngModel)]="config.description"
cols="50"
lines="5"
></textarea>
<div>
<label for="my_name">
{{"creation.name"|translate}} :
</label>
<input
type="text"
name="my_name"
id="my_name"
placeholder="mon nom"
[(ngModel)]="config.myName"
>
</div>
</div>
<div>
<label
for="poll_description"
class="title-label"
i18n
>
{{"creation.description"|translate}}
</label>
<textarea
id="poll_description"
name="poll_description"
[(ngModel)]="config.description"
placeholder="description"
cols="50"
lines="5"
></textarea>
</div>
<button
[routerLink]="'/step/answers'"
class="btn btn--primary"
class="btn btn-block"
i18n
>
Continuer
@ -85,5 +88,6 @@
i18n
>
Retour
</a>
</a>
<hr>
</div>

View File

@ -1,6 +1,6 @@
<!--ceci est la popup pour ajouter une image-->
<h1 i18n>
Images
Images
</h1>
<a [routerLink]="'/step/visibility'" class="btn btn--primary">ok</a>

View File

@ -2,9 +2,9 @@
Résumé avant validation
</h1>
<section>
TODO
<pre>
{{config |json}}
</pre>
<div markdown *ngFor="let questions of config.answers">
{{questions.id+1}}. {{questions.text}}
</div>
<button [routerLink]="'/step/answers'" class="btn btn-info">Retour</button>
</section>
<button [routerLink]="'/step/end'" class="btn btn--primary" i18n="@@confirm">C'est parfait!</button>

View File

@ -1,14 +1,14 @@
<h1 i18n>
Visibilité des réponses
{{"visibility.title"|translate}}
</h1>
<h1 i18n>
Votes
{{"visibility.votes"|translate}}
</h1>
<h1 i18n>
Archivage
{{"visibility.archiving"|translate}}
</h1>
<h1 i18n>
Accès au sondage
{{"visibility.access"|translate}}
</h1>
<a [routerLink]="'/step/end'" class="btn btn--primary" i18n="@@confirm">C'est parfait!</a>

View File

@ -1,29 +1,29 @@
<nav class="choices">
<a [routerLink]="'/step/creation'">
<a [routerLink]="'/step/creation'" i18n>
Création
</a>
<a [routerLink]="'/step/date'">
<a [routerLink]="'/step/date'" i18n>
Les Dates
</a>
<a [routerLink]="'/step/answers'">
<a [routerLink]="'/step/answers'" i18>
Réponses
</a>
<a [routerLink]="'/step/visibility'">
<a [routerLink]="'/step/visibility'" i18n>
Visibilité
</a>
<a [routerLink]="'/step/base'">
<a [routerLink]="'/step/base'" i18n>
Base
</a>
<a [routerLink]="'/step/pictures'">
<a [routerLink]="'/step/pictures'" i18n>
Images
</a>
<a [routerLink]="'/step/resume'">
<a [routerLink]="'/step/resume'" i18n>
Résumé
</a>
<a [routerLink]="'/step/kind'">
<a [routerLink]="'/step/kind'" i18n>
Page démo
</a>
<a [routerLink]="'/home'">
<a [routerLink]="'/home'" i18n>
Accueil
</a>
</nav>

64
src/assets/i18n/en.json Normal file
View File

@ -0,0 +1,64 @@
{
"Title": "Translation example",
"Intro": "Hello I am {{name}}, I am {{age}} years old.",
"home": {
"title": "home's title"
},
"config": {
"demo": "this is a demo",
"demo_other": "this is an other demo",
"continue": "Continue",
"perfect": "That's perfect",
"title": "Create a poll",
"letsgo": "Lets go!",
"description": "Shedule appointments with your friends or your family, or create a pool with text, pictures or links… A real survey!",
"find_my_polls": "Where are my polls ?",
"find_helper": "I am looking for polls linked to my email",
"find_button": "Find my polls"
},
"creation": {
"title": "To begin with",
"want": "I want to create a poll",
"kind": {
"classic": "classic",
"date": "special dates"
},
"choose_title": "Whom title will be",
"choose_title_placeholder": "title",
"name": "I can also specify my name if i want",
"name_placeholder": "my name",
"description": "and the description would be",
"description_placeholder": "summary of the poll's purpose"
},
"dates": {
"title": "Config especially for the dates",
"hours_different": "I want to put slots for each day",
"multiple": {
"identical": "same",
"different": "possibly different"
},
"add": "Add a date range",
"count_dates": "choices of dates"
},
"choices": {
"title": "Write the proposals",
"helper": "You can use markdown syntax",
"answer_preset_1": "Demo answer 1",
"answer_preset_2": "answer 2",
"answer_preset_3": "and D, the answer D",
"add": "Add",
"continue": "Let's see how it goes"
},
"resume": {
"title": "And that's all for us!",
"admins": "Admin side",
"users": "Respondent side",
"links_mail": "Receive links by email"
},
"visibility": {
"title": "Visibility of answers",
"votes": "Votes",
"archiving": "Archiving",
"access": "Access to the pool"
}
}

64
src/assets/i18n/fr.json Normal file
View File

@ -0,0 +1,64 @@
{
"Title": "Example de traduction",
"Intro": "Bonjour je m'appelle {{name}}, j'ai {{age}} ans.",
"home": {
"title": "le titre de la home"
},
"config": {
"demo": "C'est une démo traduite en Français",
"demo_other": "C'est une <strong>autre</strong> démo traduite en Français",
"continue": "Continuer",
"perfect": "C'est parfait",
"title": "Créer un sondage",
"letsgo": "C'est parti'",
"description": "Planifiez des rendez-vous avec vos amis ou votre famille ou créez un sondage avec du texte, des images ou des liens… un sondage quoi !",
"find_my_polls": "Où sont mes sondages ?",
"find_helper": "Je cherche les sondages qui correspondent à mon mail",
"find_button": "Retrouver mes sondages"
},
"creation": {
"title": "Pour commencer ",
"want": "Je veux créer un sondage",
"kind": {
"classic": "classique",
"date": "spécial dates"
},
"choose_title": "Dont le titre sera",
"choose_title_placeholder": "titre",
"name": "Je peux aussi préciser mon nom si je le souhaite",
"name_placeholder": "mon nom",
"description": "et la description serait",
"description_placeholder": "description"
},
"dates": {
"title": "Config spécialement pour les dates ",
"hours_different": "Je souhaite mettre des créneaux horaires pour chaque journée",
"multiple": {
"identical": "identiques",
"different": "possiblement différentes"
},
"add": "Ajouter une plage de dates",
"count_dates": "choix de dates"
},
"choices": {
"title": "Choisir les propositions",
"helper": "vous pouvez utiliser la syntaxe markdown ",
"answer_preset_1": "réponse de démo 1",
"answer_preset_2": "réponse 2",
"answer_preset_3": "la réponse D",
"add": "Ajouter",
"continue": "Voyons ce que ça donne"
},
"resume": {
"title": "Et c'est tout pour nous !",
"admins": "Coté administrateur-ice-eux",
"users": "Coté sondés",
"links_mail": "recevoir les liens par e-mail"
},
"visibility": {
"title": "Visibilité des réponses",
"votes": "Votes",
"archiving": "Archivage",
"access": "Accès au sondage"
}
}

View File

@ -1,3 +1,8 @@
.logo_first, .logo_second {
padding-left: 0;
padding-right: 0;
}
.logo_first {
color: $logo_color;
}

View File

@ -1,16 +1,16 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Framadate</title>
<base href="/">
<meta charset="utf-8">
<title>Framadate</title>
<base href="/">
<meta content="width=device-width, initial-scale=1" name="viewport">
<link href="favicon.ico" rel="icon" type="image/x-icon">
<meta content="width=device-width, initial-scale=1" name="viewport">
<link href="favicon.ico" rel="icon" type="image/x-icon">
<link rel="stylesheet" href="assets/css/bootstrap-reboot-4.3.1.css">
<link rel="stylesheet" href="assets/css/bootstrap-reboot-4.3.1.css">
</head>
<body>
<app-root></app-root>
<app-root></app-root>
</body>
</html>

View File

@ -1,59 +1,39 @@
<?xml version="1.0" encoding="UTF-8" ?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
<file source-language="en" datatype="plaintext" original="ng2.template">
<file source-language="fr" datatype="plaintext" original="ng2.template">
<body>
<trans-unit id="5f48694aae82f756b2486bed76c1fa564bac44e3" datatype="html">
<trans-unit id="demo" datatype="html">
<source>
Ceci est une démo
</source>
Ceci est une démo
</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/app.component.html</context>
<context context-type="linenumber">7</context>
</context-group>
<note priority="1" from="description">introduction header saying just demo </note>
<note priority="1" from="meaning">demo title</note>
</trans-unit>
<trans-unit id="c9a7731e9e283ee83d0c2fd1747e57f9cba067d6" datatype="html">
<trans-unit id="plural_example" datatype="html">
<source>
Pour commencer
</source>
Updated <x id="ICU" equiv-text="{minutes, plural, =0 {...} =1 {...} other {...}}"/>
</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/form-container/form-container.component.html</context>
<context context-type="linenumber">4</context>
</context-group>
</trans-unit>
<trans-unit id="e40f615c5bada8d5458ede5b03812bdb8074d7d7" datatype="html">
<source>
Je veux créer un sondage
</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/form-container/form-container.component.html</context>
<context context-type="sourcefile">src/app/app.component.html</context>
<context context-type="linenumber">10</context>
</context-group>
</trans-unit>
<trans-unit id="805abd40471b9825d00b1a958e5ecaf244d84a8f" datatype="html">
<source>
Dont le titre sera
</source>
<trans-unit id="5a134dee893586d02bffc9611056b9cadf9abfad" datatype="html">
<source>{VAR_PLURAL, plural, =0 {just now} =1 {one minute ago} other {<x id="INTERPOLATION" equiv-text="{{minutes}}"/> minutes ago} }</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/form-container/form-container.component.html</context>
<context context-type="linenumber">34</context>
<context context-type="sourcefile">src/app/app.component.html</context>
<context context-type="linenumber">11</context>
</context-group>
</trans-unit>
<trans-unit id="5bf90b01331c01753f8446a4c931b942b128f7ab" datatype="html">
<source>
et la description serait
</source>
<trans-unit id="c279d3eb8220c1a0b77adb0a520b3e81f086d046" datatype="html">
<source>placeholder à traduire</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/form-container/form-container.component.html</context>
<context context-type="linenumber">64</context>
</context-group>
</trans-unit>
<trans-unit id="43c8155b739dc52b87e8deabeda5f93baf5fcfe5" datatype="html">
<source>
Continuer
</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/form-container/form-container.component.html</context>
<context context-type="linenumber">82</context>
<context context-type="sourcefile">src/app/app.component.html</context>
<context context-type="linenumber">13</context>
</context-group>
</trans-unit>
<trans-unit id="confirm" datatype="html">
@ -75,9 +55,9 @@
<context context-type="linenumber">10</context>
</context-group>
</trans-unit>
<trans-unit id="cf84be7024daae2b7a58064917082c3c48964f6b" datatype="html">
<trans-unit id="8dfa2af2946c94200a9c49226ac8221ddec0834d" datatype="html">
<source>
Config spécialement pour les dates
Config spécialement pour les dates
</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/pages/dates/dates.component.html</context>
@ -102,9 +82,9 @@
<context context-type="linenumber">20</context>
</context-group>
</trans-unit>
<trans-unit id="e8ecc8aa309cfa900b1a70db4e53564bb7c91279" datatype="html">
<trans-unit id="0bd3bae4b21407cbd1ab7f12f2516aba84ee8cd5" datatype="html">
<source>
Ajouter une plage de dates
Ajouter une plage de dates
</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/pages/dates/dates.component.html</context>
@ -120,10 +100,10 @@
<context context-type="linenumber">35</context>
</context-group>
</trans-unit>
<trans-unit id="8ba76abb289f2f5f1aca7be9ba2ed719776c08b4" datatype="html">
<trans-unit id="6387b579b9b1bdb74c3dfd9d63387adb40076376" datatype="html">
<source>
infos de debug
</source>
infos de debug
</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/debugger/debugger.component.html</context>
<context context-type="linenumber">4</context>
@ -156,90 +136,90 @@
<context context-type="linenumber">51</context>
</context-group>
</trans-unit>
<trans-unit id="48d19c1e53f2688d4a4644e7469dbe178c41b94b" datatype="html">
<trans-unit id="9dffbece2b62a762cc013cd9a092a45386644395" datatype="html">
<source>
Envoyer le formulaire
Envoyer le formulaire
</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/debugger/debugger.component.html</context>
<context context-type="linenumber">64</context>
</context-group>
</trans-unit>
<trans-unit id="b40afc8ef9bdf7cebd275e90d7d3a99de783316c" datatype="html">
<trans-unit id="a2e46fcfdbcd6457dd6dda15896ff772a4cccb59" datatype="html">
<source>
Visibilité des réponses
Visibilité des réponses
</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/pages/visibility/visibility.component.html</context>
<context context-type="linenumber">1</context>
</context-group>
</trans-unit>
<trans-unit id="9683875f0b9358b14311cd8677625d41cd3b8761" datatype="html">
<trans-unit id="f3fa123ec08a0f55d20203474e459cb166171530" datatype="html">
<source>
Votes
Votes
</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/pages/visibility/visibility.component.html</context>
<context context-type="linenumber">4</context>
</context-group>
</trans-unit>
<trans-unit id="8141de4312b125a7d4bb37407f11f051d7c8ea52" datatype="html">
<trans-unit id="07056464cc8e77270490824db1c119774a9605d8" datatype="html">
<source>
Archivage
Archivage
</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/pages/visibility/visibility.component.html</context>
<context context-type="linenumber">7</context>
</context-group>
</trans-unit>
<trans-unit id="3f0000f510cabfeb754fa68a6e1d3ab1e9646310" datatype="html">
<trans-unit id="e89a47f338845c2bc853956b810455622ea70d18" datatype="html">
<source>
Accès au sondage
Accès au sondage
</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/pages/visibility/visibility.component.html</context>
<context context-type="linenumber">11</context>
</context-group>
</trans-unit>
<trans-unit id="794bc2b544c051c52da8d4ff49b895e7c08fe324" datatype="html">
<trans-unit id="575c777901e66582920b91544ddfc3f1cff6dfdd" datatype="html">
<source>
Résumé avant validation
Résumé avant validation
</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/pages/resume/resume.component.html</context>
<context context-type="linenumber">1</context>
</context-group>
</trans-unit>
<trans-unit id="482e483f961c90409e68eeeb88cd8fc9740405a9" datatype="html">
<trans-unit id="e73989397fa8b6b2a516ec090b7653d7ca8a9f2d" datatype="html">
<source>
Images
Images
</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/pages/pictures/pictures.component.html</context>
<context context-type="linenumber">1</context>
<context context-type="linenumber">2</context>
</context-group>
</trans-unit>
<trans-unit id="ab5ed75fbdc05c50c07e2a989800e2c01f609096" datatype="html">
<trans-unit id="f6d82bb9d11a1a8fbfbc8dd54388b068db42fd4a" datatype="html">
<source>
Choisir les propositions
</source>
Choisir les propositions
</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/pages/answers/answers.component.html</context>
<context context-type="linenumber">2</context>
</context-group>
</trans-unit>
<trans-unit id="9d3134dd15200d284b849d82901859540d7468b9" datatype="html">
<trans-unit id="aa15ed6f3664a52d0532b4caccc5e3862eceaff6" datatype="html">
<source>
vous pouvez utiliser la syntaxe markdown
</source>
vous pouvez utiliser la syntaxe markdown
</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/pages/answers/answers.component.html</context>
<context context-type="linenumber">6</context>
</context-group>
</trans-unit>
<trans-unit id="2ef54ad8955ee783666a80a4a9f2d2566cde636d" datatype="html">
<trans-unit id="8c8496fbdf12a4a3ef88119cd37deca10bf6c661" datatype="html">
<source>
Et c&apos;est tout pour nous!
Et c&apos;est tout pour nous!
</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/pages/end-confirmation/end-confirmation.component.html</context>
@ -267,20 +247,20 @@
<context context-type="linenumber">6</context>
</context-group>
</trans-unit>
<trans-unit id="fcc2982bfe4e0867b8e03ae32f12536e35e9f2ee" datatype="html">
<trans-unit id="f74e29e3e6b015dc4163c3d43002088d0e1da5dc" datatype="html">
<source>
Créer un sondage
</source>
Créer un sondage
</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/pages/create-or-retrieve/create-or-retrieve.component.html</context>
<context context-type="linenumber">2</context>
</context-group>
</trans-unit>
<trans-unit id="ac06acb64dc44609e549c0026b8d4a0bd35a9d2d" datatype="html">
<trans-unit id="36ab2505621b4451317833191d6a4c2d7c214b3c" datatype="html">
<source>
Planifiez des rendez-vous avec vos amis ou votre famille ou créez un sondage avec du texte, des images ou des
liens… un sondage quoi !
</source>
Planifiez des rendez-vous avec vos amis ou votre famille ou créez un sondage avec du texte, des images ou des
liens… un sondage quoi !
</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/pages/create-or-retrieve/create-or-retrieve.component.html</context>
<context context-type="linenumber">8</context>
@ -295,24 +275,69 @@
<context context-type="linenumber">19</context>
</context-group>
</trans-unit>
<trans-unit id="dde7379e3a2366fe5e1dfb96d27efab283b08bf2" datatype="html">
<trans-unit id="9e1fa5a7ae3c13a9fa4a657d94085e239066377a" datatype="html">
<source>
Où sont mes sondages ?
</source>
Où sont mes sondages ?
</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/pages/create-or-retrieve/create-or-retrieve.component.html</context>
<context context-type="linenumber">29</context>
</context-group>
</trans-unit>
<trans-unit id="2129459e12afb298befa20cfc241adc6ed88e612" datatype="html">
<trans-unit id="b291d9e84fc9afe337b3450266847c430523bcc5" datatype="html">
<source>
Je cherche les sondages qui correspondent à mon mail :
</source>
Je cherche les sondages qui correspondent à mon mail :
</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/pages/create-or-retrieve/create-or-retrieve.component.html</context>
<context context-type="linenumber">40</context>
</context-group>
</trans-unit>
<trans-unit id="9606f1c734851ad834d5f9eca4fbc79fad2cf406" datatype="html">
<source>
Pour commencer
</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/pages/home/home.component.html</context>
<context context-type="linenumber">4</context>
</context-group>
</trans-unit>
<trans-unit id="e40f615c5bada8d5458ede5b03812bdb8074d7d7" datatype="html">
<source>
Je veux créer un sondage
</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/pages/home/home.component.html</context>
<context context-type="linenumber">10</context>
</context-group>
</trans-unit>
<trans-unit id="99eef0ca99f5a0e0aee806ffdefb5ca1ca318b07" datatype="html">
<source>
Dont le titre sera
</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/pages/home/home.component.html</context>
<context context-type="linenumber">34</context>
</context-group>
</trans-unit>
<trans-unit id="77100ae0f206a821d33d9582dd2962f379eaeac7" datatype="html">
<source>
et la description serait
</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/pages/home/home.component.html</context>
<context context-type="linenumber">64</context>
</context-group>
</trans-unit>
<trans-unit id="114007b6744088dc57d792702b19f91f68f7926e" datatype="html">
<source>
Continuer
</source>
<context-group purpose="location">
<context context-type="sourcefile">src/app/pages/home/home.component.html</context>
<context context-type="linenumber">82</context>
</context-group>
</trans-unit>
</body>
</file>
</xliff>