@@ -64,23 +64,24 @@ def mergeProjects(projects, sourceLocaleName, focusedLocaleName=None, verbose=Fa for project in projects: sourceStrings = project.condenseStringSourceFiles() - - for localeName, localizedStrings in project.locales.iteritems(): - if not focusedLocaleName or focusedLocaleName == localeName: - if localizedStrings.name in translations: - translation = translations[localizedStrings.name] - else: - translation = Translation(localizedStrings.name) - translation.open(".", "2") - translations[localizedStrings.name] = translation + sourceStrings.save() - if translation.strings: - if verbose: - localizedStrings.mergeReport(sourceStrings, translation) - - localizedStrings.mergeTranslation(sourceStrings, translation) - if not dryRun: - localizedStrings.save() + # for localeName, localizedStrings in project.locales.iteritems(): + # if not focusedLocaleName or focusedLocaleName == localeName: + # if localizedStrings.name in translations: + # translation = translations[localizedStrings.name] + # else: + # translation = Translation(localizedStrings.name) + # translation.open(".", "2") + # translations[localizedStrings.name] = translation + # + # if translation.strings: + # if verbose: + # localizedStrings.mergeReport(sourceStrings, translation) + # + # localizedStrings.mergeTranslation(sourceStrings, translation) + # if not dryRun: + # localizedStrings.save() ################################################################################################### @@ -99,6 +100,10 @@ class XcodeProject(object): """ Copies all strings from all sources files into a single file.""" sourceStrings = LocalizableStrings(self.sourceLocaleName) + sourceStrings.path = self.__findSourceStringsPath() + if not sourceStrings.path: + sourceStrings.path = os.path.join(self.sourceLocalePath, "Localizable.strings") + for sourceFile in self.stringSourceFiles: sourceStrings.update(sourceFile) return sourceStrings @@ -194,7 +199,13 @@ class XcodeProject(object): filePath = os.path.join(buildPath, fileName) strings.open(filePath) yield strings - + + def __findSourceStringsPath(self): + for name in os.listdir(self.sourceLocalePath): + m = reStringsFileName.match(name) + if m: + return os.path.join(self.sourceLocalePath, name) + def __findSourceStrings(self): for name in os.listdir(self.sourceLocalePath): m = reStringsFileName.match(name) diffstrings.py @@ -123,7 +123,7 @@ UIDeviceOrientation orientation = TTDeviceOrientation(); CGFloat marginRight = 0, marginLeft = 0, marginBottom = 0; - if (UIInterfaceOrientationIsPortrait(orientation)) { + if (!UIInterfaceOrientationIsLandscape(orientation)) { marginBottom = TT_ROW_HEIGHT; } else if (orientation == UIDeviceOrientationLandscapeLeft) { marginLeft = TTBarsHeight(); src/TTPhotoView.m @@ -224,7 +224,7 @@ static const CGFloat kBannerViewHeight = 22; - (void)keyboardDidAppear:(BOOL)animated withBounds:(CGRect)bounds { [super keyboardDidAppear:animated withBounds:bounds]; - self.tableView.frame = [self.tableView frameWithKeyboardSubtracted:0]; + self.tableView.frame = TTRectContract(self.tableView.frame, 0, bounds.size.height); [self.tableView scrollFirstResponderIntoView]; [self layoutOverlayView]; [self layoutBannerView]; src/TTTableViewController.m src/Three20.bundle/de.lproj/Localizable.strings src/Three20.bundle/en.lproj/Localizable.strings src/Three20.bundle/es.lproj/Localizable.strings src/Three20.bundle/fr.lproj/Localizable.strings src/Three20.bundle/it.lproj/Localizable.strings src/Three20.bundle/ja.lproj/Localizable.strings d869804da6e9924f69c089691c88f16d9baeedb7 Joe Hewitt joe@joehewitt.com http://github.com/facebook/three20/commit/adf957b6324ba06ddeb6c4044ea1f2ce6d93bda9 adf957b6324ba06ddeb6c4044ea1f2ce6d93bda9 2009-08-15T16:37:47-07:00 2009-08-15T16:37:47-07:00 * More localized strings * Fixed: photo captions are incorrectly sized when orientation is flat f3c69fb0738df9d8fb7a059e9495b41ca95af8f9 Joe Hewitt joe@joehewitt.com