From e7a3608d6f7ddc961505486489356abb414e90c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nedim=20Kurbegovi=C4=87?= Date: Sat, 25 Apr 2020 16:09:52 +0200 Subject: [PATCH 1/4] bs.js This is a translation locale file for Bosnian language with ISO 639-1 code: BS This pull request closes #2735 --- src/i18n/locale/bs.js | 198 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 198 insertions(+) create mode 100644 src/i18n/locale/bs.js diff --git a/src/i18n/locale/bs.js b/src/i18n/locale/bs.js new file mode 100644 index 000000000..b705a6ca4 --- /dev/null +++ b/src/i18n/locale/bs.js @@ -0,0 +1,198 @@ +const traitInputAttr = { placeholder: 'Ovdje ide tekst' }; + +export default { + assetManager: { + addButton: 'Dodaj sliku', + inputPlh: 'http://putanja/url/do/slike.jpg', + modalTitle: 'Odaberi sliku', + uploadTitle: 'Ubaci datoteke ovdje ili klikni za 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': 'Category Label', + } + }, + domComponents: { + names: { + '': 'Boks', + wrapper: 'Struktura', + text: 'Tekst', + comment: 'Komentar', + image: 'Slika', + video: 'Video', + label: 'Oznaka', + link: 'Link', + map: 'Mapa', + tfoot: 'Podnožje tabele', + tbody: 'Struktura tabele', + thead: 'Zaglavlje tabele', + table: 'Tabela', + row: 'Red tabele', + cell: 'Ćelija tabele' + } + }, + deviceManager: { + device: 'Uređaj', + devices: { + desktop: 'Računar', + tablet: 'Tablet', + mobileLandscape: 'Mobitel vodoravno', + mobilePortrait: 'Mobitel uspravno' + } + }, + panels: { + buttons: { + titles: { + preview: 'Pregled', + fullscreen: 'Čitav ekran', + 'sw-visibility': 'Vidi komponente', + 'export-template': 'Vidi kod', + 'open-sm': 'Otvori postavke izgleda', + 'open-tm': 'Postavke', + 'open-layers': 'Otvori postavke slojeva', + 'open-blocks': 'Otvori blokove' + } + } + }, + selectorManager: { + label: 'Klase', + selected: 'Odabrano', + emptyState: '- Stanje -', + states: { + hover: 'Miš preko', + active: 'Kliknuto', + 'nth-of-type(2n)': 'Parno/Neparno' + } + }, + styleManager: { + empty: 'Odaberi element prije korištenja Postavki Izgleda', + layer: 'Sloj', + fileButton: 'Slike', + sectors: { + general: 'Općenito', + layout: 'Raspored', + typography: 'Izgled teksta', + decorations: 'Dekoracije', + extra: 'Dodatno', + flex: 'Flex', + dimension: 'Dimenzije' + }, + // The core library generates the name by their `property` name + properties: { + float: 'Plutanje', + display: 'Prikaz', + position: 'Pozicija', + top: 'Vrh', + right: 'Desno', + left: 'Lijevo', + bottom: 'Dno', + width: 'Širina', + height: 'Visina', + 'max-width': 'Maksimalna širina', + 'max-height': 'Maksimalna visina', + margin: 'Margina', + 'margin-top': 'Margina od vrha', + 'margin-right': 'Margina od desno', + 'margin-left': 'Margina od lijevo', + 'margin-bottom': 'Margina od dna', + padding: 'Unutrašnji razmak', + 'padding-top': 'Unutrašnji razmak od vrha', + 'padding-left': 'Unutrašnji razmak od lijevo', + 'padding-right': 'Unutrašnji razmak od desno', + 'padding-bottom': 'Unutrašnji razmak od dna', + 'font-family': 'Font', + 'font-size': 'Veličina fonta', + 'font-weight': 'Debljina fonta', + 'letter-spacing': 'Razmak između slova', + color: 'Boja', + 'line-height': 'Visina lnije', + 'text-align': 'Ravnanje teksta', + 'text-shadow': 'Sjena teksta', + 'text-shadow-h': 'Sjena teksta: horizontalno', + 'text-shadow-v': 'Sjena teksta: vertikalno', + 'text-shadow-blur': 'Sjena teksta: zamagljenost', + 'text-shadow-color': 'Sjena teksta: boja', + 'border-top-left': 'Granica gore lijevo', + 'border-top-right': 'Granica gore desno', + 'border-bottom-left': 'Granica dole lijevo', + 'border-bottom-right': 'Granica dole desno', + 'border-radius-top-left': 'Zaobljenost granice gore lijevo', + 'border-radius-top-right': 'Zaobljenost granice gore desno', + 'border-radius-bottom-left': 'Zaobljenost granice dole lijevo', + 'border-radius-bottom-right': 'Zaobljenost granice dole desno', + 'border-radius': 'Zaobljenost granice', + border: 'Granica', + 'border-width': 'Debljina granice', + 'border-style': 'Izgled granice', + 'border-color': 'Boja granice', + 'box-shadow': 'Sjena', + 'box-shadow-h': 'Sjena: horizontalno', + 'box-shadow-v': 'Sjena: vertikalno', + 'box-shadow-blur': 'Sjena: zamagljenost', + 'box-shadow-spread': "Sjena: širenje", + 'box-shadow-color': "Sjena: boja", + 'box-shadow-type': "Sjena: tip", + background: 'Pozadina', + 'background-image': 'Pozadinska slika', + 'background-repeat': 'Ponavljanje pozadine', + 'background-position': 'Pozicija pozadine', + 'background-attachment': 'Vezanost pozadine', + 'background-size': 'Veličina pozadine', + 'background-color': 'Boja pozadine', + transition: 'Tranzicija', + 'transition-property': 'Tip tranzicije', + 'transition-duration': 'Trajanje tranzicije', + 'transition-timing-function': 'Vremenska funkcija tranzicije', + perspective: 'Perspektiva', + transform: 'Transformacija', + 'transform-rotate-x': 'Transformacija: Rotacija x', + 'transform-rotate-y': 'Transformacija: Rotacija y', + 'transform-rotate-z': 'Transformacija: Rotacija z', + 'transform-scale-x': 'Transformacija: Skala x', + 'transform-scale-y': 'Transformacija: Skala y', + 'transform-scale-z': 'Transformacija: Skala z', + 'flex-direction': 'Smjer Flex-a', + 'flex-wrap': 'Flex wrap', + 'justify-content': 'Rasporedi sadržaj', + 'align-items': 'Poravnaj stavke', + 'align-content': 'Poravnaj sadržaj', + order: 'Red', + 'flex-basis': 'Flex Basis', + 'flex-grow': 'Flex Rast', + 'flex-shrink': 'Flex Smanjenje', + 'align-self': 'Poravnaj sebe' + } + }, + traitManager: { + empty: 'Odaberi element prije korištenja Postavki Osobina', + label: 'Postavke komponente', + traits: { + // The core library generates the name by their `name` property + labels: { + // id: 'Id', + // alt: 'Opis', + // title: 'Naslov', + // href: 'Link', + }, + // In a simple trait, like text input, these are used on input attributes + attributes: { + id: traitInputAttr, + alt: traitInputAttr, + title: traitInputAttr, + href: { placeholder: 'npr. https://google.com' } + }, + // In a trait like select, these are used to translate option names + options: { + target: { + false: 'Ovaj prozor', + _blank: 'Novi prozor' + } + } + } + } +}; From 3cba682ebad118d2eb3457a2a1eed8665abf95c8 Mon Sep 17 00:00:00 2001 From: Hugues BUREAU Date: Thu, 30 Apr 2020 12:31:19 +0200 Subject: [PATCH 2/4] fix: sass error when using main.scss in project ``` SassError: Can't find stylesheet to import. > @import "node_modules/spectrum-colorpicker/spectrum"; ``` --- src/styles/scss/main.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/styles/scss/main.scss b/src/styles/scss/main.scss index fbeaf08af..21fc3beb3 100644 --- a/src/styles/scss/main.scss +++ b/src/styles/scss/main.scss @@ -1,7 +1,7 @@ /* stylelint-disable */ -@import "node_modules/spectrum-colorpicker/spectrum"; -@import "node_modules/codemirror/lib/codemirror"; -@import "node_modules/codemirror/theme/hopscotch"; +@import "~spectrum-colorpicker/spectrum"; +@import "~codemirror/lib/codemirror"; +@import "~codemirror/theme/hopscotch"; @import "gjs_variables.scss"; From 1582740c61c36aa9031d6712fa8c8df845bb51f9 Mon Sep 17 00:00:00 2001 From: Matthew Day Date: Thu, 7 May 2020 11:25:15 -0500 Subject: [PATCH 3/4] Checking for inputs on the main document as well as the frame. Fix for #2422 --- src/canvas/index.js | 6 +++++- src/canvas/view/CanvasView.js | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/canvas/index.js b/src/canvas/index.js index dddc77bcb..383eb3329 100644 --- a/src/canvas/index.js +++ b/src/canvas/index.js @@ -552,8 +552,12 @@ export default () => { */ isInputFocused() { const doc = this.getDocument(); + const frame = this.getFrameEl(); const toIgnore = ['body', ...this.getConfig().notTextable]; - const focused = doc && doc.activeElement; + const docActive = frame && document.activeElement === frame; + const focused = docActive + ? doc && doc.activeElement + : document.activeElement; return focused && !toIgnore.some(item => focused.matches(item)); }, diff --git a/src/canvas/view/CanvasView.js b/src/canvas/view/CanvasView.js index cb7d8a1c0..e9a6c7d05 100644 --- a/src/canvas/view/CanvasView.js +++ b/src/canvas/view/CanvasView.js @@ -92,7 +92,11 @@ export default Backbone.View.extend({ const { em } = this; const key = getKeyChar(ev); - if (key === ' ' && em.getZoomDecimal() !== 1) { + if ( + key === ' ' && + em.getZoomDecimal() !== 1 && + !em.get('Canvas').isInputFocused() + ) { this.preventDefault(ev); em.get('Editor').runCommand('core:canvas-move'); } From 621cb46f3c494775c0019b2c77c36242c23f8406 Mon Sep 17 00:00:00 2001 From: Thibaut Date: Fri, 15 May 2020 15:08:10 +0200 Subject: [PATCH 4/4] fix: Edit padding/margin keys to be more detailed --- src/i18n/locale/fr.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/i18n/locale/fr.js b/src/i18n/locale/fr.js index 1154104ee..258b162d9 100644 --- a/src/i18n/locale/fr.js +++ b/src/i18n/locale/fr.js @@ -94,16 +94,16 @@ export default { height: 'Hauteur', 'max-width': 'Largeur max.', 'max-height': 'Hauteur max.', - margin: 'Marge', - 'margin-top': 'Marge supérieure', - 'margin-right': 'Marge droite', - 'margin-left': 'Marge gauche', - 'margin-bottom': 'Marge inférieure', - padding: 'Padding', - 'padding-top': 'Padding supérieur', - 'padding-left': 'Padding gauche', - 'padding-right': 'Padding droite', - 'padding-bottom': 'Padding inférieur', + margin: 'Marge externe', + 'margin-top': 'Marge externe supérieure', + 'margin-right': 'Marge externe droite', + 'margin-left': 'Marge externe gauche', + 'margin-bottom': 'Marge externe inférieure', + padding: 'Marge interne', + 'padding-top': 'Marge interne supérieure', + 'padding-left': 'Marge interne gauche', + 'padding-right': 'Marge interne droite', + 'padding-bottom': 'Marge interne inférieure', 'font-family': 'Police de caractères', 'font-size': 'Taille de police', 'font-weight': 'Épaisseur de police',