浏览代码

Merge branch 'master' into t/ckeditor5-ui/144

Aleksander Nowodzinski 8 年之前
父节点
当前提交
c0ee559693
共有 42 个文件被更改,包括 50 次插入11 次删除
  1. 4 4
      packages/ckeditor5-build-balloon/build-config.js
  2. 3 2
      packages/ckeditor5-build-balloon/build/ckeditor.js
  3. 1 1
      packages/ckeditor5-build-balloon/build/ckeditor.js.map
  4. 1 0
      packages/ckeditor5-build-balloon/build/lang/ast.js
  5. 1 0
      packages/ckeditor5-build-balloon/build/lang/bg.js
  6. 1 0
      packages/ckeditor5-build-balloon/build/lang/da.js
  7. 1 0
      packages/ckeditor5-build-balloon/build/lang/de.js
  8. 1 0
      packages/ckeditor5-build-balloon/build/lang/el.js
  9. 1 0
      packages/ckeditor5-build-balloon/build/lang/en-au.js
  10. 1 0
      packages/ckeditor5-build-balloon/build/lang/eo.js
  11. 1 0
      packages/ckeditor5-build-balloon/build/lang/es.js
  12. 1 0
      packages/ckeditor5-build-balloon/build/lang/et.js
  13. 1 0
      packages/ckeditor5-build-balloon/build/lang/fi.js
  14. 1 0
      packages/ckeditor5-build-balloon/build/lang/fr.js
  15. 1 0
      packages/ckeditor5-build-balloon/build/lang/gl.js
  16. 1 0
      packages/ckeditor5-build-balloon/build/lang/gu.js
  17. 1 0
      packages/ckeditor5-build-balloon/build/lang/hr.js
  18. 1 0
      packages/ckeditor5-build-balloon/build/lang/hu.js
  19. 1 0
      packages/ckeditor5-build-balloon/build/lang/it.js
  20. 1 0
      packages/ckeditor5-build-balloon/build/lang/ja.js
  21. 1 0
      packages/ckeditor5-build-balloon/build/lang/km.js
  22. 1 0
      packages/ckeditor5-build-balloon/build/lang/kn.js
  23. 1 0
      packages/ckeditor5-build-balloon/build/lang/ko.js
  24. 1 0
      packages/ckeditor5-build-balloon/build/lang/ku.js
  25. 1 0
      packages/ckeditor5-build-balloon/build/lang/nb.js
  26. 1 0
      packages/ckeditor5-build-balloon/build/lang/ne.js
  27. 1 0
      packages/ckeditor5-build-balloon/build/lang/nl.js
  28. 1 0
      packages/ckeditor5-build-balloon/build/lang/oc.js
  29. 1 0
      packages/ckeditor5-build-balloon/build/lang/pl.js
  30. 1 0
      packages/ckeditor5-build-balloon/build/lang/pt-br.js
  31. 1 0
      packages/ckeditor5-build-balloon/build/lang/pt.js
  32. 1 0
      packages/ckeditor5-build-balloon/build/lang/ro.js
  33. 1 0
      packages/ckeditor5-build-balloon/build/lang/ru.js
  34. 1 0
      packages/ckeditor5-build-balloon/build/lang/sk.js
  35. 1 0
      packages/ckeditor5-build-balloon/build/lang/sv.js
  36. 1 0
      packages/ckeditor5-build-balloon/build/lang/tr.js
  37. 1 0
      packages/ckeditor5-build-balloon/build/lang/uk.js
  38. 1 0
      packages/ckeditor5-build-balloon/build/lang/zh-cn.js
  39. 1 0
      packages/ckeditor5-build-balloon/build/lang/zh.js
  40. 2 2
      packages/ckeditor5-build-balloon/package.json
  41. 2 1
      packages/ckeditor5-build-balloon/src/ckeditor.js
  42. 2 1
      packages/ckeditor5-build-balloon/webpack.config.js

+ 4 - 4
packages/ckeditor5-build-balloon/build-config.js

@@ -33,9 +33,6 @@ module.exports = {
 		'@ckeditor/ckeditor5-upload/src/imageupload',
 	],
 
-	// UI language. Language codes follow the https://en.wikipedia.org/wiki/ISO_639-1 format.
-	language: 'en',
-
 	// Editor config.
 	config: {
 		toolbar: {
@@ -54,6 +51,9 @@ module.exports = {
 
 		image: {
 			toolbar: [ 'imageStyleFull', 'imageStyleSide', '|', 'imageTextAlternative' ]
-		}
+		},
+
+		// UI language. Language codes follow the https://en.wikipedia.org/wiki/ISO_639-1 format.
+		language: 'en'
 	}
 };

文件差异内容过多而无法显示
+ 3 - 2
packages/ckeditor5-build-balloon/build/ckeditor.js


文件差异内容过多而无法显示
+ 1 - 1
packages/ckeditor5-build-balloon/build/ckeditor.js.map


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/ast.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/bg.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/da.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/de.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/el.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/en-au.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/eo.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/es.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/et.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/fi.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/fr.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/gl.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/gu.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/hr.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/hu.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/it.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/ja.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/km.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/kn.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/ko.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/ku.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/nb.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/ne.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/nl.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/oc.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/pl.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/pt-br.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/pt.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/ro.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/ru.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/sk.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/sv.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/tr.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/uk.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/zh-cn.js


文件差异内容过多而无法显示
+ 1 - 0
packages/ckeditor5-build-balloon/build/lang/zh.js


+ 2 - 2
packages/ckeditor5-build-balloon/package.json

@@ -18,8 +18,8 @@
     "@ckeditor/ckeditor5-autoformat": "^1.0.0-alpha.2",
     "@ckeditor/ckeditor5-basic-styles": "^1.0.0-alpha.2",
     "@ckeditor/ckeditor5-block-quote": "^1.0.0-alpha.2",
-    "@ckeditor/ckeditor5-dev-utils": "^4.0.1",
-    "@ckeditor/ckeditor5-dev-webpack-plugin": "^2.0.18",
+    "@ckeditor/ckeditor5-dev-utils": "^6.0.0",
+    "@ckeditor/ckeditor5-dev-webpack-plugin": "^3.0.0",
     "@ckeditor/ckeditor5-easy-image": "^1.0.0-alpha.2",
     "@ckeditor/ckeditor5-editor-balloon": "^1.0.0-alpha.2",
     "@ckeditor/ckeditor5-essentials": "^1.0.0-alpha.2",

+ 2 - 1
packages/ckeditor5-build-balloon/src/ckeditor.js

@@ -63,6 +63,7 @@ BalloonEditor.build = {
 				'|',
 				'imageTextAlternative'
 			]
-		}
+		},
+		language: 'en'
 	}
 };

+ 2 - 1
packages/ckeditor5-build-balloon/webpack.config.js

@@ -30,7 +30,8 @@ module.exports = {
 
 	plugins: [
 		new CKEditorWebpackPlugin( {
-			languages: [ buildConfig.language ]
+			language: buildConfig.config.language,
+			additionalLanguages: 'all'
 		} ),
 		new BabiliPlugin( null, {
 			comments: false