add locales

Author: previ

src/common/coderbot.js

@@ -24,7 +24,6 @@ class CoderBot {
         const defaultActivity = {
           stock: true,
           default: true,
-          uiLang: 'browser',
           defaultView: null,
           exec: {
             camera: true,
@@ -193,6 +192,7 @@ class CoderBot {
     data.movementUseMPU = remoteConfig.movement_use_mpu;
     data.movementUseMotion = remoteConfig.movement_use_motion;
     data.movementUseEncoder = remoteConfig.movement_use_encoder;
+    data.locale = remoteConfig.locale;
     this.$store.commit('setSettings', data);
   }
 
@@ -244,7 +244,8 @@ class CoderBot {
       prog_scrollbars: settings.progScrollbars,
       movement_use_mpu: settings.movementUseMPU,
       movement_use_motion: settings.movementUseMotion,
-      movement_use_encoder: settings.movementUseEncoder
+      movement_use_encoder: settings.movementUseEncoder,
+      locale: settings.locale
     };
     this.$store.commit('setSettings', settings);
     return this.$axios.put(`${this.CB}/settings`, legacySettings);

src/components/Activity.vue

@@ -354,9 +354,6 @@ export default {
     }
     this.$coderbot.loadActivity(activityName, activityDefault).then((activity) => {
       this.activity = activity.data;
-      if (this.activity.uiLang != 'browser') {
-        this.$i18n.locale = this.activity.uiLang;
-      }
       this.theme.global.name.value = this.activity.theme != 'dark' ? 'light' : 'dark';
       this.settings.maxBlocks = this.activity.maxBlocks;
       this.updateCssProps();

src/components/ActivityEditor.vue

@@ -134,24 +134,6 @@
                   </v-col>
                   </v-row>
                   <v-row>
-                  <v-col>
-									<v-card>
-                    <v-card-title>
-                      {{ $t("message.activity_locale") }}
-                    </v-card-title>
-										<v-card-text>
-											<v-select v-model="activity.uiLang"
-                        :items="langs"
-                        item-title="text"
-                        item-value="key"
-                        v-bind:label="$t('message.activity_locale')" required
-                        @change="v$.activity.uiLang.$touch"
-                      ></v-select>
-										</v-card-text>
-									</v-card>
-                  </v-col>
-                  </v-row>
-                  <v-row>
                   <v-col>
                   <v-card>
                     <v-card-title>
@@ -500,7 +482,6 @@ export default {
       activity: {
         stock: null,
         default: null,
-        uiLang: "browser",
         theme: null,
         defaultView: null,
         exec: {
@@ -588,14 +569,6 @@ export default {
         'Protanomaly',
         'Protanopia',
       ],
-      langs: [
-        { key: 'browser', text: this.$i18n.t('message.activity_lang_browser') },
-        { key: 'it', text: this.$i18n.t('message.activity_lang_italian') },
-        { key: 'en', text: this.$i18n.t('message.activity_lang_english') },
-        { key: 'fr', text: this.$i18n.t('message.activity_lang_french') },
-        { key: 'es', text: this.$i18n.t('message.activity_lang_spanish') },
-        { key: 'de', text: this.$i18n.t('message.activity_lang_german') },
-      ],
       editHistory: false,
       navHistory: false,
       experimental: true,
@@ -631,7 +604,6 @@ export default {
     return {
       activity: {
         default: { },
-        uiLang: { },
         defaultView: { },
         drawerEnabled: { },
         showName: { },

src/components/Settings.vue

@@ -174,6 +174,22 @@
                     </v-card-text>
                   </v-card>
                 </v-col>
+                <v-col>
+                <v-card>
+                  <v-card-title>
+                    {{ $t("message.settings_locale") }}
+                  </v-card-title>
+                  <v-card-text>
+                    <v-select v-model="settings.locale"
+                      :items="langs"
+                      item-title="text"
+                      item-value="key"
+                      v-bind:label="$t('message.settings_locale')" required
+                      @change="v$.settings.locale.$touch"
+                    ></v-select>
+                  </v-card-text>
+                </v-card>
+                </v-col>
                 <v-col>
                   <v-card>
                     <v-card-title>
@@ -1081,6 +1097,7 @@ export default {
     },
     save() {
       if (this.v$.$invalid) {
+        console.log(this.v$)
         this.snackText = this.$i18n.t('message.settings_errors');
         this.snackbar = true;
       } else {
@@ -1241,6 +1258,7 @@ export default {
         startupProgram: null,
         progLevel: null,
         adminPassword: null,
+        locale: null
       },
       musicPackages: null,
       cb: {
@@ -1276,6 +1294,14 @@ export default {
       passwordIncorrect: false,
       interval_wifi: null,
       interval_info: null,
+      langs: [
+        { key: 'browser', text: this.$i18n.t('message.activity_lang_browser') },
+        { key: 'it', text: this.$i18n.t('message.activity_lang_italian') },
+        { key: 'en', text: this.$i18n.t('message.activity_lang_english') },
+        { key: 'fr', text: this.$i18n.t('message.activity_lang_french') },
+        { key: 'es', text: this.$i18n.t('message.activity_lang_spanish') },
+        { key: 'de', text: this.$i18n.t('message.activity_lang_german') },
+      ]
     };
   },
   validations() {
@@ -1436,6 +1462,8 @@ export default {
         },
         adminPassword: {
         },
+        locale: {
+        }
       },
     };
   },

src/i18n/index.js

@@ -3,6 +3,8 @@ import { createI18n } from 'vue-i18n';
 import * as it_messages from './locales/it/messages.json';
 import * as en_messages from './locales/en/messages.json';
 import * as fr_messages from './locales/fr/messages.json';
+import * as es_messages from './locales/es/messages.json';
+import * as de_messages from './locales/de/messages.json';
 
 const locales = {
   it: {
@@ -14,6 +16,12 @@ const locales = {
   fr: {
     message: fr_messages.default,
   },
+  es: {
+    message: es_messages.default,
+  },
+  de: {
+    message: de_messages.default,
+  },
 };
 
 const language = (window.navigator.userLanguage || window.navigator.language).substring(0, 2);

src/i18n/locales/de/messages.json

@@ -37,7 +37,6 @@
     "activity_edit": "Aktivität bearbeiten",
     "activity_tip_1": "Hier können Sie eine Aktivität erstellen oder bearbeiten und definieren, wie sie dem Schüler angezeigt werden soll, der sie zum Schreiben von Programmen verwenden wird. Denken Sie daran, dass die Aktivität dann gestartet werden muss (Aktivitätsmenü -> Öffnen), um sie auszuführen tatsächlich verwenden.",
     "activity_data": "Aktivitätseinstellungen",
-    "activity_locale": "Sprache der Benutzeroberfläche",
     "activity_typography": "Typografie",
     "activity_typography_font_ui": "Schriftart der Benutzeroberfläche",
     "activity_typography_font_editor": "Code-Schriftart (Werte, Code-Editoren)",
@@ -303,6 +302,7 @@
     "settings_admin_password_title": "Administrationspasswort",
     "settings_admin_password": "Passwort",
     "settings_admin_password_incorrect": "Ungültiges Passwort",
+    "settings_locale": "Sprache der Benutzeroberfläche",
     "validation_integer": "Gib eine ganze Zahl ein (1234)",
     "validation_decimal": "Fügen Sie eine Dezimalzahl ein (12,34)",
     "validation_integer_positive": "Gib eine ganze Zahl ein, positiv oder gleich 0 ",

src/i18n/locales/en/messages.json

@@ -37,7 +37,6 @@
     "activity_edit": "Edit Activity",
     "activity_tip_1": "Here you can create or edit an activity, defining how it should appear to the student who will use it to write programs. Remember that the activity will then have to be started (Activity Menu -> Open) in order to actually use it.",
     "activity_data": "Activity settings",
-    "activity_locale": "User interface language",
     "activity_typography": "Typography",
     "activity_typography_font_ui": "Interface font",
     "activity_typography_font_editor": "Code font (values, code editors)",
@@ -303,6 +302,7 @@
     "settings_admin_password_title": "Administration password",
     "settings_admin_password": "password",
     "settings_admin_password_incorrect": "Invalid password",
+    "settings_locale": "User interface language",
     "validation_integer": "Insert a integer number (1234)",
     "validation_decimal": "Insert a decimal number (12.34)",
     "validation_integer_positive": "Insert a integer number, positive or equal to 0 ",

src/i18n/locales/es/messages.json

@@ -37,7 +37,6 @@
     "activity_edit": "Editar Actividad",
     "activity_tip_1": "Aquí puedes crear o editar una actividad, definiendo cómo debe aparecer para el estudiante que la usará para escribir programas. Recuerda que la actividad deberá iniciarse (Menú Actividad -> Abrir) para poder realmente usarlo.",
     "activity_data": "Configuración de la actividad",
-    "activity_locale": "Idioma de la interfaz de usuario",
     "activity_typography": "Tipografía",
     "activity_typography_font_ui": "Fuente de la interfaz",
     "activity_typography_font_editor": "Fuente de código (valores, editores de código)",
@@ -303,6 +302,7 @@
     "settings_admin_password_title": "Contraseña de administración",
     "settings_admin_password": "contraseña",
     "settings_admin_password_incorrect": "Contraseña no válida",
+    "settings_locale": "Idioma de la interfaz de usuario",
     "validation_integer": "Insertar un número entero (1234)",
     "validation_decimal": "Insertar un número decimal (12.34)",
     "validation_integer_positive": "Inserte un número entero, positivo o igual a 0",

src/i18n/locales/fr/messages.json

@@ -37,7 +37,6 @@
     "activity_edit": "Modifier l'activité",
     "activity_tip_1": "Ici, vous pouvez créer ou modifier une activité, en définissant comment elle doit apparaître à l'étudiant qui l'utilisera pour écrire des programmes. N'oubliez pas que l'activité devra ensuite être lancée (Menu Activité -> Ouvrir) afin de l'utiliser réellement.",
     "activity_data": "Paramètres d'activité",
-    "activity_locale": "Langue de l'interface utilisateur",
     "activity_typography": "Typographie",
     "activity_typography_font_ui": "Police de l'interface",
     "activity_typography_font_editor": "Police du code (valeurs, éditeurs de code)",
@@ -303,6 +302,7 @@
     "settings_admin_password_title": "Mot de passe administrateur",
     "settings_admin_password": "mot de passe",
     "settings_admin_password_incorrect": "Mot de passe invalide",
+    "settings_locale": "Langue de l'interface utilisateur",
     "validation_integer": "Insérez un nombre entier (1234)",
     "validation_decimal": "Insérer un nombre décimal (12.34)",
     "validation_integer_positive": "Insère un nombre entier, positif ou égal à 0",

src/i18n/locales/it/messages.json

@@ -37,7 +37,6 @@
     "activity_edit": "Modifica Attività",
     "activity_tip_1": "Qui puoi creare o modificare una attività, definendo come dovrà apparire allo studente che dovrà utilizzarla per scrivere programmi. Ricorda che l'attività andrà poi avviata (Menù Attività -> Apri) per poterne fare effettivamente uso.",
     "activity_data": "Dati Attività",
-    "activity_locale": "Lingua interfaccia",
     "activity_typography": "Tipografia",
     "activity_typography_font_ui": "Carattere tipografico dell'interfaccia",
     "activity_typography_font_editor": "Carattere tipografico del codice (valori, editor di codice)",
@@ -303,6 +302,7 @@
     "settings_admin_password_title": "Password di amministrazione.",
     "settings_admin_password": "password",
     "settings_admin_password_incorrect": "Password non corretta.",
+    "settings_locale": "Lingua interfaccia",
     "validation_integer": "Inserire un numero intero (1234)",
     "validation_decimal": "Inserire un numero decimale (12.34)",
     "validation_integer_positive": "Inserire un numero intero maggiore o uguale a 0",