From 73bd18eff645478651afb45da631d7c07d03b226 Mon Sep 17 00:00:00 2001 From: dynaflash Date: Mon, 28 Jan 2013 01:23:38 +0000 Subject: MacGui: Remove extra space in encoding status line string for 1 pass encodes. - Patch by sanmarcos Thanks! - Addresses https://reviews.handbrake.fr/r/422/ git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5215 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- macosx/Controller.m | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/macosx/Controller.m b/macosx/Controller.m index 8c2eba628..13b324aca 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -1029,7 +1029,15 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It pass_desc = @""; } - string = [NSMutableString stringWithFormat: NSLocalizedString( @"Encoding: %@ \nPass %d %@ of %d, %.2f %%", @"" ), currentQueueEncodeNameString, p.job_cur, pass_desc, p.job_count, 100.0 * p.progress]; + + if ([pass_desc length]) + { + string = [NSMutableString stringWithFormat: NSLocalizedString( @"Encoding: %@ \nPass %d %@ of %d, %.2f %%", @"" ), currentQueueEncodeNameString, p.job_cur, pass_desc, p.job_count, 100.0 * p.progress]; + } + else + { + string = [NSMutableString stringWithFormat: NSLocalizedString( @"Encoding: %@ \nPass %d of %d, %.2f %%", @"" ), currentQueueEncodeNameString, p.job_cur, p.job_count, 100.0 * p.progress]; + } if( p.seconds > -1 ) { -- cgit v1.2.3