Changeset 3897:61304e9616a6
- Timestamp:
- 10/01/18 11:24:07 (5 years ago)
- Branch:
- default
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
admin/comment.php
r3874 r3897 230 230 231 231 '<p class="area"><label for="comment_content">' . __('Comment:') . '</label> ' . 232 form::textarea('comment_content', 50, 10, html::escapeHTML($comment_content)) . 232 form::textarea('comment_content', 50, 10, 233 [ 234 'default' => html::escapeHTML($comment_content), 235 'extra_html' => 'lang="' . $core->auth->getInfo('user_lang') . '"' 236 ]) . 233 237 '</p>' . 234 238 -
admin/js/jsUpload/load-image.js
r1144 r3897 14 14 15 15 /*jslint nomen: true, bitwise: true */ 16 /*global window, document, URL, webkitURL, Blob, File,FileReader, define */16 /*global window, document, URL, webkitURL, FileReader, define */ 17 17 18 18 (function ($) { -
admin/js/jsUpload/template-download.js
r3706 r3897 3 3 'use strict'; 4 4 5 vartemplate_download = tmpl('{% for (var i=0, file; file=o.files[i]; i++) { %}<li class="template-download fade"><div class="upload-file"><div class="upload-fileinfo"><span class="upload-filename">{%=file.name%}</span><span class="upload-filesize">({%=o.formatFileSize(file.size)%})</span><span class="upload-filemsg{% if (file.error) { %} upload-error{% } %}">{% if (file.error) { %}' + dotclear.jsUpload.msg.error + ' {%=file.error%}{% } else { %}' + dotclear.jsUpload.msg.file_successfully_uploaded + '{% } %}</span></div><div class="upload-progress">{% if (!file.error) { %}<div class="bar" style="width:100%;">100%</div>{% } %}</div></li>{% } %}');5 const template_download = tmpl('{% for (var i=0, file; file=o.files[i]; i++) { %}<li class="template-download fade"><div class="upload-file"><div class="upload-fileinfo"><span class="upload-filename">{%=file.name%}</span><span class="upload-filesize">({%=o.formatFileSize(file.size)%})</span><span class="upload-filemsg{% if (file.error) { %} upload-error{% } %}">{% if (file.error) { %}' + dotclear.jsUpload.msg.error + ' {%=file.error%}{% } else { %}' + dotclear.jsUpload.msg.file_successfully_uploaded + '{% } %}</span></div><div class="upload-progress">{% if (!file.error) { %}<div class="bar" style="width:100%;">100%</div>{% } %}</div></li>{% } %}'); -
admin/js/jsUpload/template-upload.js
r3706 r3897 3 3 'use strict'; 4 4 5 vartemplate_upload = tmpl('{% for (var i=0, file; file=o.files[i]; i++) { %}<li class="template-upload fade"><div class="upload-file"><div class="upload-fileinfo"><span class="upload-filename">{%=file.name%}</span><span class="upload-filesize">({%=o.formatFileSize(file.size)%})</span><span class="upload-filecancel cancel">' + dotclear.jsUpload.msg.cancel + '</span>{% if (!o.files.error && !i && !o.options.autoUpload) { %}<input type="submit" class="button start" value="' + dotclear.jsUpload.msg.send + '"/>{% } %}<span class="upload-filemsg"></span></div>{% if (!o.files.error) { %}<div class="upload-progress progress progress-success progress-striped active"><div class="bar" style="width:0%;"></div></div>{% } %}</li>{% } %}');5 const template_upload = tmpl('{% for (var i=0, file; file=o.files[i]; i++) { %}<li class="template-upload fade"><div class="upload-file"><div class="upload-fileinfo"><span class="upload-filename">{%=file.name%}</span><span class="upload-filesize">({%=o.formatFileSize(file.size)%})</span><span class="upload-filecancel cancel">' + dotclear.jsUpload.msg.cancel + '</span>{% if (!o.files.error && !i && !o.options.autoUpload) { %}<input type="submit" class="button start" value="' + dotclear.jsUpload.msg.send + '"/>{% } %}<span class="upload-filemsg"></span></div>{% if (!o.files.error) { %}<div class="upload-progress progress progress-success progress-striped active"><div class="bar" style="width:0%;"></div></div>{% } %}</li>{% } %}'); -
admin/media.php
r3874 r3897 383 383 if ($dir && !empty($_FILES['upfile'])) { 384 384 // only one file per request : @see option singleFileUploads in admin/js/jsUpload/jquery.fileupload 385 $upfile = ['name' => $_FILES['upfile']['name'][0], 386 'type' => $_FILES['upfile']['type'][0], 387 'tmp_name' => $_FILES['upfile']['tmp_name'][0], 388 'error' => $_FILES['upfile']['error'][0], 389 'size' => $_FILES['upfile']['size'][0], 390 'title' => html::escapeHTML($_FILES['upfile']['name'][0]) 385 $upfile = [ 386 'name' => $_FILES['upfile']['name'][0], 387 'type' => $_FILES['upfile']['type'][0], 388 'tmp_name' => $_FILES['upfile']['tmp_name'][0], 389 'error' => $_FILES['upfile']['error'][0], 390 'size' => $_FILES['upfile']['size'][0], 391 'title' => html::escapeHTML($_FILES['upfile']['name'][0]) 391 392 ]; 392 393 … … 405 406 ]; 406 407 } catch (Exception $e) { 407 $message['files'][] = ['name' => $upfile['name'], 408 'size' => $upfile['size'], 409 'error' => $e->getMessage() 408 $message['files'][] = [ 409 'name' => $upfile['name'], 410 'size' => $upfile['size'], 411 'error' => $e->getMessage() 410 412 ]; 411 413 } -
admin/post.php
r3878 r3897 659 659 '<p class="area" id="excerpt-area"><label for="post_excerpt" class="bold">' . __('Excerpt:') . ' <span class="form-note">' . 660 660 __('Introduction to the post.') . '</span></label> ' . 661 form::textarea('post_excerpt', 50, 5, html::escapeHTML($post_excerpt)) . 661 form::textarea('post_excerpt', 50, 5, 662 [ 663 'default' => html::escapeHTML($post_excerpt), 664 'extra_html' => 'lang="' . $post_lang . '"' 665 ]) . 662 666 '</p>', 663 667 … … 668 672 [ 669 673 'default' => html::escapeHTML($post_content), 670 'extra_html' => 'required placeholder="' . __('Content') . '" '674 'extra_html' => 'required placeholder="' . __('Content') . '" lang="' . $post_lang . '"' 671 675 ]) . 672 676 '</p>', … … 811 815 '<p class="area"><label for="comment_content" class="required"><abbr title="' . __('Required field') . '">*</abbr> ' . 812 816 __('Comment:') . '</label> ' . 813 form::textarea('comment_content', 50, 8, ['extra_html' => 'required placeholder="' . __('Comment') . '"']) . 817 form::textarea('comment_content', 50, 8, 818 [ 819 'extra_html' => 'required placeholder="' . __('Comment') . '" lang="' . $core->auth->getInfo('user_lang') . '"' 820 ]) . 814 821 '</p>' . 815 822 -
plugins/dcCKEditor/_post_config.php
r3769 r3897 108 108 <?php endif;?> 109 109 110 CKEDITOR.config.defaultLanguage = dotclear.user_language; 111 CKEDITOR.config.language = dotclear.user_language; 112 CKEDITOR.config.contentsLanguage = dotclear.user_language; 113 110 114 <?php 111 115 if (!empty($extraPlugins) && count($extraPlugins) > 0) { … … 237 241 238 242 CKEDITOR.on('instanceLoaded',function(e) { 239 240 243 // Retrieve textarea element of the instance, then its line-height (in px) and rows values, 241 244 // then apply line-height * rows (min = 6) to the inner height of the instance. … … 250 253 } 251 254 } 252 253 255 }); 254 256 … … 268 270 }); 269 271 272 const ta = document.getElementById(e.editor.name); 273 if (ta !== undefined) { 274 if (ta.lang && e.editor.config.contentsLanguage !== ta.lang) { 275 let config = e.editor.config; 276 config.contentsLanguage = ta.lang; 277 e.editor.destroy(); 278 CKEDITOR.replace(e.editor.name, config); 279 } 280 } 270 281 }); 271 282 -
plugins/dcCKEditor/inc/dc.ckeditor.behaviors.php
r3874 r3897 40 40 dcPage::jsVar('dotclear.base_url', $GLOBALS['core']->blog->host) . 41 41 dcPage::jsVar('dotclear.dcckeditor_plugin_url', DC_ADMIN_URL . self::$p_url) . 42 dcPage::jsVar('dotclear.user_language', $GLOBALS['core']->auth->getInfo('user_lang')) . 42 43 'CKEDITOR_GETURL = function(resource) { 43 44 // If this is not a full or absolute path. -
plugins/dcLegacyEditor/js/jsToolBar/jsToolBar.wysiwyg.js
r3880 r3897 188 188 } 189 189 190 // Set lang if set for the textarea 191 if (This.textarea.lang) { 192 doc.documentElement.setAttribute('lang', This.textarea.lang); 193 } 194 190 195 This.iwin = This.iframe.contentWindow; 191 196 -
plugins/pages/page.php
r3878 r3897 487 487 '<p class="area" id="excerpt-area"><label for="post_excerpt" class="bold">' . __('Excerpt:') . ' <span class="form-note">' . 488 488 __('Introduction to the page.') . '</span></label> ' . 489 form::textarea('post_excerpt', 50, 5, html::escapeHTML($post_excerpt)) . 489 form::textarea('post_excerpt', 50, 5, 490 [ 491 'default' => html::escapeHTML($post_excerpt), 492 'extra_html' => 'lang="' . $post_lang . '"' 493 ]) . 490 494 '</p>', 491 495 … … 496 500 [ 497 501 'default' => html::escapeHTML($post_content), 498 'extra_html' => 'required placeholder="' . __('Content') . '" '502 'extra_html' => 'required placeholder="' . __('Content') . '" lang="' . $post_lang . '"' 499 503 ]) . 500 504 '</p>',
Note: See TracChangeset
for help on using the changeset viewer.