yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-27 23:24:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

update branch

Browse Source 
Merge branch 'plugin/settings-manager-dev' of github.com:soupette/strapi into plugin/settings-manager-dev
This commit is contained in:
cyril lopez 2017-07-24 17:30:11 +02:00
commit 58fa8b9573
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,7 @@
"form.i18n.name": "Languages",
"form.i18n.description": "Configure your languages.",
"form.i18n.chose": "Choose your language",
"form.i18n.choose": "Choose your language",
"request.error.type.string": "A text is required.",
"request.error.type.number": "A number is required.",

2
packages/strapi-plugin-setings-manager/admin/src/translations/fr.json
View File

@ -47,7 +47,7 @@
"form.i18n.name": "Langages",
"form.i18n.description": "Modification des langues.",
"form.i18n.chose": "Choisissez votre mangue",
"form.i18n.choose": "Choisissez votre langue",
"request.error.type.string": "Un texte est demandé.",
"request.error.type.number": "Un nombre est demandé.",

4
packages/strapi-plugin-setings-manager/services/SettingsManager.js
View File

@ -243,7 +243,7 @@ module.exports = {
name: '',
items: [
{
name: 'form.i18n.chose',
name: 'form.i18n.choose',
target: 'i18n.i18n.defaultLocale',
type: 'select',
items: strapi.plugins['settings-manager'].services.languages
@ -354,7 +354,7 @@ module.exports = {
const checkValidations = (input, item) => {
_.forEach(item.validations, (value, key) => {
if (key === 'required' && (_.isNull(input) || _.isEmpty(input) || _.isUndefined(input))) errors.push({
if (key === 'required' && (_.isNull(input) || (_.isString(input) && _.isEmpty(input)) || _.isUndefined(input))) errors.push({
target: item.target,
message: 'request.error.validation.required'
});