yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-12 10:48:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into update/plugin-generators

Browse Source
This commit is contained in:
cyril lopez 2019-10-11 13:04:37 +02:00 committed by GitHub
commit 97b4764b16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/strapi-generate-model/templates/bookshelf/model.template
View File

@ -12,7 +12,7 @@ module.exports = {
// After saving a value.
// Fired after an `insert` or `update` query.
// afterSave: async (model, response, options) => {},
// Before fetching all values.
// Fired before a `fetchAll` operation.
// beforeFetchCollection: async (model, columns, options) => {},
@ -20,7 +20,7 @@ module.exports = {
// After fetching all values.
// Fired after a `fetchAll` operation.
// afterFetchCollection: async (model, columns, options) => {},
// Before fetching a value.
// Fired before a `fetch` operation.
// beforeFetch: async (model, columns, options) => {},

2
packages/strapi-plugin-users-permissions/admin/src/translations/de.json
View File

@ -30,7 +30,7 @@
"EditPage.notification.policies.error": "Beim Abruf von policies ist ein Fehler aufgetreten",
"EditPage.notification.role.error": "Beim Abruf der Rolle ist ein Fehler aufgetreten",
"EditPage.submit": "Speichern",
"Email.template.email_confirmation": "Betsätigung der E-Mail Adresse",
"Email.template.email_confirmation": "Bestätigung der E-Mail Adresse",
"Email.template.reset_password": "Passwort zurücksetzen",
"Email.template.success_register": "Anmeldung erfolgreich",
"Email.template.validation_email": "Validierung der E-Mail-Adresse",