Changeset 3718

Timestamp:

09/11/07 22:10:21 (1 year ago)

Author:

rinoa

Message:

Fixes strings that were supposed to be localized. Adding patch submitted in #1084 by redgecko.

Files:

• trunk/Controllers/JVChatController.m (modified) (1 diff)
• trunk/Controllers/JVChatViewCriterionController.m (modified) (1 diff)
• trunk/Controllers/JVChatWindowController.m (modified) (1 diff)
• trunk/Controllers/JVTranscriptCriterionController.m (modified) (1 diff)
• trunk/Controllers/MVApplicationController.m (modified) (1 diff)
• trunk/Controllers/MVConnectionsController.m (modified) (5 diffs)
• trunk/Controllers/MVFileTransferController.m (modified) (2 diffs)
• trunk/Panels/JVChatTranscriptBrowserPanel.m (modified) (1 diff)
• trunk/Panels/JVDirectChatPanel.m (modified) (1 diff)
• trunk/Panels/JVSmartTranscriptPanel.m (modified) (1 diff)
• trunk/Preferences/JVAppearancePreferences.m (modified) (2 diffs)
• trunk/Preferences/JVInterfacePreferences.m (modified) (1 diff)
• trunk/Preferences/JVNotificationPreferences.m (modified) (1 diff)

trunk/Controllers/JVChatController.m

@@ -603 +603 @@
-                                        NSMutableDictionary *context = [NSMutableDictionary dictionary];
-                                        [context setObject:NSLocalizedString( @"You Have Been Identified", "identified bubble title" ) forKey:@"title"];
-@"%@ on %@"
+NSLocalizedString( @"%@ on %@", "identified bubble message, server message and server name" )
-                                        [context setObject:[NSImage imageNamed:@"Keychain"] forKey:@"image"];
-                                        [[JVNotificationController defaultController] performNotification:@"JVNickNameIdentifiedWithServer" withContextInfo:context];

trunk/Controllers/JVChatViewCriterionController.m

@@ -329 +329 @@
-        [self view];
-        if( [self format] == JVChatViewTextCriterionFormat ) {
-@"%@ %@ \"%@\""
+NSLocalizedString( @"%@ %@ \"%@\"", "description format for kind, operation and query, JVChatViewCriterion" )
-        } else if( [self format] == JVChatViewBooleanCriterionFormat ) {
-                return [booleanKindButton titleOfSelectedItem];
-        } else if( [self format] == JVChatViewListCriterionFormat ) {
-@"%@ %@ %@"
+NSLocalizedString( @"%@ %@ %@", "description format for kind, operation and type, JVChatViewCriterion" )
-        } else return [super description];
-}

trunk/Controllers/JVChatWindowController.m

@@ -628 +628 @@
-- (BOOL) windowShouldClose:(id) sender {
-        if( [[self chatViewControllersWithControllerClass:[JVChatRoomPanel class]] count] <= 1 ) return YES; // no rooms, close without a prompt
-@"Close", @"Cancel"
+NSLocalizedString( @"Close", "close button" ), NSLocalizedString( @"Cancel", "close button" )
-                return YES;
-        return NO;

trunk/Controllers/JVTranscriptCriterionController.m

@@ -464 +464 @@
-        [self view];
-        if( [self format] == JVTranscriptTextCriterionFormat ) {
-@"%@ %@ \"%@\""
-
-@"%@ %@ %@ %@"
+NSLocalizedString( @"%@ %@ \"%@\"", "description format for kind, operation and query, JVTranscriptCriterionController" )
+
+NSLocalizedString( @"%@ %@ %@ %@", "description format for kind, operation, query and unit, JVTranscriptCriterionController" )
-        } else if( [self format] == JVTranscriptBooleanCriterionFormat ) {
-                return [booleanKindButton titleOfSelectedItem];
-        } else if( [self format] == JVTranscriptListCriterionFormat ) {
-@"%@ %@ %@"
+NSLocalizedString( @"%@ %@ %@", "description format for kind, operation and type, JVTranscriptCriterionController" )
-        } else return [super description];
-}

trunk/Controllers/MVApplicationController.m

@@ -441 +441 @@
-        if( ! [[[JVChatController defaultController] chatViewControllersKindOfClass:[JVDirectChatPanel class]] count] )
-                return NSTerminateNow; // no active chats, we can just quit now
-@"Quit", @"Cancel"
+ NSLocalizedString( @"Quit", "quit button" ),  NSLocalizedString( @"Cancel", "cancel button" )
-                return NSTerminateCancel;
-        return NSTerminateNow;

trunk/Controllers/MVConnectionsController.m

@@ -101 +101 @@
-        [favoritesMenu addItem:menuItem];
-
-@"Add to Favorites"
+NSLocalizedString( @"Add to Favorites", "add to favorites contextual menu")
-        [menuItem setEnabled:NO];
-        [menuItem setTag:10];
@@ -1508 +1508 @@
-                        case MVChatPacketSizeError:
-                                if( ! [connection isConnected] ) {
-@"Cancel"
+NSLocalizedString( @"Cancel", "cancel button" )
-                                                [connection connect];
-                                } else {
-@"Cancel"
+NSLocalizedString( @"Cancel" "cancel buttun" )
-                                                [connection connect];
-                                }
@@ -1523 +1523 @@
-                        case MVChatSocketError:
-                        case MVChatDNSError:
-@"Cancel"
+NSLocalizedString( @"Cancel", "cancel button" )
-                                        [connection connect];
-                                break;
@@ -1812 +1812 @@
-        switch( [[dict objectForKey:@"publicKeyType"] unsignedLongValue] ) {
-                case MVChatConnectionClientPublicKeyType:
-@"User name:"
-@"Please verify the users public key."
+NSLocalizedString( @"User name:", "verification target name" )
+NSLocalizedString( @"Please verify the users public key.", "message of verification for public key" )
-                        break;
-                case MVChatConnectionServerPublicKeyType:
-@"Server name"
-@"Please verify the servers public key."
+NSLocalizedString( @"Server name:", "verification target name" )
+NSLocalizedString( @"Please verify the servers public key.", "message of verification for public key" )
-                        break;
-        }
@@ -1928 +1928 @@
-
-        MVChatConnection *connection = [[_bookmarks objectAtIndex:row] objectForKey:@"connection"];
-@"Cancel", @"OK"
+NSLocalizedString( @"Cancel", "cancel button" ), NSLocalizedString( @"OK", "OK button" )
-}
-

trunk/Controllers/MVFileTransferController.m

@@ -244 +244 @@
-
-        if( ! download ) {
-@"Invalid URL", nil, nil, nil, [self window], nil, nil, nil, nil, @"The download URL is either invalid or unsupported."
+NSLocalizedString( @"Invalid URL", "Invalid URL title" ), nil, nil, nil, [self window], nil, nil, nil, nil, NSLocalizedString( @"The download URL is either invalid or unsupported.", "Invalid URL message" )
-                return;
-        }
@@ -730 +730 @@
-                                resumePossible = NO;
-                                result = NSOKButton;
-@"Cancel"
-@"Cancel"
+NSLocalizedString( @"Cancel", "cancel button" )
+NSLocalizedString( @"Cancel", "cancel button" )
-
-                if( result == NSCancelButton ) {

trunk/Panels/JVChatTranscriptBrowserPanel.m

@@ -37 +37 @@
-        }
-
-@"%d logs still have to be indexed"
-@"One log still has to be indexed"
-@"Indexing is complete"
+NSLocalizedString( @"%d logs still have to be indexed", "number of transcripts indexing remains message" )
+NSLocalizedString( @"One log still has to be indexed", "one  indexing remains message" )
+NSLocalizedString( @"Indexing is complete", "transcripts indexing finished message" )
-}
-

trunk/Panels/JVDirectChatPanel.m

@@ -1988 +1988 @@
-        }
-
-@"unknown"
+NSLocalizedString( @"unknown", "unknown name for script event" )
-        if( ! [name isKindOfClass:[NSString class]] ) {
-                name = [[NSScriptCoercionHandler sharedCoercionHandler] coerceValue:name toClass:[NSString class]];

trunk/Panels/JVSmartTranscriptPanel.m

@@ -106 +106 @@
-
-- (NSString *) title {
-@"Smart Transcript"
+NSLocalizedString( @"Smart Transcript", "default smart transcript name" )
-}
-

trunk/Preferences/JVAppearancePreferences.m

@@ -598 +598 @@
-- (id) tableView:(NSTableView *) view objectValueForTableColumn:(NSTableColumn *) column row:(int) row {
-        if( [[column identifier] isEqualToString:@"key"] ) {
-[[_styleOptions objectAtIndex:row] objectForKey:@"description"]
+NSLocalizedString( [[_styleOptions objectAtIndex:row] objectForKey:@"description"], "description of style options, appearance preferences" )
-        } else if( [[column identifier] isEqualToString:@"value"] ) {
-                NSDictionary *info = [_styleOptions objectAtIndex:row];
@@ -722 +722 @@
-                } else if( [[options objectForKey:@"type"] isEqualToString:@"list"] ) {
-                        NSPopUpButtonCell *cell = [[NSPopUpButtonCell new] autorelease];
+                        NSMutableArray *localizedOptions = [NSMutableArray array];
+                        NSString *optionTitle = nil;
+                        NSEnumerator *enumerator = [[options objectForKey:@"options"] objectEnumerator];
+                        while( ( optionTitle = [enumerator nextObject] ) ) {
+                                [localizedOptions addObject:NSLocalizedString( optionTitle, "title of style option value" )];
+                        }
-                        [cell setControlSize:NSSmallControlSize];
-                        [cell setFont:[NSFont menuFontOfSize:[NSFont smallSystemFontSize]]];
-[options objectForKey:@"options"]
+localizedOptions
-                        [options setObject:cell forKey:@"cell"];
-                        return cell;

trunk/Preferences/JVInterfacePreferences.m

@@ -146 +146 @@
-
-        while( ( rule = [enumerator nextObject] ) ) {
-@" and "
-@" or "
+NSLocalizedString( @" and ", "operation label, interface preferences" )
+NSLocalizedString( @" or ", "operation label, interface preferences" )
-                [title appendString:[rule description]];
-                first = NO;

trunk/Preferences/JVNotificationPreferences.m

@@ -91 +91 @@
-        while( ( info = [enumerator nextObject] ) ) {
-                if( ! [info objectForKey:@"seperator"] ) {
-[info objectForKey:@"title"]
+NSLocalizedString( [info objectForKey:@"title"], "notification event menu items, notification preferences" )
-                        [menuItem setRepresentedObject:[info objectForKey:@"identifier"]];
-                        [availableEvents addItem:menuItem];