AkkomaGang/masto-fe
2
2
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity

Move locale-data back to app/javascript/mastodon/locales/locale-data (#2169)

Browse source 
This reduces differences with upstream and fixes a bunch of locale-data
files having been forgotten.
This commit is contained in:
Claire 2023-04-08 14:11:40 +02:00 committed by GitHub
parent dc6befe1a4
commit 10469a0b85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
app/javascript/locales/locale-data/README.md → app/javascript/mastodon/locales/locale-data/README.md
View file

0
app/javascript/locales/locale-data/oc.js → app/javascript/mastodon/locales/locale-data/oc.js
View file

8
config/webpack/generateLocalePacks.js
View file

@ -13,7 +13,7 @@ const { existsSync, readdirSync, writeFileSync } = require('fs');
const { join, resolve } = require('path');
const rimraf = require('rimraf');
const mkdirp = require('mkdirp');
const { flavours } = require('./configuration.js');
const { flavours } = require('./configuration');
module.exports = Object.keys(flavours).reduce(function (map, entry) {
const flavour = flavours[entry];
@ -43,13 +43,13 @@ module.exports = Object.keys(flavours).reduce(function (map, entry) {
// first try react-intl
`node_modules/react-intl/locale-data/${baseLocale}.js`,
// then check locales/locale-data
`app/javascript/locales/locale-data/${baseLocale}.js`,
`app/javascript/mastodon/locales/locale-data/${baseLocale}.js`,
// fall back to English (this is what react-intl does anyway)
'node_modules/react-intl/locale-data/en.js',
].filter(
filename => existsSync(filename)
filename => existsSync(filename),
).map(
filename => filename.replace(/(?:node_modules|app\/javascript)\//, '')
filename => filename.replace(/(?:node_modules|app\/javascript)\//, ''),
)[0];
const localeContent = `//
// locales/${entry}/${locale}.js