# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1248861161 -7200
# Node ID 0c0e4024a98ed1ce1a9281fba167bf7490d2760e
# Parent  fe330a707a9fba52a348a28fa1ac2a2960330fdc
Replace local function with its canonical implementation in some cases.
These changes follow porting of the project to build 64-bit targets.
The replacements are needed due to segfaults otherwise ocurring in
some cases of local function (from helper.m) usage. These segfaults
do not ocurr when building only 32-bit targets. This hackish logic
deserves further testing until a fully orthogonal string localization
strategy is available for all targets.

diff -r fe330a707a9f -r 0c0e4024a98e tunblick/MenuController.m
--- a/tunblick/MenuController.m	Wed Jul 29 11:44:56 2009 +0200
+++ b/tunblick/MenuController.m	Wed Jul 29 11:52:41 2009 +0200
@@ -250,7 +250,7 @@
     
     while (item = [e nextObject]) 
     {
-        [item setTitle:local([item title])];
+        [item setTitle:NSLocalizedString([item title], nil)];
     }
 }
 
@@ -383,7 +383,7 @@
                 }
             }
         }
-		NSString *label = [NSString stringWithFormat:@"%@ (%@%@)",[myConnection configName],local(cState), cTimeS];
+		NSString *label = [NSString stringWithFormat:@"%@ (%@%@)",[myConnection configName],NSLocalizedString(cState, nil), cTimeS];
 		[[tabView tabViewItemAtIndex:i] setLabel:label];
 		i++;
 	}
@@ -397,7 +397,7 @@
 	if(connectionNumber == 1) {
 		myState = local(@"OpenVPN: 1 connection active.");
 	} else {
-		myState = [NSString stringWithFormat:local(@"OpenVPN: %d connections active."),connectionNumber];
+		myState = [NSString stringWithFormat:NSLocalizedString(@"OpenVPN: %d connections active.", nil),connectionNumber];
 	}
 	
     [statusMenuItem setTitle: myState];