Skip to content

Commit b3f9b6a

Browse files
Adding the FR version of Advanced Mapping in JOSM part 2
1 parent 3695f98 commit b3f9b6a

File tree

6 files changed

+33
-12
lines changed

6 files changed

+33
-12
lines changed

app/_data/cs.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,9 @@ beginner:
190190
##############
191191
advanced:
192192
title: "Pokročilé mapování"
193+
links:
194+
guide: "JOSM Guide"
195+
advancedJOSM_pdf: "JOSM_Advanced_Mapping_EN.pdf"
193196
josm: "JOSM je silný OSM editovací nástroj, který znásobí tvoje mapovací dovednosti! Doporučujeme maperům, kteří chtějí povznést své mapování na vyšší level používat tento nástroj. Nejprve si musíte aplikaci stáhnout <a href=\"https://josm.openstreetmap.de/wiki/Download\">zde</a> Aplikace je dostupná pro PC i MAC. V porovnání s iD editorem nemusí být nastavení tak snadné, proto počítejte s dostatkem času k orientaci v JOSM před tím než se pustíte do samotného mapování. Jakmile začnete jednou mapovat v JOSM, nebudete chtít jinak!"
194197

195198
###########

app/_data/en.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,9 @@ beginner:
191191
##############
192192
advanced:
193193
title: "Advanced Mapping"
194-
guide: "JOSM Guide"
194+
links:
195+
guide: "JOSM Guide"
196+
advancedJOSM_pdf: "JOSM_Advanced_Mapping_EN.pdf"
195197
josm: "JOSM is a powerful OpenStreetMap editing tool that will supercharge your mapping abilities! We recommend that mappers who want to take their mapping to the next level progress to using this tool. First, you’ll need to download the application. You can do that <a href=\"https://josm.openstreetmap.de/wiki/Download\">here</a>. This application is available for both Macs and PCs. Compared to iD Editor, the setup process can be no picnic, so give yourself time to navigate this new tool before you plan to jump into your mapping. Once you are using JOSM you’ll never look back! "
196198

197199
###########

app/_data/es.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,9 @@ beginner:
191191
##############
192192
advanced:
193193
title: "Mapeo Avanzado"
194-
guide: "JOSM Guide"
194+
links:
195+
guide: "JOSM Guide"
196+
advancedJOSM_pdf: "JOSM_Advanced_Mapping_EN.pdf"
195197
josm: "JOSM es una potente herramienta de edición de OpenStreetMap que impulsará tu capacidad de mapeo. Recomendamos que los mapeadores que quieren mejorar su nivel de mapeo empiecen a utilizar esta herramienta. En primer lugar, tendrás que descargar la aplicación. Puedes hacerlo <a href=\"https://josm.openstreetmap.de/wiki/Download\">aquí</a> . Esta aplicación está disponible tanto para Mac como PC. Comparada con el editor de iD, el proceso de instalación puede no ser nada fácil, así que date tiempo para navegar por esta nueva herramienta antes de saltar a mapear. ¡Una vez que empieces a usar JOSM nunca te plantearás volver a lo de antes!"
196198

197199
###########

app/_data/fr.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,9 @@ beginner:
189189
##############
190190
advanced:
191191
title: "CARTOGRAPHIE AVANCÉE"
192-
guide: "JOSM Guide"
192+
links:
193+
guide: "Manuel de cartographie avancée avec JOSM"
194+
advancedJOSM_pdf: "JOSM_Advanced_Mapping_EN.pdf"
193195
josm: "JOSM est un outil d'édition puissant d'OpenStreetMap qui optimisera vos compétences cartographiques ! Nous recommandons aux cartographes qui veulent améliorer leur cartographie d'utiliser cet outil. Premièrement, vous aurez besoin de télécharger l'application. Vous pouvez le faire <a href=\"https://josm.openstreetmap.de/wiki/Download\">ici</a>. Cette application est disponible pour les Macs et les PCs. En comparaison avec l'iD Editor, le processus d'installation n'est pas de tout repos, alors laissez vous du temps pour naviguer sur ce nouvel outil avant de commencer à cartographier. Une fois que vous êtes familier avec JOSM, vous ne reviendrez plus jamais en arrière !"
194196

195197
###########

app/_includes/advanced.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ <h1 class="title feature-header">{{site.data[locale].advanced.title}}</h1>
1111

1212
<div class="row contribute-options">
1313
<div class="columns" style="text-align: center">
14-
<a href="{{ site.baseurl }}/assets/downloads/JOSM_Advanced_Mapping_EN.pdf">
14+
<a href="{{ site.baseurl }}/assets/downloads/{{site.data[locale].checker.links.advancedJOSM_pdf:}}">
1515
<img src="{{ site.baseurl }}/assets/graphics/content/process/Learn-MapNow.svg" alt="{{site.data[locale].img-alt.Learn-MapNow}}" /><br>
1616
<div class="btn btn-grn contribute-caps">{{site.data[locale].advanced.guide}}</div>
1717
</a>

gulpfile.js

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ function zipMaterials() {
107107
}
108108
exports.zipMaterials = zipMaterials;
109109

110-
function validationPdf(cb) {
110+
function AdvJosmPdfEN(cb) {
111111
markdownpdf({
112112
cssPath: 'app/assets/styles/github-markdown.css',
113113
paperFormat: 'Letter'})
@@ -117,9 +117,21 @@ function validationPdf(cb) {
117117
cb();
118118
})
119119
}
120-
exports.validationPdf = validationPdf;
120+
exports.AdvJosmPdfEN = AdvJosmPdfEN;
121121

122-
function josmPdfEN(cb) {
122+
function AdvJosmPdfFR(cb) {
123+
markdownpdf({
124+
cssPath: 'app/assets/styles/github-markdown.css',
125+
paperFormat: 'Letter'})
126+
.from('app/assets/sources/JOSM_Advanced_Mapping_FR.md')
127+
.to(".tmp/assets/downloads/JOSM_Advanced_Mapping_FR.pdf", function () {
128+
console.log("Done converting JOSM_Advanced_Mapping_FR.md to PDF.")
129+
cb();
130+
})
131+
}
132+
exports.AdvJosmPdfFR = AdvJosmPdfFR;
133+
134+
function validationPdfEN(cb) {
123135
markdownpdf({
124136
cssPath: 'app/assets/styles/github-markdown.css',
125137
paperFormat: 'Letter'})
@@ -129,9 +141,9 @@ function josmPdfEN(cb) {
129141
cb();
130142
})
131143
}
132-
exports.josmPdfEN = josmPdfEN;
144+
exports.validationPdfEN = validationPdfEN;
133145

134-
function josmPdfES(cb) {
146+
function validationPdfES(cb) {
135147
markdownpdf({
136148
cssPath: 'app/assets/styles/github-markdown.css',
137149
paperFormat: 'Letter'})
@@ -141,7 +153,7 @@ function josmPdfES(cb) {
141153
cb();
142154
})
143155
}
144-
exports.josmPdfES = josmPdfES;
156+
exports.validationPdfES = validationPdfES;
145157

146158

147159
function cloneBlog(cb) {
@@ -190,7 +202,7 @@ exports.serve = gulp.series(
190202
clean,
191203
gulp.parallel(cloneBlog, grabEvents, grabEventHelpers),
192204
jekyll,
193-
gulp.parallel(javascripts, styles, icons, zipMaterials, validationPdf, josmPdfEN, josmPdfES),
205+
gulp.parallel(javascripts, styles, icons, zipMaterials, AdvJosmPdfEN, AdvJosmPdfFR, validationPdfEN, validationPdfES),
194206
copyAssets,
195207
watching);
196208

@@ -201,7 +213,7 @@ exports.prod = gulp.series(
201213
gulp.parallel(cloneBlog, grabEvents, grabEventHelpers),
202214
setProd,
203215
jekyll,
204-
gulp.parallel(javascripts, styles, icons, zipMaterials, validationPdf, josmPdfEN, josmPdfES),
216+
gulp.parallel(javascripts, styles, icons, zipMaterials, AdvJosmPdfEN, AdvJosmPdfFR, validationPdfEN, validationPdfES),
205217
copyAssets);
206218

207219

0 commit comments

Comments
 (0)