From 94e194aa8343706b796aa35fc6b6adc79e55c375 Mon Sep 17 00:00:00 2001
From: znek <znek@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Mon, 19 Jul 2004 16:50:05 +0000
Subject: [PATCH] locales utf-16 -> utf-8

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@148 d1b88da0-ebda-0310-925b-ed51d893ca5b
---
 SOGo/Main/ChangeLog            |   6 +++++-
 SOGo/Main/English.lproj/Locale | Bin 3062 -> 1530 bytes
 SOGo/Main/French.lproj/Locale  | Bin 3256 -> 1641 bytes
 SOGo/Main/SOGoRootPage.wox     |   2 +-
 SOGo/Main/Version              |   4 ++--
 SOGo/Main/sogod.m              |  32 +++++++++++++++++++++-----------
 6 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/SOGo/Main/ChangeLog b/SOGo/Main/ChangeLog
index dd0797df..faf0d466 100644
--- a/SOGo/Main/ChangeLog
+++ b/SOGo/Main/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-19  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+	* sogod.m, */Locale: converted to UTF-8 for better editability (v0.9.3)
+
 2004-07-19  Marcus Mueller  <znek@mulle-kybernetik.com>
 
 	* v0.9.2
@@ -13,4 +17,4 @@
 
 	* SOGoRootPage.wox: some debug code (for locales).
 
-	* created ChangeLog.
\ No newline at end of file
+	* created ChangeLog.
diff --git a/SOGo/Main/English.lproj/Locale b/SOGo/Main/English.lproj/Locale
index 09b1125a8b5b46ec6ab73d89631dfb916e649431..ac087fc26af4549431b482e94ea136868578040f 100644
GIT binary patch
literal 1530
zcmaJ>-%r~x5Plwi#VH~ZAVYt^U;*u+BSU~lsgzELy_v>KtR;5kIIw8i|GqmrG=;T$
zxn6zeyYKtXm%#yiRe34v0uBZ{zjr=N(>t#6hUa3+D*>M&=;FZz1+TQJc)2ljrx&~w
zmpXH|gbFTTZ~!;yJ)9m#ha;-LR=v;5-zJW`#2Gh2*-Ndg_+<$P0-yquWR}FDmbv0q
zYK4)#Ny1>3>^p#$jlp}1Hf^gXUDCZ>k38m9IP^BPMyi}b;e<i>1ww&8kA2!)R^r}d
zqDxES$7@$R77K~&W0^}^Q{!M5FbGCu#$=AkoRIlQ=9J7CnNMV*z(efHq+-bpx7rYr
zBj5ciH>DJY0IYFzy_QC5!=U7~Ww3OX=h|1i){UW=yuY(IWKhXW$-J=p4E9F!UmJz=
z-QO_-rM1GUjan4$=!60PVTGY{cMvhiq*B7{`(8IV5aYGy<x1^WNx!A>YV0TD(b;P1
zcxe+Wg~RoA6P$EGBqql2mejrFs^O+(a3!9M_Y!Uv1%nBSQ8Gw425%dM<GXE2^e0W;
zkUS`@71fhKz3vxQJ7=n&yCc-!dA{!y5yZTGFP+sWl+iDJ(w0PGknz^%&1gs)s<om<
z0aj^gp$#_O@E}LkAQXeJ_0PfOZ4}0dLJA;7RHN6zN#T@mGB^PkAbAGJ+oN=4-8B9O
z0m9MEd6+=BTm$nU#82e+W=?5?F9=aGm^V0z2a%yyGzig11i`xj&kI>^kj841h2CK&
z^}Ntc%~e*v*$?J1Yz4i($Q|(WFh%STe($gTv;U5vPxM(^_&JD3(fuOJ+BwKnbuRKX
z{t!vKAo6bdi9ZT%+#p?p{`2KlyTu?aCN2Pj7gV@=OuCj<K8x2SdyjrMVo?+w4Tm23
QROI+Y+@5~8p8sd(Fa0akGynhq

literal 3062
zcmbVO+fLg+5S`cZ6$pV85SJ1tlvaI62?!8@NTI6eTS#1kni!Nzsa5sY+nzI%^{$Np
zgCfVX>$#pev-aPAvLP!nF9(uHECacbv0P)lg8e!9jq8n^Nk>kls~S_>V~McWl_Bo)
z@(I^M!G1wLW|oI?D<kN3;k~-mDXe;G6Ujd0eh@1{CX6sY%l#Pnony5lTe2r>vI*Jp
zFVDTqU;L!Udck8GnT?Q9A`{Jy_eg%>-{D~hIP@CQk~Xd;w8p?VhGiGpH>fO`+0=wu
zt5{KUIY4k<rif<odXl2r6nI|2c96we)cjq%rh1RWV?Tk_1U_yMFV3u%5R(y?<g@-q
zv(;s(w+mRa=jZUle&oHex=T3<@@BO?wPEj@kYZdDAYdrf5alf{X0U*+IjNpWTbZ<-
zN$)agCzEzF>3t^cK?+gKXVXD$ciKhvfedw>TZf%z?}6%YE?BQapuCU1t~<qsURm1!
zKE{YbnK7NrNxIGDc!V{3?dIgUI5pr$uS4Y5M`wxfH6ktRZVi~a=gfuA*?s@Cu6hZg
zl82V-6jBdfyw<ip>B@I_CJIj9YwW2;U;QVlvz)8z7&gw<^Pa4D$n7Fazks>Tl4;+T
zI_ld+^~G7YNL72qd^x!xS6Yh41Sq&pG*I^ly-N{~CtgiXuu9M^o&>4Ze+W-kScQ8n
zeNH@yZUg=2)C_dRXJ&Z<8|FbB%7fW{19FVZF~(TS`Z)jW1uf3eFLK!LoMH8|pk@5`
zmSMeT&?N>uH&XnUol>6Nj5WkXL~i9ihn(}|?$tc9cE;~({4le&;>B3iJf)huG2o%M
z4*Eb}Rw=cfKOr|!>jqB9NdME^>EQiUXAC=LOrd1_pk&-|dm%5lXRI(ia)Oevfs!$R
zl69Vv^*hAUXX|H!)A$+`_|DjrWBGu43(=Oq?C{+5vA)88BtK^TdwiZcIs?qyu%vW>
zJ(~)8>1)*&=;2hQL*)kbI^a!yf~m!CnQE*dqm3=}#`7)DYI@_zJVu-Zn&TPvoc-ea
zV>O4v%aMNUjhsiExOb2%ap(WH(x_F~?Rpq`3_JO<{&^Iwi+*jr90xdCPdWSHuJw16
z+p|u4U)FEFDQz!g`6c|ZFMc9@1y7%AJUeJf4h+$6zO(GyzQ+@CIE>SV2EXMdxOmnU
m-(=5Wzld+uRb2e7<2}tUA^+XM^D|a%z0UiZJm&w8%>4)Ltk*FB

diff --git a/SOGo/Main/French.lproj/Locale b/SOGo/Main/French.lproj/Locale
index 147c098aa965b6ce938a659568b3a6d3b1740a9b..af3faccc31e38972ff7f1bbd55c1f65a03f3ed38 100644
GIT binary patch
literal 1641
zcmaJ>&2G~`5I)nVSXo%Kl}mnFTGEO`Xj-+XP9t1E<+ima@dkT0+O;Dh#D$lkm3RY=
zeiNRAnO*0nA>}e2&&<xxH$RPCcCJCjDcfyqecO80kFK~Jm3#z!o&$TsJg4?fNO!Ju
z&a<V4%jzc=#wo8<%riJuiG4QI-U(~$vdie29qxDbS`=W#{nCy<Hf-011CDtWr%D#^
zwV*^W3OP6}H6=WYX8E1UNWuR6_~laQ@d9j)MO0`ZN2K+;%m?PbW&Z8b=tksltrMt?
zdg1MbEwBf%zzTa}BnpGCx4otpFt0_VO=O?Q0g+ck4v8EQc}=9_?X0?qV8S&ol%_la
z7yXRuOn{~YdSJvz@<J$SV_`ZHRp`fZ)x8FET1(BU*wk?@RH>;O>z=lo0n3FfMX?jG
z?N*!q5@C7LU`T0y4$vu|=<43=k%4E0oq!o7^o}d#67knANuDjRpQC&B;r*h^2kq9;
zqRIGZQ;8F;;*<*+usH`y7E4@6jf);)`%|j0t2LidL&jWA9Z19KVXBcujB>8=F~{GG
zenh~=B?Up6Wl&I+s`_1^rGZHS`JKkFDlU{|q?*<uFR314%hv$+arSzAwvKNC7(}`h
z$>a&MIkwKcb~(^O=?y+pEX8?@Ql&BKhEaxwpEvxOn<Q(t5g@FWz;VD>To$NUP!J>w
zh{MAo5impn#RNc|sP%7~_@7jm-?}*V!<CFa0er#o9yP5e@_=2H7(C=S-yse8J17J8
z5l|NK+!cP43bO$jkC$T{^yEca;)vP>yGd1PxJ=BW6=Uv_m<f-ep2R2fUtWc}gkwKq
z{%2PRz53^l*h10D1(AxmICn5q8W<+S_z=gQ#VW&vcGqqb7zth&Jh(W4St%2oRh(Y?
z0Uc`~ZVV-TrXUk1Ft`D@zqa&S;M#WG`d&LB9+$FuptF%Hfh%F`pn`kZ4F}=MB-1u^
q!+;G!ryeLH3NeNGlCJ~M2|At5%VzVr!>A7<ydzJW@2%Q@-}(z~NCS!h

literal 3256
zcmbVO>rN9v6h43DDVoN{LO{6*R^tz(5HJ)PiyHh_N?VHCm2|hn#`s3Qm+%ZG>i5mr
z+1V*ux|(LYXJ^j!JC~W?f8?1gNlEr)BwY!mBbWGE!s>#2!}Cavr6otw#$I2>c=y3~
zjQ0@llDx)K_N2@5DwW%pFVH&#caSSXtv|6lkO*3w+!5qDMye~jpf57EdeBJTQsVg`
z{5!$dmTX8(R%8vd`k(K6p1$^j8rP>ZHsP6~6&vqDiQ(T@{98OU7K`34a2q8O9ht!2
z2{1WFTtO;PD*f;fsKW-eIs{|L#n3V^nXr~BvI89zgHJ`?82T(%(<vmGvlHkbp1!8K
zG~`SUGC8P&r(<N8y*j8qo*0=@+f`Uu#j}j>GEleFdP;4i)MiROPpPex+D@q#DOCft
zIMbUJe7iPTAWEz;i^nqLTpjHho&bI`UW))Di%dMBL3scTVJ0p`CrqR?KDTxYP2I##
zw@Up{f`waEUe<OtmIK&hMc6K?&+(@Uoax079)*x(78cD)6}Ydbdl%So>sE#cQO@mb
zCVsYo;Ye=b_lnU?d3s7))Lb)E1aAl6Tg1;HdkBrJ&k^2gff%w<?pOPC)$YlAc?Vt7
z9lVKH)?^#&)BUTKisp||aeiFFA4bl2rq{Z;tD3?4ypb1s!_-R*{WgO;usDLX2`q6U
zR^<v`q1?beG1409$sJbMcU;qc;cT>((@u5+!_S?8p{`8MH4dc%;M@iNs<#b)e&I_s
zM%cMFx#5gqt&)p)uv6Shh_4&$X1U6k40qsktA6DkV~2B&(`kbL`F*5Ou=-r>SS|Kl
zOj{W?UA?l$tZv`Ora_o9p_tywBp+E1TgWXnXr#sFa2MxM1wQeAf?T+GownkYldYI+
zrEp#Agp^++u0pheh!`s)TNkbtNNEj_vYGd>be_B3D|#;Zc<_u`!};<O@5T&tJ|d@G
z`JCi!c5m@48k(v;LT6~y4aBN_)_@MB-hvt%z7L?3uLZuLSB<C0HSZtAs)d-2(cL=1
zFXRcNIgx$bsFNHKxI^?*gtL3riAC()ER0a&ZPS7N6#RGm^X>(H7MP0`a$k{8UPi2~
z`F9VOQPq`=gtb*d<Sw3bV9>)VXA-NJ$nf1W(~4(!2fG0tp2pcTplD_A1Y=L=Jys`Q
zfIQHW&Qk93{$sybD;?vJUAuyJ<CKFFlG60qaxkmBN%1>7HO{a`?XJt6-w#hpR#k}K
z9W>Z(=c%jb5huEKdI&0OaR;`Vc=9K)J&VZ29w%p3x(TFt4~p?H&gqkTUjBJMsF~kW
b+)!5Ku~$W$?tR4dzuH&K{UcBRcUkxg9Zmia

diff --git a/SOGo/Main/SOGoRootPage.wox b/SOGo/Main/SOGoRootPage.wox
index af5e8e38..5cf9a093 100644
--- a/SOGo/Main/SOGoRootPage.wox
+++ b/SOGo/Main/SOGoRootPage.wox
@@ -18,7 +18,7 @@
     </form>
 	<!--
 	<hr />
-	Current locale: <var:string value="context.locale" />
+	Current locale: <pre><var:string value="context.locale" /></pre>
 	-->
   </body>
 </html>
diff --git a/SOGo/Main/Version b/SOGo/Main/Version
index 46fb72d5..fc795f55 100644
--- a/SOGo/Main/Version
+++ b/SOGo/Main/Version
@@ -1,3 +1,3 @@
-# $Id: Version,v 1.1 2003/11/24 01:24:40 helge Exp $
+# $Id$
 
-SUBMINOR_VERSION:=2
+SUBMINOR_VERSION:=3
diff --git a/SOGo/Main/sogod.m b/SOGo/Main/sogod.m
index b4643267..84d2a7fe 100644
--- a/SOGo/Main/sogod.m
+++ b/SOGo/Main/sogod.m
@@ -224,22 +224,32 @@ static BOOL doCrashOnSessionCreate = NO;
 }
 
 - (NSDictionary *)localeForLanguageNamed:(NSString *)_name {
-  NSString     *lpath;
+  NSString *lpath;
+  id data;
   NSDictionary *locale;
-    
+
   NSAssert(_name != nil, @"_name MUST NOT be nil!");
-  if ((locale = [self->localeLUT objectForKey:_name]) != nil)
+  if((locale = [self->localeLUT objectForKey:_name]) != nil)
     return locale;
-
   lpath = [[self resourceManager]
-	    pathForResourceNamed:@"Locale"
-	    inFramework:nil
-	    languages:[NSArray arrayWithObject:_name]];
-  locale = [[NSString stringWithContentsOfFile:lpath] propertyList];
-  if (locale == nil) {
+    pathForResourceNamed:@"Locale"
+    inFramework:nil
+    languages:[NSArray arrayWithObject:_name]];
+
+  data = [NSData dataWithContentsOfFile:lpath];
+  if(data == nil) {
     NSLog(@"%s didn't find locale with name:%@",
-	  __PRETTY_FUNCTION__,
-	  _name);
+      __PRETTY_FUNCTION__,
+      _name);
+    return nil;
+  }
+  data = [[[NSString alloc] initWithData:data
+                            encoding:NSUTF8StringEncoding] autorelease];
+  locale = [data propertyList];
+  if(locale == nil) {
+    NSLog(@"%s couldn't load locale with name:%@",
+      __PRETTY_FUNCTION__,
+      _name);
     return nil;
   }
   [self->localeLUT setObject:locale forKey:_name];
-- 
2.39.5