Contributed Logic / file comparison
comparison: tunblick/MenuController.m
tunblick/MenuController.m
- changeset 7
- 0c0e4024a98e
- parent 6
- fe330a707a9f
- child 8
- 07bbe272a9be
equal
deleted
inserted
replaced
| 1:0dc51fdde68b | 2:45052ae5ac25 |
|---|---|
| 248 NSMenuItem *item; | 248 NSMenuItem *item; |
| 249 NSEnumerator *e = [[myVPNMenu itemArray] objectEnumerator]; | 249 NSEnumerator *e = [[myVPNMenu itemArray] objectEnumerator]; |
| 250 | 250 |
| 251 while (item = [e nextObject]) | 251 while (item = [e nextObject]) |
| 252 { | 252 { |
| 253 [item setTitle:local([item title])]; | 253 [item setTitle:NSLocalizedString([item title], nil)]; |
| 254 } | 254 } |
| 255 } | 255 } |
| 256 | 256 |
| 257 - (void)activateStatusMenu | 257 - (void)activateStatusMenu |
| 258 { | 258 { |
| 381 } else { | 381 } else { |
| 382 cTimeS = [NSString stringWithFormat:@" %li:%02li:%02li", cTimeL/3600, (cTimeL/60) % 60, cTimeL%60]; | 382 cTimeS = [NSString stringWithFormat:@" %li:%02li:%02li", cTimeL/3600, (cTimeL/60) % 60, cTimeL%60]; |
| 383 } | 383 } |
| 384 } | 384 } |
| 385 } | 385 } |
| 386 NSString *label = [NSString stringWithFormat:@"%@ (%@%@)",[myConnection configName],local(cState), cTimeS]; | 386 NSString *label = [NSString stringWithFormat:@"%@ (%@%@)",[myConnection configName],NSLocalizedString(cState, nil), cTimeS]; |
| 387 [[tabView tabViewItemAtIndex:i] setLabel:label]; | 387 [[tabView tabViewItemAtIndex:i] setLabel:label]; |
| 388 i++; | 388 i++; |
| 389 } | 389 } |
| 390 } | 390 } |
| 391 | 391 |
| 395 unsigned connectionNumber = [connectionArray count]; | 395 unsigned connectionNumber = [connectionArray count]; |
| 396 NSString *myState; | 396 NSString *myState; |
| 397 if(connectionNumber == 1) { | 397 if(connectionNumber == 1) { |
| 398 myState = local(@"OpenVPN: 1 connection active."); | 398 myState = local(@"OpenVPN: 1 connection active."); |
| 399 } else { | 399 } else { |
| 400 myState = [NSString stringWithFormat:local(@"OpenVPN: %d connections active."),connectionNumber]; | 400 myState = [NSString stringWithFormat:NSLocalizedString(@"OpenVPN: %d connections active.", nil),connectionNumber]; |
| 401 } | 401 } |
| 402 | 402 |
| 403 [statusMenuItem setTitle: myState]; | 403 [statusMenuItem setTitle: myState]; |
| 404 [theItem setToolTip: myState]; | 404 [theItem setToolTip: myState]; |
| 405 | 405 |
