diff --git a/.gitignore b/.gitignore index df4b755d6e..7a0e072c2c 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,9 @@ /public/packs /public/packs-test +# Vue i18n messages generated at boot (cf. config/initializers/vue_i18n.rb) +/public/vue/*.json + # Ignore some JS stuff /node_modules /yarn-error.log diff --git a/app/controllers/admin/vue_i18n_controller.rb b/app/controllers/admin/vue_i18n_controller.rb deleted file mode 100644 index ca1339f0a1..0000000000 --- a/app/controllers/admin/vue_i18n_controller.rb +++ /dev/null @@ -1,7 +0,0 @@ -class Admin::VueI18nController < Admin::ApplicationController - layout false - - def index - render json: I18n.t('vue') - end -end diff --git a/app/javascript/apps/blocks-editor/BlocksEditorApp.vue b/app/javascript/apps/blocks-editor/BlocksEditorApp.vue index 7b71cec299..51533004ee 100644 --- a/app/javascript/apps/blocks-editor/BlocksEditorApp.vue +++ b/app/javascript/apps/blocks-editor/BlocksEditorApp.vue @@ -11,12 +11,10 @@ export default { loading: true, csrfToken: '', url: { - i18n: '', new: '', reorder: '', data: '', }, - i18n: {}, data: {}, planMode: false, offcanvasState: 'closed', // closed, picking, editing @@ -26,11 +24,9 @@ export default { beforeMount() { this.csrfToken = document.querySelector('[name="csrf-token"]').content; const dataset = document.getElementById('blocks-editor-app').dataset; - this.url.i18n = dataset.i18nUrl; this.url.data = dataset.dataUrl; this.url.new = dataset.newUrl; this.url.reorder = dataset.reorderUrl; - this.loadJson(this.url.i18n, 'i18n'); this.refresh(); }, methods: { @@ -38,7 +34,7 @@ export default { const res = await fetch(url, { headers: { Accept: 'application/json' } }); if (!res.ok) return; this[target] = await res.json(); - if (this.i18n.blocksEditor && this.data.blocks) { + if (this.data.blocks) { this.loading = false; } }, @@ -77,7 +73,7 @@ export default { notyf.open({ type: 'success', position: { x: 'left', y: 'bottom' }, - message: this.i18n.blocksEditor.confirm.copy, + message: this.$t('blocksEditor.confirm.copy'), duration: 9000, ripple: true, dismissible: true, @@ -137,19 +133,18 @@ export default { - {{ i18n.blocksEditor.actions.addBlock }} + {{ $t('blocksEditor.actions.addBlock') }} - {{ i18n.blocksEditor.planMode.button }} + {{ $t('blocksEditor.planMode.button') }} - {{ i18n.blocksEditor.actions.addBlock }} + {{ $t('blocksEditor.actions.addBlock') }} -  {{ i18n.blocksEditor.actions.move }} +  {{ $t('blocksEditor.actions.move') }} @@ -91,23 +90,23 @@ export default { href="#" class="action text-danger ms-2" @click="onDelete($event, block)"> - {{ i18n.blocksEditor.actions.delete }} + {{ $t('blocksEditor.actions.delete') }} - {{ i18n.blocksEditor.actions.copy }} + {{ $t('blocksEditor.actions.copy') }} - {{ i18n.blocksEditor.actions.duplicate }} + {{ $t('blocksEditor.actions.duplicate') }} - {{ i18n.blocksEditor.actions.edit }} + {{ $t('blocksEditor.actions.edit') }}
- {{ i18n.cancel }} + {{ $t('changes.cancel') }}
diff --git a/app/javascript/apps/components/CropperModal.vue b/app/javascript/apps/components/CropperModal.vue index ccba152cb2..633a410d3c 100644 --- a/app/javascript/apps/components/CropperModal.vue +++ b/app/javascript/apps/components/CropperModal.vue @@ -23,7 +23,6 @@ export default { width: null, height: null, }, - i18n: {}, } }, methods: { @@ -74,10 +73,6 @@ export default { xhr.send(JSON.stringify(this.data)); }, }, - beforeMount() { - this.dataset = document.getElementById('media-picker-app').dataset; - this.i18n = JSON.parse(this.dataset.i18n).cropperModal; - }, }; // On utilise canvas=false et check-orientation=false pour éviter les problèmes de CORS @@ -94,7 +89,7 @@ export default {