revert footer_version and fix i18n command report

This commit is contained in:
Axolotle 2020-11-06 14:44:15 +01:00
parent e9d47d2627
commit 3290b71ba8
4 changed files with 12 additions and 22 deletions

View file

@ -8,7 +8,8 @@
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
"lint": "vue-cli-service lint",
"i18n:report": "vue-cli-service i18n:report --src './src/**/*.?(js|vue)' --locales './src/locales/**/*.json'"
"i18n": "vue-cli-service i18n:report --src './src/**/*.?(js|vue)' --locales './src/i18n/locales/*.json'",
"i18n:en": "vue-cli-service i18n:report --src './src/**/*.?(js|vue)' --locales './src/i18n/locales/en.json'"
},
"dependencies": {
"bootstrap-vue": "^2.18.1",

View file

@ -62,22 +62,11 @@
<b-nav-item href="https://donate.yunohost.org/" target="_blank" link-classes="text-secondary">
<icon iname="heart" /> {{ $t('footer.donate') }}
</b-nav-item>
<i18n
v-if="yunohost" path="footer.version" tag="b-nav-text"
id="yunohost-version" class="ml-md-auto text-center"
>
<template v-slot:ynh>
<b-link href="https://yunohost.org">
YunoHost
</b-link>
</template>
<template v-slot:version>
{{ yunohost.version }}
</template>
<template v-slot:repo>
{{ yunohost.repo }}
</template>
</i18n>
<b-nav-text
v-if="yunohost" id="yunohost-version" class="ml-md-auto text-center"
v-html="$t('footer_version', yunohost)"
/>
</b-nav>
</nav>
</footer>

View file

@ -116,7 +116,6 @@
"created_at": "Created at",
"custom_app_install": "Install custom app",
"custom_app_url_only_github": "Currently only from GitHub",
"default": "Default",
"delete": "Delete",
"description": "Description",
"details": "Details",
@ -156,8 +155,8 @@
"experimental": "Experimental",
"experimental_warning": "Warning: this feature is experimental and not consider stable, you shouldn't be using it except if you know what you are doing.",
"firewall": "Firewall",
"footer_version": "Powered by <a href='https://yunohost.org'>YunoHost</a> {version} ({repo}).",
"footer": {
"version": "Powered by {ynh} {version} ({repo}).",
"documentation": "Documentation",
"help": "Need help?",
"donate": "Donate"
@ -443,7 +442,8 @@
"warnings": "{count} warnings",
"warning_first_user": "You probably need to <a href='#/users/create' class='alert-link'>create a user</a> first.",
"words": {
"collapse": "Collapse"
"collapse": "Collapse",
"default": "Default"
},
"wrong_password": "Wrong password",
"yes": "Yes",

View file

@ -24,8 +24,8 @@
<h5>
{{ domain }}
<small v-if="domain === mainDomain">
<span class="sr-only">{{ $t('default') }}</span>
<icon iname="star" :title="$t('default')" />
<span class="sr-only">{{ $t('words.default') }}</span>
<icon iname="star" :title="$t('words.default')" />
</small>
</h5>
<p>https://{{ domain }}</p>