Skip to content
Permalink
Browse files

Merge branch 't/13934'

  • Loading branch information...
mlewand committed Nov 12, 2015
2 parents c463eef + f1fb48d commit b34ea4de6106ce5513da723ba42c3ba52da7424a
Showing with 74 additions and 1,487 deletions.
  1. +0 −4 CHANGES.md
  2. +0 −21 dev/langtool/meta/ckeditor.plugin-smiley/meta.txt
  3. +5 −7 plugins/smiley/dialogs/smiley.js
  4. +1 −22 plugins/smiley/lang/af.js
  5. +1 −22 plugins/smiley/lang/ar.js
  6. +1 −22 plugins/smiley/lang/bg.js
  7. +1 −22 plugins/smiley/lang/bn.js
  8. +1 −22 plugins/smiley/lang/bs.js
  9. +1 −22 plugins/smiley/lang/ca.js
  10. +1 −22 plugins/smiley/lang/cs.js
  11. +1 −22 plugins/smiley/lang/cy.js
  12. +1 −22 plugins/smiley/lang/da.js
  13. +1 −22 plugins/smiley/lang/de.js
  14. +1 −22 plugins/smiley/lang/el.js
  15. +1 −22 plugins/smiley/lang/en-au.js
  16. +1 −22 plugins/smiley/lang/en-ca.js
  17. +1 −22 plugins/smiley/lang/en-gb.js
  18. +1 −22 plugins/smiley/lang/en.js
  19. +1 −22 plugins/smiley/lang/eo.js
  20. +1 −22 plugins/smiley/lang/es.js
  21. +1 −22 plugins/smiley/lang/et.js
  22. +3 −24 plugins/smiley/lang/eu.js
  23. +1 −22 plugins/smiley/lang/fa.js
  24. +1 −22 plugins/smiley/lang/fi.js
  25. +1 −22 plugins/smiley/lang/fo.js
  26. +1 −22 plugins/smiley/lang/fr-ca.js
  27. +1 −22 plugins/smiley/lang/fr.js
  28. +1 −22 plugins/smiley/lang/gl.js
  29. +1 −22 plugins/smiley/lang/gu.js
  30. +1 −22 plugins/smiley/lang/he.js
  31. +1 −22 plugins/smiley/lang/hi.js
  32. +1 −22 plugins/smiley/lang/hr.js
  33. +1 −22 plugins/smiley/lang/hu.js
  34. +1 −22 plugins/smiley/lang/id.js
  35. +1 −22 plugins/smiley/lang/is.js
  36. +1 −22 plugins/smiley/lang/it.js
  37. +1 −22 plugins/smiley/lang/ja.js
  38. +1 −22 plugins/smiley/lang/ka.js
  39. +1 −22 plugins/smiley/lang/km.js
  40. +1 −22 plugins/smiley/lang/ko.js
  41. +1 −22 plugins/smiley/lang/ku.js
  42. +1 −22 plugins/smiley/lang/lt.js
  43. +1 −22 plugins/smiley/lang/lv.js
  44. +1 −22 plugins/smiley/lang/mk.js
  45. +1 −22 plugins/smiley/lang/mn.js
  46. +1 −22 plugins/smiley/lang/ms.js
  47. +1 −22 plugins/smiley/lang/nb.js
  48. +1 −22 plugins/smiley/lang/nl.js
  49. +1 −22 plugins/smiley/lang/no.js
  50. +1 −22 plugins/smiley/lang/pl.js
  51. +1 −22 plugins/smiley/lang/pt-br.js
  52. +1 −22 plugins/smiley/lang/pt.js
  53. +1 −22 plugins/smiley/lang/ro.js
  54. +1 −22 plugins/smiley/lang/ru.js
  55. +1 −22 plugins/smiley/lang/si.js
  56. +1 −22 plugins/smiley/lang/sk.js
  57. +1 −22 plugins/smiley/lang/sl.js
  58. +1 −22 plugins/smiley/lang/sq.js
  59. +1 −22 plugins/smiley/lang/sr-latn.js
  60. +1 −22 plugins/smiley/lang/sr.js
  61. +1 −22 plugins/smiley/lang/sv.js
  62. +1 −22 plugins/smiley/lang/th.js
  63. +1 −22 plugins/smiley/lang/tr.js
  64. +1 −22 plugins/smiley/lang/tt.js
  65. +1 −22 plugins/smiley/lang/ug.js
  66. +1 −22 plugins/smiley/lang/uk.js
  67. +1 −22 plugins/smiley/lang/vi.js
  68. +1 −22 plugins/smiley/lang/zh-cn.js
  69. +1 −22 plugins/smiley/lang/zh.js
  70. +1 −1 plugins/smiley/plugin.js
@@ -3,10 +3,6 @@ CKEditor 4 Changelog

## CKEditor 4.5.5

New Features:

* [PR#222](https://github.com/ckeditor/ckeditor-dev/pull/222): [Smiley](http://ckeditor.com/addon/smiley) dialog icon labels can now be translated. Thanks to [Andrej Y. Hristoliubov](https://github.com/anhr)!

Fixed Issues:

* [#13887](https://dev.ckeditor.com/ticket/13887): Fixed: [Link](http://ckeditor.com/addon/link) plugin alters the `target` attribute value. Thanks to [SamZiemer](https://github.com/SamZiemer)!
@@ -4,24 +4,3 @@
options = Voice label for the Smiley Options feature.
title = Label for the Smiley dialog window.
toolbar = Toolbar button tooltip for the Smiley feature.
smiley = Tooltip and voice label for the smiley icon.
sad = Tooltip and voice label for the sad icon.
wink = Tooltip and voice label for the wink icon.
laugh = Tooltip and voice label for the laugh icon.
frown = Tooltip and voice label for the frown icon.
cheeky = Tooltip and voice label for the cheeky icon.
blush = Tooltip and voice label for the blush icon.
surprise = Tooltip and voice label for the surprise icon.
indecision = Tooltip and voice label for the indecision icon.
angry = Tooltip and voice label for the angry icon.
angel = Tooltip and voice label for the angel icon.
cool = Tooltip and voice label for the cool icon.
devil = Tooltip and voice label for the devil icon.
crying = Tooltip and voice label for the crying icon.
enlightened = Tooltip and voice label for the enlightened icon.
no = Tooltip and voice label for the "no" icon.
yes = Tooltip and voice label for the "yes" icon.
heart = Tooltip and voice label for the heart icon.
broken_heart = Tooltip and voice label for the broken heart icon.
kiss = Tooltip and voice label for the kiss icon.
mail = Tooltip and voice label for the mail icon.
@@ -129,19 +129,17 @@ CKEDITOR.dialog.add( 'smiley', function( editor ) {
if ( i % columns === 0 )
html.push( '<tr role="presentation">' );

var smileyLabelId = 'cke_smile_label_' + i + '_' + CKEDITOR.tools.getNextNumber(),
simleyLabel = lang[ config.smiley_descriptions[ i ] ] || config.smiley_descriptions[ i ];

var smileyLabelId = 'cke_smile_label_' + i + '_' + CKEDITOR.tools.getNextNumber();
html.push(
'<td class="cke_dark_background cke_centered" style="vertical-align: middle;" role="presentation">' +
'<a href="javascript:void(0)" role="option"', ' aria-posinset="' + ( i + 1 ) + '"', ' aria-setsize="' + size + '"', ' aria-labelledby="' + smileyLabelId + '"',
' class="cke_smile cke_hand" tabindex="-1" onkeydown="CKEDITOR.tools.callFunction( ', onKeydown, ', event, this );">',
'<img class="cke_hand" title="', simleyLabel, '"' +
' cke_src="', CKEDITOR.tools.htmlEncode( config.smiley_path + images[ i ] ), '" alt="', simleyLabel, '"',
'<img class="cke_hand" title="', config.smiley_descriptions[ i ], '"' +
' cke_src="', CKEDITOR.tools.htmlEncode( config.smiley_path + images[ i ] ), '" alt="', config.smiley_descriptions[ i ], '"',
' src="', CKEDITOR.tools.htmlEncode( config.smiley_path + images[ i ] ), '"',
// IE BUG: Below is a workaround to an IE image loading bug to ensure the image sizes are correct.
( CKEDITOR.env.ie ? ' onload="this.setAttribute(\'width\', 2); this.removeAttribute(\'width\');" ' : '' ), '>' +
'<span id="' + smileyLabelId + '" class="cke_voice_label">' + simleyLabel + '</span>' +
'<span id="' + smileyLabelId + '" class="cke_voice_label">' + config.smiley_descriptions[ i ] + '</span>' +
'</a>', '</td>'
);

@@ -177,7 +175,7 @@ CKEDITOR.dialog.add( 'smiley', function( editor ) {
};

return {
title: lang.title,
title: editor.lang.smiley.title,
minWidth: 270,
minHeight: 120,
contents: [ {
@@ -5,26 +5,5 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
CKEDITOR.plugins.setLang( 'smiley', 'af', {
options: 'Lagbekkie opsies',
title: 'Voeg lagbekkie by',
toolbar: 'Lagbekkie',
smiley: 'smiley', // MISSING
sad: 'sad', // MISSING
wink: 'wink', // MISSING
laugh: 'laugh', // MISSING
frown: 'frown', // MISSING
cheeky: 'cheeky', // MISSING
blush: 'blush', // MISSING
surprise: 'surprise', // MISSING
indecision: 'indecision', // MISSING
angry: 'angry', // MISSING
angel: 'angel', // MISSING
cool: 'cool', // MISSING
devil: 'devil', // MISSING
crying: 'crying', // MISSING
enlightened: 'enlightened', // MISSING
no: 'no', // MISSING
yes: 'yes', // MISSING
heart: 'heart', // MISSING
broken_heart: 'broken heart', // MISSING
kiss: 'kiss', // MISSING
mail: 'mail' // MISSING
toolbar: 'Lagbekkie'
} );
@@ -5,26 +5,5 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
CKEDITOR.plugins.setLang( 'smiley', 'ar', {
options: 'خصائص الإبتسامات',
title: 'إدراج ابتسامات',
toolbar: 'ابتسامات',
smiley: 'smiley', // MISSING
sad: 'sad', // MISSING
wink: 'wink', // MISSING
laugh: 'laugh', // MISSING
frown: 'frown', // MISSING
cheeky: 'cheeky', // MISSING
blush: 'blush', // MISSING
surprise: 'surprise', // MISSING
indecision: 'indecision', // MISSING
angry: 'angry', // MISSING
angel: 'angel', // MISSING
cool: 'cool', // MISSING
devil: 'devil', // MISSING
crying: 'crying', // MISSING
enlightened: 'enlightened', // MISSING
no: 'no', // MISSING
yes: 'yes', // MISSING
heart: 'heart', // MISSING
broken_heart: 'broken heart', // MISSING
kiss: 'kiss', // MISSING
mail: 'mail' // MISSING
toolbar: 'ابتسامات'
} );
@@ -5,26 +5,5 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
CKEDITOR.plugins.setLang( 'smiley', 'bg', {
options: 'Опции за усмивката',
title: 'Вмъкване на усмивка',
toolbar: 'Усмивка',
smiley: 'smiley', // MISSING
sad: 'sad', // MISSING
wink: 'wink', // MISSING
laugh: 'laugh', // MISSING
frown: 'frown', // MISSING
cheeky: 'cheeky', // MISSING
blush: 'blush', // MISSING
surprise: 'surprise', // MISSING
indecision: 'indecision', // MISSING
angry: 'angry', // MISSING
angel: 'angel', // MISSING
cool: 'cool', // MISSING
devil: 'devil', // MISSING
crying: 'crying', // MISSING
enlightened: 'enlightened', // MISSING
no: 'no', // MISSING
yes: 'yes', // MISSING
heart: 'heart', // MISSING
broken_heart: 'broken heart', // MISSING
kiss: 'kiss', // MISSING
mail: 'mail' // MISSING
toolbar: 'Усмивка'
} );
@@ -5,26 +5,5 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
CKEDITOR.plugins.setLang( 'smiley', 'bn', {
options: 'Smiley Options', // MISSING
title: 'স্মাইলী যুক্ত কর',
toolbar: 'স্মাইলী',
smiley: 'smiley', // MISSING
sad: 'sad', // MISSING
wink: 'wink', // MISSING
laugh: 'laugh', // MISSING
frown: 'frown', // MISSING
cheeky: 'cheeky', // MISSING
blush: 'blush', // MISSING
surprise: 'surprise', // MISSING
indecision: 'indecision', // MISSING
angry: 'angry', // MISSING
angel: 'angel', // MISSING
cool: 'cool', // MISSING
devil: 'devil', // MISSING
crying: 'crying', // MISSING
enlightened: 'enlightened', // MISSING
no: 'no', // MISSING
yes: 'yes', // MISSING
heart: 'heart', // MISSING
broken_heart: 'broken heart', // MISSING
kiss: 'kiss', // MISSING
mail: 'mail' // MISSING
toolbar: 'স্মাইলী'
} );
@@ -5,26 +5,5 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
CKEDITOR.plugins.setLang( 'smiley', 'bs', {
options: 'Smiley Options', // MISSING
title: 'Ubaci smješka',
toolbar: 'Smješko',
smiley: 'smiley', // MISSING
sad: 'sad', // MISSING
wink: 'wink', // MISSING
laugh: 'laugh', // MISSING
frown: 'frown', // MISSING
cheeky: 'cheeky', // MISSING
blush: 'blush', // MISSING
surprise: 'surprise', // MISSING
indecision: 'indecision', // MISSING
angry: 'angry', // MISSING
angel: 'angel', // MISSING
cool: 'cool', // MISSING
devil: 'devil', // MISSING
crying: 'crying', // MISSING
enlightened: 'enlightened', // MISSING
no: 'no', // MISSING
yes: 'yes', // MISSING
heart: 'heart', // MISSING
broken_heart: 'broken heart', // MISSING
kiss: 'kiss', // MISSING
mail: 'mail' // MISSING
toolbar: 'Smješko'
} );
@@ -5,26 +5,5 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
CKEDITOR.plugins.setLang( 'smiley', 'ca', {
options: 'Opcions d\'emoticones',
title: 'Insereix una icona',
toolbar: 'Icona',
smiley: 'smiley', // MISSING
sad: 'sad', // MISSING
wink: 'wink', // MISSING
laugh: 'laugh', // MISSING
frown: 'frown', // MISSING
cheeky: 'cheeky', // MISSING
blush: 'blush', // MISSING
surprise: 'surprise', // MISSING
indecision: 'indecision', // MISSING
angry: 'angry', // MISSING
angel: 'angel', // MISSING
cool: 'cool', // MISSING
devil: 'devil', // MISSING
crying: 'crying', // MISSING
enlightened: 'enlightened', // MISSING
no: 'no', // MISSING
yes: 'yes', // MISSING
heart: 'heart', // MISSING
broken_heart: 'broken heart', // MISSING
kiss: 'kiss', // MISSING
mail: 'mail' // MISSING
toolbar: 'Icona'
} );
@@ -5,26 +5,5 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
CKEDITOR.plugins.setLang( 'smiley', 'cs', {
options: 'Nastavení smajlíků',
title: 'Vkládání smajlíků',
toolbar: 'Smajlíci',
smiley: 'smajlík',
sad: 'smutný',
wink: 'mrkající',
laugh: 'smějící se',
frown: 'mračící se',
cheeky: 'drzý',
blush: 'stydící se',
surprise: 'překvapený',
indecision: 'nerozhodný',
angry: 'naštvaný',
angel: 'nevinný',
cool: 'frajer',
devil: 'ďábel',
crying: 'brečící',
enlightened: 'osvětlený',
no: 'nesouhlasím',
yes: 'souhlasím',
heart: 'srdce',
broken_heart: 'zlomené srdce',
kiss: 'polibek',
mail: 'pošta'
toolbar: 'Smajlíci'
} );
@@ -5,26 +5,5 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
CKEDITOR.plugins.setLang( 'smiley', 'cy', {
options: 'Opsiynau Gwenogluniau',
title: 'Mewnosod Gwenoglun',
toolbar: 'Gwenoglun',
smiley: 'smiley', // MISSING
sad: 'sad', // MISSING
wink: 'wink', // MISSING
laugh: 'laugh', // MISSING
frown: 'frown', // MISSING
cheeky: 'cheeky', // MISSING
blush: 'blush', // MISSING
surprise: 'surprise', // MISSING
indecision: 'indecision', // MISSING
angry: 'angry', // MISSING
angel: 'angel', // MISSING
cool: 'cool', // MISSING
devil: 'devil', // MISSING
crying: 'crying', // MISSING
enlightened: 'enlightened', // MISSING
no: 'no', // MISSING
yes: 'yes', // MISSING
heart: 'heart', // MISSING
broken_heart: 'broken heart', // MISSING
kiss: 'kiss', // MISSING
mail: 'mail' // MISSING
toolbar: 'Gwenoglun'
} );
@@ -5,26 +5,5 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
CKEDITOR.plugins.setLang( 'smiley', 'da', {
options: 'Smileymuligheder',
title: 'Vælg smiley',
toolbar: 'Smiley',
smiley: 'smiley', // MISSING
sad: 'sad', // MISSING
wink: 'wink', // MISSING
laugh: 'laugh', // MISSING
frown: 'frown', // MISSING
cheeky: 'cheeky', // MISSING
blush: 'blush', // MISSING
surprise: 'surprise', // MISSING
indecision: 'indecision', // MISSING
angry: 'angry', // MISSING
angel: 'angel', // MISSING
cool: 'cool', // MISSING
devil: 'devil', // MISSING
crying: 'crying', // MISSING
enlightened: 'enlightened', // MISSING
no: 'no', // MISSING
yes: 'yes', // MISSING
heart: 'heart', // MISSING
broken_heart: 'broken heart', // MISSING
kiss: 'kiss', // MISSING
mail: 'mail' // MISSING
toolbar: 'Smiley'
} );
@@ -5,26 +5,5 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
CKEDITOR.plugins.setLang( 'smiley', 'de', {
options: 'Smiley-Optionen',
title: 'Smiley auswählen',
toolbar: 'Smiley',
smiley: 'Smiley',
sad: 'traurig',
wink: 'zwinkern',
laugh: 'lachen',
frown: 'Stirnrunzeln',
cheeky: 'frech',
blush: 'erröten',
surprise: 'überrascht',
indecision: 'unentschlossen',
angry: 'verärgert',
angel: 'Engel',
cool: 'geil',
devil: 'Teufel',
crying: 'weinend',
enlightened: 'erleuchtet',
no: 'nein',
yes: 'ja',
heart: 'Herz',
broken_heart: 'gebrochenes Herz',
kiss: 'Kuss',
mail: 'Brief'
toolbar: 'Smiley'
} );
@@ -5,26 +5,5 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
CKEDITOR.plugins.setLang( 'smiley', 'el', {
options: 'Επιλογές Φατσούλων',
title: 'Εισάγετε μια Φατσούλα',
toolbar: 'Φατσούλα',
smiley: 'smiley', // MISSING
sad: 'sad', // MISSING
wink: 'wink', // MISSING
laugh: 'laugh', // MISSING
frown: 'frown', // MISSING
cheeky: 'cheeky', // MISSING
blush: 'blush', // MISSING
surprise: 'surprise', // MISSING
indecision: 'indecision', // MISSING
angry: 'angry', // MISSING
angel: 'angel', // MISSING
cool: 'cool', // MISSING
devil: 'devil', // MISSING
crying: 'crying', // MISSING
enlightened: 'enlightened', // MISSING
no: 'no', // MISSING
yes: 'yes', // MISSING
heart: 'heart', // MISSING
broken_heart: 'broken heart', // MISSING
kiss: 'kiss', // MISSING
mail: 'mail' // MISSING
toolbar: 'Φατσούλα'
} );
Oops, something went wrong.

0 comments on commit b34ea4d

Please sign in to comment.
You can’t perform that action at this time.