From 90aa75753f2eb242a08bc59f2f2ff40416b95b80 Mon Sep 17 00:00:00 2001 From: Yevhen Uzhva Date: Mon, 9 Mar 2020 11:29:00 +0200 Subject: [PATCH 1/4] fix: replace static bg colors with scss var --- src/styles/scss/_gjs_inputs.scss | 2 +- src/styles/scss/_gjs_style_manager.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/styles/scss/_gjs_inputs.scss b/src/styles/scss/_gjs_inputs.scss index 84e20c2f2..d295c50f4 100644 --- a/src/styles/scss/_gjs_inputs.scss +++ b/src/styles/scss/_gjs_inputs.scss @@ -91,7 +91,7 @@ } .#{$app-prefix}field { - background-color: rgba(0, 0, 0, 0.2); + background-color: $mainDkColor; border: none; box-shadow: none; border-radius: 2px; diff --git a/src/styles/scss/_gjs_style_manager.scss b/src/styles/scss/_gjs_style_manager.scss index 3b9ae7fd9..6f33d1a35 100644 --- a/src/styles/scss/_gjs_style_manager.scss +++ b/src/styles/scss/_gjs_style_manager.scss @@ -181,7 +181,7 @@ } &.#{$sm-prefix}composite { - background-color: rgba(0, 0, 0, 0.1); + background-color: $mainDklColor; border: 1px solid rgba(0, 0, 0, 0.25); } From 1cb5992149761001099144fed483a3a8773c73d8 Mon Sep 17 00:00:00 2001 From: Joris Ros Date: Thu, 12 Mar 2020 17:33:54 +0100 Subject: [PATCH 2/4] Add the translations for dutch language --- src/i18n/locale/nl | 198 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 198 insertions(+) create mode 100644 src/i18n/locale/nl diff --git a/src/i18n/locale/nl b/src/i18n/locale/nl new file mode 100644 index 000000000..f97d7a996 --- /dev/null +++ b/src/i18n/locale/nl @@ -0,0 +1,198 @@ +const traitInputAttr = { placeholder: 'bijv. Tekst hier' }; + +export default { + assetManager: { + addButton: 'Afbeelding toevoegen', + inputPlh: 'http://path/to/the/image.jpg', + modalTitle: 'Selecteer afbeelding', + uploadTitle: 'Drop files here or click to upload' + }, + // Here just as a reference, GrapesJS core doesn't contain any block, + // so this should be omitted from other local files + blockManager: { + labels: { + // 'block-id': 'Block Label', + }, + categories: { + // 'category-id': 'Categorie Label', + } + }, + domComponents: { + names: { + '': 'Box', + wrapper: 'Body', + text: 'Tekst', + comment: 'Commentaar', + image: 'Afbeelding', + video: 'Video', + label: 'Label', + link: 'Link', + map: 'Kaart', + tfoot: 'Tabel foot', + tbody: 'Tabel body', + thead: 'Tabel head', + table: 'Tabel', + row: 'Tabel rij', + cell: 'Tabel cel' + } + }, + deviceManager: { + device: 'Apparaat', + devices: { + desktop: 'Desktop', + tablet: 'Tablet', + mobileLandscape: 'Mobile Landscape', + mobilePortrait: 'Mobile Portrait' + } + }, + panels: { + buttons: { + titles: { + preview: 'Voorbeeld', + fullscreen: 'Volledig scherm', + 'sw-visibility': 'Bekijk componenten', + 'export-template': 'Bekijk code', + 'open-sm': 'Open Stijl Manager', + 'open-tm': 'Instellingen', + 'open-layers': 'Open Laag Manager', + 'open-blocks': 'Open Blocks' + } + } + }, + selectorManager: { + label: 'Classes', + selected: 'Selecteer', + emptyState: '- Status -', + states: { + hover: 'Zweven', + active: 'Klik', + 'nth-of-type(2n)': 'Even/oneven' + } + }, + styleManager: { + empty: 'Selecteer een element voordat je Stijl Manager kan gebruiken.', + layer: 'Laag', + fileButton: 'Afbeeldingen', + sectors: { + general: 'Algemeen', + layout: 'Indeling', + typography: 'Typografie', + decorations: 'Decoraties', + extra: 'Extra', + flex: 'Flex', + dimension: 'Afmetingen' + }, + // The core library generates the name by their `property` name + properties: { + float: 'Uitlijning', + display: 'Weergave', + position: 'Positie', + top: 'Boven', + right: 'Rechts', + left: 'Links', + bottom: 'Onder', + width: 'Breedte', + height: 'Hoogte', + 'max-width': 'Breedte max.', + 'max-height': 'Hoogte max.', + margin: 'Buiten afstand', + 'margin-top': 'Buiten afstand boven', + 'margin-right': 'Buiten afstand rechts', + 'margin-left': 'Buiten afstand links', + 'margin-bottom': 'Buiten afstand onder', + padding: 'Binnen afstand', + 'padding-top': 'Binnen afstand boven', + 'padding-left': 'Binnen afstand links', + 'padding-right': 'Binnen afstand rechts', + 'padding-bottom': 'Binnen afstand onder', + 'font-family': 'Lettertype', + 'font-size': 'Lettergrootte', + 'font-weight': 'Letter dikte', + 'letter-spacing': 'Letter afstand', + color: 'Kleur', + 'line-height': 'Regelafstand', + 'text-align': 'Tekst richting', + 'text-shadow': 'Tekst schaduw', + 'text-shadow-h': 'Tekst schaduw: horizontaal', + 'text-shadow-v': 'Tekst schaduw: verticaal', + 'text-shadow-blur': 'Tekst schaduw: vervagen', + 'text-shadow-color': 'Tekst schaduw: kleur', + 'border-top-left': 'Rand boven links', + 'border-top-right': 'Rand boven rechts', + 'border-bottom-left': 'Rand onder links', + 'border-bottom-right': 'Rand onder rechts', + 'border-radius-top-left': 'Rand straal boven links', + 'border-radius-top-right': 'Rand straal boven rechts', + 'border-radius-bottom-left': 'Rand straal onder links', + 'border-radius-bottom-right': 'Rand straal onder rechts', + 'border-radius': 'Rand straal', + border: 'Rand', + 'border-width': 'Rand breedte', + 'border-style': 'Rand stijl', + 'border-color': 'Rand kleur', + 'box-shadow': 'Box schaduw', + 'box-shadow-h': 'Box schaduw: Horizontaal', + 'box-shadow-v': 'Box schaduw: Verticaal', + 'box-shadow-blur': 'Box schaduw: Vervagen', + 'box-shadow-spread': "Box schaduw: Verspreiding", + 'box-shadow-color': "Box schaduw: Kleur", + 'box-shadow-type': "Box schaduw: Type", + background: 'Achtergrond', + 'background-image': 'Achtergrond afbeelding', + 'background-repeat': 'Achtergrond herhalen', + 'background-position': 'Achtergrond positie', + 'background-attachment': 'Achtergrond bijlage', + 'background-size': 'Achtergrond grootte', + 'background-color': 'Achtergrond kleur', + transition: 'Overgang', + 'transition-property': 'Overgang: Type', + 'transition-duration': 'Overgang: Duur', + 'transition-timing-function': 'Overgang: Timing', + perspective: 'Perspectief', + transform: 'Transformatie', + 'transform-rotate-x': 'Transformatie: Rotatie x', + 'transform-rotate-y': 'Transformatie: Rotatie y', + 'transform-rotate-z': 'Transformatie: Rotatie z', + 'transform-scale-x': 'Transformatie: Schalen x', + 'transform-scale-y': 'Transformatie: Schalen y', + 'transform-scale-z': 'Transformatie: Schalen z', + 'flex-direction': 'Uitlijning Flex', + 'flex-wrap': 'Flex wrap', + 'justify-content': 'Uitlijning', + 'align-items': 'Element uitlijning', + 'align-content': 'Content uitlijning', + order: 'Volgorde', + 'flex-basis': 'Flex basis', + 'flex-grow': 'Flex groei', + 'flex-shrink': 'Flex krimp', + 'align-self': 'Lijn jezelf uit' + } + }, + traitManager: { + empty: 'Selecteer een element voordat je Trait Manager kan gebruiken.', + label: 'Component instellingen', + traits: { + // The core library generates the name by their `name` property + labels: { + id: 'ID', + alt: 'Tekst alternatief', + title: 'Titel', + href: 'Link' + }, + // In a simple trait, like text input, these are used on input attributes + attributes: { + id: traitInputAttr, + alt: traitInputAttr, + title: traitInputAttr, + href: { placeholder: 'Bijv. https://google.com' } + }, + // In a trait like select, these are used to translate option names + options: { + target: { + false: 'Dit scherm', + _blank: 'Nieuw scherm' + } + } + } + } +}; From 015ab20f0b47301315c6b39119e9d84ba5f644b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Mar 2020 22:28:49 +0000 Subject: [PATCH 3/4] Bump acorn from 5.7.3 to 5.7.4 Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4. - [Release notes](https://github.com/acornjs/acorn/releases) - [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4) Signed-off-by: dependabot[bot] --- package-lock.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index b35eec78d..7121dece1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4432,9 +4432,9 @@ } }, "acorn": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz", - "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==", + "version": "5.7.4", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz", + "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==", "dev": true }, "acorn-globals": { @@ -4448,9 +4448,9 @@ }, "dependencies": { "acorn": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz", - "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", + "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==", "dev": true } } @@ -9140,9 +9140,9 @@ }, "dependencies": { "acorn": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz", - "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz", + "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==", "dev": true } } @@ -22222,9 +22222,9 @@ }, "dependencies": { "acorn": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz", - "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", + "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==", "dev": true }, "ajv": { From afe843c9002151fb3e9a6d16de0ba1252532901b Mon Sep 17 00:00:00 2001 From: majid hooshiyar <43379900+majidh1@users.noreply.github.com> Date: Sat, 14 Mar 2020 09:54:44 +0330 Subject: [PATCH 4/4] Added Persian language --- src/i18n/locale/fa.js | 116 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 src/i18n/locale/fa.js diff --git a/src/i18n/locale/fa.js b/src/i18n/locale/fa.js new file mode 100644 index 000000000..f74b1e465 --- /dev/null +++ b/src/i18n/locale/fa.js @@ -0,0 +1,116 @@ +const traitInputAttr = { placeholder: 'متن را اینجا وارد کنید' }; + +export default { + assetManager: { + addButton: 'افزودن تصویر', + inputPlh: 'http://path/to/the/image.jpg', + modalTitle: 'انتخاب تصویر', + uploadTitle: 'فایل را انتخاب کنید یا در این مکان رها کنید' + }, + // Here just as a reference, GrapesJS core doesn't contain any block, + // so this should be omitted from other local files + blockManager: { + labels: { + // 'block-id': 'Block Label', + }, + categories: { + // 'category-id': 'Category Label', + } + }, + domComponents: { + names: { + '': 'باکس', + wrapper: 'یدنه', + text: 'متن', + comment: 'اظهار نظر', + image: 'تصویر', + video: 'ویدئو', + label: 'برچسب', + link: 'پیوند', + map: 'نقشه', + tfoot: 'پا جدول', + tbody: 'بدنه جدول', + thead: 'سر جدول', + table: 'جدول', + row: 'ردیف جدول', + cell: 'سلول جدول' + } + }, + deviceManager: { + device: 'دستگاه', + devices: { + desktop: 'دسک تاپ', + tablet: 'تبلت', + mobileLandscape: 'موبایل خوابیده', + mobilePortrait: 'موبایل ایستاده' + } + }, + panels: { + buttons: { + titles: { + preview: 'پیش نمایش', + fullscreen: 'تمام صفحه', + 'sw-visibility': 'مشاهده اجزاء', + 'export-template': 'نمایش کد', + 'open-sm': 'باز کردن مدیریت استایل', + 'open-tm': 'تنظیمات', + 'open-layers': 'باز کردن مدیریت لایه‌ها', + 'open-blocks': 'باز کردن مدیریت بلوک‌ها' + } + } + }, + selectorManager: { + label: 'کلاس‌ها', + selected: 'انتخاب شده', + emptyState: '- حالت -', + states: { + hover: 'هاور', + active: 'کلیک', + 'nth-of-type(2n)': 'زوج/فرد' + } + }, + styleManager: { + empty: 'قبل از استفاده از مدیریت استایل یک عنصر را انتخاب کنید', + layer: 'لایه', + fileButton: 'تصاویر', + sectors: { + general: 'کلی', + layout: 'چیدمان', + typography: 'شیوه نگارش', + decorations: 'تزئینات', + extra: 'اضافی', + flex: 'فلکس', + dimension: 'ابعاد' + }, + // The core library generates the name by their `property` name + properties: { + // float: 'Float', + }, + traitManager: { + empty: 'قبل از استفاده از مدیر ویژگی ، یک عنصر را انتخاب کنید', + label: 'تنظیمات جزء', + traits: { + // The core library generates the name by their `name` property + labels: { + // id: 'Id', + // alt: 'Alt', + // title: 'Title', + // href: 'Href', + }, + // In a simple trait, like text input, these are used on input attributes + attributes: { + id: traitInputAttr, + alt: traitInputAttr, + title: traitInputAttr, + href: { placeholder: 'مثال: https://google.com' } + }, + // In a trait like select, these are used to translate option names + options: { + target: { + false: 'پنجره فعلی', + _blank: 'پنجره جدید' + } + } + } + } + };