yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-02 19:04:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into patch-1

Browse Source
This commit is contained in:
Jim LAURIE 2019-03-12 17:39:05 +01:00 committed by GitHub
commit 9d60afc440
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/strapi-generate-api/templates/bookshelf/service.template
View File

@ -237,7 +237,7 @@ module.exports = {
qb.limit(_.toNumber(filters.limit));
}
}).fetchAll({
width: populate
withRelated: populate
});
}
};

4
packages/strapi-plugin-settings-manager/admin/src/translations/fr.json
View File

@ -608,14 +608,14 @@
"popUpWarning.databases.delete.message": "Etes-vous sûre de vouloir supprimer cette connexion ?",
"popUpWarning.languages.delete.message": "Etes-vous sûre de vouloir supprimer ce language ?",
"popUpWarning.title": "Merci de confirmer",
"request.error.config": "Le fichier de configuration n'éxiste pas.",
"request.error.config": "Le fichier de configuration n'existe pas.",
"request.error.database.exist": "Cette connexion est déjà utilisée",
"request.error.database.unknow": "Il n'y a pas de connexion de ce genre",
"request.error.environment.required": "L'environnement est obligatoire.",
"request.error.environment.unknow": "L'environnement est inconnu.",
"request.error.languages.exist": "Ce langage existe déjà.",
"request.error.languages.incorrect": "Ce langage est incorrecte.",
"request.error.languages.unknow": "Ce langage n'éxiste pas.",
"request.error.languages.unknow": "Ce langage n'existe pas.",
"request.error.type.boolean": "Un boolean est demandé.",
"request.error.type.number": "Un nombre est demandé.",
"request.error.type.select": "La valeur doit être dans la liste prédéfini.",

4
packages/strapi-provider-upload-local/lib/index.js
View File

@ -16,7 +16,7 @@ module.exports = {
upload: (file) => {
return new Promise((resolve, reject) => {
// write file in public/assets folder
fs.writeFile(path.join(strapi.config.appPath, 'public', `uploads/${file.hash}${file.ext}`), file.buffer, (err) => {
fs.writeFile(path.join(strapi.config.public.path, `/uploads/${file.hash}${file.ext}`), file.buffer, (err) => {
if (err) {
return reject(err);
}
@ -29,7 +29,7 @@ module.exports = {
},
delete: (file) => {
return new Promise((resolve, reject) => {
const filePath = path.join(strapi.config.appPath, 'public', `uploads/${file.hash}${file.ext}`);
const filePath = path.join(strapi.config.public.path, `/uploads/${file.hash}${file.ext}`);
if (!fs.existsSync(filePath)) {
return resolve('File doesn\'t exist');