Skip to content

Commit

Permalink
Mark missing labels as translatable
Browse files Browse the repository at this point in the history
  • Loading branch information
ivchicano committed Jun 4, 2021
1 parent af9b6bd commit 70780ec
Show file tree
Hide file tree
Showing 13 changed files with 109 additions and 71 deletions.
2 changes: 1 addition & 1 deletion app/src/components/data_settings/DocumentTypeManager.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="q-pa-md">
<div class="row">
<h5 class="col-6">{{$options.name}}</h5>
<h5 class="col-6">{{$t("data_settings.document_types")}}</h5>
<div class="col-6 div-1">
<q-btn
color="info"
Expand Down
2 changes: 1 addition & 1 deletion app/src/components/data_settings/IntegrationCategory.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="row wrap justify-start items-start content-center">
<div class="col">
<router-link :to="'#'+$options.name">
<h5 @click="onClickTitle()">{{$options.name}}</h5>
<h5 @click="onClickTitle()">{{$t("data_settings.intervention_categories")}}</h5>
</router-link>
</div>
<div class="full-height col">
Expand Down
2 changes: 1 addition & 1 deletion app/src/components/data_settings/IntegrationType.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="q-pa-md">
<div class="row">
<h5 class="col-6">{{$options.name}}</h5>
<h5 class="col-6">{{$t("data_settings.intervention_types")}}</h5>
<div class="col-6 div-1">
<q-btn
:data-cy="'addtype'"
Expand Down
6 changes: 3 additions & 3 deletions app/src/components/data_settings/Topic.vue
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<template>
<div class="q-pa-md">
<div class="row">
<h5 class="col-6">{{$options.name}}</h5>
<h5 class="col-6">{{$t("data_settings.topics")}}</h5>
<div class="col-6 div-1">
<q-btn
:data-cy="'addtopic'"
color="info"
no-caps
:label="$t('button.add_type')"
:label="$t('button.add_topic')"
@click="newTopic()"
:disable="hideAdd"
class="add-button"
Expand Down Expand Up @@ -245,7 +245,7 @@ export default {
translatedButtonMixin,
storeMappingMixin({
getters: {
topic: 'topic/topic',
topic: 'topic/topic'
}, actions: {
deleteTopic: 'topic/deleteTopic',
saveTopic: 'topic/saveTopic',
Expand Down
2 changes: 1 addition & 1 deletion app/src/components/data_settings/UserType.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="q-pa-md">
<div class="row">
<h5 class="col-6">{{$options.name}}</h5>
<h5 class="col-6">{{$t("data_settings.user_types")}}</h5>
<div class="col-6 div-1">
<q-btn
:data-cy="'addusertype'"
Expand Down
6 changes: 3 additions & 3 deletions app/src/components/migration_monitor/Board.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
v-model="printList"
multiple
:options="categories.map((c) => c.category)"
label="Select categories to print"
:label="t('migration_monitor.print_categories')"
style="width: 250px"
/>
<q-btn
no-caps
class="q-ml-md"
label="print"
:label="t('button.print')"
color="info"
size="md"
v-close-popup
Expand All @@ -29,7 +29,7 @@
text-color="black"
size="md"
to="/situation/main"
title="return to main page"
:title="$('button.return_main')"
/>
</div>
<div class="charts">
Expand Down
2 changes: 1 addition & 1 deletion app/src/components/migration_monitor/Main.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
background-color: #ff7c44;
"
>
MICADO Migration Situation Monitor
{{$t("migration_monitor.title")}}
</div>
<div class="q-pa-md row justify-center">
<q-btn
Expand Down
14 changes: 7 additions & 7 deletions app/src/components/migration_monitor/chart/Chart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</h6>
</div>
<p class="q-px-lg q-mx-lg no-padding">
<strong>description:</strong>
<strong>{{$t('migration_monitor.chart_description')}}</strong>
{{ graph.description }}
<br />
</p>
Expand Down Expand Up @@ -54,21 +54,21 @@
<div class="row">
<div class="col">
<p>
<strong>data provider:</strong> EU
<strong>{{$t('migration_monitor.data_provider')}}</strong> EU
<br />
<strong>updated time:</strong> 2019.07
<strong>{{$t('migration_monitor.updated_time')}}</strong> 2019.07
<br />
<strong>Statistics:</strong> {{ lower }} to
<strong>{{$t('migration_monitor.statistics')}}</strong> {{ lower }} {{$t('migration_monitor.to')}}
{{ upper }}
</p>
</div>
<div class="col">
<p>
<strong>Minimum Value:</strong> {{ min }}
<strong>{{$t('migration_monitor.minimum_value')}}</strong> {{ min }}
<br />
<strong>Maximum Value:</strong> {{ max }}
<strong>{{$t('migration_monitor.maximum_value')}}</strong> {{ max }}
<br />
<strong>Mean Value:</strong> {{ mean }}
<strong>{{$t('migration_monitor.mean_value')}}</strong> {{ mean }}
</p>
</div>
</div>
Expand Down
71 changes: 35 additions & 36 deletions app/src/components/migration_monitor/editor/AddNew.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
style="text-align: center; padding-right: 45px"
>
<div class="col-12 q-pl-xl">
<p class="label">Data Format</p>
<p class="label">{{$t("input_labels.data_format")}}</p>
</div>
<div class="col-12 q-pl-xl">
<q-select
v-model="data_format"
filled
:options="formats"
label="Standard"
:label="$t('input_labels.standard')"
@input="onChangeFileType"
:rules="[(val) => !!val || 'Field is required']"
:rules="[(val) => !!val || $t('warning.req_fields')]"
/>
</div>
</div>
Expand All @@ -26,15 +26,15 @@
style="text-align: center; padding-right: 45px"
>
<div class="col-12 q-pl-xl">
<p class="label">Choose csv</p>
<p class="label">{{$t('input_labels.choose_csv')}}</p>
</div>
<div class="col-12 q-pl-xl">
<q-file
v-model="filename"
@input="getFiles"
dense
filled
:rules="[(val) => !!val || 'Field is required']"
:rules="[(val) => !!val || $t('warning.req_fields')]"
></q-file>
</div>
</div>
Expand All @@ -45,15 +45,15 @@
style="text-align: center; padding-right: 45px"
>
<div class="col-12 q-pl-xl">
<p class="label">Choose JSON</p>
<p class="label">{{$t('input_labels.choose_json')}}</p>
</div>
<div class="col-12 q-pl-xl">
<q-file
v-model="filename"
@input="getFiles"
dense
filled
:rules="[(val) => !!val || 'Field is required']"
:rules="[(val) => !!val || $t('warning.req_fields')]"
></q-file>
</div>
</div>
Expand All @@ -62,15 +62,15 @@
style="text-align: center; padding-right: 45px"
>
<div class="col-12 q-pl-xl">
<p class="label">Chart Title</p>
<p class="label">{{$t('input_labels.chart_title')}}</p>
</div>
<div class="col-12 q-pl-xl">
<q-input
dense
filled
v-model="title"
:rules="[(val) => !!val || 'Field is required']"
placeholder="Enter chart title here"
:rules="[(val) => !!val || $t('warning.req_fields')]"
:placeholder="$t('help.enter_chart_title')"
/>
</div>
</div>
Expand All @@ -79,15 +79,15 @@
style="text-align: center; padding-right: 45px"
>
<div class="col-12 q-pl-xl">
<p class="label">Chart Type</p>
<p class="label">{{$t('input_labels.chart_type')}}</p>
</div>
<div class="col-12 q-pl-xl">
<q-select
filled
v-model="type"
:options="types"
label
:rules="[(val) => !!val || 'Field is required']"
:rules="[(val) => !!val || $t('warning.req_fields')]"
/>
</div>
</div>
Expand All @@ -96,10 +96,10 @@
style="text-align: center; padding-right: 45px"
>
<div class="col-6 q-pl-xl q-mr-l">
<p class="label">Board</p>
<p class="label">{{$t('input_labels.board')}}</p>
</div>
<div class="col-6 q-pl-xl">
<p class="label">Category</p>
<p class="label">{{$t('input_labels.category')}}</p>
</div>
<div class="col-6 q-pl-xl">
<q-select
Expand All @@ -112,14 +112,14 @@
:options="boardOpts"
@filter="filterBoards"
@input-value="setBoard"
hint="if the board does not already exist, it will be automatically created"
:hint="$t('help.board')"
style="width: 250px; padding-bottom: 32px"
:rules="[(val) => !!val || 'Field is required']"
:rules="[(val) => !!val || $t('warning.req_fields')]"
>
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">
No results
{{$t('warning.no_results')}}
</q-item-section>
</q-item>
</template>
Expand All @@ -136,14 +136,14 @@
:options="catOpts"
@filter="filterCats"
@input-value="setCategory"
hint="if the category does not already exist, it will be automatically created"
:hint="$t('help.category')"
style="width: 250px; padding-bottom: 32px"
:rules="[(val) => !!val || 'Field is required']"
:rules="[(val) => !!val || $t('warning.req_fields')]"
>
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">
no results
{{$t('warning.no_results')}}
</q-item-section>
</q-item>
</template>
Expand All @@ -157,25 +157,25 @@
style="text-align: center; padding-right: 45px"
>
<div class="col-6 q-pl-xl q-mr-l">
<p class="label">x Axis</p>
<p class="label">{{$t('input_labels.x_axis')}}</p>
</div>
<div class="col-6 q-pl-xl">
<p class="label">y Axis</p>
<p class="label">{{$t('input_labels.y_axis')}}</p>
</div>
<div class="col-6 q-pl-xl">
<q-input
dense
filled
v-model="x"
:rules="[(val) => !!val || 'Field is required']"
:rules="[(val) => !!val || $t('warning.req_fields')]"
/>
</div>
<div class="col-6 q-pl-xl" style="margin: auto; display: block">
<q-input
dense
filled
v-model="y"
:rules="[(val) => !!val || 'Field is required']"
:rules="[(val) => !!val || $t('warning.req_fields')]"
/>
</div>
</div>
Expand All @@ -185,14 +185,14 @@
style="padding-bottom: 15px; padding-right: 45px"
>
<div class="col-12 q-pl-xl">
<p class="label">Chart Description</p>
<p class="label">{{$t('input_labels.chart_description')}}</p>
</div>
<div class="col-12 q-pl-xl">
<q-input
type="textarea"
filled
v-model="description"
placeholder="Describe your Chart"
:placeholder="$t('help.chart_description')"
/>
</div>
</div>
Expand All @@ -205,7 +205,7 @@
unelevated
no-caps
size="md"
label="Cancel"
:label="$t('button.cancel')"
@click="reset()"
to="/situation/editor"
/>
Expand All @@ -216,7 +216,7 @@
unelevated
no-caps
size="md"
label="Save"
:label="$t('button.save')"
@click="addChart()"
/>
</div>
Expand All @@ -225,11 +225,10 @@
<q-dialog v-model="succeed">
<q-card>
<q-card-section>
<div class="text-h6">Success</div>
<div class="text-h6">{{$t("success_messages.add_chart_title")}}</div>
</q-card-section>
<q-card-section class="q-pt-none">
Upload succeeded! Please check the corresponding board to see the new
chart.
{{$t("success_messages.add_chart_description")}}
</q-card-section>
<q-card-actions align="right">
<q-btn
Expand All @@ -245,11 +244,11 @@
<q-dialog v-model="fail">
<q-card>
<q-card-section>
<div class="text-h6">Error</div>
<div class="text-h6">{{$t('error_messages.add_chart_title')}}</div>
</q-card-section>
<q-card-section class="q-pt-none">
Upload failed. Please check if the uploaded file has the correct format and content structure.<br />
This Error could also be caused by the server. In this case please contact the system administrator for assistance.
{{$t('error_messages.add_chart_description_1')}}<br />
{{$t('error_messages.add_chart_description_2')}}
</q-card-section>
<q-card-actions align="right">
<q-btn flat label="OK" color="black" v-close-popup @click="!fail" />
Expand All @@ -259,9 +258,9 @@
<q-dialog v-model="empty">
<q-card>
<q-card-section>
<div class="text-h6">Empty field detected</div>
<div class="text-h6">{{$t('error_messages.add_chart_empty_field_title')}}</div>
</q-card-section>
<q-card-section class="q-pt-none"> Please make sure all required fields are filled. </q-card-section>
<q-card-section class="q-pt-none"> {{$t('error_messages.add_chart_empty_field_description')}} </q-card-section>
<q-card-actions align="right">
<q-btn flat label="OK" color="black" v-close-popup @click="!empty" />
</q-card-actions>
Expand Down
2 changes: 1 addition & 1 deletion app/src/components/migration_monitor/editor/Editor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div>
<div
style="font-style: normal;height:72px;text-align: center; padding-top:15px;font-weight: bold;font-size: 30px;line-height: 41px;color:white; background-color:#FF7C44">
Add new chart</div>
{{$t("migration_monitor.add_chart")}}</div>
<div class="q-pa-md">
<AddNew />
</div>
Expand Down
Loading

0 comments on commit 70780ec

Please sign in to comment.