English.lproj/Localizable.strings English.lproj/MainWindow.xib Swedish.lproj/Localizable.strings Swedish.lproj/MainWindow.xib @@ -41,7 +41,7 @@ // by passing the bundle as the url we can reference the logo mark easily in the html [webView loadHTMLString:html baseURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] bundlePath]]]; - self.title = @"About"; + self.title = NSLocalizedString(@"About", @"About button"); } @@ -95,4 +95,4 @@ } -@end +@end \ No newline at end of file AboutViewController.m @@ -143,24 +143,13 @@ Word *myWord = [wordsForSection objectAtIndex:index]; if ([database executeUpdate:@"DELETE FROM words WHERE word = ? AND lang = ?", myWord.word, [NSNumber numberWithInt:myWord.lang]]) { -#ifdef DEBUG - NSLog(@"Deleted word from database"); [database executeUpdate:@"VACUUM"]; // clean up the database -#endif - } - else { -#ifdef DEBUG - NSLog(@"unable to delete %@ from database", myWord); -#endif } [wordsForSection removeObjectAtIndex:index]; } - (void)addWordToDictionary:(NSMutableDictionary *)words word:(Word *)newWord andDatabase:(BOOL) andDatabase { -#ifdef DEBUG - NSLog(@"in Add Word to Dictionary %d", andDatabase); -#endif // get a pointer to the array for the letter this word belongs to NSMutableArray *wordsForLetter = [words objectForKey:newWord.letter]; // if we don't have an array set yet, create it. @@ -178,16 +167,10 @@ if (index == NSNotFound) { // add the word to the array [wordsForLetter addObject:newWord]; -#ifdef DEBUG - NSLog(@"new Word"); -#endif } else { // this word was already in the wordList, update the word object [[wordsForLetter objectAtIndex:index] setTranslation:newWord.translation]; -#ifdef DEBUG - NSLog(@"update translation"); -#endif } } @@ -196,16 +179,7 @@ [wordsForLetter sortUsingSelector:@selector(compare:)]; newWord.word = [newWord.word capitalizedString]; - if ([database executeUpdate:@"REPLACE INTO words(word, lang, translation) VALUES(?, ?, ?)", [newWord.word capitalizedString], [NSNumber numberWithInt:newWord.lang], newWord.translation]) { -#ifdef DEBUG - NSLog(@"Added word to database too"); -#endif - } - else { -#ifdef DEBUG - NSLog(@"Error adding word to database"); -#endif - } + [database executeUpdate:@"REPLACE INTO words(word, lang, translation) VALUES(?, ?, ?)", [newWord.word capitalizedString], [NSNumber numberWithInt:newWord.lang], newWord.translation]; } } Classes/LexikonAppDelegate.m Default.png @@ -23,7 +23,7 @@ <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>21</string> + <string>22</string> <key>CFBundleShortVersionString</key> <string>1.2</string> <key>LSRequiresIPhoneOS</key> Info.plist @@ -12,7 +12,6 @@ 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; 288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; }; - 28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD733E0D9D9553002E5188 /* MainWindow.xib */; }; 3C0911FF0EDDA7AF00A982E9 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C0911FE0EDDA7AF00A982E9 /* libsqlite3.dylib */; }; 3C0B82520F420FBA005AB976 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C0B82510F420FBA005AB976 /* MainViewController.m */; }; 3C3C29C60EE6DC0800028066 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 3C3C29C50EE6DC0800028066 /* Icon.png */; }; @@ -23,11 +22,13 @@ 3C7E70890ED5F2B50022B3A9 /* database.sqlite3 in Resources */ = {isa = PBXBuildFile; fileRef = 3C7E70880ED5F2B50022B3A9 /* database.sqlite3 */; }; 3CAD0D450EE7EFBB003C1C97 /* DetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CAD0D440EE7EFBB003C1C97 /* DetailViewController.m */; }; 3CB9C87D0EED4674001753BD /* translationTemplate.html in Resources */ = {isa = PBXBuildFile; fileRef = 3CB9C87C0EED4674001753BD /* translationTemplate.html */; }; + 3CD141670F4759DC0005BB62 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3CD141660F4759DC0005BB62 /* MainWindow.xib */; }; + 3CD1416D0F475E7F0005BB62 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3CD1416B0F475E7F0005BB62 /* Localizable.strings */; }; + 3CD141D10F47804C0005BB62 /* aboutView.html in Resources */ = {isa = PBXBuildFile; fileRef = 3CDAEC6B0F0FEE34000A0C6E /* aboutView.html */; }; 3CD1B33E0F128B96000D44AD /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CD1B33D0F128B96000D44AD /* CoreLocation.framework */; }; 3CD1B3420F128BA2000D44AD /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CD1B3410F128BA2000D44AD /* SystemConfiguration.framework */; }; 3CDAEC670F0FECB2000A0C6E /* AboutView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3CDAEC660F0FECB2000A0C6E /* AboutView.xib */; }; 3CDAEC6A0F0FED5F000A0C6E /* clockwiseLogo.png in Resources */ = {isa = PBXBuildFile; fileRef = 3CDAEC690F0FED5F000A0C6E /* clockwiseLogo.png */; }; - 3CDAEC6C0F0FEE34000A0C6E /* aboutView.html in Resources */ = {isa = PBXBuildFile; fileRef = 3CDAEC6B0F0FEE34000A0C6E /* aboutView.html */; }; 3CDAEC6F0F0FEFD6000A0C6E /* AboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CDAEC6E0F0FEFD6000A0C6E /* AboutViewController.m */; }; 3CDAEDDE0F1029EB000A0C6E /* lexikonIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 3CDAEDDD0F1029EB000A0C6E /* lexikonIcon.png */; }; 3CEE1E580F3F8284000AE3F6 /* SearchSuggestionsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CEE1E570F3F8284000AE3F6 /* SearchSuggestionsController.m */; }; @@ -44,7 +45,7 @@ 1D6058910D05DD3D006BFB54 /* Lexikon.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Lexikon.app; sourceTree = BUILT_PRODUCTS_DIR; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 288765FC0DF74451002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; - 28AD733E0D9D9553002E5188 /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = "<group>"; }; + 28AD733E0D9D9553002E5188 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainWindow.xib; sourceTree = "<group>"; }; 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; }; 32CA4F630368D1EE00C91783 /* Lexikon_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Lexikon_Prefix.pch; sourceTree = "<group>"; }; 3C0911FE0EDDA7AF00A982E9 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; }; @@ -61,6 +62,9 @@ 3CAD0D430EE7EFBB003C1C97 /* DetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetailViewController.h; path = Classes/DetailViewController.h; sourceTree = "<group>"; }; 3CAD0D440EE7EFBB003C1C97 /* DetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DetailViewController.m; path = Classes/DetailViewController.m; sourceTree = "<group>"; }; 3CB9C87C0EED4674001753BD /* translationTemplate.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = translationTemplate.html; sourceTree = "<group>"; }; + 3CD141680F4759E80005BB62 /* Swedish */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Swedish; path = Swedish.lproj/MainWindow.xib; sourceTree = "<group>"; }; + 3CD1416C0F475E7F0005BB62 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; }; + 3CD1416E0F475E890005BB62 /* Swedish */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Swedish; path = Swedish.lproj/Localizable.strings; sourceTree = "<group>"; }; 3CD1B33D0F128B96000D44AD /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; 3CD1B3410F128BA2000D44AD /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; 3CDAEC660F0FECB2000A0C6E /* AboutView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AboutView.xib; sourceTree = "<group>"; }; @@ -140,7 +144,8 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( - 28AD733E0D9D9553002E5188 /* MainWindow.xib */, + 3CD1416B0F475E7F0005BB62 /* Localizable.strings */, + 3CD141660F4759DC0005BB62 /* MainWindow.xib */, 3CDAEC660F0FECB2000A0C6E /* AboutView.xib */, 3CEE1E5B0F3F837D000AE3F6 /* SearchSuggestions.xib */, 3CDAEDE00F1029F1000A0C6E /* HTML */, @@ -237,6 +242,13 @@ buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Lexikon" */; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + Swedish, + ); mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; projectDirPath = ""; projectRoot = ""; @@ -251,7 +263,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */, + 3CD141670F4759DC0005BB62 /* MainWindow.xib in Resources */, 3C7E70890ED5F2B50022B3A9 /* database.sqlite3 in Resources */, 3CF7D6510EE555030086D98C /* LICENSE.txt in Resources */, 3C3C29C60EE6DC0800028066 /* Icon.png in Resources */, @@ -259,10 +271,11 @@ 3C52BB490F0EB69D006C34C1 /* Default.png in Resources */, 3CDAEC670F0FECB2000A0C6E /* AboutView.xib in Resources */, 3CDAEC6A0F0FED5F000A0C6E /* clockwiseLogo.png in Resources */, - 3CDAEC6C0F0FEE34000A0C6E /* aboutView.html in Resources */, + 3CD141D10F47804C0005BB62 /* aboutView.html in Resources */, 3CDAEDDE0F1029EB000A0C6E /* lexikonIcon.png in Resources */, 3CEE1E5C0F3F837D000AE3F6 /* SearchSuggestions.xib in Resources */, 3CEE1E7A0F404D99000AE3F6 /* searchSuggestionsDropShadow.png in Resources */, + 3CD1416D0F475E7F0005BB62 /* Localizable.strings in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -288,6 +301,27 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXVariantGroup section */ + 3CD141660F4759DC0005BB62 /* MainWindow.xib */ = { + isa = PBXVariantGroup; + children = ( + 28AD733E0D9D9553002E5188 /* English */, + 3CD141680F4759E80005BB62 /* Swedish */, + ); + name = MainWindow.xib; + sourceTree = "<group>"; + }; + 3CD1416B0F475E7F0005BB62 /* Localizable.strings */ = { + isa = PBXVariantGroup; + children = ( + 3CD1416C0F475E7F0005BB62 /* English */, + 3CD1416E0F475E890005BB62 /* Swedish */, + ); + name = Localizable.strings; + sourceTree = "<group>"; + }; +/* End PBXVariantGroup section */ + /* Begin XCBuildConfiguration section */ 1D6058940D05DD3E006BFB54 /* Debug */ = { isa = XCBuildConfiguration; @@ -328,7 +362,7 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Caleb Jaffa"; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 22; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -360,7 +394,7 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 22; DEBUG = 1; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -377,7 +411,7 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 22; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; Lexikon.xcodeproj/project.pbxproj @@ -71,11 +71,11 @@ [self.indexLetters addObject: @"Å"]; [self.indexLetters addObject: @"Ä"]; [self.indexLetters addObject: @"Ö"]; - languageSwitcherButton.title = @"Swe to Eng"; + languageSwitcherButton.title = NSLocalizedString(@"Swe to Eng", @"Language toggle button Swedish to English"); } else { [self.indexLetters removeObjectsInArray: [NSArray arrayWithObjects: @"Å", @"Ä", @"Ö", nil]]; - languageSwitcherButton.title = @"Eng to Swe"; + languageSwitcherButton.title = NSLocalizedString(@"Eng to Swe", @"Lanuage toggle button English to Swedish"); } } @@ -172,7 +172,7 @@ [aSearchBar setTintColor: [UIColor colorWithRed:0.769 green:0.80 blue:0.824 alpha:1.0]]; [aSearchBar sizeToFit]; aSearchBar.autocapitalizationType = UITextAutocapitalizationTypeNone; - aSearchBar.placeholder = @"Search"; + aSearchBar.placeholder = NSLocalizedString(@"Search", @"Search placeholder"); aSearchBar.delegate = self; aSearchBar.frame = CGRectMake(0, 0, 290, 44); @@ -187,7 +187,6 @@ NSMutableArray *wordsForSection = [appDelegate.currentWords objectForKey:sectionLetter]; cell.text = [[wordsForSection objectAtIndex:indexPath.row] word]; - // NSLog(@"SECTION: %d ROW: %d CELL: %@", indexPath.section, indexPath.row, cell.text); } return cell; @@ -370,7 +369,7 @@ } else { tableView.sectionIndexMinimumDisplayRowCount = 1; - buttonItem = [[UIBarButtonItem alloc] initWithTitle:@"About" style:UIBarButtonItemStylePlain target:self action:@selector(showAbout:)]; + buttonItem = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"About", @"About button") style:UIBarButtonItemStylePlain target:self action:@selector(showAbout:)]; } [self.navigationItem setRightBarButtonItem: buttonItem animated:YES]; [buttonItem release]; @@ -471,12 +470,12 @@ } else { // display error message that the word was not found - [self searchFailed:[NSString stringWithFormat:@"%@ not found", searchWord]]; + [self searchFailed:[NSString stringWithFormat:NSLocalizedString(@"Word not found", @"%@ not found"), searchWord]]; } } else { // display error message alerting the user that we were not able to contact the Lexin website - [self searchFailed:@"Unable to reach the Lexin website"]; + [self searchFailed:NSLocalizedString(@"Unable to reach the Lexin website", @"Error message when unable to contact Lexin")]; //[NSString stringWithFormat:@"%@ %@", [myError localizedDescription], [myError localizedFailureReason]]]; } @@ -487,10 +486,10 @@ } - (void)searchFailed:(NSString *)message { - UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Search Error" + UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Search Error", @"Search Error alert title") message:message delegate:nil - cancelButtonTitle:@"OK" + cancelButtonTitle:NSLocalizedString(@"OK", @"Alert OK button") otherButtonTitles: nil]; [alert show]; [alert release]; MainViewController.m @@ -109,14 +109,6 @@ </object> <object class="IBConnectionRecord"> <object class="IBCocoaTouchOutletConnection" key="connection"> - <string key="label">dropDownShadow</string> - <reference key="source" ref="372490531"/> - <reference key="destination" ref="135150028"/> - </object> - <int key="connectionID">23</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBCocoaTouchOutletConnection" key="connection"> <string key="label">view</string> <reference key="source" ref="372490531"/> <reference key="destination" ref="191373211"/> @@ -229,17 +221,8 @@ <string key="className">SearchSuggestionsController</string> <string key="superclassName">UIViewController</string> <object class="NSMutableDictionary" key="outlets"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>dropDownShadow</string> - <string>tableView</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>UIImageView</string> - <string>UITableView</string> - </object> + <string key="NS.key.0">tableView</string> + <string key="NS.object.0">UITableView</string> </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> SearchSuggestions.xib @@ -12,13 +12,11 @@ @interface SearchSuggestionsController : UIViewController { IBOutlet UITableView *tableView; - IBOutlet UIImageView *dropDownShadow; NSMutableArray *suggestions; MainViewController *main; } @property (nonatomic, retain) UITableView *tableView; -@property (nonatomic, retain) UIImageView *dropDownShadow; @property (nonatomic, retain) NSMutableArray *suggestions; @property (nonatomic, retain) MainViewController *main; SearchSuggestionsController.h MainWindow.xib f5d15bcd20cea6a71e7ec092577fa48aa1ab6df7 Caleb Jaffa caleb@clockwi.se http://github.com/octover/lexikon/commit/4d7b1b387205194eb7f76c3e6c7a5ef9cdc7e2be 4d7b1b387205194eb7f76c3e6c7a5ef9cdc7e2be 2009-02-14T14:52:40-08:00 2009-02-14T14:52:40-08:00 internationalization and misc changes 05d1ffd4344f73c4b9d95cba53b63f8383d88d21 Caleb Jaffa caleb@clockwi.se