Skip to content

Commit 4491128

Browse files
previprevi
committed
wip #73 
1 parent 411bdf1 commit 4491128

File tree

4 files changed

+42
-18
lines changed

4 files changed

+42
-18
lines changed

‎src/components/Activity.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
{{ activity.name }}
1111
</v-app-bar-title>
1212
<v-spacer></v-spacer>
13+
<v-chip class="ma-2" v-if="activity.maxBlocks > 0" label>{{ $t("message.activity_program_remaining_blocks") }}: {{ workspace.remainingCapacity() }}</v-chip>
1314
<!-- If the API is available, show the desired buttons -->
1415
<template v-if="status == 200">
1516
<template v-for="button in activity.buttons">

‎src/components/ActivityEditor.vue

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
<v-card>
3434
<v-form class="cardContent">
3535
<v-text-field v-model="activity.name" label="Nome" required></v-text-field>
36-
<v-text-field v-model="activity.description" label="Descrizione"></v-text-field>
37-
<v-select v-model="defaultView" :items="viste" label="Vista predefinita" required></v-select>
36+
<v-text-field v-model="activity.description" v-bind:label="$t('message.activity_description')"></v-text-field>
37+
<v-select v-model="defaultView" :items="viste" v-bind:label="$t('message.activity_predefined_view')" required></v-select>
3838
</v-form>
3939
</v-card>
4040
<br><br>
@@ -44,7 +44,7 @@
4444
<!--
4545
<v-select :items="fontSizeLabels" v-model="activity.fontSize" label="Grandezza testo"></v-select>
4646
-->
47-
<v-switch :label="`Solo maiuscole`" v-model="activity.capsSwitch"></v-switch>
47+
<v-switch v-bind:label="$t('message.activity_caps_only')" v-model="activity.capsSwitch"></v-switch>
4848
<!--
4949
<v-layout row wrap>
5050
<v-flex>
@@ -94,7 +94,7 @@
9494
</v-card>
9595
<br><br>
9696
-->
97-
<h3 class="text-xs-left">Programmazione</h3>
97+
<h3 class="text-xs-left">{{ $t("message.activity_programing_title") }}</h3>
9898
<v-card>
9999
<div class="cardContent">
100100
<v-layout row wrap>
@@ -113,7 +113,7 @@
113113
</v-flex>
114114
-->
115115
<v-flex>
116-
<v-text-field v-model="activity.maxBlocks" label="Numero massimo di blocchi"></v-text-field>
116+
<v-text-field v-model="activity.maxBlocks" v-bind:label="$t('message.activity_blocks_max_blocks')"></v-text-field>
117117
</v-flex>
118118
</v-layout>
119119
</div>
@@ -147,7 +147,7 @@
147147
<h3> {{ $t("message.activity_toolbar_preview") }} </h3>
148148
<v-app-bar>
149149
<v-app-bar-nav-icon v-if="activity.drawerEnabled"></v-app-bar-nav-icon>
150-
<v-app-bar-title v-if="activity.showName">{{ activity.name || "Nome Attività"}}</v-app-bar-title>
150+
<v-app-bar-title v-if="activity.showName">{{ activity.name || $t("message.activity_name")}}</v-app-bar-title>
151151
<v-spacer></v-spacer>
152152
<template v-for="button in activity.buttons">
153153
<v-btn style="height: 70%" :color="button.colorBtn" :class="button.colorText">
@@ -158,8 +158,8 @@
158158
</template>
159159
</v-app-bar>
160160
<br>
161-
<v-switch label="Icona menù laterale" v-model="activity.drawerEnabled"></v-switch>
162-
<v-switch label="Nome Attività" v-model="activity.showName"></v-switch>
161+
<v-switch v-bind:label="$t('message.activity_lateral_menu_icon')" v-model="activity.drawerEnabled"></v-switch>
162+
<v-switch v-bind:label="$t('message.activity_name')" v-model="activity.showName"></v-switch>
163163
<br>
164164
<h3> {{ $t("message.activity_toolbar_buttons") }} </h3>
165165
<v-btn @click="addButton()" outlined color="green">
@@ -182,11 +182,11 @@
182182
<div class="cardContent">
183183
<span class="grey--text text--darken-2" v-if="button.notErasable">
184184
{{ $t("message.activity_toolbar_buttons_cannot_remove_run") }} </span>
185-
<v-text-field v-model="button.label" label="Etichetta"></v-text-field>
186-
<v-select v-model="button.action" :items="actions" label="Azione"
185+
<v-text-field v-model="button.label" v-bind:label="$t('message.activity_label')"></v-text-field>
186+
<v-select v-model="button.action" :items="actions" v-bind:label="$t('message.activity_action')"
187187
:disabled="button.notErasable">
188188
</v-select>
189-
<v-select :items="textColors" v-model="button.colorText" label="Colore testo"></v-select>
189+
<v-select :items="textColors" v-model="button.colorText" v-bind:label="$t('message.activity_text_color')"></v-select>
190190
<v-layout row wrap>
191191
<v-flex xs4 style="text-align: left">
192192
<span style="vertical-align: 55%"> {{ $t("message.activity_toolbar_buttons_color") }}
@@ -437,8 +437,9 @@ export default {
437437
'Protanopia',
438438
],
439439
langs: [
440-
'Italiano',
441-
'Inglese',
440+
this.$i18n.t('message.activity_lang_italian'),
441+
this.$i18n.t('message.activity_lang_english'),
442+
this.$i18n.t('message.activity_lang_french'),
442443
],
443444
uiLang: 'Italiano',
444445
blocklyLang: 'Inglese',

‎src/components/ActivityList.vue

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,18 @@
1515
<p style="text-align: left">
1616
<v-alert :value="true" type="info" style="font-size:16px">
1717
{{ $t("message.activity_tip_1") }}<br>
18-
L'icona <v-icon class="white--text">delete</v-icon> ti permette di eliminarla, mentre cliccando su
19-
<v-icon class="white--text">edit</v-icon> puoi modificarla.
18+
<i18n path="message.activity_list_text_1">
19+
<v-icon class="white--text">delete</v-icon>
20+
<v-icon class="white--text">edit</v-icon>
21+
</i18n>
2022
</v-alert>
2123
</p>
2224
<v-card>
2325
<v-list>
2426
<span v-if="activityList == null || activityList == [] || activityList.length == 0">
25-
Nessuna Attività, perchè non ne <a href="#/activity/new">crei</a> una nuova?
27+
<i18n path="message.activity_list_text_2" tag="label" for="message.activity_list_create">
28+
<a href="#/activity/new">{{ $t("message.activity_list_create") }}</a>
29+
</i18n>
2630
</span>
2731
<template v-for="activity in activityList">
2832
<v-list-item :key="activity.el" link>
@@ -41,9 +45,9 @@
4145
>
4246
<v-card>
4347
<v-card-title class="text-h5">
44-
Conferma Cancella Attività
48+
{{ $t("message.activity_list_delete_confirm_title") }}
4549
</v-card-title>
46-
<v-card-text>Sei sicuro di voler cancellare l'attività?<br/>L'azione non è reversibile</v-card-text>
50+
<v-card-text>{{ $t("message.activity_list_delete_confirm_text") }}</v-card-text>
4751
<v-card-actions>
4852
<v-spacer></v-spacer>
4953
<v-btn

‎src/i18n/locales/it/messages.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,24 @@
6565
"activity_save_error": "Salvataggio non riuscito: inserisci un nome all'attività!",
6666
"activity_program_save_as_name": "Nome del programma",
6767
"activity_program_save": "Salva",
68+
"activity_program_remaining_blocks": "Blocchi rimanenti",
69+
"activity_description": "Description",
70+
"activity_predefined_view": "Vista predefinita",
71+
"activity_caps_only": "solo maiuscole",
72+
"activity_programing_title": "Programmazione",
73+
"activity_blocks_max_blocks": "Numero massimo di blocchi",
74+
"activity_name": "Nome attività",
75+
"activity_lateral_menu_icon": "Icona menù laterale",
76+
"activity_text_color": "Colore testo",
77+
"activity_label": "Etichetta",
78+
"activity_lang_italian": "Italiano",
79+
"activity_lang_inglese": "Inglese",
80+
"activity_lang_francese": "Francese",
81+
"activity_list_text_1": "L'icona {0} ti permette di eliminarla, mentre cliccando su {1} puoi modificarla.",
82+
"activity_list_text_2": "Nessuna Attività, perchè non ne {0} una nuova?",
83+
"activity_list_create": "crei",
84+
"activity_list_delete_confirm_title": "Conferma Cancella Attività",
85+
"activity_list_delete_confirm_text": "Sei sicuro di voler cancellare l'attività?\nL'azione non è reversibile",
6886
"control_speak": "Pronuncia",
6987
"control_speaking": "Sto pronunciando",
7088
"control_photo_take": "Scatta foto",

0 commit comments

Comments
 (0)