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

Merge branch 'master' into features/i18n

Browse Source
This commit is contained in:
Alexandre Bodin 2021-04-20 19:26:22 +02:00
commit 08526388ae
13 changed files with 51 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/strapi-admin/admin/src/translations/en.json
View File

@ -329,7 +329,7 @@
"components.OverlayBlocker.description": "You're using a feature that needs the server to restart. Please wait until the server is up.",
"components.OverlayBlocker.description.serverError": "The server should have restarted, please check your logs in the terminal.",
"components.OverlayBlocker.title": "Waiting for restart...",
"components.OverlayBlocker.title.serverError": "The restart takes longer than expected",
"components.OverlayBlocker.title.serverError": "The restart is taking longer than expected",
"components.PageFooter.select": "entries per page",
"components.ProductionBlocker.description": "For safety purposes we have to disable this plugin in other environments.",
"components.ProductionBlocker.header": "This plugin is only available in development.",

2
packages/strapi-admin/admin/src/translations/es.json
View File

@ -64,7 +64,7 @@
"Roles.ListPage.notification.delete-all-not-allowed": "Algunos roles no se pudieron eliminar porque están asociados a usuarios",
"Roles.ListPage.notification.delete-not-allowed": "No se puede eliminar un rol si está asociado a usuarios",
"Roles.RoleRow.user-count.plural": "{number} usuarios",
"Roles.RoleRow.user-count.singular": "{número} usuario",
"Roles.RoleRow.user-count.singular": "{number} usuario",
"Roles.components.List.empty.withSearch": "No hay rol correspondiente a la búsqueda ({search})...",
"Settings.PageTitle": "Configuración - {name}",
"Settings.error": "Error",

43
packages/strapi-admin/admin/src/translations/he.json
View File

@ -5,6 +5,9 @@
"Auth.form.button.forgot-password": "שלח דוא\"ל",
"Auth.form.button.go-home": "חזרה ",
"Auth.form.button.login": "התחבר",
"Auth.form.button.login.strapi": "התחבר באמצעות סטראפי",
"Auth.form.button.login.providers.see-more": "המשך קריאה",
"Auth.form.button.login.providers.error": "אנחנו לא יכולים לחבר אותך באמצעות הספק שנבחר.",
"Auth.form.button.register": "בוא נתחיל",
"Auth.form.button.reset-password": "שינוי סיסמה",
"Auth.form.confirmPassword.label": "אישור סיסמה",
@ -56,6 +59,7 @@
"HomePage.welcome.congrats.content.bold": "מומלץ ליצור את סוג האוסף הראשון.",
"Media Library": "ספריית המדיה",
"New entry": "רשומה חדשה",
"or": "או",
"Password": "סיסמה",
"Provider": "ספק",
"ResetPasswordToken": "אפס אסימון סיסמה",
@ -66,11 +70,19 @@
"Roles.RoleRow.user-count.plural": "{number} משתמשים",
"Roles.RoleRow.user-count.singular": "משתמש {number}",
"Roles.components.List.empty.withSearch": "אין תפקיד שמתאים לחיפוש ({search}) ...",
"Settings.application.title": "אפליקציה",
"Settings.application.description": "צפה בפרטי הפרויקטים שלך",
"Settings.application.link-pricing": "צפה בכל המחירים",
"Settings.application.link-upgrade": "שדרג את הפרויקט שלך",
"Settings.application.strapi-version": "גרסת סטראפי",
"Settings.application.node-version": "גרסת NODE",
"Settings.application.edition-title": "חבילה נוכחית",
"Settings.PageTitle": "הגדרות - {name}",
"Settings.error": "שגיאה",
"Settings.global": "הגדרות גלובליות",
"Settings.permissions": "לוח בקרה",
"Settings.permissions.category": "הגדרות הרשאות עבור {category}",
"Settings.permissions.category": "הגדרת הרשאות עבור {category}",
"Settings.permissions.category.plugins": "הגדרת הרשאות עבור התוסף {category}",
"Settings.permissions.conditions.anytime": "בכל עת",
"Settings.permissions.conditions.apply": "החל",
"Settings.permissions.conditions.can": "יכול",
@ -88,6 +100,8 @@
"Settings.permissions.users.form.email": "דוא\"ל",
"Settings.permissions.users.form.firstname": "שם פרטי",
"Settings.permissions.users.form.lastname": "שם משפחה",
"Settings.permissions.users.form.sso": "התחבר באמצעות SSO",
"Settings.permissions.users.form.sso.description": "כשמאופשר (ON), משתמשים יוכלו להתחבר באמצעות SSO",
"Settings.permissions.users.listview.header.description.plural": "נמצאו {number} משתמשים",
"Settings.permissions.users.listview.header.description.singular": "נמצא משתמש {number}",
"Settings.permissions.users.listview.header.title": "משתמשים",
@ -103,6 +117,7 @@
"Settings.roles.form.permissions.attributesPermissions": "הרשאות שדות",
"Settings.roles.form.permissions.create": "יצירה",
"Settings.roles.form.permissions.delete": "מחיקה",
"Settings.roles.form.permissions.publish": "פרסום",
"Settings.roles.form.permissions.read": "קריאה",
"Settings.roles.form.permissions.update": "עדכון",
"Settings.roles.form.title": "פרטים",
@ -112,17 +127,25 @@
"Settings.roles.list.title.singular": "תפקיד {number}",
"Settings.roles.title": "תפקידים",
"Settings.roles.title.singular": "תפקיד",
"Settings.sso.title": "Single Sign-On",
"Settings.sso.description": "הגדרת הרשאות עבור הפיצ'ר Single Sign-On.",
"Settings.sso.form.registration.label": "הרשמה אוטומטית",
"Settings.sso.form.registration.description": "צור חשבון משתמש בעת התחברות עם SSO במידה ולא קיים חשבון זהה",
"Settings.sso.form.defaultRole.label": "הרשאה דיפולטית",
"Settings.sso.form.defaultRole.description": "אפשרות זו תעניק הרשאה דיפולטית למשתמש שהתחבר בפעם הראשונה",
"Settings.sso.form.defaultRole.description-not-allowed": "נדרשות הרשאות כדי לצפות בהרשאות מנהל",
"Settings.webhooks.create": "צור webhook",
"Settings.webhooks.create.header": "יצירת כותרת חדשה",
"Settings.webhooks.created": "נוצר Webhook",
"Settings.webhooks.disabled": "מכובה",
"Settings.webhooks.enabled": "מופעל",
"Settings.webhooks.event.publish-tooltip": "מופע זה קיים רק לתוכן לו מופעל מנגנון הטיוטה/פורסם",
"Settings.webhooks.events.create": "יצירה",
"Settings.webhooks.events.edit": "עריכה",
"Settings.webhooks.events.update": "עדכון",
"Settings.webhooks.form.events": "ארועים",
"Settings.webhooks.form.headers": "כותרות",
"Settings.webhooks.form.name": "שם",
"Settings.webhooks.form.url": "Url",
"Settings.webhooks.form.url": "קישור",
"Settings.webhooks.key": "מפתח",
"Settings.webhooks.list.button.add": "הוספת webhook חדש",
"Settings.webhooks.list.description": "קבל הודעות על שינויים ב-POST.",
@ -168,7 +191,7 @@
"app.components.HomePage.welcomeBlock.content.issues": "בעיות.",
"app.components.HomePage.welcomeBlock.content.raise": " או אעלה ",
"app.components.ImgPreview.hint": "גרור ושחרר את הקובץ לאזור זה או {browse} קובץ להעלאה",
"app.components.ImgPreview.hint.browse": "browse",
"app.components.ImgPreview.hint.browse": "בחירת קובץ",
"app.components.InputFile.newFile": "הוסף קובץ חדש",
"app.components.InputFileDetails.open": "פתח בכרטיסייה חדשה",
"app.components.InputFileDetails.originalName": "שם מקורי:",
@ -219,8 +242,11 @@
"app.components.UpgradePlanModal.text-power": "פתח את מלוא הכוח",
"app.components.UpgradePlanModal.text-strapi": "של סטראפי על ידי שדרוג התוכנית ל",
"app.components.Users.MagicLink.connect": "שלח קישור זה למשתמש כדי שיוכל להתחבר.",
"app.components.Users.MagicLink.connect.sso": "שלח את הקישור הזה למשתמש, ההתחברות הראשונה יכולה להתבצע באמצעות ספק SSO",
"app.components.Users.ModalCreateBody.block-title.details": "פרטים",
"app.components.Users.ModalCreateBody.block-title.roles": "תפקידי משתמש",
"app.components.Users.ModalCreateBody.block-title.roles.description": "לחשבון שלך יכולה להיות הרשאה אחת או יותר",
"app.components.Users.ModalCreateBody.block-title.login": "הגדרות התחברות",
"app.components.Users.SortPicker.button-label": "מיין לפי",
"app.components.Users.SortPicker.sortby.email_asc": "דוא\"ל (א עד ת)",
"app.components.Users.SortPicker.sortby.email_desc": "דוא\"ל (ת עד א)",
@ -242,7 +268,7 @@
"app.containers.Users.EditPage.form.active.label": "פעיל",
"app.containers.Users.EditPage.header.label": "עריכת {name}",
"app.containers.Users.EditPage.header.label-loading": "עריכת משתמש",
"app.containers.Users.EditPage.roles-bloc-title": "Attributed roles",
"app.containers.Users.EditPage.roles-bloc-title": "הרשאות ייחוס",
"app.containers.Users.ModalForm.footer.button-success": "צור משתמש",
"app.links.configure-view": "הגדר תצוגה",
"app.static.links.cheatsheet": "שליף",
@ -250,9 +276,12 @@
"app.utils.add-filter": "הוסף פילטר",
"app.utils.defaultMessage": " ",
"app.utils.delete": "מחק",
"app.utils.errors.file-too-big.message": "הקובץ גדול מידי",
"app.utils.filters": "פילטר",
"app.utils.placeholder.defaultMessage": " ",
"app.utils.publish": "פרסום",
"app.utils.select-all": "בחר הכל",
"app.utils.unpublish": "ביטול פרסום",
"component.Input.error.validation.integer": "הערך חייב להיות מספר שלם",
"components.AutoReloadBlocker.description": "הפעל את סטראפי באמצעות אחת מהפקודות הבאות:",
"components.AutoReloadBlocker.header": "יש צורך בתכונת טעינה מחדש עבור תוסף זה.",
@ -289,6 +318,7 @@
"components.Input.error.validation.unique": "כבר נעשה שימוש בערך זה.",
"components.InputSelect.option.placeholder": "בחר כאן",
"components.ListRow.empty": "אין נתונים להצגה.",
"components.NotAllowedInput.text": "אין לך הרשאות לצפייה בשדה זה",
"components.OverlayBlocker.description": "אתה משתמש בתכונה שדורשת להפעיל מחדש את השרת. אנא המתן עד שהשרת יהיה למעלה.",
"components.OverlayBlocker.description.serverError": "השרת צריך היה להתחיל מחדש, אנא בדוק את יומני המסוף.",
"components.OverlayBlocker.title": "ממתין להפעלה מחדש ...",
@ -325,7 +355,10 @@
"notification.form.error.fields": "הטופס מכיל מספר שגיאות",
"notification.form.success.fields": "שינויים נשמרו",
"notification.link-copied": "הקישור הועתק ללוח",
"notification.permission.not-allowed-read": "You are not allowed to see this document",
"notification.success.delete": "הפריט נמחק",
"notification.success.saved": "נשמר",
"notification.version.update.message": "גרסה חדשה של סטראפי זמינה!",
"notification.version.update.link": "המשך קריאה",
"request.error.model.unknown": "המודל הזה לא קיים"
}

33
packages/strapi-database/index.d.ts vendored
View File

@ -1,33 +0,0 @@
export function createDatabaseManager(strapi: any): Promise<DatabaseManager>;
interface ConnectionInfo {
name: string;
}
export class DatabaseManager {
connections: Array<ConnectionInfo>;
initialize(): Promise<DatabaseManager>;
query(model: string, plugin: string): Repository;
getModel(model: string, plugin: string): Model;
getModelByAssoc(assoc: object): Model;
}
class Model {}
export class Repository {
model: Model;
find(params: object): Promise<Array<ModelValue>>;
findOne(params: object): Promise<ModelValue>;
create(input: object): Promise<ModelValue>;
update(params: object, input: object): Promise<ModelValue>;
delete(params: object): Promise<ModelValue | Array<ModelValue>>;
count(params: object): Promise<number>;
search(params: object): Promise<Array<ModelValue>>;
countSearch(params: object): Promise<number>;
}
interface ModelValue {
id: string | number;
[propName: string]: any;
}

2
packages/strapi-helper-plugin/lib/src/testUtils/commonTrads.json
View File

@ -122,7 +122,7 @@
"components.OverlayBlocker.description": "You're using a feature that needs the server to restart. Please wait until the server is up.",
"components.OverlayBlocker.description.serverError": "The server should have restarted, please check your logs in the terminal.",
"components.OverlayBlocker.title": "Waiting for restart...",
"components.OverlayBlocker.title.serverError": "The restart takes longer than expected",
"components.OverlayBlocker.title.serverError": "The restart is taking longer than expected",
"components.PageFooter.select": "entries per page",
"components.ProductionBlocker.description": "For safety purposes we have to disable this plugin in other environments.",
"components.ProductionBlocker.header": "This plugin is only available in development.",

1
packages/strapi-plugin-content-type-builder/services/schema-builder/content-type-builder.js
View File

@ -226,6 +226,7 @@ const generateRelation = ({ key, attribute, plugin, modelName, targetAttribute =
plugin,
columnName: attribute.targetColumnName || undefined,
autoPopulate: targetAttribute.autoPopulate,
private: targetAttribute.private || undefined,
};
switch (attribute.nature) {

3
packages/strapi-plugin-email/README.md
View File

@ -1 +1,2 @@
# Strapi plugin
# Strapi plugin
> :warning: The Shipper Email may also need to be changed in the `Email Templates` tab on the admin panel for emails to send properly

1
packages/strapi-provider-email-amazon-ses/README.md
View File

@ -34,6 +34,7 @@ npm install strapi-provider-email-amazon-ses --save
| settings.defaultFrom | string | Default sender mail address | no | undefined |
| settings.defaultReplyTo | string \| array<string> | Default address or addresses the receiver is asked to reply to | no | undefined |
> :warning: The Shipper Email (or defaultfrom) may also need to be changed in the `Email Templates` tab on the admin panel for emails to send properly
### Example
**Path -** `config/plugins.js`

3
packages/strapi-provider-email-mailgun/README.md
View File

@ -34,6 +34,7 @@ npm install strapi-provider-email-mailgun --save
| settings.defaultFrom | string | Default sender mail address | no | undefined |
| settings.defaultReplyTo | string \| array<string> | Default address or addresses the receiver is asked to reply to | no | undefined |
> :warning: The Shipper Email (or defaultfrom) may also need to be changed in the `Email Templates` tab on the admin panel for emails to send properly
### Example
**Path -** `config/plugins.js`
@ -46,7 +47,7 @@ module.exports = ({ env }) => ({
providerOptions: {
apiKey: env('MAILGUN_API_KEY'),
domain: env('MAILGUN_DOMAIN'), //Required if you have an account with multiple domains
host: env('MAILGUN_HOST', 'api.us.mailgun.net'), //Optional. If domain region is Europe use 'api.eu.mailgun.net'
host: env('MAILGUN_HOST', 'api.mailgun.net'), //Optional. If domain region is Europe use 'api.eu.mailgun.net'
},
settings: {
defaultFrom: 'myemail@protonmail.com',

1
packages/strapi-provider-email-nodemailer/README.md
View File

@ -105,6 +105,7 @@ module.exports = ({ env }) => ({
```
## Usage
> :warning: The Shipper Email (or defaultfrom) may also need to be changed in the `Email Templates` tab on the admin panel for emails to send properly
To send an email from anywhere inside Strapi:

1
packages/strapi-provider-email-sendgrid/README.md
View File

@ -35,6 +35,7 @@ npm install strapi-provider-email-sendgrid --save
| settings.defaultFrom | string | Default sender mail address | no | undefined |
| settings.defaultReplyTo | string \| array<string> | Default address or addresses the receiver is asked to reply to | no | undefined |
> :warning: The Shipper Email (or defaultfrom) may also need to be changed in the `Email Templates` tab on the admin panel for emails to send properly
### Example
**Path -** `config/plugins.js`

1
packages/strapi-provider-email-sendmail/README.md
View File

@ -34,6 +34,7 @@ npm install strapi-provider-email-sendmail --save
| settings.defaultFrom | string | Default sender mail address | no | undefined |
| settings.defaultReplyTo | string \| array<string> | Default address or addresses the receiver is asked to reply to | no | undefined |
> :warning: The Shipper Email (or defaultfrom) may also need to be changed in the `Email Templates` tab on the admin panel for emails to send properly
### Example
**Path -** `config/plugins.js`

2
test/config/front/testUtils/commonTrads.json
View File

@ -122,7 +122,7 @@
"components.OverlayBlocker.description": "You're using a feature that needs the server to restart. Please wait until the server is up.",
"components.OverlayBlocker.description.serverError": "The server should have restarted, please check your logs in the terminal.",
"components.OverlayBlocker.title": "Waiting for restart...",
"components.OverlayBlocker.title.serverError": "The restart takes longer than expected",
"components.OverlayBlocker.title.serverError": "The restart is taking longer than expected",
"components.PageFooter.select": "entries per page",
"components.ProductionBlocker.description": "For safety purposes we have to disable this plugin in other environments.",
"components.ProductionBlocker.header": "This plugin is only available in development.",