Skip to content

Commit bb51beb

Browse files
ofr1tzofr1tz
authored
Merge pull request #62 from mapswipe/align-look-for-statement
Align lookFor statement with mobile app
2 parents f8b6713 + 579ae40 commit bb51beb

19 files changed

+56
-75
lines changed

‎src/components/CompareProject.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ export default defineComponent({
141141
if (tileServerB) attribution.push(tileServerB.credits)
142142
return attribution.join('; ')
143143
},
144-
instructionMessage() {
145-
const message = this.$t('compareProject.lookForChange', { lookFor: this.project?.lookFor })
144+
mission() {
145+
const message = this.$t('projectView.youAreLookingFor', { lookFor: this.project.lookFor })
146146
return message
147147
},
148148
},
@@ -189,7 +189,7 @@ export default defineComponent({
189189
</script>
190190

191191
<template>
192-
<project-header :instructionMessage="instructionMessage" :title="project.projectTopic">
192+
<project-header :mission="mission" :title="project.projectTopic">
193193
<tile-map :page="[tasks[taskIndex]]" :zoomLevel="project.zoomLevel" />
194194
<project-info
195195
ref="projectInfo"
@@ -201,7 +201,7 @@ export default defineComponent({
201201
<template #instructions>
202202
<compare-project-instructions
203203
:attribution="attribution"
204-
:instructionMessage="instructionMessage"
204+
:mission="mission"
205205
:options="options"
206206
:verificationNumber="project.verificationNumber"
207207
/>

‎src/components/CompareProjectTutorial.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ export default defineComponent({
5858
}
5959
},
6060
computed: {
61-
instructionMessage() {
62-
const message = this.$t('compareProject.lookForChange', { lookFor: this.tutorial?.lookFor })
61+
mission() {
62+
const message = this.$t('projectView.youAreLookingFor', { lookFor: this.tutorial.lookFor })
6363
return message
6464
},
6565
currentScreen() {
@@ -198,7 +198,7 @@ export default defineComponent({
198198
<v-row v-if="!hasCompletedAllTasks">
199199
<v-col>
200200
<div>
201-
{{ instructionMessage }}
201+
{{ mission }}
202202
</div>
203203
</v-col>
204204
</v-row>

‎src/components/DigitizeProject.vue‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export default defineComponent({
7676
geometryFunction() {
7777
return this.project.drawType === 'Box' ? createBox() : undefined
7878
},
79-
instructionMessage() {
79+
mission() {
8080
const message = this.$t('digitizeProject.draw', { lookFor: this.project.lookFor })
8181
return message
8282
},
@@ -211,7 +211,7 @@ export default defineComponent({
211211
</script>
212212

213213
<template>
214-
<project-header :instructionMessage="instructionMessage" :title="project.projectTopic">
214+
<project-header :mission="mission" :title="project.projectTopic">
215215
<v-btn-toggle v-model="interaction" variant="outlined" mandatory divided>
216216
<v-btn
217217
:title="$t('digitizeProject.draw', { lookFor: this.project.lookFor })"
@@ -254,10 +254,7 @@ export default defineComponent({
254254
@toggle-dialog="arrowKeys = !arrowKeys"
255255
>
256256
<template #instructions>
257-
<digitize-project-instructions
258-
:drawType="drawType"
259-
:instructionMessage="instructionMessage"
260-
/>
257+
<digitize-project-instructions :drawType="drawType" :mission="mission" />
261258
</template>
262259
</project-info>
263260
</project-header>

‎src/components/DigitizeProjectInstructions.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export default defineComponent({
77
type: String,
88
required: false,
99
},
10-
instructionMessage: {
10+
mission: {
1111
type: String,
1212
required: true,
1313
},
@@ -17,7 +17,7 @@ export default defineComponent({
1717

1818
<template>
1919
<v-card-text>
20-
<div class="text-p">{{ instructionMessage }}.</div>
20+
<div class="text-p">{{ mission }}.</div>
2121
<div class="text-h6 mt-10">{{ $t('digitizeProjectInstructions.switchMode') }}</div>
2222
<div class="text-p mt-2">
2323
<v-row align="center" dense>

‎src/components/FindProject.vue‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,8 @@ export default defineComponent({
113113
const columnsPerPage = this.clamp(rounded, 1, this.totalColumns)
114114
return columnsPerPage
115115
},
116-
instructionMessage() {
117-
const verb = this.project.tileServerB ? 'findProject.compare' : 'findProject.lookFor'
118-
const message = this.$t(verb, { lookFor: this.project.lookFor })
116+
mission() {
117+
const message = this.$t('projectView.youAreLookingFor', { lookFor: this.project.lookFor })
119118
return message
120119
},
121120
forwardDisabled() {
@@ -348,7 +347,7 @@ export default defineComponent({
348347
</script>
349348

350349
<template>
351-
<project-header :instructionMessage="instructionMessage" :title="project.projectTopic">
350+
<project-header :mission="mission" :title="project.projectTopic">
352351
<v-chip v-if="tilesInSelection" color="primary" :ripple="false">
353352
{{ selectedTaskIds.length }}
354353
<span class="hidden-md-and-down">&nbsp;{{ $t('findProject.selected') }}</span>
@@ -379,7 +378,7 @@ export default defineComponent({
379378
<find-project-instructions
380379
:attribution="attribution"
381380
:exampleTileUrls="[page.flat()[0]?.url, page.flat()[0]?.urlB]"
382-
:instructionMessage="instructionMessage"
381+
:mission="mission"
383382
:options="options"
384383
:verificationNumber="project.verificationNumber"
385384
/>

‎src/components/FindProjectInstructions.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export default defineComponent({
77
imageTile: ImageTile,
88
},
99
props: {
10-
instructionMessage: {
10+
mission: {
1111
type: String,
1212
required: true,
1313
},
@@ -41,7 +41,7 @@ export default defineComponent({
4141
<v-card-text>
4242
<div class="text-h6">{{ $t('findProjectInstructions.classifyTitle') }}</div>
4343
<div class="text-p">
44-
{{ instructionMessage }}. {{ $t('findProjectInstructions.classifyInstruction') }}.
44+
{{ mission }}. {{ $t('findProjectInstructions.classifyInstruction') }}.
4545
</div>
4646
<v-row class="mt-2" dense>
4747
<v-col sm="auto" lg="auto" v-for="(option, index) in options" :key="index">

‎src/components/FindProjectTutorial.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ export default defineComponent({
8888
{} as Record<number, MappedOption>,
8989
)
9090
},
91-
instructionMessage() {
92-
const message = this.$t('compareProject.lookForChange', { lookFor: this.tutorial?.lookFor })
91+
mission() {
92+
const message = this.$t('projectView.youAreLookingFor', { lookFor: this.tutorial.lookFor })
9393
return message
9494
},
9595
currentScreen() {
@@ -295,7 +295,7 @@ export default defineComponent({
295295
<v-row v-if="!hasCompletedAllTasks">
296296
<v-col>
297297
<div>
298-
{{ instructionMessage }}
298+
{{ mission }}
299299
</div>
300300
</v-col>
301301
</v-row>

‎src/components/MediaProject.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export default defineComponent({
6767
const attribution = this.project?.mediaCredits || ''
6868
return attribution
6969
},
70-
instructionMessage() {
70+
mission() {
7171
const message = this.project?.lookFor
7272
return message
7373
},
@@ -129,7 +129,7 @@ export default defineComponent({
129129
</script>
130130

131131
<template>
132-
<project-header :instructionMessage="instructionMessage" :title="project?.projectTopic">
132+
<project-header :mission="mission" :title="project?.projectTopic">
133133
<project-info
134134
:first="first"
135135
:informationPages="createInformationPages(tutorial, project, createFallbackInformationPages)"
@@ -139,7 +139,7 @@ export default defineComponent({
139139
<template #instructions>
140140
<media-project-instructions
141141
:attribution="attribution"
142-
:instructionMessage="instructionMessage"
142+
:mission="mission"
143143
:options="options"
144144
/>
145145
</template>

‎src/components/MediaProjectInstructions.vue‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { defineComponent } from 'vue'
33
44
export default defineComponent({
55
props: {
6-
instructionMessage: {
6+
mission: {
77
type: String,
88
required: true,
99
},
@@ -22,9 +22,7 @@ export default defineComponent({
2222
<template>
2323
<v-card-text>
2424
<div class="text-h6">{{ $t('projectInstructions.classifyTitle') }}</div>
25-
<div class="text-p">
26-
{{ instructionMessage }} {{ $t('projectInstructions.classifyInstruction') }}.
27-
</div>
25+
<div class="text-p">{{ mission }} {{ $t('projectInstructions.classifyInstruction') }}.</div>
2826

2927
<v-row v-for="(option, optionIndex) in options" :key="optionIndex" align="center" dense>
3028
<v-col cols="auto" class="mr-4">

‎src/components/ProjectHeader.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { defineComponent } from 'vue'
33
44
export default defineComponent({
55
props: {
6-
instructionMessage: {
6+
mission: {
77
type: String,
88
required: false,
99
},
@@ -20,7 +20,7 @@ export default defineComponent({
2020
<v-toolbar-title>
2121
<div class="text-caption">{{ title }}</div>
2222
<div style="font-size: 1rem">
23-
<strong>{{ instructionMessage }}</strong>
23+
<strong>{{ mission }}</strong>
2424
</div>
2525
</v-toolbar-title>
2626
<slot></slot>

0 commit comments

Comments
 (0)