Skip to content

Commit

Permalink
Merge branch 't/12113'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Reinmar
Reinmar committed Aug 25, 2014
2 parents aaa5ff9 + 428a52a commit 558f516
Show file tree
Hide file tree
Showing 44 changed files with 88 additions and 43 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
View file
Expand Up @@ -6,6 +6,7 @@ CKEditor 4 Changelog
Fixed Issues:

* [#12315](http://dev.ckeditor.com/ticket/12315): Fixed: Marked [`config.autoParagraph`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-autoParagraph) as deprecated.
* [#12113](http://dev.ckeditor.com/ticket/12113): Fixed: Code snippet should be presented in elements path as "codesnippet".

## CKEditor 4.4.4

Expand Down
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/bg.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'bg', {
codeContents: 'Code content', // MISSING
emptySnippetError: 'A code snippet cannot be empty.', // MISSING
language: 'Language', // MISSING
title: 'Code snippet' // MISSING
title: 'Code snippet', // MISSING
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/ca.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'ca', {
codeContents: 'Contingut del codi',
emptySnippetError: 'El fragment de codi no pot estar buit.',
language: 'Idioma',
title: 'Fragment de codi'
title: 'Fragment de codi',
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/cs.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'cs', {
codeContents: 'Obsah kódu',
emptySnippetError: 'Úryvek kódu nemůže být prázdný.',
language: 'Jazyk',
title: 'Úryvek kódu'
title: 'Úryvek kódu',
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/da.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'da', {
codeContents: 'Code content', // MISSING
emptySnippetError: 'A code snippet cannot be empty.', // MISSING
language: 'Language', // MISSING
title: 'Code snippet' // MISSING
title: 'Code snippet', // MISSING
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/de.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'de', {
codeContents: 'Codeinhalt',
emptySnippetError: 'Ein Codeschnipsel kann nicht leer sein.',
language: 'Sprache',
title: 'Codeschnipsel'
title: 'Codeschnipsel',
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/el.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'el', {
codeContents: 'Περιεχόμενο κώδικα',
emptySnippetError: 'Δεν γίνεται να είναι κενά τα αποσπάσματα κώδικα.',
language: 'Γλώσσα',
title: 'Απόσπασμα κώδικα'
title: 'Απόσπασμα κώδικα',
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/en-gb.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'en-gb', {
codeContents: 'Code content',
emptySnippetError: 'A code snippet cannot be empty.',
language: 'Language',
title: 'Code snippet'
title: 'Code snippet',
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/en.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'en', {
codeContents: 'Code content',
emptySnippetError: 'A code snippet cannot be empty.',
language: 'Language',
title: 'Code snippet'
title: 'Code snippet',
pathName: 'codesnippet'
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/eo.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'eo', {
codeContents: 'Kodenhavo',
emptySnippetError: 'Kodaĵero ne povas esti malplena.',
language: 'Lingvo',
title: 'Kodaĵero'
title: 'Kodaĵero',
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/es.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'es', {
codeContents: 'Code content', // MISSING
emptySnippetError: 'A code snippet cannot be empty.', // MISSING
language: 'Language', // MISSING
title: 'Code snippet' // MISSING
title: 'Code snippet', // MISSING
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/et.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'et', {
codeContents: 'Code content', // MISSING
emptySnippetError: 'A code snippet cannot be empty.', // MISSING
language: 'Language', // MISSING
title: 'Code snippet' // MISSING
title: 'Code snippet', // MISSING
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/fa.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'fa', {
codeContents: 'محتوای کد',
emptySnippetError: 'کد نمی تواند خالی باشد.',
language: 'زبان',
title: 'کد قطعه'
title: 'کد قطعه',
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/fi.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'fi', {
codeContents: 'Koodisisältö',
emptySnippetError: 'Koodileike ei voi olla tyhjä.',
language: 'Kieli',
title: 'Koodileike'
title: 'Koodileike',
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/fr-ca.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'fr-ca', {
codeContents: 'Code content', // MISSING
emptySnippetError: 'A code snippet cannot be empty.', // MISSING
language: 'Language', // MISSING
title: 'Code snippet' // MISSING
title: 'Code snippet', // MISSING
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/fr.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'fr', {
codeContents: 'Contenu du code',
emptySnippetError: 'Un extrait de code ne peut pas être vide',
language: 'Langue',
title: 'Extrait de code'
title: 'Extrait de code',
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/hr.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'hr', {
codeContents: 'Code content', // MISSING
emptySnippetError: 'A code snippet cannot be empty.', // MISSING
language: 'Language', // MISSING
title: 'Code snippet' // MISSING
title: 'Code snippet', // MISSING
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/hu.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'hu', {
codeContents: 'Kód tartalom',
emptySnippetError: 'A kódtöredék nem lehet üres.',
language: 'Nyelv',
title: 'Kódtöredék'
title: 'Kódtöredék',
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/it.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'it', {
codeContents: 'Contenuto del codice',
emptySnippetError: 'Un frammento di codice non può essere vuoto.',
language: 'Lingua',
title: 'Frammento di codice'
title: 'Frammento di codice',
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/ja.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'ja', {
codeContents: 'コード内容',
emptySnippetError: 'コードスニペットを入力してください。',
language: '言語',
title: 'コードスニペット'
title: 'コードスニペット',
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/km.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'km', {
codeContents: 'មាតិកាកូដ',
emptySnippetError: 'A code snippet cannot be empty.', // MISSING
language: 'ភាសា',
title: 'Code snippet' // MISSING
title: 'Code snippet', // MISSING
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/ku.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'ku', {
codeContents: 'Code content', // MISSING
emptySnippetError: 'A code snippet cannot be empty.', // MISSING
language: 'Language', // MISSING
title: 'Code snippet' // MISSING
title: 'Code snippet', // MISSING
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/lt.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'lt', {
codeContents: 'Code content', // MISSING
emptySnippetError: 'A code snippet cannot be empty.', // MISSING
language: 'Language', // MISSING
title: 'Code snippet' // MISSING
title: 'Code snippet', // MISSING
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/lv.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'lv', {
codeContents: 'Code content', // MISSING
emptySnippetError: 'A code snippet cannot be empty.', // MISSING
language: 'Language', // MISSING
title: 'Code snippet' // MISSING
title: 'Code snippet', // MISSING
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/nb.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'nb', {
codeContents: 'Kodeinnhold',
emptySnippetError: 'En kodesnutt kan ikke være tom.',
language: 'Språk',
title: 'Kodesnutt'
title: 'Kodesnutt',
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/nl.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'nl', {
codeContents: 'Code',
emptySnippetError: 'Een stuk code kan niet leeg zijn.',
language: 'Taal',
title: 'Stuk code'
title: 'Stuk code',
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/no.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'no', {
codeContents: 'Code content', // MISSING
emptySnippetError: 'A code snippet cannot be empty.', // MISSING
language: 'Language', // MISSING
title: 'Code snippet' // MISSING
title: 'Code snippet', // MISSING
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/pl.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'pl', {
codeContents: 'Treść kodu',
emptySnippetError: 'Kod nie może być pusty.',
language: 'Język',
title: 'Fragment kodu'
title: 'Fragment kodu',
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/pt-br.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'pt-br', {
codeContents: 'Conteúdo do código',
emptySnippetError: 'Um fragmento de código não pode ser vazio',
language: 'Idioma',
title: 'Fragmento de código'
title: 'Fragmento de código',
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/pt.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'pt', {
codeContents: 'Code content', // MISSING
emptySnippetError: 'A code snippet cannot be empty.', // MISSING
language: 'Language', // MISSING
title: 'Code snippet' // MISSING
title: 'Code snippet', // MISSING
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/ro.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'ro', {
codeContents: 'Code content', // MISSING
emptySnippetError: 'A code snippet cannot be empty.', // MISSING
language: 'Language', // MISSING
title: 'Code snippet' // MISSING
title: 'Code snippet', // MISSING
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/ru.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'ru', {
codeContents: 'Содержимое кода',
emptySnippetError: 'Сниппет не может быть пустым',
language: 'Язык',
title: 'Сниппет'
title: 'Сниппет',
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/sk.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'sk', {
codeContents: 'Code content', // MISSING
emptySnippetError: 'A code snippet cannot be empty.', // MISSING
language: 'Language', // MISSING
title: 'Code snippet' // MISSING
title: 'Code snippet', // MISSING
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/sl.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'sl', {
codeContents: 'Koda vsebina',
emptySnippetError: 'Odrezek kode ne more biti prazen.',
language: 'Jezik',
title: 'Odrezek kode'
title: 'Odrezek kode',
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/sq.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'sq', {
codeContents: 'Code content', // MISSING
emptySnippetError: 'A code snippet cannot be empty.', // MISSING
language: 'Language', // MISSING
title: 'Code snippet' // MISSING
title: 'Code snippet', // MISSING
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/sv.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'sv', {
codeContents: 'Kodinnehålll',
emptySnippetError: 'Innehåll krävs för kodsnutt',
language: 'Språk',
title: 'Kodsnutt'
title: 'Kodsnutt',
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/th.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'th', {
codeContents: 'Code content', // MISSING
emptySnippetError: 'A code snippet cannot be empty.', // MISSING
language: 'Language', // MISSING
title: 'Code snippet' // MISSING
title: 'Code snippet', // MISSING
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/tt.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'tt', {
codeContents: 'Код эчтәлеге',
emptySnippetError: 'Код өзеге буш булмаска тиеш',
language: 'Тел',
title: 'Код өзеге'
title: 'Код өзеге',
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/ug.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'ug', {
codeContents: 'Code content', // MISSING
emptySnippetError: 'A code snippet cannot be empty.', // MISSING
language: 'Language', // MISSING
title: 'Code snippet' // MISSING
title: 'Code snippet', // MISSING
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/uk.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'uk', {
codeContents: 'Code content', // MISSING
emptySnippetError: 'A code snippet cannot be empty.', // MISSING
language: 'Language', // MISSING
title: 'Code snippet' // MISSING
title: 'Code snippet', // MISSING
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/vi.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'vi', {
codeContents: 'Nội dung mã',
emptySnippetError: 'Một đoạn mã không thể để trống.',
language: 'Ngôn ngữ',
title: 'Đoạn mã'
title: 'Đoạn mã',
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/zh-cn.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'zh-cn', {
codeContents: 'Code content', // MISSING
emptySnippetError: '插入代码不能为空',
language: '语言',
title: 'Code snippet' // MISSING
title: 'Code snippet', // MISSING
pathName: 'codesnippet' // MISSING
} );
3 changes: 2 additions & 1 deletion plugins/codesnippet/lang/zh.js
View file
Expand Up @@ -8,5 +8,6 @@ CKEDITOR.plugins.setLang( 'codesnippet', 'zh', {
codeContents: '程式碼內容',
emptySnippetError: '程式碼片段不可為空白。',
language: '語言',
title: '程式碼片段'
title: '程式碼片段',
pathName: 'codesnippet' // MISSING
} );
4 changes: 3 additions & 1 deletion plugins/codesnippet/plugin.js
View file
Expand Up @@ -274,7 +274,8 @@
function registerWidget( editor ) {
var codeClass = editor.config.codeSnippet_codeClass,
newLineRegex = /\r?\n/g,
textarea = new CKEDITOR.dom.element( 'textarea' );
textarea = new CKEDITOR.dom.element( 'textarea' ),
lang = editor.lang.codesnippet;

editor.widgets.add( 'codeSnippet', {
allowedContent: 'pre; code(language-*)',
Expand All @@ -284,6 +285,7 @@
styleableElements: 'pre',
template: '<pre><code class="' + codeClass + '"></code></pre>',
dialog: 'codeSnippet',
pathName: lang.pathName,
mask: true,

parts: {
Expand Down

0 comments on commit 558f516

Please sign in to comment.