8
0
Quellcode durchsuchen

Merge branch 'master' into t/3

Piotrek Koszuliński vor 7 Jahren
Ursprung
Commit
eb01745747

+ 7 - 0
packages/ckeditor5-ckfinder/lang/contexts.json

@@ -0,0 +1,7 @@
+{
+	"Insert image or file": "Toolbar button tooltip for inserting an image or file via a CKFinder file browser.",
+	"Could not obtain resized image URL.": "Error message displayed when inserting a resized version of an image failed.",
+	"Selecting resized image failed": "Title of a notification displayed when inserting a resized version of an image failed.",
+	"Could not insert image at the current position.": "Error message displayed when an image cannot be inserted at the current position.",
+	"Inserting image failed": "Title of a notification displayed when an image cannot be inserted at the current position."
+}

+ 2 - 2
packages/ckeditor5-ckfinder/src/ckfindercommand.js

@@ -102,7 +102,7 @@ export default class CKFinderCommand extends Command {
 					const notification = editor.plugins.get( Notification );
 					const t = editor.locale.t;
 
-					notification.showWarning( t( 'Could not obtain resized image URL. Try different image or folder.' ), {
+					notification.showWarning( t( 'Could not obtain resized image URL.' ), {
 						title: t( 'Selecting resized image failed' ),
 						namespace: 'ckfinder'
 					} );
@@ -126,7 +126,7 @@ function insertImages( editor, urls ) {
 		const notification = editor.plugins.get( Notification );
 		const t = editor.locale.t;
 
-		notification.showWarning( t( 'Could not insert image at current selection.' ), {
+		notification.showWarning( t( 'Could not insert image at the current position.' ), {
 			title: t( 'Inserting image failed' ),
 			namespace: 'ckfinder'
 		} );

+ 1 - 1
packages/ckeditor5-ckfinder/src/ckfinderui.js

@@ -39,7 +39,7 @@ export default class CKFinderUI extends Plugin {
 			const button = new ButtonView( locale );
 
 			button.set( {
-				label: t( 'CKFinder' ),
+				label: t( 'Insert image or file' ),
 				icon: ckfinderIcon,
 				tooltip: true
 			} );

+ 2 - 2
packages/ckeditor5-ckfinder/tests/ckfindercommand.js

@@ -308,7 +308,7 @@ describe( 'CKFinderCommand', () => {
 			const notification = editor.plugins.get( Notification );
 
 			notification.on( 'show:warning', ( evt, data ) => {
-				expect( data.message ).to.equal( 'Could not obtain resized image URL. Try different image or folder.' );
+				expect( data.message ).to.equal( 'Could not obtain resized image URL.' );
 				expect( data.title ).to.equal( 'Selecting resized image failed' );
 				evt.stop();
 
@@ -341,7 +341,7 @@ describe( 'CKFinderCommand', () => {
 			const notification = editor.plugins.get( Notification );
 
 			notification.on( 'show:warning', ( evt, data ) => {
-				expect( data.message ).to.equal( 'Could not insert image at current selection.' );
+				expect( data.message ).to.equal( 'Could not insert image at the current position.' );
 				expect( data.title ).to.equal( 'Inserting image failed' );
 				evt.stop();
 

+ 1 - 1
packages/ckeditor5-ckfinder/tests/ckfinderui.js

@@ -56,7 +56,7 @@ describe( 'CKFinderUI', () => {
 		} );
 
 		it( 'should set a #label of the #buttonView', () => {
-			expect( button.label ).to.equal( 'CKFinder' );
+			expect( button.label ).to.equal( 'Insert image or file' );
 		} );
 
 		it( 'should set an #icon of the #buttonView', () => {