Skip to content

Commit

Permalink
[Installer] Promote beta version instead of official
Browse files Browse the repository at this point in the history
  • Loading branch information
Yaya-Cout committed May 2, 2024
1 parent 7b6b7f2 commit 80de0cb
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 11 deletions.
11 changes: 7 additions & 4 deletions src/components/CustomSelect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
},
Expand Down
4 changes: 2 additions & 2 deletions src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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"
}
},
Expand Down
6 changes: 3 additions & 3 deletions src/locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
},
Expand Down
3 changes: 1 addition & 2 deletions src/views/Installer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ export default defineComponent({
modelUnknown: false,
theme: 'upsilon_light',
lang: 'en',
channel: 'official',
channel: 'beta',
slot: 'A',
slots: ['A', 'B'],
binaries: [],
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 80de0cb

Please sign in to comment.