1
0
Fork 0
mirror of https://gitlab.com/bramw/baserow.git synced 2025-04-15 01:28:30 +00:00

Merge branch '5-enable-i18n-by-default' into 'develop'

Enable i18n by default

Closes 

See merge request 
This commit is contained in:
Jrmi 2022-01-13 08:55:03 +00:00
commit cc17daef0b
4 changed files with 7 additions and 10 deletions
changelog.md
web-frontend/modules/core

View file

@ -4,6 +4,7 @@
* Fixed frontend errors occurring sometimes when mass deleting and restoring sorted
fields
* Added French translation.
* Added Video, Audio, PDF and some Office file preview.
* Added rating field type.
* Fix deleted options that appear in the command line JSON file export.

View file

@ -1,5 +1,5 @@
<template>
<div v-if="$env.ENABLE_I18N" class="lang-picker">
<div class="lang-picker">
<a
ref="dropdownLink"
class="lang-picker__link"

View file

@ -18,7 +18,7 @@
</div>
</div>
</div>
<div v-if="$env.ENABLE_I18N" class="control">
<div class="control">
<label class="control__label">
<i class="fas fa-globe"></i> {{ $t('accountForm.languageLabel') }}
</label>

View file

@ -47,10 +47,6 @@ export default function CoreModule(options) {
key: 'PUBLIC_WEB_FRONTEND_URL',
default: 'http://localhost:3000',
},
{
key: 'ENABLE_I18N',
default: false,
},
{
key: 'INITIAL_TABLE_DATA_LIMIT',
default: null,
@ -70,10 +66,10 @@ export default function CoreModule(options) {
])
// Use feature flag to enable i18n
const locales = [{ code: 'en', name: 'English', file: 'en.js' }]
if (process.env.ENABLE_I18N) {
locales.push({ code: 'fr', name: 'Français', file: 'fr.js' })
}
const locales = [
{ code: 'en', name: 'English', file: 'en.js' },
{ code: 'fr', name: 'Français', file: 'fr.js' },
]
this.requireModule([
'@nuxtjs/i18n',