From adf957b6324ba06ddeb6c4044ea1f2ce6d93bda9 Mon Sep 17 00:00:00 2001
From: Joe Hewitt <joe@joehewitt.com>
Date: Sat, 15 Aug 2009 16:37:47 -0700
Subject: [PATCH] * More localized strings * Fixed: photo captions are
 incorrectly sized when orientation is flat

---
 diffstrings.py                                |  45 +++++++++++-------
 src/TTPhotoView.m                             |   2 +-
 src/TTTableViewController.m                   |   2 +-
 .../de.lproj/Localizable.strings              | Bin 1725 -> 3432 bytes
 .../en.lproj/Localizable.strings              | Bin 6760 -> 3968 bytes
 .../es.lproj/Localizable.strings              | Bin 3324 -> 3326 bytes
 .../fr.lproj/Localizable.strings              | Bin 4096 -> 4096 bytes
 .../it.lproj/Localizable.strings              | Bin 3306 -> 3336 bytes
 .../ja.lproj/Localizable.strings              | Bin 2744 -> 2750 bytes
 9 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/diffstrings.py b/diffstrings.py
index 9366699e51..c1478f24d4 100755
--- a/diffstrings.py
+++ b/diffstrings.py
@@ -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 @@ def condenseStringSourceFiles(self):
         """ 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 @@ def __iterateSourceStrings(self):
                     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)
diff --git a/src/TTPhotoView.m b/src/TTPhotoView.m
index 6813449c20..c62ae9972f 100644
--- a/src/TTPhotoView.m
+++ b/src/TTPhotoView.m
@@ -123,7 +123,7 @@ - (void)layoutSubviews {
 
   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();
diff --git a/src/TTTableViewController.m b/src/TTTableViewController.m
index 119b95e75b..b745072dd9 100644
--- a/src/TTTableViewController.m
+++ b/src/TTTableViewController.m
@@ -224,7 +224,7 @@ - (void)restoreView:(NSDictionary*)state {
 
 - (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];
diff --git a/src/Three20.bundle/de.lproj/Localizable.strings b/src/Three20.bundle/de.lproj/Localizable.strings
index 35fe66aff43b70f6f6d029dcc26f5e1501d342de..234514207808875de46f3565718d799e0a981454 100644
GIT binary patch
literal 3432
zcmbW3%T8255Qcm0Q=CkqD+7CsQErODfXRS_<qR{xa5<Q{K=65e2AAspbxl)s@Bq<t
z22OWZ*X{qSx_|%bq<$Kt>oiZZRO!3c-?KcQ<oT(-JNkO7UnkvY#`;Lox02>-tTUs$
z+SBS>v!Ujl^d`N~=%kmLS81xXW1VJqs(C-PYc}bgq%ZDu)j?Y~Elb04y3=sKhG{8v
z^|RHc<?D1Jd+2p}vqCh)YkTF?s$v;w^-jBU{h#V@bA`z3oUfT=D#gY8Sf?)2yI`f8
zerokhk|Sv$zr(C?sGPA<DTia}zR<aGmLx9&4eW7pB)w=XzL6I)=#i8a)?JP~G&AHY
zt_z&;pcWQn;l2KT$><Z;G+5bOcni*;Ygt47gCtGb*mJ7g@A{3Ua~3>0&>3R8)LxZO
zRQkTw8tj<K>Nwl@c5mM}GZU&F?S`bt96F-q3uU_2Fwbg9S>7vo0V-Iry<7b+F`&6*
zWB&;cKp3XXq=#&QT&<NVxwq3t{6uzD9t?#1mA>(UXn$x8MqFscDkw%2J$sCgk!fqv
z5g9gJWPn&Be>M|?3SW^o_|p&BwY{yhwb=FS^fD?Bxl$_Ye|Y1y_b)86y1mL7qhnbW
zJ>5&XK|0pRp3pN+kpC+6l#3JnCX#o?efn#!64y>NjBODq%kE}+Ep0oCLCrHiS`615
zrRiVg#8Qwg>?~D|r>Bx-xTZsS45y9lREPCo`1PuC6wk#$V+o!6N({crvex;V{g}F$
zC>zubtQ}-Y*HyfCFMOqVeWWwkvx@7hBf0d)uoqFGR*<K6lw0R8qf*OzqIVy5a}9!!
z*#Hq@S<ltV>{#=0p1HPdt&>OMdU*Cms}se_KE1kWZ(o{*@+HQxr4z<P_p2wliN;+<
zo@z%c_P9Ch_JeV(PO@x7b4TmroOf>8QrG4)Jz^w%mLsZnE+&H2EL$KCb>>FF;6N<L
zXY%kgclzo@+~0j^$10r`9GV=m3M?-Ki>1k&@<uSpUe;-Rj5w3am4NZ8yklPcHf-B(
zqllp20)Ccip^mu&9QU4LD|f2P?kQ@Q*-P8Ohc+HnX<wP4Zm74tjJ==#nse6VPbHbc
zP;U0?7BAZSaa$)QFK%yF_Q2KS*^~w2luJd<xFq=)q;qMYN+K3(S~EV;=OQXyy|Ngt
z+gBX9k$7H7it3*V3Ha$J@OiFZm3FlUB6M84uid-mtCVg<oK|V@zMXUJ@6vb!xCO(y
z^q3~{&O7(JFwHf<Gvc6UU4{s4&JOQF`mw#_{N#>Mw3km;U)CGkCU1#{9Uh#m%b~aU
zLjA?pP3-oD4EN7t_dT}`I5C!TuWDo5hCHNO#!Oge;Em@o6((TOWupyvQ&_T|b7OC2
vmtGYko3CF#VYi9PewGH`Eg5~T%fZFRGS*)2&s9_<k3ommRI~o+#pdB3L1Fv_

literal 1725
zcmZ`(&2HN;48HFvhycA6?!Cj%^(WoBHpu|DD|(bI##ZA<g)BA5PJ5VPkI>5wJLFCF
z0(*r~r0u5Z=8Gjtq&|N9$Ui@Sja1=c0A-<e(Sxeo2;RZy(RskIQh>&yhde~9arE}h
zo6(+z7E5P!`{FX0b6libmak0?^uc<~v2-@cXxTZtIqYe+lgp#CX_t<UJ;K^WXk)in
zDH|X-D3vX-IbxT|=Bca$wgGemZLo!v@r%ZkHK?NSSk`EdI9!faUP+4%)0#dG!;AFj
zRI;5?mf}^rm9Z7<y@$`W3$EqsV|oTXMM?JaWG22U{EDUu>~>>S(O?4GIHe)friF*(
zPgI4BW1JCK?3@>yCu=F1CENijY*dOZPh=eM`b7jFx`Q&d1?wbkyA`yB<EDs9KpX1K
z_a?w1)l8m}Xxr2Zk0(YbYzYB+VQf4eLw&ehf|8`iu%Mm5aasv;A2EhO2TNmV_euv7
zHVdJ%2g=M?$kkkV!+|gQ9c-TFbK*fj((~hexS|jAKHSmQ!ANGErGt#EscxyLRHrNx
z9&U}-#ABOE9pLx3AB_4wQj!XmZb{S(Vy(~<-GD_WiaSyh6}QXp1MdX;af3cEh+E}t
zv=v94I=HapVd<q)M|CWNah9)LGV%TCBl^Nv-TURw(n>Axe}QpN{99+a^M1Wg`a<fF
zl}a)M^xk=);R=nWW=*vvByf&3WdJJ9D-0e(&-BfMR$-StwFpr)rZtrFz#w&KnhLKf
zEaN~}x^{=0{INak`Pph6p@e&ePjghhtl1%tsax4PTd-wz$-8G(;o2-w!z@Y}z6^{)
zOeHA18$xU;caUw86bI%-(#<%L#U>#~Fva4YswiokB&z1~E*D(E1lv|s$WBv?2vb$o
zK6NfTPw3+_UZgj=feO+cgYI@Fsx*mYf5`#5?3p})NCQLwB2texY@|O@*<0+nyGj#h
z;z$re`_L0;h@yVv$cX7XgRlaX_PN=02FW%scjl~Qd`@yOBK(vf$V`>%69#w6<5{rv
jBbX1UvDo@a@iyVy6<t62dR$wT->noBXqM0^fMxR+SVaWO

diff --git a/src/Three20.bundle/en.lproj/Localizable.strings b/src/Three20.bundle/en.lproj/Localizable.strings
index c9123ba93555bee04147b8544410bfb1b6ab8488..7e8e14ec5d92483cbf4665f04ce9ca8c52a5ae08 100644
GIT binary patch
delta 345
zcmaE1(jd?D|KH>?afQh(ToIE+n1Uw9aY#)z;qjPk!Z>O28cvPLH-xmnVxKsK<SQ8<
zP>Df-!4`;>p!`Z8%bI~}@<n0k$@fI~CLa(nn!G^5Ve%{qA7&+nkjV!nq$jTutDDRv
zW-|GSxW>dsK9e5^C``U3U<5Q;ZSozCrpaEyHj{1mWF{L(Sxo-NtTFixpTXp7d^VG>
z2v<yY5UrWKi(O^1iKN5CBAJOf8j~ZKBPJ*CTTK2Ss53c0KxXm;Hi^j!>=4I);q(BS
z8Z^0tWfqWDn9RZvGI<@Z8`u+ayj=WR4EhXQKnMFm;ABT$VOEIqS2M*=e#WmfnMZKi
zWG(JAs1CNtb9gc)D+%R6`A(DHu<A@cB&ooz#Nfk_&yYAdP*`$u3^&Il9uc5JR3>+^
G=>Y)fC22+g

literal 6760
zcmcgw+invv5S{0K#i{}cDnu_5st7`W+B^VFi`4d^kDE)c+oVc1ME!ZnId)u+x9gCI
zb+p<|JY#!ijy)Iq>Cd)oNhZfK!ncR-J)VIKr9}Hd#-RL`8|j1A2c;{I_>zAG>Ja}1
z=<^=5E!mb0*_79&-!;Zf!I^-QqwffuOg`gX)Z-Io*uXp~G`ctXPGQ$zfmX3zTC)RV
z+1Q|9QKE$d*hWN%8m%w!5-%b+gGAz#$s5_lcO;ki?#hn5#czn5<q<`V*si=XxH|5h
zX>W?wtLZhQ&fF10NRF>#tXCS%av;i`Mci||dc9umwB>rQLsRYx=M(?Zv%YT{Ex$=&
zc4nz|o2I3bO7F=KOSqO9b{AuXrp&OqHU?Qg>X~*AeG2&!=o*e&eWvwVxQy=XlSZop
zg`$rxAvKj`#u4U=9(?!4M3qe1Sart7v0Bjs!&}sIof@7&SLQ?Jz7rF7G;Vb^)s0A_
z@u5L#ps@24E%6Ym&a9Uq>k#XE({7>NF*7g|wUCQGfbsyY&q!^oP#f)Q@L3lya(Vmf
zxvNO-V?NdsE(6*b+b?90viiL5F!K+rSz%=C$-a=X2TOP4V~tdDkLFK?6=(Zm{#31Q
z8*aR}*0#C4T<0&ErlrPLJ+|8Qs~l3bgy!tJ#VSoyPG=SBYS3!+xJ=(PS{}h$auW&Y
zH#YD5dam^*sDk<Uow98IwA!*Jy^87<a<wM${j-k>o!+!v@uLnXeY}r&JPILoISJNl
z>8tzj!PtK7AbxegXKW64sXJ-Jd#s`dBb3#|#VI?lm8~uH^1^u4oTnVaFJ{oEgWm}r
zd-Cu)#Q56YCbiM$I?kKUZl0#To0^a(Db@!(1JqRu8jV#(rNbx_9Ve>#g}gLcoXAh*
zleU#g(p?~ltyGd8OqOux?o)WfCEhV=HjnWMY8vK}`d(TyR&J#^54lQ-=l2{H>m5dS
zP4&mq2<IvhaadJlCJ&V0aZmD;Y|kr;?f_gA@$2rj)ikYJb3S_tG>B0T7I?WKRZAv^
zwPOxs3jAuzh{6=Px(nNLpjQ|KoPBO2&yz((7H4#HEv;EQd2<okXentWhB?*cBBDX*
zAvcvKyla@vWo5XN`wG0>-4Xx$eKrXYs*dBmlOD@^r<dc`X~nXduTM+Xf@9P?JTK5A
zn4h@6d52-|%@{FAwP#&jBc5VaRv(=T?<qX_7Mk*m-U{|bm6Jw;GoW{4Fw;?H0*x4H
z?OkMPB8`o;L!hT45^Hep@6F7X%F<DQ@EI&2;_0N>v$jTOglNR`cPgppCM$Fi`{@lf
zFBY)Vo}uU|v9;E#_<ysc!Sfthkl67itL}6a<EPQ)0{H4E?%FA(@jhw%ynkGdvywxe
G)#5J;6%J4U

diff --git a/src/Three20.bundle/es.lproj/Localizable.strings b/src/Three20.bundle/es.lproj/Localizable.strings
index 030572f770ad63a04ab0dd005ef1ce3f4ee2bf19..c703fa3e25ed422fafee2cb28b05b582404c5e3f 100644
GIT binary patch
delta 61
zcmew(`A>4gKgP*soHCpLF`i>&_F(YXe3m(wl@rKduwuw%$esL<MR>9dm(1iK&O@6m
NxSAkpc5^#20sxgp6FdL_

delta 59
zcmew-`A2fYKgP*_n8h|5FzsMu%-;N(Ihd6@o56}97YG#?5+{FVRG(bNd1!JFr^;pv
Mt|pM0z1)tB0E*xf#{d8T

diff --git a/src/Three20.bundle/fr.lproj/Localizable.strings b/src/Three20.bundle/fr.lproj/Localizable.strings
index 0d5804f1a6c885130b48505f01dad496b23448f2..67446266275ff7dfe70578392cca8b1590b25fb1 100644
GIT binary patch
delta 67
zcmV-J0KETzAb=pSP6Ct03LcZF1QwIZ1T?dl0uTa|=m#{j90kk*lc)rAvm6Mh0+U`2
Z29w?m8k67!43qi`E|cU6>a!*c+5;@|7^?sP

delta 59
zcmV-B0L1@*Ab=pSP6D%R0$Ku-YyuXO+y`E>`UK1Zlg0!zvpNW<0+UPvAd@@`>XX<F
RAd|iY43iEEF0&{M*aLi$6te&T

diff --git a/src/Three20.bundle/it.lproj/Localizable.strings b/src/Three20.bundle/it.lproj/Localizable.strings
index 5820a150220cd6cbd9bf57e0e0eeb639b39e30af..b894bb0fd3bf26ebae532537e4ce6af108400786 100644
GIT binary patch
delta 86
zcmaDQ*&#Kdi8X~mpTT!yyENluFHV`sx0uB??_gA7ntXswZF2xi0TWQ9Z1OX<9qgG5
q`3yx2d6P?d^fzx|Z(!u~VDMnDV#sC4o&1<ne{vdU$7Ug}8%zMmMH`&}

delta 82
zcmeB>dL=obiPe`upCM&qyENnGeT)`NlY7|8Hp{RSFirl(tTvg6eFtYgLlHwBLn1@&
m=Ev;4jNBOvRt&j7sKAgoc{-!|<Q1G9lUq1dHXCr=U;+Rm6d45o

diff --git a/src/Three20.bundle/ja.lproj/Localizable.strings b/src/Three20.bundle/ja.lproj/Localizable.strings
index 48de8267950d4eb9da6299756cffb4064cd6c081..efffe102979177654a304cfa4ca77305be6b6344 100644
GIT binary patch
delta 77
zcmdlXx=(aM(PSG&j)`TrCi}3<O=e*g+nmNYg%QX|*sR2Sf>9{jU}^HK+Hiw30~doj
hgJ^@v29rN98EsBseZe@nj6-E}7CR5)=2;waOaS{78BPEI

delta 74
zcmV-Q0JZ<V6}T0Uaszn)d69YBvvL8d0h3?_D6@P6$N>+fW14+TFhVejFn%ywFq4yK
g0U?tz14^@q1?T~jQ~@5dlm`p}lW+$lv!Dnb0s$2nYybcN