Merge branch 't/10368'

ckeditor · Aug 27, 2013 · a7609c3 · a7609c3
2 parents ba119ff + e99bb86
commit a7609c3
Show file tree

Hide file tree

Showing 67 changed files with 20 additions and 533 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -3,6 +3,7 @@ CKEditor 4 Changelog
 
 ## CKEditor 4.2.1
 
+* [#10368](http://dev.ckeditor.com/ticket/10368): Move language reading direction definition ("dir") from main language file to core.
 * [#9330](http://dev.ckeditor.com/ticket/9330): Fixed pasting anchors from MS Word.
 * [#8103](http://dev.ckeditor.com/ticket/8103): Fixed pasting nested lists from MS Word.
 * [#9958](http://dev.ckeditor.com/ticket/9958): Press ok button will trigger onbeforeunload event in popup-dialog on ie9.

diff --git a/core/lang.js b/core/lang.js
@@ -18,7 +18,12 @@
 		 *
 		 *		alert( CKEDITOR.lang.en ); // 1
 		 */
-		languages: { 'af':1,'ar':1,'bg':1,'bn':1,'bs':1,'ca':1,'cs':1,'cy':1,'da':1,'de':1,'el':1,'en-au':1,'en-ca':1,'en-gb':1,'en':1,'eo':1,'es':1,'et':1,'eu':1,'fa':1,'fi':1,'fo':1,'fr-ca':1,'fr':1,'gl':1,'gu':1,'he':1,'hi':1,'hr':1,'hu':1,'id':1,'is':1,'it':1,'ja':1,'ka':1,'km':1,'ko':1,'ku':1,'lt':1,'lv':1,'mk':1,'mn':1,'ms':1,'nb':1,'nl':1,'no':1,'pl':1,'pt-br':1,'pt':1,'ro':1,'ru':1,'si':1,'sk':1,'sl':1,'sq':1,'sr-latn':1,'sr':1,'sv':1,'th':1,'tr':1,'ug':1,'uk':1,'vi':1,'zh-cn':1,'zh':1 },
+		languages: { af:1,ar:1,bg:1,bn:1,bs:1,ca:1,cs:1,cy:1,da:1,de:1,el:1,'en-au':1,'en-ca':1,'en-gb':1,en:1,eo:1,es:1,et:1,eu:1,fa:1,fi:1,fo:1,'fr-ca':1,fr:1,gl:1,gu:1,he:1,hi:1,hr:1,hu:1,id:1,is:1,it:1,ja:1,ka:1,km:1,ko:1,ku:1,lt:1,lv:1,mk:1,mn:1,ms:1,nb:1,nl:1,no:1,pl:1,'pt-br':1,pt:1,ro:1,ru:1,si:1,sk:1,sl:1,sq:1,'sr-latn':1,sr:1,sv:1,th:1,tr:1,ug:1,uk:1,vi:1,'zh-cn':1,zh:1 },
+
+		/**
+		 * The list of languages written Right-To-Left (RTL) and supported by the editor.
+		 */
+		rtl: { ar:1,fa:1,he:1,ku:1,ug:1 },
 
 		/**
 		 * Loads a specific language file, or auto detect it. A callback is
@@ -41,6 +46,7 @@
 
 			if ( !this[ languageCode ] ) {
 				CKEDITOR.scriptLoader.load( CKEDITOR.getUrl( 'lang/' + languageCode + '.js' ), function() {
+					this[ languageCode ].dir = this.rtl[ languageCode ] ? 'rtl' : 'ltr';
 					callback( languageCode, this[ languageCode ] );
 				}, this );
 			} else

diff --git a/lang/af.js b/lang/af.js
@@ -18,14 +18,6 @@
  * @namespace
  */
 CKEDITOR.lang[ 'af' ] = {
-	/**
-	 * The language reading direction. Possible values are "rtl" for
-	 * Right-To-Left languages (like Arabic) and "ltr" for Left-To-Right
-	 * languages (like English).
-	 * @default 'ltr'
-	 */
-	dir: 'ltr',
-
 	// ARIA description.
 	editor: 'Teksverwerker',
 

diff --git a/lang/ar.js b/lang/ar.js
@@ -18,14 +18,6 @@
  * @namespace
  */
 CKEDITOR.lang[ 'ar' ] = {
-	/**
-	 * The language reading direction. Possible values are "rtl" for
-	 * Right-To-Left languages (like Arabic) and "ltr" for Left-To-Right
-	 * languages (like English).
-	 * @default 'ltr'
-	 */
-	dir: 'rtl',
-
 	// ARIA description.
 	editor: 'محرر النص الغني',
 

diff --git a/lang/bg.js b/lang/bg.js
@@ -18,14 +18,6 @@
  * @namespace
  */
 CKEDITOR.lang[ 'bg' ] = {
-	/**
-	 * The language reading direction. Possible values are "rtl" for
-	 * Right-To-Left languages (like Arabic) and "ltr" for Left-To-Right
-	 * languages (like English).
-	 * @default 'ltr'
-	 */
-	dir: 'ltr',
-
 	// ARIA description.
 	editor: 'Текстов редактор за форматиран текст',
 

diff --git a/lang/bn.js b/lang/bn.js
@@ -18,14 +18,6 @@
  * @namespace
  */
 CKEDITOR.lang[ 'bn' ] = {
-	/**
-	 * The language reading direction. Possible values are "rtl" for
-	 * Right-To-Left languages (like Arabic) and "ltr" for Left-To-Right
-	 * languages (like English).
-	 * @default 'ltr'
-	 */
-	dir: 'ltr',
-
 	// ARIA description.
 	editor: 'Rich Text Editor', // MISSING
 

diff --git a/lang/bs.js b/lang/bs.js
@@ -18,14 +18,6 @@
  * @namespace
  */
 CKEDITOR.lang[ 'bs' ] = {
-	/**
-	 * The language reading direction. Possible values are "rtl" for
-	 * Right-To-Left languages (like Arabic) and "ltr" for Left-To-Right
-	 * languages (like English).
-	 * @default 'ltr'
-	 */
-	dir: 'ltr',
-
 	// ARIA description.
 	editor: 'Rich Text Editor', // MISSING
 

diff --git a/lang/ca.js b/lang/ca.js
@@ -18,14 +18,6 @@
  * @namespace
  */
 CKEDITOR.lang[ 'ca' ] = {
-	/**
-	 * The language reading direction. Possible values are "rtl" for
-	 * Right-To-Left languages (like Arabic) and "ltr" for Left-To-Right
-	 * languages (like English).
-	 * @default 'ltr'
-	 */
-	dir: 'ltr',
-
 	// ARIA description.
 	editor: 'Editor de text enriquit',
 

diff --git a/lang/cs.js b/lang/cs.js
@@ -18,14 +18,6 @@
  * @namespace
  */
 CKEDITOR.lang[ 'cs' ] = {
-	/**
-	 * The language reading direction. Possible values are "rtl" for
-	 * Right-To-Left languages (like Arabic) and "ltr" for Left-To-Right
-	 * languages (like English).
-	 * @default 'ltr'
-	 */
-	dir: 'ltr',
-
 	// ARIA description.
 	editor: 'Textový editor',
 

diff --git a/lang/cy.js b/lang/cy.js
@@ -18,14 +18,6 @@
  * @namespace
  */
 CKEDITOR.lang[ 'cy' ] = {
-	/**
-	 * The language reading direction. Possible values are "rtl" for
-	 * Right-To-Left languages (like Arabic) and "ltr" for Left-To-Right
-	 * languages (like English).
-	 * @default 'ltr'
-	 */
-	dir: 'ltr',
-
 	// ARIA description.
 	editor: 'Golygydd Testun Cyfoethog',
 

diff --git a/lang/da.js b/lang/da.js
@@ -18,14 +18,6 @@
  * @namespace
  */
 CKEDITOR.lang[ 'da' ] = {
-	/**
-	 * The language reading direction. Possible values are "rtl" for
-	 * Right-To-Left languages (like Arabic) and "ltr" for Left-To-Right
-	 * languages (like English).
-	 * @default 'ltr'
-	 */
-	dir: 'ltr',
-
 	// ARIA description.
 	editor: 'Rich Text Editor',
 

diff --git a/lang/de.js b/lang/de.js
@@ -18,14 +18,6 @@
  * @namespace
  */
 CKEDITOR.lang[ 'de' ] = {
-	/**
-	 * The language reading direction. Possible values are "rtl" for
-	 * Right-To-Left languages (like Arabic) and "ltr" for Left-To-Right
-	 * languages (like English).
-	 * @default 'ltr'
-	 */
-	dir: 'ltr',
-
 	// ARIA description.
 	editor: 'WYSIWYG-Editor',
 

diff --git a/lang/el.js b/lang/el.js
@@ -18,14 +18,6 @@
  * @namespace
  */
 CKEDITOR.lang[ 'el' ] = {
-	/**
-	 * The language reading direction. Possible values are "rtl" for
-	 * Right-To-Left languages (like Arabic) and "ltr" for Left-To-Right
-	 * languages (like English).
-	 * @default 'ltr'
-	 */
-	dir: 'ltr',
-
 	// ARIA description.
 	editor: 'Επεξεργαστής Πλούσιου Κειμένου',
 

diff --git a/lang/en-au.js b/lang/en-au.js
@@ -18,14 +18,6 @@
  * @namespace
  */
 CKEDITOR.lang[ 'en-au' ] = {
-	/**
-	 * The language reading direction. Possible values are "rtl" for
-	 * Right-To-Left languages (like Arabic) and "ltr" for Left-To-Right
-	 * languages (like English).
-	 * @default 'ltr'
-	 */
-	dir: 'ltr',
-
 	// ARIA description.
 	editor: 'Rich Text Editor',
 

diff --git a/lang/en-ca.js b/lang/en-ca.js
@@ -18,14 +18,6 @@
  * @namespace
  */
 CKEDITOR.lang[ 'en-ca' ] = {
-	/**
-	 * The language reading direction. Possible values are "rtl" for
-	 * Right-To-Left languages (like Arabic) and "ltr" for Left-To-Right
-	 * languages (like English).
-	 * @default 'ltr'
-	 */
-	dir: 'ltr',
-
 	// ARIA description.
 	editor: 'Rich Text Editor', // MISSING
 

diff --git a/lang/en-gb.js b/lang/en-gb.js
@@ -18,14 +18,6 @@
  * @namespace
  */
 CKEDITOR.lang[ 'en-gb' ] = {
-	/**
-	 * The language reading direction. Possible values are "rtl" for
-	 * Right-To-Left languages (like Arabic) and "ltr" for Left-To-Right
-	 * languages (like English).
-	 * @default 'ltr'
-	 */
-	dir: 'ltr',
-
 	// ARIA description.
 	editor: 'Rich Text Editor',
 

diff --git a/lang/en.js b/lang/en.js
@@ -18,14 +18,6 @@
  * @namespace
  */
 CKEDITOR.lang[ 'en' ] = {
-	/**
-	 * The language reading direction. Possible values are "rtl" for
-	 * Right-To-Left languages (like Arabic) and "ltr" for Left-To-Right
-	 * languages (like English).
-	 * @default 'ltr'
-	 */
-	dir: 'ltr',
-
 	// ARIA description.
 	editor: 'Rich Text Editor',
 

diff --git a/lang/eo.js b/lang/eo.js
@@ -18,14 +18,6 @@
  * @namespace
  */
 CKEDITOR.lang[ 'eo' ] = {
-	/**
-	 * The language reading direction. Possible values are "rtl" for
-	 * Right-To-Left languages (like Arabic) and "ltr" for Left-To-Right
-	 * languages (like English).
-	 * @default 'ltr'
-	 */
-	dir: 'ltr',
-
 	// ARIA description.
 	editor: 'Redaktilo por Riĉiga Teksto',
 

diff --git a/lang/es.js b/lang/es.js
@@ -18,14 +18,6 @@
  * @namespace
  */
 CKEDITOR.lang[ 'es' ] = {
-	/**
-	 * The language reading direction. Possible values are "rtl" for
-	 * Right-To-Left languages (like Arabic) and "ltr" for Left-To-Right
-	 * languages (like English).
-	 * @default 'ltr'
-	 */
-	dir: 'ltr',
-
 	// ARIA description.
 	editor: 'Editor de texto enriquecido',
 

diff --git a/lang/et.js b/lang/et.js
@@ -18,14 +18,6 @@
  * @namespace
  */
 CKEDITOR.lang[ 'et' ] = {
-	/**
-	 * The language reading direction. Possible values are "rtl" for
-	 * Right-To-Left languages (like Arabic) and "ltr" for Left-To-Right
-	 * languages (like English).
-	 * @default 'ltr'
-	 */
-	dir: 'ltr',
-
 	// ARIA description.
 	editor: 'Rikkalik tekstiredaktor',
 

diff --git a/lang/eu.js b/lang/eu.js
@@ -18,14 +18,6 @@
  * @namespace
  */
 CKEDITOR.lang[ 'eu' ] = {
-	/**
-	 * The language reading direction. Possible values are "rtl" for
-	 * Right-To-Left languages (like Arabic) and "ltr" for Left-To-Right
-	 * languages (like English).
-	 * @default 'ltr'
-	 */
-	dir: 'ltr',
-
 	// ARIA description.
 	editor: 'Testu Aberastuko Editorea',
 

diff --git a/lang/fa.js b/lang/fa.js
@@ -18,14 +18,6 @@
  * @namespace
  */
 CKEDITOR.lang[ 'fa' ] = {
-	/**
-	 * The language reading direction. Possible values are "rtl" for
-	 * Right-To-Left languages (like Arabic) and "ltr" for Left-To-Right
-	 * languages (like English).
-	 * @default 'ltr'
-	 */
-	dir: 'rtl',
-
 	// ARIA description.
 	editor: 'ویرایشگر متن کامل',
 

diff --git a/lang/fi.js b/lang/fi.js
@@ -18,14 +18,6 @@
  * @namespace
  */
 CKEDITOR.lang[ 'fi' ] = {
-	/**
-	 * The language reading direction. Possible values are "rtl" for
-	 * Right-To-Left languages (like Arabic) and "ltr" for Left-To-Right
-	 * languages (like English).
-	 * @default 'ltr'
-	 */
-	dir: 'ltr',
-
 	// ARIA description.
 	editor: 'Rikastekstieditori',
 

diff --git a/lang/fo.js b/lang/fo.js
@@ -18,14 +18,6 @@
  * @namespace
  */
 CKEDITOR.lang[ 'fo' ] = {
-	/**
-	 * The language reading direction. Possible values are "rtl" for
-	 * Right-To-Left languages (like Arabic) and "ltr" for Left-To-Right
-	 * languages (like English).
-	 * @default 'ltr'
-	 */
-	dir: 'ltr',
-
 	// ARIA description.
 	editor: 'Rich Text Editor',
 

diff --git a/lang/fr-ca.js b/lang/fr-ca.js
@@ -18,14 +18,6 @@
  * @namespace
  */
 CKEDITOR.lang[ 'fr-ca' ] = {
-	/**
-	 * The language reading direction. Possible values are "rtl" for
-	 * Right-To-Left languages (like Arabic) and "ltr" for Left-To-Right
-	 * languages (like English).
-	 * @default 'ltr'
-	 */
-	dir: 'ltr',
-
 	// ARIA description.
 	editor: 'Éditeur de texte enrichi',
 

diff --git a/lang/fr.js b/lang/fr.js
@@ -18,14 +18,6 @@
  * @namespace
  */
 CKEDITOR.lang[ 'fr' ] = {
-	/**
-	 * The language reading direction. Possible values are "rtl" for
-	 * Right-To-Left languages (like Arabic) and "ltr" for Left-To-Right
-	 * languages (like English).
-	 * @default 'ltr'
-	 */
-	dir: 'ltr',
-
 	// ARIA description.
 	editor: 'Éditeur de Texte Enrichi',