Commit d3a29ea1 authored by JosephK's avatar JosephK
Browse files

️ vue-fs 21.1.19 + fix #68

parent 19710b7d
Pipeline #387226 passed with stages
in 2 minutes and 22 seconds
......@@ -7,3 +7,4 @@ npm-debug.log
pnpm-lock.yaml
tools/backup/
tools/tmp/
app/locales/*/sfs.yml
......@@ -13,7 +13,7 @@ pages:
stage: deploy
script:
- npm run commons
- ./base64.sh
- ./tools/base64.sh
- npm run preview
- mv -f public/$(echo $CI_PAGES_URL | cut -d/ -f4-)/* public
- find public -type f -iregex '.*\.\(htm\|html\|txt\|text\|js\|css\)$' -execdir gzip -f --keep {} \;
......@@ -37,7 +37,7 @@ production:
stage: deploy
script:
- npm run commons
- ./base64.sh
- ./tools/base64.sh
- npm run prod
- cp ./public/fr/index.html ./public/index.html
- for f in $(find -type l);do cp --remove-destination $(readlink -f $f) $f;done;
......
......@@ -634,7 +634,7 @@
</template>
<script>
import I18n from '../partials/I18n.vue';
import I18n from 'vue-fs-commons/app/components/partials/I18n.vue';
import Signature from '../partials/Signature.vue';
export default {
......
......@@ -16,7 +16,7 @@
</template>
<script>
import I18n from './I18n.vue';
import I18n from 'vue-fs-commons/app/components/partials/I18n.vue';
export default {
components: {
......
......@@ -45,6 +45,14 @@ img:
- ['Facebook', 'stickerDiO_facebook.png', '<i lang="en">Facebook is watching you.</i>']
- ['Apple', 'stickerDiO_apple.png', '<i lang="en">Apple: Kids, don’t do drugs.</i>']
- ['Microsoft', 'stickerDiO_microsoft.png', '<i lang="en">Microsoft: do you need a backdoor?</i>']
link:
F: '@:link.soft'
S: '@:link.soutenir'
DIo: '@:link.dio'
DIoL: '@:link.diolist'
charte: '@:link.soft/charte'
cloud: https://framacloud.org/fr/cultiver-son-jardin
chatons: https://chatons.org
home:
medias:
- ['https://web.archive.org/web/20150417064442/http://www.canalplus.fr:80/c-emissions/c-la-nouvelle-edition/pid6850-la-nouvelle-edition.html',
......
......@@ -178,7 +178,8 @@ messages.locales.available.forEach((k) => {
// Create locale template to be able to use the English text
// instead of the yaml key for translation
if (k === 'en') {
// (disabled by default)
if (false && k === 'en') {
Object.assign(messages.locales.map,
...function _flatten(o, k) {
return [].concat(...Object.keys(o)
......
......@@ -10,15 +10,6 @@ meta:
start: Die Kampagne begann am
edit: Letzte Änderung am
support: Unterstütze dieses Projekt
link:
F: '@:link.soft'
S: '@:link.soutenir'
DIo: '@:link.dio'
DIoL: '@:link.dio/@:lang/list'
charte: '@:link.soft/@:lang/charte'
docs: https://docs.framasoft.org/fr/
cloud: https://framacloud.org/fr/cultiver-son-jardin
chatons: https://chatons.org
img:
map: Carte2016-romains-en.png
leds:
......
......@@ -10,15 +10,6 @@ meta:
start: Campaign began on
edit: Last modification on the
support: Support this project
link:
F: '@:link.soft'
S: '@:link.soutenir'
DIo: '@:link.dio'
DIoL: '@:link.dio/@:lang/list'
charte: '@:link.soft/@:lang/charte'
docs: https://docs.framasoft.org/fr/
cloud: https://framacloud.org/fr/cultiver-son-jardin
chatons: https://chatons.org
img:
map: Carte2016-romains-en.png
leds:
......
......@@ -10,15 +10,6 @@ meta:
start: Campaña comenzada el día
edit: Última modificación el
support: Sostener este proyecto
link:
F: '@:link.soft'
S: '@:link.soutenir'
DIo: '@:link.dio'
DIoL: '@:link.dio/@:lang/list'
charte: '@:link.soft/@:lang/charte'
docs: https://docs.framasoft.org/fr/
cloud: https://framacloud.org/fr/cultiver-son-jardin
chatons: https://chatons.org
img:
map: Carte2016-romains-en.png
leds:
......
......@@ -9,15 +9,6 @@ meta:
start: Campagne commencée le
edit: Dernière modification le
support: Soutenir ce projet
link:
F: '@:link.soft'
S: '@:link.soutenir'
DIo: '@:link.dio'
DIoL: '@:link.dio/@:lang/list'
charte: '@:link.soft/@:lang/charte'
docs: https://docs.framasoft.org/fr/
cloud: https://framacloud.org/fr/cultiver-son-jardin
chatons: https://chatons.org
img:
map: Carte2016-romains.png
leds:
......
{
"name": "vue-fs-template",
"version": "20.12.30",
"version": "21.1.19",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
......@@ -11796,7 +11796,7 @@
}
},
"vue-fs-commons": {
"version": "git+https://git@framagit.org/framasoft/vue-fs/commons.git#b68caaf3f318f3334face0ed40d5c63eeff39891",
"version": "git+https://git@framagit.org/framasoft/vue-fs/commons.git#505bfd761d9409b743114889de0ffec6eccbbb23",
"from": "git+https://git@framagit.org/framasoft/vue-fs/commons.git"
},
"vue-functional-data-merge": {
......
{
"name": "vue-fs-template",
"description": "Vue skeleton with i18n router",
"version": "20.12.30",
"version": "21.1.19",
"author": "JosephK",
"private": true,
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"commons": "rm -rf node_modules/vue-fs-commons && npm i",
"sfs": "./node_modules/vue-fs-commons/tools/copy-sfs-locales.sh",
"dev": "rm -rf ./public && cross-env NODE_ENV=development webpack-dev-server --open false --hot --mode development",
"preview": "rm -rf ./public && cross-env NODE_ENV=preview webpack --progress --hide-modules --mode production",
"prod": "rm -rf ./public && cross-env NODE_ENV=production webpack --progress --hide-modules --mode production"
......@@ -16,7 +17,7 @@
"bootstrap-vue": "^2.21.1",
"image-map-resizer": "^1.0.10",
"jquery": "^3.3.1",
"lodash": "^4.17.19",
"lodash": "^4.17.20",
"maphilight": "^1.4.0",
"marked": "^0.7.0",
"roboto-fontface": "^0.10.0",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment