Changeset 516

Show
Ignore:
Timestamp:
03/31/08 17:57:10 (9 months ago)
Author:
pmerrill
Message:
  • Audited description text.
  • Employed path cropping for settings & descriptions.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/SapphireFrappliance/SapphireCollectionSettings.m

    r472 r516  
    2323#import "SapphireMediaPreview.h" 
    2424#import <SapphireCompatClasses/SapphireFrontRowCompat.h> 
     25#import "NSString-Extensions.h" 
    2526 
    2627@implementation SapphireCollectionSettings 
     
    9495         
    9596        // add text 
    96         [SapphireFrontRowCompat setTitle:name forMenu:result]; 
     97        [SapphireFrontRowCompat setTitle:[NSString stringByCroppingDirectoryPath:name toLength:3] forMenu:result]; 
    9798                                 
    9899        return ( result ) ; 
     
    158159                if([settingName hasPrefix:@"Hide"]) 
    159160                { 
    160                         settingName = [NSString stringWithFormat:@"Hide Collection \"%@\"",[names objectAtIndex:item]]; 
    161                         settingDescription=BRLocalizedString(@"tells Sapphire to hide this collection on the main menu.", @"Hide collections setting description"); 
     161                        settingName = [NSString stringWithFormat:@"Hide Collection \"%@\"",[NSString stringByCroppingDirectoryPath:[names objectAtIndex:item] toLength:3]]; 
     162                        settingDescription=BRLocalizedString(@"Tells Sapphire to hide this collection on the main menu.", @"Hide collections setting description"); 
    162163                } 
    163164                else 
    164165                { 
    165                         settingName = [NSString stringWithFormat:@"Don't Import \"%@\"",[names objectAtIndex:item]]; 
    166                         settingDescription=BRLocalizedString(@"tells Sapphire to ignore this collection when running any import tool.", @"Import collections setting description"); 
     166                        settingName = [NSString stringWithFormat:@"Don't Import \"%@\"",[NSString stringByCroppingDirectoryPath:[names objectAtIndex:item] toLength:3]]; 
     167                        settingDescription=BRLocalizedString(@"Tells Sapphire to ignore this collection when running any import tool.", @"Import collections setting description"); 
    167168                } 
    168169                /* Construct a gerneric metadata asset for display */ 
  • trunk/SapphireFrappliance/SapphireImporterDataMenu.m

    r506 r516  
    2525#import "SapphireImportHelper.h" 
    2626#import "SapphireApplianceController.h" 
     27#import "NSString-Extensions.h" 
    2728 
    2829@interface BRLayerController (compatounth) 
     
    231232- (void)scanningDir:(NSString *)dir 
    232233{ 
    233         [self setCurrentFile:[NSString stringWithFormat:BRLocalizedString(@"Scanning Directory: %@", "Current scan import process format, directory"),dir]]; 
     234        [self setCurrentFile:[NSString stringWithFormat:BRLocalizedString(@"Scanning Directory: %@", "Current scan import process format, directory"),[NSString stringByCroppingDirectoryPath:dir toLength:3]]]; 
    234235        [SapphireFrontRowCompat renderScene:[self scene]]; 
    235236} 
     
    299300                SapphireFileMetaData *fileMeta = [importItems objectAtIndex:0]; 
    300301                NSString * fileName=[[fileMeta path] lastPathComponent] ; 
    301                 [self setCurrentFile:[NSString stringWithFormat:BRLocalizedString(@"Current File: %@", "Current TV Show import process format, filename"),fileName]]; 
     302                [self setCurrentFile:[NSString stringWithFormat:BRLocalizedString(@"Fetching For: %@", "Current TV Show import process format, filename"),fileName]]; 
    302303                 
    303304                current++ ; 
     
    319320        else 
    320321                [self setCurrentFile:BRLocalizedString(@"Waiting for background import to complete", @"The import is complete, just waiting on background processes")]; 
    321         [self setFileProgress:[NSString stringWithFormat:BRLocalizedString(@"File Progress: %0.0f / %0.0f", @"Import progress format, current and the max"), current, max,updated]]; 
     322        [self setFileProgress:[NSString stringWithFormat:BRLocalizedString(@"Finished Processing: %0.0f / %0.0f", @"Import progress format, current and the max"), current, max,updated]]; 
    322323        [bar setPercentage:current/max * 100.0f]; 
    323324         
  • trunk/SapphireFrappliance/SapphireSettings.m

    r491 r516  
    3131#import "SapphireCollectionSettings.h" 
    3232#import <SapphireCompatClasses/SapphireFrontRowCompat.h> 
     33#import "NSString-Extensions.h" 
    3334 
    3435static SapphireSettings *sharedInstance = nil; 
     
    100101/*                                                                                              BRLocalizedString(@"Choose Movie Posters", @"Start Poster Chooser description"),*/ 
    101102                                                                                                BRLocalizedString(@"Allows the user to specify which collections should be hidden from Sapphire's main menu.", @"Hide Collections description"), 
    102                                                                                                 BRLocalizedString(@"Allows to user to specify which collections should be skipped when importing meta data.", @"Don't Import Collections description"), 
     103                                                                                                BRLocalizedString(@"Allows the user to specify which collections should be skipped when importing meta data.", @"Don't Import Collections description"), 
    103104                                                                                                BRLocalizedString(@"Tells Sapphire that when changing filter settings, skip over the favorite shows filter.", @"Skip Favorite shows description"), 
    104105/*                                                                                              BRLocalizedString(@"Skip \"Top Shows\" filter", @"Skip Top shows description"),*/ 
     
    111112                                                                                                BRLocalizedString(@"Tells Sapphire that when using a filter, use the cached data to setup directories rather than scanning the directories themselves for new files.", @"Fast Directory Switching description"), 
    112113                                                                                                BRLocalizedString(@"Tells Sapphire that you have an AC3 decoder and to enable passthrough of the full audio information to the decoder. This is how you get 5.1 output.", @"Enable AC3 Passthrough description"), 
    113                                                                                                 BRLocalizedString(@"Tells Sapphire that you want to use directory instead of filenames for movie lookup", @"Enable Directory lookup description"), 
     114                                                                                                BRLocalizedString(@"Tells Sapphire that you want to use directory names instead of file names for identifying movies.", @"Enable Directory lookup description"), 
    114115                                                                                                BRLocalizedString(@"Tells Sapphire to not report any anonymous information on how you use Sapphire. Anonymous reporting enables us to improve the plugin for future use.", @"Disable the anonymous reporting description"), nil]; 
    115116