diff --git a/app/data.yml b/app/data.yml
index 080b0b46ba3283f28d7ff132264dbfe41eb676d1..e9f761795c859602d4eaccb9cb1de936db62079c 100644
--- a/app/data.yml
+++ b/app/data.yml
@@ -1,4 +1,46 @@
meta:
- name: Framacalc
- baseURL: https://framacalc.org
- framaname: Framacalc
+ title: Framacalc
+ author: Framasoft
+ canonical: https://framacalc.org
+ i18n: http://trad.framasoft.org/iteration/view/framacalc/master
+
+txt:
+ soft: Framasoft
+ calc: Framacalc
+ pad: Framapad
+
+color:
+ soft: Framasoft
+ calc: Framacalc
+ pad: Framapad
+
+link:
+ soft: https://framasoft.org
+ dio: https://degooglisons-internet.org
+ cuo: https://contributopia.org
+ soutenir: https://soutenir.framasoft.org
+ contact: https://contact.framasoft.org
+ participer: https://participer.framasoft.org
+ calc: https://framacalc.org
+ pad: https://framapad.org
+
+html:
+ soft: Framasoft
+ calc: Framacalc
+ pad: Framapad
+
+license:
+ lal: 'Art Libre'
+ cc0: 'Creative Commons 0'
+ ccby3: 'Creative Commons By 3.0'
+ ccby4: 'Creative Commons By 4.0'
+ ccbysa3: 'Creative Commons By-SA 3.0'
+ ccbysa4: 'Creative Commons By-SA 4.0'
+ ccbysa2fr: 'Creative Commons By-SA 2.0'
+ ccbysa3fr: 'Creative Commons By-SA 3.0'
+ ccbysa4fr: 'Creative Commons By-SA 4.0'
+ gpl2: 'GNU GPL v2'
+ gpl3: 'GNU GPL v3'
+ gnufdl: 'GNU FDL'
+ agpl3: 'GNU AGPL v3'
+ apache2: 'Apache 2.0'
diff --git a/app/index.js b/app/index.js
index f10f92fd6f4fa4fcc9636aa1a7fb2bbc0067fb92..1142621579a1ba0671e43b72ef8a66659860bfd0 100644
--- a/app/index.js
+++ b/app/index.js
@@ -3,12 +3,11 @@ import VueRouter from 'vue-router';
import VueI18n from 'vue-i18n';
import vueHeadful from 'vue-headful';
-import '../node_modules/bootstrap/dist/css/bootstrap.css';
-import '../node_modules/fork-awesome/css/fork-awesome.css';
-
import App from './App.vue';
import Home from './components/pages/Home.vue';
+import './assets/scss/bootstrap.scss';
+import '../node_modules/fork-awesome/css/fork-awesome.css';
import './assets/scss/main.scss';
Vue.use(VueRouter);
@@ -41,7 +40,7 @@ let defaultRouteLang = '';
const messages = {};
messages.locales = require('./lang.yml'); // eslint-disable-line
-messages.locales.avalaible = locales;
+messages.locales.avalaible = Object.keys(messages.locales).filter(n => locales.indexOf(n) > -1);
// Data import
messages.data = {};
@@ -50,7 +49,7 @@ messages.data['/'] = `/${process.env.BASE_URL.replace(/(.+)/, '$1/')}`;
messages.data['/img/'] = `${messages.data['/']}img/`;
const routes = [
- { path: '/', component: Home },
+ { path: '/', component: Home, meta: { id: 'home' } },
];
for (let i = 0; i < locales.length; i += 1) {
@@ -72,6 +71,7 @@ for (let i = 0; i < locales.length; i += 1) {
routes.push({
path: `/${locales[i]}${pages[j].toLowerCase().replace(/^/, '/').replace('/home', '')}`,
component: component.default,
+ meta: { id: pages[j].toLowerCase() },
});
}
}
diff --git a/app/locales/en.yml b/app/locales/en.yml
index 1fcb303c087ae4f89fbcba449a525d0fa229556c..7601bcff5f4ab5eca72481f9cf00e9a8346717d2 100644
--- a/app/locales/en.yml
+++ b/app/locales/en.yml
@@ -1,25 +1,17 @@
meta:
- title: '@:data.meta.name - Online collaborative spreadsheet'
+ title: '@:data.txt.calc - Online collaborative spreadsheet'
lead: Online collaborative spreadsheet
nav:
langChange: Change language
lang: Language
what:
- title: What is @:data.meta.name?
- desc: 'A "calc" is an online collaborative spreadsheet.
-
+ title: What is @:data.txt.calc?
+ desc: 'A “calc“ is an online collaborative spreadsheet.
Your data is automatically saved on the internet, and
-
your friends can collaborate on the document at the same time.
-
- View all changes in real time!
-
- '
+ View all changes in real time!'
desc2: 'Work together on your inventories, your surveys,
-
- your content, your meetings and much more!
-
- '
+ your content, your meetings and much more!'
how:
title: Features
collab: Collaborative editing (several users connected to the same spreadsheet can
@@ -30,13 +22,9 @@ how:
graph: Basic graphs (histogram, lines, points)
export: HTML export, CSV
size: 'Document size: up to 100,000 lines'
- share: '@:data.meta.framaname documents are easy to share (just provide the address),
-
+ share: '@:data.color.calc documents are easy to share (just provide the address),
to export (to HTML, CSV), are saved permanently and automatically,
-
- and remain always accessible by Internet
-
- '
+ and remain always accessible by Internet'
demo: Want a demonstration?
public:
title: Options
@@ -44,61 +32,39 @@ public:
warning: Do not choose a name too simple.
samename: Anyone using the same calc name will access your content.
help: 'Your calc will be deleted after one year of inactivity
-
(no access, no modification), in order to avoid enlargement of
-
- our database indefinitely.
-
- '
+ our database indefinitely.'
create: Create a calc
warning:
title: Important
close: Close
- text1: Ethercalc, the software that powers @:data.meta.framaname, currently suffers
+ text1: Ethercalc, the software that powers @:data.color.calc, currently suffers
from various bugs that make the service unstable.
text2: 'We decided to host any new calc on a
-
new installation of Ethercalc, which is proposed with less than
-
functionalities (no more import, no more multi-sheet calc),
-
- to improve its stability (fewer crashes).
-
- '
+ to improve its stability (fewer crashes).'
text3: Your old layers remain available at the web address you carefully bookmarked.
text4: Developers, think of contribute
to Ethercalc !
help:
title: Getting Started
desc: 'The interface has some differences compared to other spreadsheets.
-
- They can be confusing.
-
- '
+ They can be confusing.'
desc2: 'If you need a hand, the answer to your questions may be there:'
desc3: Otherwise, do not hesitate to contact us.
faq: F.A.Q.
software:
title: Software
- basedon: '@:data.meta.framaname is based on free software'
+ basedon: '@:data.color.calc is based on free software'
license: 'Ethercalc is under
-
CPAL license
-
- and uses many free libraries.
-
- '
+ and uses many free libraries.'
garden:
title: Cultivate your garden
contrib: 'To participate in the development of the software, suggest improvements
-
- or simply download it, go to
-
- '
+ or simply download it, go to'
devsite: the development site
install: 'If you wish to install this software for your own use
-
- and thus gain in autonomy, we help you on :
-
- '
+ and thus gain in autonomy, we help you on :'
framacloud: https://framacloud.org/fr/cultiver-son-jardin/ethercalc.html
diff --git a/app/locales/fr.yml b/app/locales/fr.yml
index e814f522d73adf0608ae230baba5b5a6cd980f20..dee5549342c6550e9d60e13cd16652a21ff6bf7a 100644
--- a/app/locales/fr.yml
+++ b/app/locales/fr.yml
@@ -1,25 +1,18 @@
meta:
- title: '@:data.meta.name - Tableur collaboratif en ligne'
+ title: '@:data.txt.calc - Tableur collaboratif en ligne'
lead: Tableur collaboratif en ligne
nav:
langChange: Changer la langue
lang: Langage
+ translate: Traduire
what:
- title: Qu’est ce que @:data.meta.name ?
+ title: Qu’est ce que @:data.txt.calc ?
desc: 'Un « calc » est un tableur collaboratif en ligne.
-
Vos données sont automatiquement sauvegardées sur internet, et
-
vos amis peuvent collaborer sur le document en même temps.
-
- Visualisez tous les changements en temps réel !
-
- '
+ Visualisez tous les changements en temps réel !'
desc2: 'Travaillez ensemble sur vos inventaires, vos sondages,
-
- vos contenus, vos réunions et bien plus !
-
- '
+ vos contenus, vos réunions et bien plus !'
how:
title: Fonctionnalités
collab: Édition collaborative (plusieurs utilisateurs connectés à la même feuille
@@ -30,15 +23,11 @@ how:
autosave: Sauvegarde permanente et automatique
graph: Graphiques de base (histogramme, lignes, points)
export: Export HTML, CSV
- size: 'Taille du document : jusqu’à 100 000 lignes'
- share: 'Les documents @:data.meta.framaname sont faciles à partager (il suffit d’en
+ size: 'Taille du document : jusqu’à 100 000 lignes'
+ share: 'Les documents @:data.color.calc sont faciles à partager (il suffit d’en
communiquer l’adresse),
-
à exporter (en HTML, CSV), sont sauvegardés en permanence et automatiquement,
-
- et restent toujours accessibles par internet
-
- '
+ et restent toujours accessibles par internet'
demo: Envie d’une démonstration ?
public:
title: Options
@@ -46,27 +35,18 @@ public:
warning: Ne choisissez pas un nom trop simple.
samename: Toute personne utilisant le même nom de calc accédera à votre contenu.
help: 'Votre calc sera supprimé au bout d’un an d’inactivité
-
(aucun accès, aucune modification), afin d’éviter de faire grossir
-
- indéfiniment notre base de données.
-
- '
+ indéfiniment notre base de données.'
create: Créer un calc
warning:
title: Important
close: Fermer
- text1: Ethercalc, le logiciel qui propulse @:data.meta.framaname, souffre actuellement
+ text1: Ethercalc, le logiciel qui propulse @:data.color.calc, souffre actuellement
de divers bugs qui rendent le service instable.
text2: 'Nous avons décidé d’héberger tout nouveau calc sur une
-
nouvelle installation d’Ethercalc, qui est proposée avec moins de
-
fonctionnalités (plus d’import, plus de calc à feuilles multiples),
-
- afin d’améliorer sa stabilité (moins de plantages).
-
- '
+ afin d’améliorer sa stabilité (moins de plantages).'
text3: Vos anciens calcs restent disponibles à l’adresse web que vous avez soigneusement
enregistrée.
text4: Développeur·euse·s, pensez à contribuer
@@ -74,35 +54,22 @@ warning:
help:
title: Prise en main
desc: 'L’interface présente quelques différences par rapport à d’autres tableurs.
-
- Elles peuvent être déroutantes.
-
- '
+ Elles peuvent être déroutantes.'
desc2: 'Si vous avez besoin d’un coup de main, la réponse à vos questions se trouve
- peut-être là :'
+ peut-être là :'
desc3: Sinon, n’hésitez pas à nous contacter.
faq: F.A.Q.
software:
title: Le logiciel
- basedon: '@:data.meta.framaname repose sur le logiciel libre'
+ basedon: '@:data.color.calc repose sur le logiciel libre'
license: 'Ethercalc est sous licence
-
CPAL
-
- et fait appel à de nombreuses librairies libres.
-
- '
+ et fait appel à de nombreuses librairies libres.'
garden:
title: Cultivez votre jardin
contrib: 'Pour participer au développement du logiciel, proposer des améliorations
-
- ou simplement le télécharger, rendez-vous sur
-
- '
+ ou simplement le télécharger, rendez-vous sur'
devsite: le site de développement
install: 'Si vous souhaitez installer ce logiciel pour votre propre usage
-
- et ainsi gagner en autonomie, nous vous aidons sur :
-
- '
+ et ainsi gagner en autonomie, nous vous aidons sur :'
framacloud: https://framacloud.org/fr/cultiver-son-jardin/ethercalc.html
diff --git a/app/locales/it.yml b/app/locales/it.yml
index a0c82a1d18e08665fc6b0e59b1b0c713ec2b1881..c3c10ade1017c29ec8defeb9cc0f35df3c0107ae 100644
--- a/app/locales/it.yml
+++ b/app/locales/it.yml
@@ -1,25 +1,18 @@
meta:
- title: '@:data.meta.name - Foglio di calcolo collaborativo online'
+ title: '@:data.txt.calc - Foglio di calcolo collaborativo online'
lead: Foglio di calcolo collaborativo online
nav:
langChange: Cambia lingua
lang: Lingua
+ translate: Tradurre
what:
- title: Cosa è @:data.meta.name?
- desc: 'Un "calc" è un foglio di calcolo collaborativo online.
-
+ title: Cosa è @:data.txt.calc?
+ desc: 'Un “calc” è un foglio di calcolo collaborativo online.
I tuoi dati sono automaticamente salvati in internet, e
-
i tuoi amici possono collaborare al documento allo stesso tempo.
-
- Vedi tutti i cambiamenti in tempo reale!
-
- '
+ Vedi tutti i cambiamenti in tempo reale!'
desc2: 'Lavorate insieme ai vostri cataloghi, i vostri sondaggi,
-
- il vostro contenuto, i vostri incontri e molto di più!
-
- '
+ il vostro contenuto, i vostri incontri e molto di più!'
how:
title: Caratteristiche
collab: Modifiche collaborative (più utenti collegati allo stesso foglio di calcolo
@@ -31,13 +24,9 @@ how:
graph: Grafici di base (istogrammi, linee, punti)
export: Esportazione in HTML, CSV
size: 'Dimensioni del document: fino a 100,000 righe'
- share: 'I documenti @:data.meta.framaname sono facili da condividere (basta fornire l'indirizzo),
-
+ share: 'I documenti @:data.color.calc sono facili da condividere (basta fornire l'indirizzo),
da esportare (come HTML, CSV), sono salvati automaticamente e permanentemente,
-
- e rimangono sempre accessibili in Internet
-
- '
+ e rimangono sempre accessibili in Internet'
demo: Vuoi una dimostrazione?
public:
title: Opzioni
@@ -45,61 +34,40 @@ public:
warning: Non scegliere un nome troppo semplice.
samename: Chiunque usi lo stesso nome di calc accederà al tuo contenuto.
help: 'Il tuo calc verrà eliminato dopo un anno di inattività
-
(nessun accesso, nessuna modifica), per evitare una crescita esagerata
-
- del nostro database.
-
- '
+ del nostro database.'
create: Crea un calc
warning:
title: Importante
close: Chiudi
- text1: Ethercalc, il software alla base di @:data.meta.framaname, soffre
+ text1: Ethercalc, il software alla base di @:data.color.calc, soffre
al momento di diversi bug che rendono il servizio instabile.
text2: 'Abbiamo deciso di ospitare qualsiasi nuovo calc su una
-
nuova installazione di Ethercalc, che provvede meno
-
funzionalità (niente importazione, niente calc multifoglio),
-
- per migliorare la sua stabilità (meno crash).
-
- '
+ per migliorare la sua stabilità (meno crash).'
text3: I tuoi vecchi layer restano disponibili al vecchio indirizzo, se lo hai messo
tra i preferiti
text4: Sviluppatori, pensate di contribuire
a Ethercalc !
help:
title: Per iniziare
- desc: 'L''interfaccia ha qualche differenza rispetto ad altri fogli di calcolo.
-
- Questo può confondere.
-
- '
+ desc: 'L’interfaccia ha qualche differenza rispetto ad altri fogli di calcolo.
+ Questo può confondere.'
desc2: 'Se hai bisogno di aiuto, la risposta alle tue domande può trovarsi qui:'
desc3: Altrimenti, non esitare a contattarci.
faq: F.A.Q.
software:
title: Software
- basedon: '@:data.meta.framaname si basa su software libero'
+ basedon: '@:data.color.calc si basa su software libero'
license: 'Ethercalc è sotto licenza
-
CPAL
-
- e utilizza molte librerie libere.
-
- '
+ e utilizza molte librerie libere.'
garden:
title: Coltiva il tuo orto
contrib: 'Per partecipare allo sviluppo del software, suggerire migliorie
-
o semplicemente scaricarlo, vai a'
devsite: il sito di sviluppo
install: 'Se vuoi installare questo software per il tuo uso personale
-
- e ottenere così maggiore autonomia, ti aiutiamo su:
-
-
- '
+ e ottenere così maggiore autonomia, ti aiutiamo su:'
framacloud: https://framacloud.org/fr/cultiver-son-jardin/ethercalc.html
diff --git a/package-lock.json b/package-lock.json
index 28e515446f618851e428934e45f2606dbc6d7afd..9a63dbfcccc489d6702f2879ae0bb2b5425734a5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1882,10 +1882,10 @@
"hoek": "2.16.3"
}
},
- "bootstrap": {
+ "bootstrap-sass": {
"version": "3.3.7",
- "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz",
- "integrity": "sha1-WjiTlFSfIzMIdaOxUGVldPip63E="
+ "resolved": "https://registry.npmjs.org/bootstrap-sass/-/bootstrap-sass-3.3.7.tgz",
+ "integrity": "sha1-ZZbHq0D2Y3OTMjqwvIDQZPxjBJg="
},
"brace-expansion": {
"version": "1.1.11",
diff --git a/package.json b/package.json
index 02eae1355e71891a950283af48309f7ccc4ca080..e11980d9adc2bc73672e4167ae73a4308099cbab 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
"prod": "cross-env NODE_ENV=production webpack --progress --hide-modules --mode production"
},
"dependencies": {
- "bootstrap": "^3.3.7",
+ "bootstrap-sass": "^3.3.7",
"fork-awesome": "^1.1.0",
"jquery": "^3.3.1",
"uiv": "^0.23.1",