Chameleon Applications Commit Details - 397 - Chameleon related Applications (system preferences panels, helper applications)

Date:

2011-12-04 02:05:03 (12 years 4 months ago)

Author:

Rekursor

Commit:

397

Parents:

396

Message:

Added localization of status red message

Changes:

M	/trunk/ChameleonPrefPane/English.lproj/Localizable.strings
M	/trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.mm
M	/trunk/ChameleonPrefPane/Sources/PreferencesControllerBase.h
M	/trunk/ChameleonPrefPane/Sources/PreferencesControllerBase.mm

File differences

-228
229 229
230 230
231 
231
232
232 233
233 234
234 
235
236
235 237
236 238
237 239
+␉␉␉ft=false;␊
␉␉␉[mStatusText setTextColor: [NSColor redColor] ];␊
␉␉␉if (errorString)␊
␉␉␉␉[mStatusText setStringValue:[NSString stringWithFormat: @"Error while parsing org.chameleon.Boot.plist : %@",␊
␉␉␉␉[mStatusText setStringValue:[NSString stringWithFormat: ␊
␉␉␉␉␉␉␉␉␉␉␉ GetLocStrDef(@"Error_Parsing", @"error", @"Error while parsing %@"),␊
␉␉␉␉␉␉␉␉␉␉␉ errorString] ];␊
␉␉␉else␊
␉␉␉␉[mStatusText setStringValue: @"Error while searching for org.chameleon.Boot.plist"];␊
␉␉␉␉[mStatusText setStringValue: ␊
␉␉␉␉GetLocStrDef(@"Error_Searching", @"Error while searching for org.chameleon.Boot.plist", @"error") ];␊
␉␉␉␊
␉␉}␊
␉␉else␊
 ␉␉␉ft=false;␊
 ␉␉␉[mStatusText setTextColor: [NSColor redColor] ];␊
 ␉␉␉if (errorString)␊
-␉␉␉␉[mStatusText setStringValue:[NSString stringWithFormat: @"Error while parsing org.chameleon.Boot.plist : %@",␊
+␉␉␉␉[mStatusText setStringValue:[NSString stringWithFormat: ␊
+␉␉␉␉␉␉␉␉␉␉␉ GetLocStrDef(@"Error_Parsing", @"error", @"Error while parsing %@"),␊
 ␉␉␉␉␉␉␉␉␉␉␉ errorString] ];␊
 ␉␉␉else␊
-␉␉␉␉[mStatusText setStringValue: @"Error while searching for org.chameleon.Boot.plist"];␊
+␉␉␉␉[mStatusText setStringValue: ␊
+␉␉␉␉GetLocStrDef(@"Error_Searching", @"Error while searching for org.chameleon.Boot.plist", @"error") ];␊
 ␉␉␉␊
 ␉␉}␊
 ␉␉else␊

-20
21 21
22 22
23
24
25
26
27
28
29
30
23 31
24 
25 32
26 33
27 34
+static KernOptionsParser kernelFlags;␊
␊
//--------------------------------------------------------------------------␊
NSString* GetLocStrDef(NSString* label, NSString* comment, NSString* def)␊
{␊
␉return NSLocalizedStringWithDefaultValue(label, nil, ␊
␉␉␉␉␉␉␉␉␉␉␉ [NSBundle bundleForClass:[ChameleonPrefPane class]],␊
␉␉␉␉␉␉␉␉␉␉␉ def, ␊
␉␉␉␉␉␉␉␉␉␉␉ comment);␊
}␊
//--------------------------------------------------------------------------␊
␊
␊
@implementation PreferencesControllerBase␊
␊
-(ChameleonPrefPane*) chameleon { return [ChameleonPrefPane instance]; }␊
 static KernOptionsParser kernelFlags;␊
 ␊
 //--------------------------------------------------------------------------␊
+NSString* GetLocStrDef(NSString* label, NSString* comment, NSString* def)␊
+{␊
+␉return NSLocalizedStringWithDefaultValue(label, nil, ␊
+␉␉␉␉␉␉␉␉␉␉␉ [NSBundle bundleForClass:[ChameleonPrefPane class]],␊
+␉␉␉␉␉␉␉␉␉␉␉ def, ␊
+␉␉␉␉␉␉␉␉␉␉␉ comment);␊
+}␊
+//--------------------------------------------------------------------------␊
 ␊
-␊
 @implementation PreferencesControllerBase␊
 ␊
 -(ChameleonPrefPane*) chameleon { return [ChameleonPrefPane instance]; }␊

-29
30 30
31 31
32
33
32 34
33 35
34 36
+␉SaveBootConfigOptions␊
};␊
␊
/// PrefPane Localization Helper␊
NSString* GetLocStrDef(NSString* label, NSString* comment, NSString* def);␊
␊
␊
// ENHANCE ME: remove this globals and integrate them in ChameleonPrefPane or at least ␊
 ␉SaveBootConfigOptions␊
 };␊
 ␊
+/// PrefPane Localization Helper␊
+NSString* GetLocStrDef(NSString* label, NSString* comment, NSString* def);␊
 ␊
 ␊
 // ENHANCE ME: remove this globals and integrate them in ChameleonPrefPane or at least ␊

-22
23 23
24 24
25 
26 
27 
25
26
27
28
29
+/* comment */␊
"Peripherals" = "Peripherals";␊
␊
/* error message 1*/␊
"Error while parsing" = "ERROR123456";␊
"Error searching for" = "ERROR123456";
/* error */␊
"Error_Parsing" = "Error while parsing %@";␊
␊
/* error */␊
"Error_Searching" = "Error while searching for org.chameleon.Boot.plist";␊
 /* comment */␊
 "Peripherals" = "Peripherals";␊
 ␊
-/* error message 1*/␊
-"Error while parsing" = "ERROR123456";␊
-"Error searching for" = "ERROR123456";
+/* error */␊
+"Error_Parsing" = "Error while parsing %@";␊
+␊
+/* error */␊
+"Error_Searching" = "Error while searching for org.chameleon.Boot.plist";␊

Download the corresponding diff file