Apache OpenOffice (AOO) Bugzilla – Issue 4479
Add estonian language support to OpenOffice
Last modified: 2013-08-07 15:02:26 UTC
This patch adds estonian language support to OpenOffice suite so it can be translated into estonian. This patch is generated against OpenOffice 1.0 source tree. This is my first post into Issuezilla so don't hit too hard:) I've faxed my Copyright Assignment Form some time ago to you. diff -urN oo_1.0_src/solenv/inc/lang.mk oo_1.0_src-et/solenv/inc/lang.mk --- oo_1.0_src/solenv/inc/lang.mkTue Aug 7 13:11:39 2001 +++ oo_1.0_src-et/solenv/inc/lang.mkSat May 4 11:11:10 2002 @@ -89,6 +89,7 @@ greek$(LANG_GUI)=-CHARSET_microsoft-cp1253 turk$(LANG_GUI)=-CHARSET_microsoft-cp1254 korean$(LANG_GUI)=-CHARSET_UTF8 +est$(LANG_GUI)=-CHARSET_microsoft-cp1257 extern$(LANG_GUI)=-CHARSET_UTF8 .ELSE# "$(USE_NEW_RSC)" != "" @@ -279,6 +280,10 @@ RSCLANG=CATALAN ($IBM_PC_850) LANGEXT=37 .ENDIF +.IF "$(solarlang)" == "est" +RSCLANG=ESTONIAN ($IBM_PC_850) +LANGEXT=77 +.ENDIF .IF "$(solarlang)" == "extern" RSCLANG=EXTERN ($UTF8) LANGEXT=99 diff -urN oo_1.0_src/solenv/inc/postset.mk oo_1.0_src-et/solenv/inc/postset.mk --- oo_1.0_src/solenv/inc/postset.mkFri Sep 28 14:12:06 2001 +++ oo_1.0_src-et/solenv/inc/postset.mkSat May 4 11:10:12 2002 @@ -295,6 +295,20 @@ iso_37=ca .ENDIF +.IF "$(RES_EST)"!="" || "$(give_me_all_languages)"!="" +alllangext+=77 +est$(LANG_GUI)*=$(default$(LANG_GUI)) +cmd_est:=est 77 -lgESTONIAN $(IBM_PC_850) $(est$(LANG_GUI)) +lang_77=est +longlang_77=estonian +langext_77=77 +rsclang_77=-lgESTONIAN $(IBM_PC_850) +rescharset_77=$(est$(LANG_GUI)) +RCLANGFLAGS_77+= -d ESTONIAN +iso_77=et +.ENDIF + + .IF "$(RES_FINN)"!="" || "$(give_me_all_languages)"!="" alllangext+=35 finn$(LANG_GUI)*=$(default$(LANG_GUI)) diff -urN oo_1.0_src/tools/source/rc/resmgr.cxx oo_1.0_src-et/tools/source/rc/resmgr.cxx --- oo_1.0_src/tools/source/rc/resmgr.cxxTue Apr 16 14:05:21 2002 +++ oo_1.0_src-et/tools/source/rc/resmgr.cxxSat May 4 10:42:57 2002 @@ -1229,7 +1229,8 @@ case LANGUAGE_CATALAN: return "37"; - + case LANGUAGE_ESTONIAN: + return "77"; default: return "99"; } diff -urN oo_1.0_src/transex3/source/export.cxx oo_1.0_src-et/transex3/source/export.cxx --- oo_1.0_src/transex3/source/export.cxxFri Oct 19 12:20:01 2001 +++ oo_1.0_src-et/transex3/source/export.cxxSat May 4 10:40:33 2002 @@ -1253,6 +1253,8 @@ return HEBREW_INDEX; else if ( sLang == "CATALAN" ) return CATALAN_INDEX; + else if ( sLang == "ESTONIAN" ) + return ESTONIAN_INDEX; else if ( sLang == "EXTERN" ) return EXTERN_INDEX; diff -urN oo_1.0_src/transex3/source/export2.cxx oo_1.0_src-et/transex3/source/export2.cxx --- oo_1.0_src/transex3/source/export2.cxxMon Oct 15 16:46:07 2001 +++ oo_1.0_src-et/transex3/source/export2.cxxSat May 4 10:40:33 2002 @@ -144,6 +144,7 @@ ARABIC, HEBREW, CATALAN, +ESTONIAN, EXTERN }; @@ -191,6 +192,7 @@ case ARABIC: return RTL_TEXTENCODING_MS_1256; case HEBREW: return RTL_TEXTENCODING_MS_1255; case CATALAN: return RTL_TEXTENCODING_MS_1252; +case ESTONIAN: return RTL_TEXTENCODING_MS_1257; case EXTERN: return RTL_TEXTENCODING_UTF8; } return 0xFFFF; @@ -424,6 +426,7 @@ "arabic", "hebrew", "catalan", +"estonian", "extern" }; diff -urN oo_1.0_src/transex3/source/merge.cxx oo_1.0_src-et/transex3/source/merge.cxx --- oo_1.0_src/transex3/source/merge.cxxMon May 28 14:38:01 2001 +++ oo_1.0_src-et/transex3/source/merge.cxxSat May 4 10:40:33 2002 @@ -412,6 +412,7 @@ case ARABIC: return ARABIC_INDEX; case HEBREW: return HEBREW_INDEX; case CATALAN: return CATALAN_INDEX; +case ESTONIAN: return ESTONIAN_INDEX; case EXTERN: return EXTERN_INDEX; } return 0xFFFF;
Oops..some lines got lost from patch. Fixed patch can be found at http://pezz.tkwcy.ee/openoffice/estonian.patch-2 <pre> diff -urN oo_1.0_src/solenv/inc/lang.mk oo_1.0_src-et/solenv/inc/lang.mk --- oo_1.0_src/solenv/inc/lang.mk Tue Aug 7 13:11:39 2001 +++ oo_1.0_src-et/solenv/inc/lang.mk Sat May 4 13:04:43 2002 @@ -89,6 +89,7 @@ greek$(LANG_GUI)=-CHARSET_microsoft-cp1253 turk$(LANG_GUI)=-CHARSET_microsoft-cp1254 korean$(LANG_GUI)=-CHARSET_UTF8 +est$(LANG_GUI)=-CHARSET_microsoft-cp1257 extern$(LANG_GUI)=-CHARSET_UTF8 .ELSE # "$(USE_NEW_RSC)" != "" @@ -279,6 +280,10 @@ RSCLANG=CATALAN ($IBM_PC_850) LANGEXT=37 .ENDIF +.IF "$(solarlang)" == "est" +RSCLANG=ESTONIAN ($IBM_PC_850) +LANGEXT=77 +.ENDIF .IF "$(solarlang)" == "extern" RSCLANG=EXTERN ($UTF8) LANGEXT=99 diff -urN oo_1.0_src/solenv/inc/postset.mk oo_1.0_src-et/solenv/inc/postset.mk --- oo_1.0_src/solenv/inc/postset.mk Fri Sep 28 14:12:06 2001 +++ oo_1.0_src-et/solenv/inc/postset.mk Sat May 4 13:04:43 2002 @@ -295,6 +295,20 @@ iso_37=ca .ENDIF +.IF "$(RES_EST)"!="" || "$(give_me_all_languages)"!="" +alllangext+=77 +est$(LANG_GUI)*=$(default$(LANG_GUI)) +cmd_est:=est 77 -lgESTONIAN $(IBM_PC_850) $(est$(LANG_GUI)) +lang_77=est +longlang_77=estonian +langext_77=77 +rsclang_77=-lgESTONIAN $(IBM_PC_850) +rescharset_77=$(est$(LANG_GUI)) +RCLANGFLAGS_77+= -d ESTONIAN +iso_77=et +.ENDIF + + .IF "$(RES_FINN)"!="" || "$(give_me_all_languages)"!="" alllangext+=35 finn$(LANG_GUI)*=$(default$(LANG_GUI)) diff -urN oo_1.0_src/tools/source/rc/resmgr.cxx oo_1.0_src-et/tools/source/rc/resmgr.cxx --- oo_1.0_src/tools/source/rc/resmgr.cxx Tue Apr 16 14:05:21 2002 +++ oo_1.0_src-et/tools/source/rc/resmgr.cxx Sat May 4 13:05:03 2002 @@ -1229,7 +1229,8 @@ case LANGUAGE_CATALAN: return "37"; - + case LANGUAGE_ESTONIAN: + return "77"; default: return "99"; } diff -urN oo_1.0_src/transex3/inc/export.hxx oo_1.0_src-et/transex3/inc/export.hxx --- oo_1.0_src/transex3/inc/export.hxx Tue Jul 31 15:12:25 2001 +++ oo_1.0_src-et/transex3/inc/export.hxx Sat May 4 13:05:37 2002 @@ -187,11 +187,15 @@ #define CATALAN_ISO "ca" #define CATALAN_INDEX 28 +#define ESTONIAN 77 +#define ESTONIAN_ISO "et" +#define ESTONIAN_INDEX 29 + // special language for l10n framework #define EXTERN 99 -#define EXTERN_INDEX 29 +#define EXTERN_INDEX 30 -#define LANGUAGES 30 +#define LANGUAGES 31 #define LANGUAGE_ALLOWED( n ) (( n != 0xFFFF ) && ( Export::LanguageAllowed( Export::LangId[ n ] )) && \ (( Export::LangId[ n ] == 01 ) || ( Export::LangId[ n ] == 03 ) || ( Export::LangId[ n ] == 07 ) || \ @@ -201,7 +205,7 @@ ( Export::LangId[ n ] == 48 ) || ( Export::LangId[ n ] == 49 ) || ( Export::LangId[ n ] == 55 ) || \ ( Export::LangId[ n ] == 81 ) || ( Export::LangId[ n ] == 82 ) || ( Export::LangId[ n ] == 86 ) || \ ( Export::LangId[ n ] == 88 ) || ( Export::LangId[ n ] == 90 ) || ( Export::LangId[ n ] == 96 ) || \ - ( Export::LangId[ n ] == 00 ) || ( Export::LangId[ n ] == 99 ))) + ( Export::LangId[ n ] == 77 ) || ( Export::LangId[ n ] == 00 ) || ( Export::LangId[ n ] == 99 ))) #define GERMAN_LIST_LINE_INDEX LANGUAGES #define LIST_REFID (GERMAN_LIST_LINE_INDEX+1) diff -urN oo_1.0_src/transex3/source/export.cxx oo_1.0_src-et/transex3/source/export.cxx --- oo_1.0_src/transex3/source/export.cxx Fri Oct 19 12:20:01 2001 +++ oo_1.0_src-et/transex3/source/export.cxx Sat May 4 13:05:37 2002 @@ -1253,6 +1253,8 @@ return HEBREW_INDEX; else if ( sLang == "CATALAN" ) return CATALAN_INDEX; + else if ( sLang == "ESTONIAN" ) + return ESTONIAN_INDEX; else if ( sLang == "EXTERN" ) return EXTERN_INDEX; diff -urN oo_1.0_src/transex3/source/export2.cxx oo_1.0_src-et/transex3/source/export2.cxx --- oo_1.0_src/transex3/source/export2.cxx Mon Oct 15 16:46:07 2001 +++ oo_1.0_src-et/transex3/source/export2.cxx Sat May 4 13:05:37 2002 @@ -144,6 +144,7 @@ ARABIC, HEBREW, CATALAN, + ESTONIAN, EXTERN }; @@ -191,6 +192,7 @@ case ARABIC: return RTL_TEXTENCODING_MS_1256; case HEBREW: return RTL_TEXTENCODING_MS_1255; case CATALAN: return RTL_TEXTENCODING_MS_1252; + case ESTONIAN: return RTL_TEXTENCODING_MS_1257; case EXTERN: return RTL_TEXTENCODING_UTF8; } return 0xFFFF; @@ -299,6 +301,7 @@ case ARABIC_INDEX: return ARABIC_ISO; case HEBREW_INDEX: return HEBREW_ISO; case CATALAN_INDEX: return CATALAN_ISO; + case ESTONIAN_INDEX: return ESTONIAN_ISO; case EXTERN_INDEX: return sIsoCode99; } return ""; @@ -424,6 +427,7 @@ "arabic", "hebrew", "catalan", + "estonian", "extern" }; diff -urN oo_1.0_src/transex3/source/merge.cxx oo_1.0_src-et/transex3/source/merge.cxx --- oo_1.0_src/transex3/source/merge.cxx Mon May 28 14:38:01 2001 +++ oo_1.0_src-et/transex3/source/merge.cxx Sat May 4 13:05:37 2002 @@ -412,6 +412,7 @@ case ARABIC: return ARABIC_INDEX; case HEBREW: return HEBREW_INDEX; case CATALAN: return CATALAN_INDEX; + case ESTONIAN: return ESTONIAN_INDEX; case EXTERN: return EXTERN_INDEX; } return 0xFFFF; </pre>
Created attachment 1554 [details] estonian language support fixes
DL->NF: Could you please integrate Peeter's patch?
-
After looking at this oldish patch I must admit that I don't know how all those different codepages defined here relate to each other and what they are used for because all our localized build were been made against extern language and this patch hasn't been tested (because I haven't been able to build usable installset with this one). GUI translation into estonian is finished now and it was done in UTF8. If you need some additional information then I can help you. Official estonian codepage is ISO-8859-15 (CP1257 as windows specific). (As comment from recent fight with Opera) ISO-8859-13 is _not_ our codepage even though it says it's "baltic". It's usable only for latvian and lithuanian, but not for estonian. Estonian national dialing code is 372 but as it isn't 2-charachter code I chose 77 as it's a nice and free number. I don't know if languages defined here are used for different purposes but if one of them must be choosen I would personally choose UTF8.
Will be part of next 1.1 Beta snapshot based on SRX644
close issue.