aboutsummaryrefslogtreecommitdiff
path: root/sources/plugins/font
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2017-12-04 18:55:29 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2017-12-04 18:55:29 +0100
commit1794320dcfdfcd19572fb1676294f9853a6bbc20 (patch)
treea4c9e978947d6930d50391747382d7f95a5863e3 /sources/plugins/font
parent7183f6a6a21ad9124e70c997e0168459f377a9f2 (diff)
downloadludivine-ckeditor-component-1794320dcfdfcd19572fb1676294f9853a6bbc20.tar.gz
ludivine-ckeditor-component-1794320dcfdfcd19572fb1676294f9853a6bbc20.tar.zst
ludivine-ckeditor-component-1794320dcfdfcd19572fb1676294f9853a6bbc20.zip
Update to 4.7.3HEAD4.7.3master
Diffstat (limited to 'sources/plugins/font')
-rw-r--r--sources/plugins/font/lang/es-mx.js14
-rw-r--r--sources/plugins/font/lang/hr.js2
-rw-r--r--sources/plugins/font/plugin.js6
3 files changed, 18 insertions, 4 deletions
diff --git a/sources/plugins/font/lang/es-mx.js b/sources/plugins/font/lang/es-mx.js
new file mode 100644
index 0000000..5d4cdcf
--- /dev/null
+++ b/sources/plugins/font/lang/es-mx.js
@@ -0,0 +1,14 @@
1/*
2Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
3For licensing, see LICENSE.md or http://ckeditor.com/license
4*/
5CKEDITOR.plugins.setLang( 'font', 'es-mx', {
6 fontSize: {
7 label: 'Tamaño',
8 voiceLabel: 'Tamaño de letra',
9 panelTitle: 'Tamaño de letra'
10 },
11 label: 'Letra',
12 panelTitle: 'Nombre de letra',
13 voiceLabel: 'Letra'
14} );
diff --git a/sources/plugins/font/lang/hr.js b/sources/plugins/font/lang/hr.js
index 0313aa3..669169c 100644
--- a/sources/plugins/font/lang/hr.js
+++ b/sources/plugins/font/lang/hr.js
@@ -9,6 +9,6 @@ CKEDITOR.plugins.setLang( 'font', 'hr', {
9 panelTitle: 'Veličina' 9 panelTitle: 'Veličina'
10 }, 10 },
11 label: 'Font', 11 label: 'Font',
12 panelTitle: 'Font', 12 panelTitle: 'Naziv fonta',
13 voiceLabel: 'Font' 13 voiceLabel: 'Font'
14} ); 14} );
diff --git a/sources/plugins/font/plugin.js b/sources/plugins/font/plugin.js
index 8794d89..fe5f47e 100644
--- a/sources/plugins/font/plugin.js
+++ b/sources/plugins/font/plugin.js
@@ -104,8 +104,8 @@
104 var previousValue = this.getValue(), 104 var previousValue = this.getValue(),
105 style = styles[ value ]; 105 style = styles[ value ];
106 106
107 // When applying one style over another, first remove the previous one (#12403). 107 // When applying one style over another, first remove the previous one (http://dev.ckeditor.com/ticket/12403).
108 // NOTE: This is only a temporary fix. It will be moved to the styles system (#12687). 108 // NOTE: This is only a temporary fix. It will be moved to the styles system (http://dev.ckeditor.com/ticket/12687).
109 if ( previousValue && value != previousValue ) { 109 if ( previousValue && value != previousValue ) {
110 var previousStyle = styles[ previousValue ], 110 var previousStyle = styles[ previousValue ],
111 range = editor.getSelection().getRanges()[ 0 ]; 111 range = editor.getSelection().getRanges()[ 0 ];
@@ -223,7 +223,7 @@
223 CKEDITOR.plugins.add( 'font', { 223 CKEDITOR.plugins.add( 'font', {
224 requires: 'richcombo', 224 requires: 'richcombo',
225 // jscs:disable maximumLineLength 225 // jscs:disable maximumLineLength
226 lang: 'af,ar,az,bg,bn,bs,ca,cs,cy,da,de,de-ch,el,en,en-au,en-ca,en-gb,eo,es,et,eu,fa,fi,fo,fr,fr-ca,gl,gu,he,hi,hr,hu,id,is,it,ja,ka,km,ko,ku,lt,lv,mk,mn,ms,nb,nl,no,oc,pl,pt,pt-br,ro,ru,si,sk,sl,sq,sr,sr-latn,sv,th,tr,tt,ug,uk,vi,zh,zh-cn', // %REMOVE_LINE_CORE% 226 lang: 'af,ar,az,bg,bn,bs,ca,cs,cy,da,de,de-ch,el,en,en-au,en-ca,en-gb,eo,es,es-mx,et,eu,fa,fi,fo,fr,fr-ca,gl,gu,he,hi,hr,hu,id,is,it,ja,ka,km,ko,ku,lt,lv,mk,mn,ms,nb,nl,no,oc,pl,pt,pt-br,ro,ru,si,sk,sl,sq,sr,sr-latn,sv,th,tr,tt,ug,uk,vi,zh,zh-cn', // %REMOVE_LINE_CORE%
227 // jscs:enable maximumLineLength 227 // jscs:enable maximumLineLength
228 init: function( editor ) { 228 init: function( editor ) {
229 var config = editor.config; 229 var config = editor.config;