Skip to content

Commit

Permalink
Adding error messages and splash screen.
Browse files Browse the repository at this point in the history
  • Loading branch information
DimitriDR committed Jan 7, 2023
1 parent d3ced73 commit f214667
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 7 deletions.
5 changes: 5 additions & 0 deletions src/assets/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
"clear-search-tooltip": "Clear Search",
"enter-to-search-web": "Press enter to search the web"
},
"splash-screen": {
"loading": "Loading"
},
"login": {
"title": "Dashy",
"guest-label": "Guest Access",
Expand Down Expand Up @@ -86,6 +89,8 @@
"rebuild-app-button": "Rebuild Application",
"change-language-button": "Change App Language",
"reset-settings-button": "Reset Local Settings",
"disabled-note": "Some configuration features have been disabled by your administrator",
"small-screen-note": "You are using a very small screen, and some screens in this menu may not be optimal",
"app-info-button": "App Info",
"backup-note": "It is recommended to make a backup of your configuration before making changes.",
"reset-config-msg-l1": "This will remove all user settings from local storage, but won't affect your 'conf.yml' file.",
Expand Down
5 changes: 5 additions & 0 deletions src/assets/locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
"clear-search-tooltip": "Effacer la recherche",
"enter-to-search-web": "Appuyez sur entrée pour rechercher sur le Web"
},
"splash-screen": {
"loading": "Chargement"
},
"footer": {
"dev-by": "Développé par",
"licensed-under": "Sous licence",
Expand Down Expand Up @@ -92,6 +95,8 @@
"rebuild-app-button": "Reconstruire l'application",
"change-language-button": "Changer la langue",
"reset-settings-button": "Réinitialiser les paramètres locaux",
"disabled-note": "Certaines fonctionnalités de configuration ont été désactivées par votre administrateur",
"small-screen-note": "Vous utilisez un très petit écran, et certains menus peuvent ne pas apparaître de manière optimale",
"app-info-button": "Informations sur l'application",
"backup-note": "Il est recommandé de faire une sauvegarde de votre configuration avant d'apporter des modifications.",
"reset-config-msg-l1": "Cela supprimera tous les paramètres utilisateur du stockage local, mais n'affectera pas votre fichier 'conf.yml'.",
Expand Down
8 changes: 2 additions & 6 deletions src/components/Configuration/ConfigContainer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,8 @@
<AppVersion />
</div>
<!-- Display note if Config disabled, or if on mobile -->
<p v-if="!enableConfig" class="config-disabled-note">
Some configuration features have been disabled by your administrator
</p>
<p class="small-screen-note" style="display: none;">
You are using a very small screen, and some screens in this menu may not be optimal
</p>
<p v-if="!enableConfig" class="config-disabled-note">{{ $t('config.disabled-note') }}</p>
<p class="small-screen-note" style="display: none;">{{ $t('config.small-screen-note') }}</p>
<div class="config-note">
<span>{{ $t('config.backup-note') }}</span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/PageStrcture/LoadingScreen.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div id="loading" v-if="isLoading" :class="c" @click="c = 'hide'">
<h2>Dashy</h2>
<div class="inner-container">
<p>Loading</p>
<p>{{ $t('splash-screen.loading')}}</p>
<span class="dots-cont">
<span class="dot dot-1"></span>
<span class="dot dot-2"></span>
Expand Down

0 comments on commit f214667

Please sign in to comment.