Skip to content
GitLab
Commit c0ca6abd authored by elplauto's avatar elplauto
Browse files

cross to skip activity, 5th trophy fixed, more translation

parent d6778e03
Hide whitespace changes
Inline Side-by-side
src/lang/messages.js
View file @ c0ca6abd
......@@ -19,6 +19,7 @@ export default {
//MENU
access: "Access",
missionMenu: "Current mission",
scoreMenu: "Score",
arboretumMenu: "My arboretum",
......@@ -90,6 +91,8 @@ export default {
restoreMission: "Restore mission",
restore: "Restore",
showOSMData: "Show OSM data",
upload: "Upload",
invalidJSON: "Your file is not a valid JSON",
//ARBORETUM
......@@ -103,6 +106,7 @@ export default {
//FOLIA
identificationViaFolia: "Identification via Folia",
identifyLeaf: "Identify a leaf",
takePict: "Take a picture of a leaf and then circle the leaf",
results: "Results",
......@@ -129,6 +133,12 @@ export default {
tap:"Tap to take a picture",
remove:"Remove picture",
change:"Change picture",
expertSpecie:"Specie identified by the expert",
expertGenus:"Genus identified by the expert",
expertCommon:"Common identified by the expert",
missed:"Missed!",
bravo: "Bravo!",
deleteIdentification: "Delete the identification exercise",
//SIMPLEPAGE
......@@ -147,10 +157,42 @@ export default {
lastModif: "Last modification by",
importedRecord: "The record as been imported into Albiziapp",
importAlbiziapp: "Import into Albiziapp",
deleteOSMTree: "Delete OSM Tree"
deleteOSMTree: "Delete OSM Tree",
//RELEVE
importedFromOSM: "Record imported from OSM",
heigth: "Heigth",
crownDiameter: "Diameter of the crown",
confidenceDegree: "Confidence degree of the observer",
usersReporting: "Users reporting this record as doubtful (without tree)",
nbValidation: "Number of validations",
modifyConfirm1:"You can",
modifyConfirm2:"modify",
modifyConfirm3:"the record",
modifyConfirm4:"or confirm that informations are correct",
modifyButton:"Modify",
confirmButton:"Confirm",
see:"See",
noTree1: "If no tree is present,",
noTree2:"you can tag this record as doubtful",
deleteButton:"Delete",
deleteDesc: "Delete the record, this operation is definitive!",
returnToOSM: "Return the record to OSM",
returnButton: "Return to OSM",
history: "History",
recordHistory: "Record history",
version: "Version",
information: "Information",
modificationBy: "Modification by",
validationConfirmation: "Your validation has been taken into account",
deletionConfirmation: "Your record has been deleted",
//IDENTIFICATION
identificationKey: "Identification key"
},
fr: {
......@@ -172,6 +214,7 @@ export default {
//MENU
access: "Accès",
missionMenu: "Mission en cours",
scoreMenu: "Score",
arboretumMenu: "Mon arboretum",
......@@ -179,7 +222,7 @@ export default {
language: "Langue",
logout: "Déconnexion",
password: "Mot de passe",
attemptIntrusion:"Votre tentavite d'intrusion à été enregistrée",
attemptIntrusion:"Votre tentavite d'intrusion a été enregistrée",
//HOME
......@@ -242,6 +285,8 @@ export default {
restoreMission: "Restaurer mission",
restore: "Restaurer",
showOSMData: "Montrer données OSM",
upload: "Upload",
invalidJSON: "Votre fichier n'est pas un JSON valide",
//ARBORETUM
......@@ -255,6 +300,7 @@ export default {
//FOLIA
identificationViaFolia: "Identification via Folia",
identifyLeaf: "Identifier une feuille",
takePict: "Prenez une photo de feuille puis réalisez un tracé à l'intérieur de la feuille",
results: "Résultats",
......@@ -282,6 +328,12 @@ export default {
tap:"Appuyer pour prendre une photo",
remove:"Supprimer photo",
change:"Modifier photo",
expertSpecie:"Espèce identifiée par l'expert",
expertGenus:"Genre identifié par l'expert",
expertCommon:"Nom vernaculaire identifié par l'expert",
missed:"Raté!",
bravo: "Bravo!",
deleteIdentification: "Supprimer le relevé d'identification",
//SIMPLEPAGE
......@@ -300,10 +352,40 @@ export default {
lastModif: "Dernière modification par",
importedRecord: "Le relevé a été importé dans Albiziapp",
importAlbiziapp: "Importer dans Albiziapp",
deleteOSMTree: "Supprimer l'arbre d'OSM"
deleteOSMTree: "Supprimer l'arbre d'OSM",
//RELEVE
importedFromOSM: "Relevé importé d'OSM",
heigth: "Hauteur",
crownDiameter: "Diamètre de la couronne",
confidenceDegree: "Degré de confiance de l'observateur",
usersReporting: "Utilisateurs déclarant ce relevé douteux (sans arbre)",
nbValidation: "Nombre de validations",
modifyConfirm1:"Vous pouvez",
modifyConfirm2:"modifier",
modifyConfirm3:"le relevé",
modifyConfirm4:"ou bien confirmer que les informations sont correctes",
modifyButton:"Modifier",
confirmButton:"Confirmer",
see:"Voir",
noTree1:" Si aucun arbre n'est présent,",
noTree2:"vous pouvez tagger ce relevé douteux",
deleteButton:"Supprimer",
deleteDesc: "Supprimer le relevé, cette opération est définitive!",
returnToOSM: "Renvoyer le relevé sur OSM",
returnButton: "Renvoyer vers OSM",
history: "Historique",
recordHistory: "Historique du relevé",
version: "Version",
information: "Information",
modificationBy: "Modification par",
validationConfirmation: "Votre validation a été prise en compte",
deletionConfirmation: "Votre relevé a été supprimé",
//IDENTIFICATION
identificationKey: "Clef d'identification"
}
}
\ No newline at end of file
src/pages/Admin.vue
View file @ c0ca6abd
......@@ -71,7 +71,7 @@
</v-ons-list-item>
<v-ons-list-item>
<div class="center">Upload</div>
<div class="center">{{ $t('upload') }}</div>
<div class="right">
<file-upload
accept=".json"
......@@ -230,7 +230,7 @@ export default {
}
,
error() {
this.$toasted.show("Votre fichier n'est pas un JSON valide", {
this.$toasted.show(this.$t('invalidJSON'), {
theme: "bubble",
position: "top-center",
duration: 5000
......
src/pages/Folia.vue
View file @ c0ca6abd
......@@ -10,7 +10,7 @@
</div>
</v-ons-card>
<v-ons-card v-if="foliaStarted">
<div class="title">Identification via Folia</div>
<div class="title">{{ $t('identificationViaFolia') }}</div>
<div class="content">
<div style="position:relative;">
<p>
......
src/pages/Home.vue
View file @ c0ca6abd
......@@ -32,7 +32,7 @@
</div>
</v-ons-col>
<v-ons-col width="10%">
<v-ons-icon icon="fa-angle-double-right" @click="showDialog = true" size="30px"></v-ons-icon>
<v-ons-icon icon="times" @click="showDialog = true" size="30px"></v-ons-icon>
</v-ons-col>
</v-ons-row>
<div v-if="timeLeft!=-1">
......@@ -178,7 +178,7 @@ export default {
'timeLeft': {
handler: function(newValue, oldValue){
if (newValue == 0) {
let status = this.goal ? "failed" : "done"
let status = this.goal == -1 ? "done" : "failed"
this.activityEnd(status)
}
},
......
src/pages/Identification.vue
View file @ c0ca6abd
......@@ -6,7 +6,7 @@
</div>
</v-ons-toolbar>
<v-ons-list-header>Clef d'identification</v-ons-list-header>
<v-ons-list-header>{{ $t('identificationKey') }}</v-ons-list-header>
<v-ons-list>
<vs-on-list-item>
......
src/pages/Menu.vue
View file @ c0ca6abd
<template>
<v-ons-page modifier="white">
<v-ons-list-title>Access</v-ons-list-title>
<v-ons-list-title>{{ $t('access') }}</v-ons-list-title>
<v-ons-list>
<v-ons-list-item
v-for="(item, index) in access"
......
src/pages/Releve.vue
View file @ c0ca6abd
......@@ -2,23 +2,23 @@
<v-ons-page>
<custom-toolbar backLabel="Retour"></custom-toolbar>
<ons-card v-if="releve">
<div class="title" v-if="!fromOSM">Relevé</div>
<div class="title" v-if="fromOSM">Relevé importé d'OSM</div>
<div class="title" v-if="!fromOSM">{{ $t('record') }}</div>
<div class="title" v-if="fromOSM">{{ $t('importedFromOSM') }}</div>
<div class="content">
<ons-list>
<ons-list-header>Information</ons-list-header>
<ons-list-header>{{ $t('information') }}</ons-list-header>
<ons-list-item v-show="releve.authorName">{{ $t('recordAuthor') }} : {{releve.authorName}}</ons-list-item>
<ons-list-item v-show="releve.specie">{{ $t('specie') }} : {{releve.specie}}</ons-list-item>
<ons-list-item v-show="releve.genus">{{ $t('genus') }} : {{releve.genus}}</ons-list-item>
<ons-list-item v-show="releve.common">{{ $t('common') }} : {{releve.common}}</ons-list-item>
<ons-list-item v-show="releve.height">Hauteur : {{releve.height}}</ons-list-item>
<ons-list-item v-show="releve.crown">Diamètre de la couronne : {{releve.crown}}</ons-list-item>
<ons-list-item v-show="releve.confidence">Degré de confiance de l'observateur : {{releve.confidence}}</ons-list-item>
<ons-list-item v-show="releve.noTree.length>0">Utilisateurs déclarant ce relevé douteux (sans arbre) : {{releve.noTree.length}}</ons-list-item>
<ons-list-item v-show="releve.height">{{ $t('heigth') }} : {{releve.height}}</ons-list-item>
<ons-list-item v-show="releve.crown">{{ $t('crownDiameter') }} : {{releve.crown}}</ons-list-item>
<ons-list-item v-show="releve.confidence">{{ $t('confidenceDegree') }} : {{releve.confidence}}</ons-list-item>
<ons-list-item v-show="releve.noTree.length>0">{{ $t('usersReporting') }} : {{releve.noTree.length}}</ons-list-item>
<ons-list-item
v-show="releve.validation.length-1"
>Nombre de validations : {{releve.validation.length-1}}</ons-list-item>
>{{ $t('nbValidation') }} : {{releve.validation.length-1}}</ons-list-item>
<ons-list-item
v-show="releve.modifierName"
>{{ $t('lastModif') }} : {{releve.modifierName}}</ons-list-item>
......@@ -27,20 +27,20 @@
<section style="margin: 16px">
<p class="center">
Vous pouvez
<b>modifier</b> le relevé
<b>ou bien confirmer que les informations sont correctes</b>
{{ $t('modifyConfirm1') }}
<b>{{ $t('modifyConfirm2') }}</b> {{ $t('modifyConfirm3') }}
<b>{{ $t('modifyConfirm4') }}</b>
</p>
<v-ons-button @click="modify" :disabled="noTreeValue" style="margin: 6px">Modifier</v-ons-button>
<v-ons-button :disabled="validated || noTreeValue" @click="validate" style="margin: 6px">Confirmer</v-ons-button>
<v-ons-button v-if="allowImport && !fromOSM && osmUpdates" @click="uploadToOSM" style="margin: 6px">Envoyer vers OSM</v-ons-button>
<v-ons-button @click="modify" :disabled="noTreeValue" style="margin: 6px">{{ $t('modifyButton') }}</v-ons-button>
<v-ons-button :disabled="validated || noTreeValue" @click="validate" style="margin: 6px">{{ $t('confirmButton') }}</v-ons-button>
<v-ons-button v-if="allowImport && !fromOSM && osmUpdates" @click="uploadToOSM" style="margin: 6px">{{ $t('sendOSM') }}</v-ons-button>
<v-ons-button v-if="visualize" @click="visualizeReleve" style="margin: 6px">Voir</v-ons-button>
</section>
<section style="margin: 16px">
<p class="center">
Si aucun arbre n'est présent,
<b>vous pouvez tagger ce relevé douteux</b>
{{ $t('noTree1') }}
<b>{{ $t('noTree2') }}</b>
</p>
<v-ons-switch
v-model="noTreeValue"
......@@ -49,35 +49,35 @@
></v-ons-switch>
</section>
<section v-if="!fromOSM" style="margin: 16px">
<p class="center">Supprimer le relevé, cette opération est définitive!</p>
<v-ons-button @click="removeObs" :disabled="(!allowRemove)" style="margin: 6px">Supprimer</v-ons-button>
<p class="center">{{ $t('deleteDesc') }}</p>
<v-ons-button @click="removeObs" :disabled="(!allowRemove)" style="margin: 6px">{{ $t('deleteButton') }}</v-ons-button>
</section>
<section v-if="fromOSM && osmUpdates" style="margin: 16px">
<p class="center">Renvoyer le relevé sur OSM</p>
<v-ons-button @click="uploadAndRemove" style="margin: 6px">Renvoyer vers OSM</v-ons-button>
<p class="center">{{ $t('returnToOSM') }}</p>
<v-ons-button @click="uploadAndRemove" style="margin: 6px">{{ $t('returnButton') }}</v-ons-button>
</section>
<section v-if="releve.prev.length>0" style="margin: 16px">
<v-ons-list>
<v-ons-list-item expandable>
Historique
{{ $t('history') }}
<div class="expandable-content">
<ons-list-header>Historique du relevé</ons-list-header>
<ons-list-header>{{ $t('recordHistory') }}</ons-list-header>
<ons-list v-for="(oldreleve,index) in releve.prev" :key="index">
<v-ons-list-title>Version {{index}}</v-ons-list-title>
<v-ons-list-title>{{ $t('version') }} {{index}}</v-ons-list-title>
<ons-list-item
v-show="oldreleve.authorName"
>Auteur du relevé : {{oldreleve.authorName}}</ons-list-item>
<ons-list-item v-show="oldreleve.specie">Espèce : {{oldreleve.specie}}</ons-list-item>
<ons-list-item v-show="oldreleve.common">Nom commun : {{oldreleve.common}}</ons-list-item>
>{{ $t('recordAuthor') }} : {{oldreleve.authorName}}</ons-list-item>
<ons-list-item v-show="oldreleve.specie">{{ $t('specie') }} : {{oldreleve.specie}}</ons-list-item>
<ons-list-item v-show="oldreleve.common">{{ $t('common') }} : {{oldreleve.common}}</ons-list-item>
<ons-list-item
v-show="oldreleve.validation.length-1"
>Nombre de validations : {{oldreleve.validation.length-1}}</ons-list-item>
>{{ $t('nbValidation') }} : {{oldreleve.validation.length-1}}</ons-list-item>
<ons-list-item
v-show="oldreleve.modifierName"
>Modification par : {{oldreleve.modifierName}}</ons-list-item>
>{{ $t('modificationBy') }} : {{oldreleve.modifierName}}</ons-list-item>
<v-ons-list-item v-if="oldreleve.image">
<img :src="oldreleve.image" style="width: 100%">
</v-ons-list-item>
......@@ -183,7 +183,7 @@ export default {
},
validate() {
this.$store.dispatch("releve/validateObservation", this.releve);
this.$toasted.show("Votre validation à été prise en compte", {
this.$toasted.show(this.$t('validationConfirmation'), {
fullWidth: true,
position: "bottom-center",
duration: 2000
......@@ -192,7 +192,7 @@ export default {
removeObs() {
this.$store.dispatch("releve/remove", this.releve);
this.$store.commit("navigator/pop");
this.$toasted.show("Votre relevé a été supprimé", {
this.$toasted.show(this.$t('deletionConfirmation'), {
fullWidth: true,
position: "bottom-center",
duration: 2000
......
src/pages/ReleveIdentification.vue
View file @ c0ca6abd
......@@ -2,7 +2,7 @@
<v-ons-page>
<v-ons-toolbar>
<div class="left">
<v-ons-back-button>Retour</v-ons-back-button>
<v-ons-back-button>{{ $t('back') }}</v-ons-back-button>
</div>
</v-ons-toolbar>
<v-ons-card>
......@@ -91,19 +91,19 @@
<v-ons-list v-show="releve.identificationValue.success">
<v-ons-list-item>
<div class="center">Espèce identifiée par l'expert : {{releve.specie}}</div>
<div v-if="releve.specie && releve.specie==releve.identificationValue.specie" class="right">Bravo!</div>
<div v-else class="right">Raté!</div>
<div class="center">{{ $t('expertSpecie') }} : {{releve.specie}}</div>
<div v-if="releve.specie && releve.specie==releve.identificationValue.specie" class="right">{{ $t('bravo') }}</div>
<div v-else class="right">{{ $t('missed') }}</div>
</v-ons-list-item>
<v-ons-list-item>
<div class="center">Genre identifié par l'expert : {{releve.genus}}</div>
<div v-if="releve.genus && releve.genus==releve.identificationValue.genus" class="right">Bravo!</div>
<div v-else class="right">Raté!</div>
<div class="center">{{ $t('expertGenus') }} : {{releve.genus}}</div>
<div v-if="releve.genus && releve.genus==releve.identificationValue.genus" class="right">{{ $t('bravo') }}</div>
<div v-else class="right">{{ $t('missed') }}</div>
</v-ons-list-item>
<v-ons-list-item>
<div class="center">Nom vernaculaire identifiée par l'expert : {{releve.common}}</div>
<div v-if="releve.common && releve.common==releve.identificationValue.common" class="right">Bravo!</div>
<div v-else class="right">Raté!</div>
<div class="center">{{ $t('expertCommon') }} : {{releve.common}}</div>
<div v-if="releve.common && releve.common==releve.identificationValue.common" class="right">{{ $t('bravo') }}</div>
<div v-else class="right">{{ $t('missed') }}</div>
</v-ons-list-item>
</v-ons-list>
<section style="margin: 16px">
......@@ -115,8 +115,8 @@
<v-ons-button modifier="outline" @click="cancel" style="margin: 6px">{{ $t('back') }}</v-ons-button>
</section>
<section style="margin: 16px" v-if="isGod">
<p class="center">Supprimer l'exercice d'identification</p>
<v-ons-button @click="removeObs" style="margin: 6px">Supprimer</v-ons-button>
<p class="center">{{ $t('deleteIdentification') }}</p>
<v-ons-button @click="removeObs" style="margin: 6px">{{ $t('delete') }}</v-ons-button>
</section>
</v-ons-page>
</template>
......@@ -171,7 +171,7 @@ export default {
removeObs() {
this.$store.dispatch("releve/remove", this.releve);
this.$store.commit("navigator/pop");
this.$toasted.show("Votre relevé a été supprimé", {
this.$toasted.show(this.$t('deletionConfirmation'), {
fullWidth: true,
position: "bottom-center",
duration: 2000
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment