From 745bdf902208673d1f5ff18492ac6ed8a8d5b2e0 Mon Sep 17 00:00:00 2001 From: Romain 'Maz' BILLOIR Date: Thu, 16 Jul 2020 10:42:28 +0200 Subject: [PATCH 1/4] Add missing French translations (#5210) --- modules/cms/lang/fr/lang.php | 45 +++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/modules/cms/lang/fr/lang.php b/modules/cms/lang/fr/lang.php index da5cfbabc..c22cf0661 100644 --- a/modules/cms/lang/fr/lang.php +++ b/modules/cms/lang/fr/lang.php @@ -19,10 +19,12 @@ return [ 'online' => 'En ligne', 'maintenance' => 'En cours de maintenance', 'manage_themes' => 'Gestion des thèmes', + 'customize_theme' => 'Personnaliser le thème', ] ], 'theme' => [ 'not_found_name' => 'Le thème ":name" n’a pas été trouvé.', + 'by_author' => 'Par :name', 'active' => [ 'not_set' => 'Aucun thème n’est activé.', 'not_found' => 'Le thème activé est introuvable.', @@ -183,7 +185,15 @@ return [ 'open_searchbox' => 'Ouvrir la boîte de dialogue Rechercher', 'close_searchbox' => 'Fermer la boîte de dialogue Rechercher', 'open_replacebox' => 'Ouvrir la boîte de dialogue Remplacer', - 'close_replacebox' => 'Fermer la boîte de dialogue Remplacer' + 'close_replacebox' => 'Fermer la boîte de dialogue Remplacer', + 'commit' => 'Envoyer', + 'reset' => 'Rétablir', + 'commit_confirm' => 'Êtes-vous sûr de vouloir envoyer vos changements apportés à ce fichier au système de fichier? Cela écrasera le fichier existant sur le système de fichier', + 'reset_confirm' => 'Êtes-vous sûr de vouloir rétablir ce fichier depuis la version présente sur le système de fichier? Cela le remplacera totalement par la version présente sur le système de fichier', + 'committing' => 'Envoi', + 'resetting' => 'Rétablissement', + 'commit_success' => 'Le :type a été envoyé au système de fichier', + 'reset_success' => 'Le :type a été rétabli depuis la verison du système de fichier', ], 'asset' => [ 'menu_label' => 'Assets', @@ -239,7 +249,10 @@ return [ 'invalid_request' => 'Le modèle ne peut être enregistré car les données d’un composant ne sont pas valides.', 'no_records' => 'Aucun composant n’a été trouvé', 'not_found' => 'Le composant ":name" est introuvable.', + 'no_default_partial' => 'Ce composant n’as aucun partiel par défaut', 'method_not_found' => 'Le composant ":name" ne contient pas de méthode ":method".', + 'soft_component' => 'Composant Soft', + 'soft_component_description' => 'Ce composant est manquant mais facultatif.', ], 'template' => [ 'invalid_type' => 'Type de modèle inconnu.', @@ -257,5 +270,35 @@ return [ 'manage_layouts' => 'Créer, modifier et supprimer des maquettes du CMS', 'manage_partials' => 'Créer, modifier et supprimer des modèles partiels du CMS', 'manage_themes' => 'Activer, désactiver et configurer les thèmes', + 'manage_theme_options' => 'Gérer les options de personnalisation du thème actif', + ], + 'theme_log' => [ + 'hint' => 'Ce journal affiche tous les changements fait sur le thème actif par les administrateurs via le panneau d’administration.', + 'menu_label' => 'Journal du thème', + 'menu_description' => 'Affiche la liste des modifications apportées au thème actif.', + 'empty_link' => 'Purger le journal du thème', + 'empty_loading' => 'Purge du journal du thème...', + 'empty_success' => 'Journal du thème purgé avec succès', + 'return_link' => 'Retourner au journal du thème', + 'id' => 'ID', + 'id_label' => 'ID du journal', + 'created_at' => 'Date & Heure', + 'user' => 'Utilisateur', + 'type' => 'Type', + 'type_create' => 'Créer', + 'type_update' => 'Modifier', + 'type_delete' => 'Supprimer', + 'theme_name' => 'Thème', + 'theme_code' => 'Code du thème', + 'old_template' => 'Modèle (Ancien)', + 'new_template' => 'Modèle (Nouveau)', + 'template' => 'Modèle', + 'diff' => 'Changements', + 'old_value' => 'Ancienne valeur', + 'new_value' => 'Nouvelle valeur', + 'preview_title' => 'Changement du odèle', + 'template_updated' => 'Le modèle a été modifié', + 'template_created' => 'Le modèle a été créé', + 'template_deleted' => 'Le modèle a été supprimé', ], ]; From 3be6e26e84c35009c691d476db376954537299e1 Mon Sep 17 00:00:00 2001 From: Ruben van Erk Date: Thu, 16 Jul 2020 11:26:49 +0200 Subject: [PATCH 2/4] Clear input after creating tag (#5053) When using the taglist field type, the input isn't cleared after a tag has been created. This problem is described here: https://github.com/select2/select2/issues/4698 This change fixes that issue. --- modules/system/assets/ui/js/select.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/system/assets/ui/js/select.js b/modules/system/assets/ui/js/select.js index f21be2020..798a8732d 100644 --- a/modules/system/assets/ui/js/select.js +++ b/modules/system/assets/ui/js/select.js @@ -127,7 +127,7 @@ */ if ($element.hasClass('select-no-dropdown')) { extraOptions.selectOnClose = true - extraOptions.closeOnSelect = false + extraOptions.closeOnSelect = true extraOptions.minimumInputLength = 1 $element.on('select2:closing', function() { From 987dfa4eb7115a5083035cd8b6147b99441f1206 Mon Sep 17 00:00:00 2001 From: Patrick Boivin Date: Thu, 16 Jul 2020 05:54:21 -0400 Subject: [PATCH 3/4] Add Paragraph Formats to Editor Settings (#4861) Co-authored-by: Luke Towers Co-authored-by: Ben Thomson --- modules/backend/formwidgets/RichEditor.php | 1 + .../richeditor/assets/js/richeditor.js | 12 ++++ .../richeditor/partials/_richeditor.htm | 1 + modules/backend/lang/en/lang.php | 4 ++ modules/backend/models/EditorSetting.php | 68 ++++++++++++++++--- .../backend/models/editorsetting/fields.yaml | 16 ++++- 6 files changed, 90 insertions(+), 12 deletions(-) diff --git a/modules/backend/formwidgets/RichEditor.php b/modules/backend/formwidgets/RichEditor.php index 0adbbc8f8..0949ced02 100644 --- a/modules/backend/formwidgets/RichEditor.php +++ b/modules/backend/formwidgets/RichEditor.php @@ -106,6 +106,7 @@ class RichEditor extends FormWidgetBase $this->vars['imageStyles'] = EditorSetting::getConfiguredStyles('html_style_image'); $this->vars['linkStyles'] = EditorSetting::getConfiguredStyles('html_style_link'); $this->vars['paragraphStyles'] = EditorSetting::getConfiguredStyles('html_style_paragraph'); + $this->vars['paragraphFormats'] = EditorSetting::getConfiguredFormats('html_paragraph_formats'); $this->vars['tableStyles'] = EditorSetting::getConfiguredStyles('html_style_table'); $this->vars['tableCellStyles'] = EditorSetting::getConfiguredStyles('html_style_table_cell'); } diff --git a/modules/backend/formwidgets/richeditor/assets/js/richeditor.js b/modules/backend/formwidgets/richeditor/assets/js/richeditor.js index 0fcb1227c..230ff8f85 100755 --- a/modules/backend/formwidgets/richeditor/assets/js/richeditor.js +++ b/modules/backend/formwidgets/richeditor/assets/js/richeditor.js @@ -50,6 +50,7 @@ imageStyles: null, linkStyles: null, paragraphStyles: null, + paragraphFormat: null, tableStyles: null, tableCellStyles: null, aceVendorPath: '/', @@ -115,6 +116,17 @@ 'oc-text-uppercase': 'Uppercase' } + froalaOptions.paragraphFormat = this.options.paragraphFormat + ? this.options.paragraphFormat + : { + 'N': 'Normal', + 'H1': 'Heading 1', + 'H2': 'Heading 2', + 'H3': 'Heading 3', + 'H4': 'Heading 4', + 'PRE': 'Code' + } + froalaOptions.tableStyles = this.options.tableStyles ? this.options.tableStyles : { diff --git a/modules/backend/formwidgets/richeditor/partials/_richeditor.htm b/modules/backend/formwidgets/richeditor/partials/_richeditor.htm index d9cf3af79..3457a34f5 100755 --- a/modules/backend/formwidgets/richeditor/partials/_richeditor.htm +++ b/modules/backend/formwidgets/richeditor/partials/_richeditor.htm @@ -19,6 +19,7 @@ data-image-styles="" data-link-styles="" data-paragraph-styles="" + data-paragraph-format="" data-table-styles="" data-table-cell-styles="" data-links-handler="getEventHandler('onLoadPageLinksForm') ?>" diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php index b173798ef..368664c63 100644 --- a/modules/backend/lang/en/lang.php +++ b/modules/backend/lang/en/lang.php @@ -406,6 +406,7 @@ return [ 'label' => 'Label', 'class_name' => 'Class name', 'markup_tags' => 'Markup Tags', + 'markup_tag' => 'Markup Tag', 'allowed_empty_tags' => 'Allowed empty tags', 'allowed_empty_tags_comment' => 'The list of tags that are not removed when they have no content inside.', 'allowed_tags' => 'Allowed tags', @@ -416,6 +417,7 @@ return [ 'remove_tags_comment' => 'The list of tags that are removed together with their content.', 'line_breaker_tags' => 'Line breaker tags', 'line_breaker_tags_comment' => 'The list of tags that are used to place a line breaker element between.', + 'toolbar_options' => 'Toolbar Options', 'toolbar_buttons' => 'Toolbar Buttons', 'toolbar_buttons_comment' => 'The Toolbar Buttons to be displayed in the Rich Editor by default.', 'toolbar_buttons_preset' => 'Insert a preset toolbar button configuration:', @@ -424,6 +426,8 @@ return [ 'minimal' => 'Minimal', 'full' => 'Full', ], + 'paragraph_formats' => 'Paragraph Formats', + 'paragraph_formats_comment' => 'The options that will appear in the Paragraph Format dropdown.', ], 'tooltips' => [ 'preview_website' => 'Preview the website', diff --git a/modules/backend/models/EditorSetting.php b/modules/backend/models/EditorSetting.php index 56983fffa..b44081b16 100644 --- a/modules/backend/models/EditorSetting.php +++ b/modules/backend/models/EditorSetting.php @@ -76,6 +76,15 @@ class EditorSetting extends Model 'oc-cell-thick-border' => 'Thick Border', ]; + protected $defaultHtmlParagraphFormats = [ + 'N' => 'Normal', + 'H1' => 'Heading 1', + 'H2' => 'Heading 2', + 'H3' => 'Heading 3', + 'H4' => 'Heading 4', + 'PRE' => 'Code', + ]; + /** * Editor toolbar presets for Froala. */ @@ -113,6 +122,15 @@ class EditorSetting extends Model $this->html_style_paragraph = $this->makeStylesForTable($this->defaultHtmlStyleParagraph); $this->html_style_table = $this->makeStylesForTable($this->defaultHtmlStyleTable); $this->html_style_table_cell = $this->makeStylesForTable($this->defaultHtmlStyleTableCell); + $this->html_paragraph_formats = $this->makeFormatsForTable($this->defaultHtmlParagraphFormats); + } + + public function afterFetch() + { + if (!isset($this->value['html_paragraph_formats'])) { + $this->html_paragraph_formats = $this->makeFormatsForTable($this->defaultHtmlParagraphFormats); + $this->save(); + } } public function afterSave() @@ -129,11 +147,48 @@ class EditorSetting extends Model }); } + protected function makeFormatsForTable($arr) + { + $count = 0; + + return array_build($arr, function ($key, $value) use (&$count) { + return [$count++, ['format_label' => $value, 'format_tag' => $key]]; + }); + } + /** - * Same as getConfigured but uses special style structure. + * Same as getConfigured but uses a special structure for styles. * @return mixed */ public static function getConfiguredStyles($key, $default = null) + { + return static::getConfiguredArray($key, $default, function ($key, $value) { + if (array_has($value, ['class_name', 'class_label'])) { + return [ + array_get($value, 'class_name'), + array_get($value, 'class_label') + ]; + } + }); + } + + /** + * Same as getConfigured but uses a special structure for paragraph formats. + * @return mixed + */ + public static function getConfiguredFormats($key, $default = null) + { + return static::getConfiguredArray($key, $default, function ($key, $value) { + if (array_has($value, ['format_tag', 'format_label'])) { + return [ + array_get($value, 'format_tag'), + array_get($value, 'format_label') + ]; + } + }); + } + + protected static function getConfiguredArray($key, $default = null, $callback = null) { $instance = static::instance(); @@ -141,15 +196,8 @@ class EditorSetting extends Model $defaultValue = $instance->getDefaultValue($key); - if (is_array($value)) { - $value = array_filter(array_build($value, function ($key, $value) { - if (array_has($value, ['class_name', 'class_label'])) { - return [ - array_get($value, 'class_name'), - array_get($value, 'class_label') - ]; - } - })); + if (is_array($value) && is_callable($callback)) { + $value = array_filter(array_build($value, $callback)); } return $value != $defaultValue ? $value : $default; diff --git a/modules/backend/models/editorsetting/fields.yaml b/modules/backend/models/editorsetting/fields.yaml index 49424f694..627651951 100644 --- a/modules/backend/models/editorsetting/fields.yaml +++ b/modules/backend/models/editorsetting/fields.yaml @@ -106,16 +106,28 @@ tabs: size: small span: auto + html_paragraph_formats: + label: backend::lang.editor.paragraph_formats + comment: backend::lang.editor.paragraph_formats_comment + tab: backend::lang.editor.toolbar_options + type: datatable + span: right + columns: + format_tag: + title: backend::lang.editor.markup_tag + format_label: + title: backend::lang.editor.label + html_toolbar_buttons: label: backend::lang.editor.toolbar_buttons comment: backend::lang.editor.toolbar_buttons_comment - tab: backend::lang.editor.toolbar_buttons + tab: backend::lang.editor.toolbar_options type: textarea span: left _html_toolbar_buttons_presets: label: backend::lang.editor.toolbar_buttons_preset - tab: backend::lang.editor.toolbar_buttons + tab: backend::lang.editor.toolbar_options type: partial path: ~/modules/backend/models/editorsetting/_toolbar_presets.htm span: left From 70eac9b0e282976fad0ab206c739e157e20e14ed Mon Sep 17 00:00:00 2001 From: Ben Thomson Date: Thu, 16 Jul 2020 18:00:19 +0800 Subject: [PATCH 4/4] Recompile assets --- .../richeditor/assets/js/build-plugins-min.js | 3 ++- modules/system/assets/js/lang/lang.hu.js | 2 +- modules/system/assets/js/lang/lang.rs.js | 9 +++++++++ modules/system/assets/js/lang/lang.sl.js | 2 +- modules/system/assets/ui/storm-min.js | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 modules/system/assets/js/lang/lang.rs.js diff --git a/modules/backend/formwidgets/richeditor/assets/js/build-plugins-min.js b/modules/backend/formwidgets/richeditor/assets/js/build-plugins-min.js index 95c153829..7f6695a99 100644 --- a/modules/backend/formwidgets/richeditor/assets/js/build-plugins-min.js +++ b/modules/backend/formwidgets/richeditor/assets/js/build-plugins-min.js @@ -157,7 +157,7 @@ Base.call(this) this.init()} RichEditor.prototype=Object.create(BaseProto) RichEditor.prototype.constructor=RichEditor -RichEditor.DEFAULTS={linksHandler:null,uploadHandler:null,stylesheet:null,fullpage:false,editorLang:'en',useMediaManager:false,toolbarButtons:null,allowEmptyTags:null,allowTags:null,noWrapTags:null,removeTags:null,lineBreakerTags:null,imageStyles:null,linkStyles:null,paragraphStyles:null,tableStyles:null,tableCellStyles:null,aceVendorPath:'/',readOnly:false} +RichEditor.DEFAULTS={linksHandler:null,uploadHandler:null,stylesheet:null,fullpage:false,editorLang:'en',useMediaManager:false,toolbarButtons:null,allowEmptyTags:null,allowTags:null,noWrapTags:null,removeTags:null,lineBreakerTags:null,imageStyles:null,linkStyles:null,paragraphStyles:null,paragraphFormat:null,tableStyles:null,tableCellStyles:null,aceVendorPath:'/',readOnly:false} RichEditor.prototype.init=function(){var self=this;this.$el.one('dispose-control',this.proxy(this.dispose)) if(!this.$textarea.attr('id')){this.$textarea.attr('id','element-'+Math.random().toString(36).substring(7))} this.initFroala()} @@ -167,6 +167,7 @@ else{froalaOptions.toolbarButtons=$.oc.richEditorButtons} froalaOptions.imageStyles=this.options.imageStyles?this.options.imageStyles:{'oc-img-rounded':'Rounded','oc-img-bordered':'Bordered'} froalaOptions.linkStyles=this.options.linkStyles?this.options.linkStyles:{'oc-link-green':'Green','oc-link-strong':'Thick'} froalaOptions.paragraphStyles=this.options.paragraphStyles?this.options.paragraphStyles:{'oc-text-gray':'Gray','oc-text-bordered':'Bordered','oc-text-spaced':'Spaced','oc-text-uppercase':'Uppercase'} +froalaOptions.paragraphFormat=this.options.paragraphFormat?this.options.paragraphFormat:{'N':'Normal','H1':'Heading 1','H2':'Heading 2','H3':'Heading 3','H4':'Heading 4','PRE':'Code'} froalaOptions.tableStyles=this.options.tableStyles?this.options.tableStyles:{'oc-dashed-borders':'Dashed Borders','oc-alternate-rows':'Alternate Rows'} froalaOptions.tableCellStyles=this.options.tableCellStyles?this.options.tableCellStyles:{'oc-cell-highlighted':'Highlighted','oc-cell-thick-border':'Thick'} froalaOptions.toolbarButtonsMD=froalaOptions.toolbarButtons diff --git a/modules/system/assets/js/lang/lang.hu.js b/modules/system/assets/js/lang/lang.hu.js index 182870308..219bc1b40 100644 --- a/modules/system/assets/js/lang/lang.hu.js +++ b/modules/system/assets/js/lang/lang.hu.js @@ -5,7 +5,7 @@ if ($.oc === undefined) $.oc = {} if ($.oc.langMessages === undefined) $.oc.langMessages = {} $.oc.langMessages['hu'] = $.extend( $.oc.langMessages['hu'] || {}, - {"markdowneditor":{"formatting":"Forr\u00e1sk\u00f3d","quote":"Id\u00e9zet","code":"K\u00f3d","header1":"C\u00edmsor 1","header2":"C\u00edmsor 2","header3":"C\u00edmsor 3","header4":"C\u00edmsor 4","header5":"C\u00edmsor 5","header6":"C\u00edmsor 6","bold":"F\u00e9lk\u00f6v\u00e9r","italic":"D\u00f6lt","unorderedlist":"Rendezett lista","orderedlist":"Sz\u00e1mozott lista","video":"Vide\u00f3","image":"K\u00e9p","link":"Hivatkoz\u00e1s","horizontalrule":"Vonal besz\u00far\u00e1sa","fullscreen":"Teljes k\u00e9perny\u0151","preview":"El\u0151n\u00e9zet"},"mediamanager":{"insert_link":"Hivatkoz\u00e1s besz\u00far\u00e1sa","insert_image":"K\u00e9p besz\u00far\u00e1sa","insert_video":"Vide\u00f3 besz\u00far\u00e1sa","insert_audio":"Audi\u00f3 besz\u00far\u00e1sa","invalid_file_empty_insert":"Hivatkoz\u00e1s k\u00e9sz\u00edt\u00e9s\u00e9hez jel\u00f6lj\u00f6n ki egy sz\u00f6vegr\u00e9szt.","invalid_file_single_insert":"K\u00e9rj\u00fck jel\u00f6lj\u00f6n ki egy f\u00e1jlt.","invalid_image_empty_insert":"V\u00e1lasszon ki legal\u00e1bb egy k\u00e9pet a besz\u00far\u00e1shoz.","invalid_video_empty_insert":"V\u00e1lasszon ki legal\u00e1bb egy vide\u00f3t a besz\u00far\u00e1shoz.","invalid_audio_empty_insert":"V\u00e1lasszon ki legal\u00e1bb egy audi\u00f3t a besz\u00far\u00e1shoz."},"alert":{"confirm_button_text":"OK","cancel_button_text":"M\u00e9gsem","widget_remove_confirm":"Val\u00f3ban t\u00f6r\u00f6lni akarja?"},"datepicker":{"previousMonth":"El\u0151z\u0151 h\u00f3nap","nextMonth":"K\u00f6vetkez\u0151 h\u00f3nap","months":["janu\u00e1r","febru\u00e1r","m\u00e1rcius","\u00e1prilis","m\u00e1jus","j\u00fanius","j\u00falius","augusztus","szeptember","okt\u00f3ber","november","december"],"weekdays":["vas\u00e1rnap","h\u00e9tf\u0151","kedd","szerda","cs\u00fct\u00f6rt\u00f6k","p\u00e9ntek","szombat"],"weekdaysShort":["va","h\u00e9","ke","sze","cs","p\u00e9","szo"]},"colorpicker":{"choose":"Ok"},"filter":{"group":{"all":"\u00f6sszes"},"scopes":{"apply_button_text":"Apply","clear_button_text":"Clear"},"dates":{"all":"\u00f6sszes","filter_button_text":"Sz\u0171r\u00e9s","reset_button_text":"Alaphelyzet","date_placeholder":"D\u00e1tum","after_placeholder":"Kezdete","before_placeholder":"V\u00e9ge"},"numbers":{"all":"\u00f6sszes","filter_button_text":"Sz\u0171r\u00e9s","reset_button_text":"Alaphelyzet","min_placeholder":"Minimum","max_placeholder":"Maximum"}},"eventlog":{"show_stacktrace":"R\u00e9szletek","hide_stacktrace":"Rejt\u00e9s","tabs":{"formatted":"Form\u00e1zott","raw":"T\u00f6m\u00f6r\u00edtett"},"editor":{"title":"Forr\u00e1sk\u00f3d szerkeszt\u0151","description":"Az oper\u00e1ci\u00f3s rendszert \u00fagy kell be\u00e1ll\u00edtani, hogy figyelembe vegye az URL s\u00e9m\u00e1t.","openWith":"Megnyit\u00e1s mint","remember_choice":"Kiv\u00e1lasztott be\u00e1ll\u00edt\u00e1sok megjegyz\u00e9se ebben a munkamenetben","open":"Megnyit\u00e1s","cancel":"M\u00e9gsem"}}} + {"markdowneditor":{"formatting":"Forr\u00e1sk\u00f3d","quote":"Id\u00e9zet","code":"K\u00f3d","header1":"C\u00edmsor 1","header2":"C\u00edmsor 2","header3":"C\u00edmsor 3","header4":"C\u00edmsor 4","header5":"C\u00edmsor 5","header6":"C\u00edmsor 6","bold":"F\u00e9lk\u00f6v\u00e9r","italic":"D\u00f6lt","unorderedlist":"Rendezett lista","orderedlist":"Sz\u00e1mozott lista","video":"Vide\u00f3","image":"K\u00e9p","link":"Hivatkoz\u00e1s","horizontalrule":"Vonal besz\u00far\u00e1sa","fullscreen":"Teljes k\u00e9perny\u0151","preview":"El\u0151n\u00e9zet"},"mediamanager":{"insert_link":"Hivatkoz\u00e1s besz\u00far\u00e1sa","insert_image":"K\u00e9p besz\u00far\u00e1sa","insert_video":"Vide\u00f3 besz\u00far\u00e1sa","insert_audio":"Audi\u00f3 besz\u00far\u00e1sa","invalid_file_empty_insert":"Hivatkoz\u00e1s k\u00e9sz\u00edt\u00e9s\u00e9hez jel\u00f6lj\u00f6n ki egy sz\u00f6vegr\u00e9szt.","invalid_file_single_insert":"K\u00e9rj\u00fck jel\u00f6lj\u00f6n ki egy f\u00e1jlt.","invalid_image_empty_insert":"V\u00e1lasszon ki legal\u00e1bb egy k\u00e9pet a besz\u00far\u00e1shoz.","invalid_video_empty_insert":"V\u00e1lasszon ki legal\u00e1bb egy vide\u00f3t a besz\u00far\u00e1shoz.","invalid_audio_empty_insert":"V\u00e1lasszon ki legal\u00e1bb egy audi\u00f3t a besz\u00far\u00e1shoz."},"alert":{"confirm_button_text":"Igen","cancel_button_text":"M\u00e9gsem","widget_remove_confirm":"Val\u00f3ban t\u00f6r\u00f6lni akarja?"},"datepicker":{"previousMonth":"El\u0151z\u0151 h\u00f3nap","nextMonth":"K\u00f6vetkez\u0151 h\u00f3nap","months":["janu\u00e1r","febru\u00e1r","m\u00e1rcius","\u00e1prilis","m\u00e1jus","j\u00fanius","j\u00falius","augusztus","szeptember","okt\u00f3ber","november","december"],"weekdays":["vas\u00e1rnap","h\u00e9tf\u0151","kedd","szerda","cs\u00fct\u00f6rt\u00f6k","p\u00e9ntek","szombat"],"weekdaysShort":["va","h\u00e9","ke","sze","cs","p\u00e9","szo"]},"colorpicker":{"choose":"Ment\u00e9s"},"filter":{"group":{"all":"\u00f6sszes"},"scopes":{"apply_button_text":"Sz\u0171r\u00e9s","clear_button_text":"Alaphelyzet"},"dates":{"all":"\u00f6sszes","filter_button_text":"Sz\u0171r\u00e9s","reset_button_text":"Alaphelyzet","date_placeholder":"D\u00e1tum","after_placeholder":"Kezdete","before_placeholder":"V\u00e9ge"},"numbers":{"all":"\u00f6sszes","filter_button_text":"Sz\u0171r\u00e9s","reset_button_text":"Alaphelyzet","min_placeholder":"Minimum","max_placeholder":"Maximum"}},"eventlog":{"show_stacktrace":"R\u00e9szletek","hide_stacktrace":"Rejt\u00e9s","tabs":{"formatted":"Form\u00e1zott","raw":"T\u00f6m\u00f6r\u00edtett"},"editor":{"title":"Forr\u00e1sk\u00f3d szerkeszt\u0151","description":"Az oper\u00e1ci\u00f3s rendszert \u00fagy kell be\u00e1ll\u00edtani, hogy figyelembe vegye az URL s\u00e9m\u00e1t.","openWith":"Megnyit\u00e1s mint","remember_choice":"Kiv\u00e1lasztott be\u00e1ll\u00edt\u00e1sok megjegyz\u00e9se ebben a munkamenetben","open":"Megnyit\u00e1s","cancel":"M\u00e9gsem"}}} ); //! moment.js locale configuration v2.22.2 diff --git a/modules/system/assets/js/lang/lang.rs.js b/modules/system/assets/js/lang/lang.rs.js new file mode 100644 index 000000000..375f5327d --- /dev/null +++ b/modules/system/assets/js/lang/lang.rs.js @@ -0,0 +1,9 @@ +/* + * This file has been compiled from: /modules/system/lang/rs/client.php + */ +if ($.oc === undefined) $.oc = {} +if ($.oc.langMessages === undefined) $.oc.langMessages = {} +$.oc.langMessages['rs'] = $.extend( + $.oc.langMessages['rs'] || {}, + {"markdowneditor":{"formatting":"Formatiranje","quote":"Citat","code":"Kod","header1":"Zaglavlje 1","header2":"Zaglavlje 2","header3":"Zaglavlje 3","header4":"Zaglavlje 4","header5":"Zaglavlje 5","header6":"Zaglavlje 6","bold":"Podebljaj","italic":"Ukosi","unorderedlist":"Neure\u0111ena lista","orderedlist":"Ure\u0111ena lista","video":"Video","image":"Slika","link":"Link","horizontalrule":"Ubaci horizontalnu liniju","fullscreen":"Ceo ekran","preview":"Pregled"},"mediamanager":{"insert_link":"Ubaci link","insert_image":"Ubaci sliku","insert_video":"Ubaci video zapis","insert_audio":"Ubaci zvu\u010dni zapis","invalid_file_empty_insert":"Odaberi fajl za ubacivanje linkova.","invalid_file_single_insert":"Odaberi jedan fajl za ubacivanje.","invalid_image_empty_insert":"Odaberi sliku\/slike za ubacivanje.","invalid_video_empty_insert":"Odaberi video zapis za ubacivanje.","invalid_audio_empty_insert":"Odaberi audio zapis za ubacivanje."},"alert":{"confirm_button_text":"OK","cancel_button_text":"Otka\u017ei","widget_remove_confirm":"Otkloni ovaj posredni\u010dki element?"},"datepicker":{"previousMonth":"Prethodni mesec","nextMonth":"Slede\u0107i mesec","months":["Januar","Februar","Mart","April","Maj","Juni","Juli","Avgust","Septembar","Oktobar","Novembar","Decembar"],"weekdays":["Nedelja","Ponedeljak","Utorak","Sreda","\u010cetvrtak","Petak","Subota"],"weekdaysShort":["Ned","Pon","Uto","Sre","\u010cet","Pet","Sub"]},"colorpicker":{"choose":"Ok"},"filter":{"group":{"all":"sve"},"scopes":{"apply_button_text":"Primeni","clear_button_text":"O\u010disti"},"dates":{"all":"svi","filter_button_text":"Filtriraj","reset_button_text":"Resetuj","date_placeholder":"Datum","after_placeholder":"Pre","before_placeholder":"Posle"},"numbers":{"all":"svi","filter_button_text":"Filtriraj","reset_button_text":"Resetuj","min_placeholder":"Minimum","max_placeholder":"Maksimum"}},"eventlog":{"show_stacktrace":"Prika\u017ei trag","hide_stacktrace":"Sakrij trag","tabs":{"formatted":"Formatiraj","raw":"Izvorno"},"editor":{"title":"Izvorni kod editora","description":"Va\u0161 operativni sistem treba da bude konfigurisan za oslu\u0161kivanje ovih URL \u0161ema.","openWith":"Otvori sa","remember_choice":"Zapamti izabranu opciju za ovu sesiju","open":"Otvori","cancel":"Otka\u017ei"}}} +); \ No newline at end of file diff --git a/modules/system/assets/js/lang/lang.sl.js b/modules/system/assets/js/lang/lang.sl.js index cd1b00afd..1ebcdc4ea 100644 --- a/modules/system/assets/js/lang/lang.sl.js +++ b/modules/system/assets/js/lang/lang.sl.js @@ -5,7 +5,7 @@ if ($.oc === undefined) $.oc = {} if ($.oc.langMessages === undefined) $.oc.langMessages = {} $.oc.langMessages['sl'] = $.extend( $.oc.langMessages['sl'] || {}, - {"markdowneditor":{"formatting":"Oblikovanje","quote":"Citat","code":"Koda","header1":"Naslov 1","header2":"Naslov 2","header3":"Naslov 3","header4":"Naslov 4","header5":"Naslov 5","header6":"Naslov 6","bold":"Krepko","italic":"Le\u017ee\u010de","unorderedlist":"Ne\u0161tevil\u010dni seznam","orderedlist":"\u0160tevil\u010dni seznam","video":"Video","image":"Slika","link":"Povezava","horizontalrule":"Vstavi vodoravno \u010drto","fullscreen":"Celozaslonski na\u010din","preview":"Predogled"},"mediamanager":{"insert_link":"Vstavi povezavo","insert_image":"Vstavi sliko","insert_video":"Vstavi video posnetek","insert_audio":"Vstavi zvo\u010dni posnetek","invalid_file_empty_insert":"Izberite datoteko, do katere \u017eelite vstaviti povezavo.","invalid_file_single_insert":"Izberite eno samo datoteko.","invalid_image_empty_insert":"Izberite slike za vstavljanje.","invalid_video_empty_insert":"Izberite video posnetek za vstavljanje.","invalid_audio_empty_insert":"Izberite zvo\u010dni posnetek za vstavljanje."},"alert":{"confirm_button_text":"V redu","cancel_button_text":"Prekli\u010di","widget_remove_confirm":"Odstrani ta vti\u010dnik?"},"datepicker":{"previousMonth":"Prej\u0161nji mesec","nextMonth":"Naslednji mesec","months":["Januar","Februar","Marec","April","Maj","Junij","Julij","Avgust","September","Oktober","November","December"],"weekdays":["Nedelja","Ponedeljek","Torek","Sreda","\u010cetrtek","Petek","Sobota"],"weekdaysShort":["Ned","Pon","Tor","Sre","\u010cet","Pet","Sob"]},"colorpicker":{"choose":"Ok"},"filter":{"group":{"all":"vsi"},"scopes":{"apply_button_text":"Uporabi","clear_button_text":"Po\u010disti"},"dates":{"all":"vsi","filter_button_text":"Filtriraj","reset_button_text":"Ponastavi","date_placeholder":"Datum","after_placeholder":"Po","before_placeholder":"Pred"},"numbers":{"all":"vsi","filter_button_text":"Filtriraj","reset_button_text":"Ponastavi","min_placeholder":"Min","max_placeholder":"Max"}},"eventlog":{"show_stacktrace":"Prika\u017ei sled dogodkov","hide_stacktrace":"Skrij sled dogodkov","tabs":{"formatted":"Oblikovano","raw":"Brez oblikovanja"},"editor":{"title":"Urejevalnik izvorne kode","description":"Va\u0161 operacijski sistem mora biti nastavljen tako, da upo\u0161teva eno od teh URL shem.","openWith":"Za odpiranje uporabi","remember_choice":"Zapomni si izbrane nastavitve za to sejo","open":"Odpri","cancel":"Prekli\u010di"}}} + {"markdowneditor":{"formatting":"Oblikovanje","quote":"Citat","code":"Koda","header1":"Naslov 1","header2":"Naslov 2","header3":"Naslov 3","header4":"Naslov 4","header5":"Naslov 5","header6":"Naslov 6","bold":"Krepko","italic":"Le\u017ee\u010de","unorderedlist":"Neo\u0161tevil\u010deni seznam","orderedlist":"\u0160tevil\u010dni seznam","video":"Video","image":"Slika","link":"Povezava","horizontalrule":"Vstavi vodoravno \u010drto","fullscreen":"Celozaslonski na\u010din","preview":"Predogled"},"mediamanager":{"insert_link":"Vstavi povezavo","insert_image":"Vstavi sliko","insert_video":"Vstavi video posnetek","insert_audio":"Vstavi zvo\u010dni posnetek","invalid_file_empty_insert":"Izberite datoteko, do katere \u017eelite vstaviti povezavo.","invalid_file_single_insert":"Izberite eno samo datoteko.","invalid_image_empty_insert":"Izberite slike za vstavljanje.","invalid_video_empty_insert":"Izberite video posnetek za vstavljanje.","invalid_audio_empty_insert":"Izberite zvo\u010dni posnetek za vstavljanje."},"alert":{"confirm_button_text":"V redu","cancel_button_text":"Prekli\u010di","widget_remove_confirm":"Odstrani ta vti\u010dnik?"},"datepicker":{"previousMonth":"Prej\u0161nji mesec","nextMonth":"Naslednji mesec","months":["Januar","Februar","Marec","April","Maj","Junij","Julij","Avgust","September","Oktober","November","December"],"weekdays":["Nedelja","Ponedeljek","Torek","Sreda","\u010cetrtek","Petek","Sobota"],"weekdaysShort":["Ned","Pon","Tor","Sre","\u010cet","Pet","Sob"]},"colorpicker":{"choose":"Ok"},"filter":{"group":{"all":"vsi"},"scopes":{"apply_button_text":"Uporabi","clear_button_text":"Po\u010disti"},"dates":{"all":"vsi","filter_button_text":"Filtriraj","reset_button_text":"Ponastavi","date_placeholder":"Datum","after_placeholder":"Po","before_placeholder":"Pred"},"numbers":{"all":"vsi","filter_button_text":"Filtriraj","reset_button_text":"Ponastavi","min_placeholder":"Min","max_placeholder":"Max"}},"eventlog":{"show_stacktrace":"Prika\u017ei sled dogodkov","hide_stacktrace":"Skrij sled dogodkov","tabs":{"formatted":"Oblikovano","raw":"Brez oblikovanja"},"editor":{"title":"Urejevalnik izvorne kode","description":"Va\u0161 operacijski sistem mora biti nastavljen tako, da upo\u0161teva eno od teh URL shem.","openWith":"Za odpiranje uporabi","remember_choice":"Zapomni si izbrane nastavitve za to sejo","open":"Odpri","cancel":"Prekli\u010di"}}} ); //! moment.js locale configuration v2.22.2 diff --git a/modules/system/assets/ui/storm-min.js b/modules/system/assets/ui/storm-min.js index a7bd3a056..8803506a3 100644 --- a/modules/system/assets/ui/storm-min.js +++ b/modules/system/assets/ui/storm-min.js @@ -3535,7 +3535,7 @@ var separators=$element.data('token-separators') if(separators){extraOptions.tags=true extraOptions.tokenSeparators=separators.split('|') if($element.hasClass('select-no-dropdown')){extraOptions.selectOnClose=true -extraOptions.closeOnSelect=false +extraOptions.closeOnSelect=true extraOptions.minimumInputLength=1 $element.on('select2:closing',function(){if($('.select2-dropdown.select-no-dropdown:first .select2-results__option--highlighted').length>0){$('.select2-dropdown.select-no-dropdown:first .select2-results__option--highlighted').removeClass('select2-results__option--highlighted') $('.select2-dropdown.select-no-dropdown:first .select2-results__option:first').addClass('select2-results__option--highlighted')}})}}