summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwebchick2013-10-02 16:45:31 (GMT)
committerwebchick2013-10-02 16:45:31 (GMT)
commitcde64227f76dac5dfcbe2ce0d468279e8d8f9b60 (patch)
treef969a0987956850edc64ff86899df9081a6c4716
parentc114c815e3d36451b55524ae34200f83dafa5718 (diff)
Issue #2067119 by pameeela, longwave, tstoeckler, Wim Leers: Fixed 'width' and 'height' HTML placeholder attributes in image dialog are not translated, yet should be lcfirst.
-rw-r--r--core/modules/editor/editor.admin.inc6
-rw-r--r--core/modules/editor/lib/Drupal/editor/Form/EditorImageDialog.php6
2 files changed, 6 insertions, 6 deletions
diff --git a/core/modules/editor/editor.admin.inc b/core/modules/editor/editor.admin.inc
index 9dc6a30..911accc 100644
--- a/core/modules/editor/editor.admin.inc
+++ b/core/modules/editor/editor.admin.inc
@@ -109,7 +109,7 @@ function editor_image_upload_settings_form(Editor $editor) {
'#maxlength' => 8,
'#min' => 1,
'#max' => 99999,
- '#placeholder' => 'width',
+ '#placeholder' => t('width'),
'#field_suffix' => ' x ',
'#states' => $show_if_image_uploads_enabled,
);
@@ -122,8 +122,8 @@ function editor_image_upload_settings_form(Editor $editor) {
'#maxlength' => 8,
'#min' => 1,
'#max' => 99999,
- '#placeholder' => 'height',
- '#field_suffix' => 'pixels',
+ '#placeholder' => t('height'),
+ '#field_suffix' => t('pixels'),
'#states' => $show_if_image_uploads_enabled,
);
diff --git a/core/modules/editor/lib/Drupal/editor/Form/EditorImageDialog.php b/core/modules/editor/lib/Drupal/editor/Form/EditorImageDialog.php
index 2f9a78d..5eb787c 100644
--- a/core/modules/editor/lib/Drupal/editor/Form/EditorImageDialog.php
+++ b/core/modules/editor/lib/Drupal/editor/Form/EditorImageDialog.php
@@ -112,7 +112,7 @@ class EditorImageDialog extends FormBase {
'#maxlength' => 8,
'#min' => 1,
'#max' => 99999,
- '#placeholder' => 'width',
+ '#placeholder' => $this->t('width'),
'#field_suffix' => ' x ',
'#parents' => array('attributes', 'width'),
);
@@ -125,8 +125,8 @@ class EditorImageDialog extends FormBase {
'#maxlength' => 8,
'#min' => 1,
'#max' => 99999,
- '#placeholder' => 'height',
- '#field_suffix' => 'pixels',
+ '#placeholder' => $this->t('height'),
+ '#field_suffix' => $this->t('pixels'),
'#parents' => array('attributes', 'height'),
);