From 80de0cbd3be3dbae4fb303332389a9a564fc653b Mon Sep 17 00:00:00 2001 From: Yaya-Cout Date: Thu, 2 May 2024 16:08:43 +0200 Subject: [PATCH] [Installer] Promote beta version instead of official --- src/components/CustomSelect.vue | 11 +++++++---- src/locales/en.json | 4 ++-- src/locales/fr.json | 6 +++--- src/views/Installer.vue | 3 +-- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/components/CustomSelect.vue b/src/components/CustomSelect.vue index d17f3d9..ba46846 100644 --- a/src/components/CustomSelect.vue +++ b/src/components/CustomSelect.vue @@ -49,10 +49,13 @@ export default defineComponent({ return { t } }, watch: { - current: function (newVal, oldVal) { - if (oldVal !== newVal) { - this.currentElement = this.items.filter((item) => item.id === newVal)[0] - } + current: { + handler: function (newVal, oldVal) { + if (oldVal !== newVal) { + this.currentElement = this.items.filter((item) => item.id === newVal)[0] + } + }, + immediate: true } }, diff --git a/src/locales/en.json b/src/locales/en.json index 782de2f..a263d1e 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -290,7 +290,7 @@ "backingup": "Backing up...", "channels": { "beta": { - "description": "More stable than dev, updated every 1-2 weeks. Use this if you want to select a theme", + "description": "Recommended. More stable than dev, often updated. Use this if you want to select a theme", "title": "Beta" }, "custom": { @@ -302,7 +302,7 @@ "title": "Dev" }, "master": { - "description": "Official version of Upsilon, integrating the validated changes", + "description": "Official version of Upsilon, integrating the validated changes. You should avoid using it because it's outdated and contain bugs already fixed in beta and dev", "title": "Official" } }, diff --git a/src/locales/fr.json b/src/locales/fr.json index dc7a068..1a0380d 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -290,15 +290,15 @@ "backingup": "Sauvegarde...", "channels": { "beta": { - "description": "Plus stable que Dev, mis à jour toutes les 1-2 semaines. Utiliser cette version pour pouvoir choisir un thème.", + "description": "Recommandée. Plus stable que Dev, souvent mise à jour. Utiliser cette version pour pouvoir choisir un thème.", "title": "Beta" }, "dev": { - "description": "Version la plus à jour, mis à jour à chaque changement", + "description": "Version la plus à jour, mise à jour à chaque changement", "title": "Dev" }, "master": { - "description": "Version officielle d'Upsilon, intégrant les changements validés", + "description": "Version officielle d'Upsilon, intégrant les changements validés. Vous ne devriez pas l'utiliser car elle n'est pas à jour et contient des bugs déjà corrigés en beta et en dev", "title": "Officiel" } }, diff --git a/src/views/Installer.vue b/src/views/Installer.vue index e7b1470..28b96a1 100644 --- a/src/views/Installer.vue +++ b/src/views/Installer.vue @@ -168,7 +168,7 @@ export default defineComponent({ modelUnknown: false, theme: 'upsilon_light', lang: 'en', - channel: 'official', + channel: 'beta', slot: 'A', slots: ['A', 'B'], binaries: [], @@ -669,7 +669,6 @@ export default defineComponent({ await this.calculatorRecovery.flashRecovery(flasher) console.log('Recovery flashed successfully') this.setStatus('recoveryDone') - this.channel = 'official' // FIXME we use beta channel as there is no flasher in official } catch (error) { this.onError(error) } finally {