Author: rmottola
Date: Mon Jan 18 17:58:22 2016
New Revision: 39290
URL: http://svn.gna.org/viewcvs/gnustep?rev=39290&view=rev
Log:
Localizations inside the Framework
Modified:
apps/gworkspace/trunk/ChangeLog
apps/gworkspace/trunk/FSNode/FSNListView.m
apps/gworkspace/trunk/FSNode/FSNodeRep.m
apps/gworkspace/trunk/FSNode/GNUmakefile.in
Modified: apps/gworkspace/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/ChangeLog?rev=39290&r1=39289&r2=39290&view=diff
==============================================================================
--- apps/gworkspace/trunk/ChangeLog (original)
+++ apps/gworkspace/trunk/ChangeLog Mon Jan 18 17:58:22 2016
@@ -1,3 +1,14 @@
+2016-01-18 Riccardo Mottola <[email protected]>
+
+ * FSNode/ExtendedInfo/Role/ExtInfoRole.m
+ * FSNode/ExtendedInfo/Role/GNUmakefile.in
+ Localizations inside the Bundle.
+
+ * FSNode/FSNListView.m
+ * FSNode/FSNodeRep.m
+ * FSNode/GNUmakefile.in
+ Localizations inside the Framework
+
2016-01-16 Riccardo Mottola <[email protected]>
* FSNode/FSNodeRep.m
Modified: apps/gworkspace/trunk/FSNode/FSNListView.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/FSNode/FSNListView.m?rev=39290&r1=39289&r2=39290&view=diff
==============================================================================
--- apps/gworkspace/trunk/FSNode/FSNListView.m (original)
+++ apps/gworkspace/trunk/FSNode/FSNListView.m Mon Jan 18 17:58:22 2016
@@ -1,6 +1,6 @@
/* FSNListView.m
*
- * Copyright (C) 2004-2014 Free Software Foundation, Inc.
+ * Copyright (C) 2004-2016 Free Software Foundation, Inc.
*
* Author: Enrico Sersale <[email protected]>
* Date: December 2004
@@ -172,28 +172,28 @@
switch(type) {
case FSNInfoNameType:
- [[column headerCell] setStringValue: NSLocalizedString(@"Name", @"")];
+ [[column headerCell] setStringValue:
NSLocalizedStringFromTableInBundle(@"Name", nil, [NSBundle bundleForClass:[self
class]], @"")];
break;
case FSNInfoKindType:
- [[column headerCell] setStringValue: NSLocalizedString(@"Type", @"")];
+ [[column headerCell] setStringValue:
NSLocalizedStringFromTableInBundle(@"Type", nil, [NSBundle bundleForClass:[self
class]], @"")];
break;
case FSNInfoDateType:
- [[column headerCell] setStringValue: NSLocalizedString(@"Date Modified",
@"")];
+ [[column headerCell] setStringValue:
NSLocalizedStringFromTableInBundle(@"Date Modified", nil, [NSBundle
bundleForClass:[self class]], @"")];
break;
case FSNInfoSizeType:
- [[column headerCell] setStringValue: NSLocalizedString(@"Size", @"")];
+ [[column headerCell] setStringValue:
NSLocalizedStringFromTableInBundle(@"Size", nil, [NSBundle bundleForClass:[self
class]], @"")];
break;
case FSNInfoOwnerType:
- [[column headerCell] setStringValue: NSLocalizedString(@"Owner", @"")];
+ [[column headerCell] setStringValue:
NSLocalizedStringFromTableInBundle(@"Owner", nil, [NSBundle
bundleForClass:[self class]], @"")];
break;
case FSNInfoParentType:
- [[column headerCell] setStringValue: NSLocalizedString(@"Parent", @"")];
+ [[column headerCell] setStringValue:
NSLocalizedStringFromTableInBundle(@"Parent", nil, [NSBundle
bundleForClass:[self class]], @"")];
break;
case FSNInfoExtendedType:
- [[column headerCell] setStringValue: NSLocalizedString(extInfoType,
@"")];
+ [[column headerCell] setStringValue: extInfoType]; /* should come
Localized from the ExtInfo bundle */
break;
default:
- [[column headerCell] setStringValue: NSLocalizedString(@"Name", @"")];
+ [[column headerCell] setStringValue:
NSLocalizedStringFromTableInBundle(@"Name", nil, [NSBundle bundleForClass:[self
class]], @"")];
break;
}
Modified: apps/gworkspace/trunk/FSNode/FSNodeRep.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/FSNode/FSNodeRep.m?rev=39290&r1=39289&r2=39290&view=diff
==============================================================================
--- apps/gworkspace/trunk/FSNode/FSNodeRep.m (original)
+++ apps/gworkspace/trunk/FSNode/FSNodeRep.m Mon Jan 18 17:58:22 2016
@@ -706,12 +706,13 @@
- (NSArray *)availableExtendedInfoNames
{
NSMutableArray *names = [NSMutableArray array];
- int i;
-
- for (i = 0; i < [extInfoModules count]; i++) {
- id module = [extInfoModules objectAtIndex: i];
- [names addObject: NSLocalizedString([module menuName], @"")];
- }
+ NSUInteger i;
+
+ for (i = 0; i < [extInfoModules count]; i++)
+ {
+ id module = [extInfoModules objectAtIndex: i];
+ [names addObject: [module menuName]];
+ }
return names;
}
@@ -719,16 +720,18 @@
- (NSDictionary *)extendedInfoOfType:(NSString *)type
forNode:(FSNode *)anode
{
- int i;
-
- for (i = 0; i < [extInfoModules count]; i++) {
- id module = [extInfoModules objectAtIndex: i];
- NSString *mname = NSLocalizedString([module menuName], @"");
-
- if ([mname isEqual: type]) {
- return [module extendedInfoForNode: anode];
- }
- }
+ NSUInteger i;
+
+ for (i = 0; i < [extInfoModules count]; i++)
+ {
+ id module = [extInfoModules objectAtIndex: i];
+ NSString *mname = [module menuName];
+
+ if ([mname isEqual: type])
+ {
+ return [module extendedInfoForNode: anode];
+ }
+ }
return nil;
}
@@ -907,7 +910,7 @@
{
NSArray *mounted = ((info == nil) ? [self mountedVolumes] : info);
NSArray *removables = [self removableMediaPaths];
- int i;
+ NSUInteger i;
for (i = 0; i < [mounted count]; i++) {
NSDictionary *dict = [mounted objectAtIndex: i];
@@ -955,7 +958,7 @@
NSArray *removables = [self removableMediaPaths];
NSArray *reserved = [self reservedMountNames];
NSMutableArray *names = [NSMutableArray array];
- unsigned i;
+ NSUInteger i;
NSLog(@"mountedRemovableMedia");
for (i = 0; i < [mounted count]; i++) {
@@ -997,7 +1000,7 @@
NSArray *mountedMedia = [self mountedRemovableMedia];
NSMutableArray *willMountMedia = [NSMutableArray array];
NSMutableArray *newlyMountedMedia = [NSMutableArray array];
- int i;
+ NSUInteger i;
for (i = 0; i < [removables count]; i++) {
NSString *removable = [removables objectAtIndex: i];
Modified: apps/gworkspace/trunk/FSNode/GNUmakefile.in
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/FSNode/GNUmakefile.in?rev=39290&r1=39289&r2=39290&view=diff
==============================================================================
--- apps/gworkspace/trunk/FSNode/GNUmakefile.in (original)
+++ apps/gworkspace/trunk/FSNode/GNUmakefile.in Mon Jan 18 17:58:22 2016
@@ -42,9 +42,15 @@
FSNode_RESOURCE_FILES = \
Resources/Images/* \
- Resources/English.lproj
+ Resources/*.lproj \
-FSNode_LANGUAGES = Resources/English
+FSNode_LANGUAGES = \
+ English \
+ Italian \
+ German \
+ French \
+
+
ifeq ($(findstring darwin, $(GNUSTEP_TARGET_OS)), darwin)
ifeq ($(OBJC_RUNTIME_LIB), gnu)
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
