mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-30 16:30:41 +00:00
Added GSBaseLocalizedString() in NSUndoManager
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@32160 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
ea857575f2
commit
f014c32856
3 changed files with 49 additions and 14 deletions
|
@ -27,12 +27,38 @@
|
|||
#import "common.h"
|
||||
#define EXPOSE_NSUndoManager_IVARS 1
|
||||
#import "Foundation/NSArray.h"
|
||||
#import "Foundation/NSBundle.h"
|
||||
#import "Foundation/NSNotification.h"
|
||||
#import "Foundation/NSInvocation.h"
|
||||
#import "Foundation/NSException.h"
|
||||
#import "Foundation/NSRunLoop.h"
|
||||
#import "Foundation/NSUndoManager.h"
|
||||
|
||||
/*
|
||||
* Localize a message of the gnustep-base library.
|
||||
*/
|
||||
static inline NSString *GSBaseLocalizedString (NSString *key)
|
||||
{
|
||||
static NSBundle *baseBundle = nil;
|
||||
|
||||
if (!baseBundle)
|
||||
{
|
||||
/* Create the base bundle we use to localize messages. */
|
||||
baseBundle = [NSBundle bundleForLibrary: @"gnustep-base"
|
||||
version: OBJC_STRINGIFY(GNUSTEP_BASE_MAJOR_VERSION.GNUSTEP_BASE_MINOR_VERSION)];
|
||||
RETAIN(baseBundle);
|
||||
}
|
||||
|
||||
if (baseBundle != nil)
|
||||
{
|
||||
return [baseBundle localizedStringForKey: key value: @"" table: nil];
|
||||
}
|
||||
else
|
||||
{
|
||||
return key;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Private class for grouping undo/redo actions.
|
||||
|
@ -685,20 +711,16 @@
|
|||
*/
|
||||
- (NSString*) redoMenuTitleForUndoActionName: (NSString*)actionName
|
||||
{
|
||||
/*
|
||||
* FIXME: The terms @"Redo" and @"Redo %@" should be localized.
|
||||
* Possibly with the introduction of GSBaseLocalizedString() private
|
||||
* the the library.
|
||||
*/
|
||||
if (actionName)
|
||||
{
|
||||
if ([actionName isEqual: @""])
|
||||
{
|
||||
return @"Redo";
|
||||
return GSBaseLocalizedString(@"Redo");
|
||||
}
|
||||
else
|
||||
{
|
||||
return [NSString stringWithFormat: @"Redo %@", actionName];
|
||||
return [NSString stringWithFormat:
|
||||
GSBaseLocalizedString(@"Redo %@"), actionName];
|
||||
}
|
||||
}
|
||||
return actionName;
|
||||
|
@ -970,20 +992,16 @@
|
|||
*/
|
||||
- (NSString*) undoMenuTitleForUndoActionName: (NSString*)actionName
|
||||
{
|
||||
/*
|
||||
* FIXME: The terms @"Undo" and @"Undo %@" should be localized.
|
||||
* Possibly with the introduction of GSBaseLocalizedString() private
|
||||
* the the library.
|
||||
*/
|
||||
if (actionName)
|
||||
{
|
||||
if ([actionName isEqual: @""])
|
||||
{
|
||||
return @"Undo";
|
||||
return GSBaseLocalizedString(@"Undo");
|
||||
}
|
||||
else
|
||||
{
|
||||
return [NSString stringWithFormat: @"Undo %@", actionName];
|
||||
return [NSString stringWithFormat:
|
||||
GSBaseLocalizedString(@"Undo %@"), actionName];
|
||||
}
|
||||
}
|
||||
return actionName;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue