# HG changeset patch # User koda # Date 1328807343 -3600 # Node ID e1125559359f47f576fd683859f94697b39189ea # Parent 6aeaba3ee584763c4b525a9c03e5eb4605063e41 small ios weapon localisation handling fix diff -r 6aeaba3ee584 -r e1125559359f hedgewars/uLocale.pas --- a/hedgewars/uLocale.pas Thu Feb 09 17:28:05 2012 +0100 +++ b/hedgewars/uLocale.pas Thu Feb 09 18:09:03 2012 +0100 @@ -96,7 +96,7 @@ end; end; Close(f); - WriteLnToConsole('Locale loaded "' + FileName + '"'); + {$IFNDEF IPHONEOS}WriteLnToConsole('Locale loaded "' + FileName + '"');{$ENDIF} end; {$I+} end; diff -r 6aeaba3ee584 -r e1125559359f project_files/HedgewarsMobile/Classes/SingleWeaponViewController.m --- a/project_files/HedgewarsMobile/Classes/SingleWeaponViewController.m Thu Feb 09 17:28:05 2012 +0100 +++ b/project_files/HedgewarsMobile/Classes/SingleWeaponViewController.m Thu Feb 09 18:09:03 2012 +0100 @@ -34,7 +34,7 @@ -(void) viewDidLoad { [super viewDidLoad]; - NSString *trFilePath = [NSString stringWithFormat:@"%@/en.txt",LOCALE_DIRECTORY()]; + NSString *trFilePath = [NSString stringWithFormat:@"%@/%@.txt",LOCALE_DIRECTORY(),[[NSLocale preferredLanguages] objectAtIndex:0]]; // fill the data structure that we are going to read LoadLocaleWrapper([trFilePath UTF8String]);