diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 902cdb1160..a755726ddb 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,79 @@ The license applies to all entries newer than 2009-04-28. */ +2012-07-24 15:04 UTC+0200 Viktor Szakats (harbour syenar.net) + * doc/en/lang.txt + * include/hblang.hbx + * src/lang/be.c + * src/lang/bg.c + * src/lang/ca.c + * src/lang/cs.c + * src/lang/de.c + * src/lang/el.c + * src/lang/en_tpl.c + * src/lang/eo.c + * src/lang/es.c + * src/lang/eu.c + * src/lang/fr.c + * src/lang/gl.c + * src/lang/he.c + * src/lang/hr.c + * src/lang/hu.c + * src/lang/id.c + * src/lang/is.c + * src/lang/it.c + * src/lang/ko.c + * src/lang/lt.c + * src/lang/nl.c + * src/lang/pl.c + * src/lang/pt.c + * src/lang/ro.c + * src/lang/ru.c + * src/lang/sk.c + * src/lang/sl.c + * src/lang/sr_cyr.c + * src/lang/sr_lat.c + * src/lang/sv.c + * src/lang/tr.c + * src/lang/uk.c + * src/lang/zh_sim.c + * src/lang/zh_tra.c + * src/rtl/langcomp.prg + * src/rtl/langlgcy.prg + * renamed UTF8 language modules internally. The new + names are the two letter ISO language code in + lowercase. With postfixes where required. For + dialects and variants, it's now possible to use + "LLDD", "LLDD_VVV" or "LL_VVV" formats, too. + See the current list in + doc/en/lang.txt + ! Ukrainian had an "UE" prefix before, now it got + corrected to "UK", which is it's official ISO code. + + HB_LANGSELECT() now accepts second parameter: + to specify the CP into which the translations should + be converted. This parameter works for legacy lang module + IDs, too. The default is hb_cdpSelect() (or legacy CP + for legacy language module IDs). + + extended the way compatibility is preserved. The + problem is with legacy language modules with a two + character ID only (ie. without CP specification), + this is the list: + CA, DE, EL, EO, ES, EU, FR, GL, IT, PT, RO, SV + If these language IDs are passed in UPPERCASE as above, + they will be handled in compatibility mode and legacy + default CP selected. + Compatibility code is marked with HB_LEGACY_LEVEL5, which + means it will stay in next two stable releases. + To depart from compatibility (recommended), use the new + lowercase flavor: hb_langSelect( "pl" ), hb_langSelect( "pt" ), + hb_langSelect( "sr_cyr" ), or use standard language + IDs: hb_langSelect( "hu-HU" ) + Or simply use this code: + --- + #include "hbextlng.ch" + hb_langSelect( hb_UserLang() [, ] ) /* if is not specified, hb_cdpSelect() will be used */ + --- + 2012-07-24 11:59 UTC+0200 Viktor Szakats (harbour syenar.net) * src/lang/sk.c * src/lang/tr.c @@ -289,8 +362,7 @@ to select language module is this: --- #include "hbextlng.ch" - hb_cdpSelect( ) - hb_langSelect( hb_UserLang() ) + hb_langSelect( hb_UserLang() [, ] ) /* if is not specified, hb_cdpSelect() will be used */ --- * ChangeLog @@ -353,15 +425,6 @@ ; TOFIX: HB_LANGMESSAGE() often returns garbage when using it from hbrun or other dynamic apps. Changing hb_retc_const() to hb_retc() didn't seem to fix it. - ; NOTE: All users are encouraged to use UTF-8 base language - modules and request all CP components manually, then - create their own dynamic language modules, f.e.: - --- - REQUEST HB_CODEPAGE_UTF8 - REQUEST HB_LANG_PTUTF - hb_langNew( "PT", hb_cdpSelect(), "PTUTF", "UTF8" ) - hb_langSelect( "PT" ) - --- * src/lang/msghuutf.c ! reconverted from a better legacy CP version, fixing diff --git a/harbour/doc/en/lang.txt b/harbour/doc/en/lang.txt index a9b2bf5a27..d5133e5c5e 100644 --- a/harbour/doc/en/lang.txt +++ b/harbour/doc/en/lang.txt @@ -10,7 +10,7 @@ * Documentation for: HB_LANGNAME(), HB_LANGSELECT() * * Copyright 2004 Chen Kedem - * Documentation for: HB_LANGERRMSG(),HB_LANGMESSAGE(),HB_SETCODEPAGE(), + * Documentation for: HB_LANGERRMSG(),HB_LANGMESSAGE(),HB_CDPSELECT(), * HB_TRANSLATE() * * See COPYING for licensing terms. @@ -46,7 +46,7 @@ * PROCEDURE Main() * // English: Argument error * ? "English:", HB_LANGERRMSG( EG_ARG ) - * HB_LANGSELECT( "ES" ) + * "ES" ) * // Spanish: Error de argumento * ? "Spanish:", HB_LANGERRMSG( EG_ARG ) * RETURN @@ -93,7 +93,7 @@ * PROCEDURE Main() * // English: Monday * ? "English:", HB_LANGMESSAGE( HB_LANG_ITEM_BASE_DAY + 1 ) - * HB_LANGSELECT( "ES" ) + * "ES" ) * // Spanish: Lunes * ? "Spanish:", HB_LANGMESSAGE( HB_LANG_ITEM_BASE_DAY + 1 ) * RETURN @@ -135,17 +135,17 @@ * REQUEST HB_LANG_RO * REQUEST HB_LANG_ES * PROCEDURE Main() - * HB_LANGSELECT( "PT" ) // Default language is now Portuguese - * ? CDOW( DATE() ) //Segunda-feira - * ? "Current language is ", HB_LANGNAME() // Portuguese - * ? "Old language id selected is ", HB_LANGSELECT() // PT - * HB_LANGSELECT( "RO" ) // Default language is now Romanian - * ? CMONTH( DATE() ) // Mai - * ? "Old language id selected is ", HB_LANGSELECT() // RO - * HB_LANGSELECT( "ES" ) // Default language is now Spanish - * ? "Current language is ",HB_LANGNAME() // Spanish - * ? CMONTH( DATE() ) // Mayo - * ? CDOW( DATE() ) // Lunes + * hb_langSelect( "pt" ) // Default language is now Portuguese + * ? CDOW( Date() ) //Segunda-feira + * ? "Current language is ", hb_langName() // Portuguese + * ? "Old language id selected is ", hb_langSelect() // PT + * hb_langSelect( "ro" ) // Default language is now Romanian + * ? CMONTH( Date() ) // Mai + * ? "Old language id selected is ", hb_langSelect() // RO + * hb_langSelect( "es" ) // Default language is now Spanish + * ? "Current language is ",hb_langName() // Spanish + * ? CMONTH( Date() ) // Mayo + * ? CDOW( Date() ) // Lunes * RETURN * $TESTS$ * See tests/langapi.prg, tests/langmsg.prg @@ -174,67 +174,50 @@ * $ONELINER$ * Select a specific nation message module * $SYNTAX$ - * HB_LANGSELECT( [] ) --> cOldLang + * HB_LANGSELECT( [ ][, ] ) --> cOldLang * $ARGUMENTS$ * The optional ID of the country language module. * Possible values for are below as defined in the * Lang library, sorted by language. + * Optional codepage ID into which the language + * module strings are automatically converted by Harbour. * * - * Language Codepage + * Language * - * Bulgarian 866 BG866 - * Bulgarian ISO-8859-5 BGISO - * Bulgarian Windows-1251 BGWIN - * Basque 850 EU - * Catalan 850 CA - * Chinese Simplified 936 ZHGB - * Chinese Traditional 950 ZHB5 - * Croatian 852 HR852 - * Croatian ISO-8859-2 HRISO - * Czech 852 CS852 - * Czech ISO-8859-2 CSISO - * Czech Kamenickych CSKAM - * Czech Windows-1250 CSWIN - * Dutch 437 NL - * English 437 EN - * Esperanto 850 EO - * French 850 FR - * Galician 850 GL - * German 850 DE - * German ANSI ANSI DEWIN - * Greek 737 EL - * Greek ANSI Windows-1253 ELWIN - * Hebrew 862 HE862 - * Hebrew Windows-1255 HEWIN - * Hungarian 852 HU852 - * Hungarian ISO-8859-2 HUISO - * Hungarian Windows-1250 HUWIN - * Icelandic 850 IS850 - * Indonesian 437 ID - * Italian 437 IT - * Korean 949 KO - * Lithuanian Windows-1257 LT - * Polish 852 PL852 - * Polish ISO-8859-2 PLISO - * Polish Mazowia PLMAZ - * Polish Windows-1250 PLWIN - * Portuguese 850 PT - * Romanian 852 RO - * Russian 866 RU866 - * Russian KOI-8 RUKOI8 - * Russian Windows-1251 RUWIN - * Serbian 852 SR852 - * Serbian ISO-8859-2 SRISO - * Serbian Windows-1251 SRWIN - * Slovenian 437 SL437 - * Slovenian 852 SL852 - * Slovenian ISO-8859-2 SLISO - * Slovenian Windows-1250 SLWIN - * Spanish 850 ES - * Spanish ANSI ANSI ESWIN - * Turkish 857 TR857 - * Turkish Windows-1254 TRWIN + * Basque eu + * Belorussian be + * Bulgarian bg + * Catalan ca + * Chinese Simplified zh_sim + * Chinese Traditional zh_tra + * Croatian hr + * Czech cs + * Dutch nl + * Esperanto eo + * French fr + * Galician gl + * German de + * Greek el + * Hebrew he + * Hungarian hu + * Icelandic is + * Indonesian id + * Italian it + * Korean ko + * Lithuanian lt + * Polish pl + * Portuguese pt + * Romanian ro + * Russian ru + * Serbian (cyrillic) sr_cyr + * Serbian (latin) sr_lat + * Slovak sk + * Slovenian sl + * Spanish es + * Swedish sv + * Turkish tr + * Ukrainian uk *
* $RETURNS$ * The old language indentifier @@ -253,15 +236,15 @@ * REQUEST HB_LANG_RO * REQUEST HB_LANG_ES * PROCEDURE Main() - * HB_LANGSELECT( "PT" ) // Default language is now Portuguese - * ? CDOW( DATE() ) // Segunda-feira + * HB_LANGSELECT( "pt" ) // Default language is now Portuguese + * ? CDOW( Date() ) // Segunda-feira * ? "Old language id selected is ", HB_LANGSELECT() // PT - * HB_LANGSELECT( "RO" ) // Default language is now Romanian - * ? CMONTH( DATE() ) // Mai + * HB_LANGSELECT( "ro" ) // Default language is now Romanian + * ? CMONTH( Date() ) // Mai * ? "Old language id selected is ", HB_LANGSELECT() // RO - * HB_LANGSELECT( "ES" ) // Default language is now Spanish - * ? CMONTH( DATE() ) // Mayo - * ? CDOW( DATE() ) // Lunes + * HB_LANGSELECT( "es" ) // Default language is now Spanish + * ? CMONTH( Date() ) // Mayo + * ? CDOW( Date() ) // Lunes * RETURN * $TESTS$ * See tests/langapi.prg, tests/langmsg.prg @@ -274,7 +257,7 @@ * $FILES$ * Libraty are rtl, lang * $SEEALSO$ - * HB_LANGNAME(),HB_SETCODEPAGE(),NATIONMSG(),REQUEST + * HB_LANGNAME(),HB_CDPSELECT(),NATIONMSG(),REQUEST * $END$ */ @@ -282,7 +265,7 @@ * $TEMPLATE$ * Function * $NAME$ - * HB_SETCODEPAGE() + * HB_CDPSELECT() * $CATEGORY$ * API * $SUBCATEGORY$ @@ -290,7 +273,7 @@ * $ONELINER$ * Select the active code page by language ID * $SYNTAX$ - * HB_SETCODEPAGE( [] ) --> cOldLang + * HB_CDPSELECT( [] ) --> cOldLang * $ARGUMENTS$ * The optional ID of the country language module. * Possible values for are below as defined in the @@ -360,7 +343,7 @@ * $RETURNS$ * The old language indentifier * $DESCRIPTION$ - * HB_SETCODEPAGE() set the active code page use by Harbour for + * HB_CDPSELECT() set the active code page use by Harbour for * sorting and comparing strings. The default code page use ASCII * order (cLang == "EN"). * @@ -370,13 +353,13 @@ * $EXAMPLES$ * REQUEST HB_CODEPAGE_HU852 * PROCEDURE Main() - * LOCAL cTxt := CHR( 71 ) + " > " + CHR( 144 ) + " is" - * ? HB_SETCODEPAGE() // EN - * ? cTxt, CHR( 71 ) > CHR( 144 ) // G > É is .F. - * ? HB_SETCODEPAGE( "HU852" ) // EN - * ? cTxt, CHR( 71 ) > CHR( 144 ) // G > É is .T. - * ? HB_SETCODEPAGE( "EN" ) // HU852 - * ? cTxt, CHR( 71 ) > CHR( 144 ) // G > É is .F. + * LOCAL cTxt := Chr( 71 ) + " > " + Chr( 144 ) + " is" + * ? hb_cdpSelect() // EN + * ? cTxt, Chr( 71 ) > Chr( 144 ) // G > É is .F. + * ? hb_cdpSelect( "HU852" ) // EN + * ? cTxt, Chr( 71 ) > Chr( 144 ) // G > É is .T. + * ? hb_cdpSelect( "EN" ) // HU852 + * ? cTxt, Chr( 71 ) > Chr( 144 ) // G > É is .F. * RETURN * $STATUS$ * R @@ -433,9 +416,9 @@ * REQUEST HB_CODEPAGE_DE * REQUEST HB_CODEPAGE_DEWIN * PROCEDURE Main() - * LOCAL cTxt := "A" + CHR( 142 ) + "BC" - * ? "German 850 text:", cTxt - * ? "German ANSI text:", HB_TRANSLATE( cTxt, "DE", "DEWIN" ) + * LOCAL cTxt := "A" + Chr( 142 ) + "BC" + * ? "German CP-850 text:", cTxt + * ? "German Windows-1252 text:", hb_Translate( cTxt, "DE", "DEWIN" ) * RETURN * $STATUS$ * R @@ -446,6 +429,6 @@ * $FILES$ * Libraty are rtl, codepage * $SEEALSO$ - * HB_LANGSELECT(),HB_SETCODEPAGE(),NATIONMSG(),REQUEST + * HB_LANGSELECT(),HB_CDPSELECT(),NATIONMSG(),REQUEST * $END$ */ diff --git a/harbour/include/hblang.hbx b/harbour/include/hblang.hbx index 9242ddd7cf..aa42333158 100644 --- a/harbour/include/hblang.hbx +++ b/harbour/include/hblang.hbx @@ -10,6 +10,7 @@ /* -------------------------------------------------------------------- */ // HB_FUNC_INCLUDE HB_LANG_* +// HB_FUNC_EXCLUDE HB_LANG_????? /* -------------------------------------------------------------------- */ /* WARNING: Automatically generated code below. DO NOT EDIT! */ @@ -28,41 +29,39 @@ #command DYNAMIC => EXTERNAL #endif -DYNAMIC HB_LANG_BEUTF -DYNAMIC HB_LANG_BGUTF -DYNAMIC HB_LANG_CAUTF -DYNAMIC HB_LANG_CSUTF -DYNAMIC HB_LANG_DEUTF -DYNAMIC HB_LANG_ELUTF -DYNAMIC HB_LANG_EOUTF -DYNAMIC HB_LANG_ESUTF -DYNAMIC HB_LANG_EUUTF -DYNAMIC HB_LANG_FRUTF -DYNAMIC HB_LANG_GLUTF -DYNAMIC HB_LANG_HEUTF -DYNAMIC HB_LANG_HRUTF -DYNAMIC HB_LANG_HUUTF -DYNAMIC HB_LANG_IDUTF -DYNAMIC HB_LANG_ISUTF -DYNAMIC HB_LANG_ITUTF -DYNAMIC HB_LANG_KOUTF -DYNAMIC HB_LANG_LTUTF -DYNAMIC HB_LANG_NLUTF -DYNAMIC HB_LANG_PLUTF -DYNAMIC HB_LANG_PTUTF -DYNAMIC HB_LANG_ROUTF -DYNAMIC HB_LANG_RUUTF -DYNAMIC HB_LANG_SKUTF -DYNAMIC HB_LANG_SLUTF -DYNAMIC HB_LANG_SRLAT -DYNAMIC HB_LANG_SRUTF -DYNAMIC HB_LANG_SVUTF -DYNAMIC HB_LANG_TRUTF -DYNAMIC HB_LANG_UAUTF -DYNAMIC HB_LANG_ZHSIM -DYNAMIC HB_LANG_ZHUTF - -DYNAMIC HB_LANG_LEGACY +DYNAMIC HB_LANG_BE +DYNAMIC HB_LANG_BG +DYNAMIC HB_LANG_CA +DYNAMIC HB_LANG_CS +DYNAMIC HB_LANG_DE +DYNAMIC HB_LANG_EL +DYNAMIC HB_LANG_EO +DYNAMIC HB_LANG_ES +DYNAMIC HB_LANG_EU +DYNAMIC HB_LANG_FR +DYNAMIC HB_LANG_GL +DYNAMIC HB_LANG_HE +DYNAMIC HB_LANG_HR +DYNAMIC HB_LANG_HU +DYNAMIC HB_LANG_ID +DYNAMIC HB_LANG_IS +DYNAMIC HB_LANG_IT +DYNAMIC HB_LANG_KO +DYNAMIC HB_LANG_LT +DYNAMIC HB_LANG_NL +DYNAMIC HB_LANG_PL +DYNAMIC HB_LANG_PT +DYNAMIC HB_LANG_RO +DYNAMIC HB_LANG_RU +DYNAMIC HB_LANG_SK +DYNAMIC HB_LANG_SL +DYNAMIC HB_LANG_SR_LAT +DYNAMIC HB_LANG_SR_CYR +DYNAMIC HB_LANG_SV +DYNAMIC HB_LANG_TR +DYNAMIC HB_LANG_UK +DYNAMIC HB_LANG_ZH_SIM +DYNAMIC HB_LANG_ZH_TRA #if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBLANG__REQUEST ) #uncommand DYNAMIC => EXTERNAL diff --git a/harbour/src/lang/be.c b/harbour/src/lang/be.c index e398f05132..e490e4d0e3 100644 --- a/harbour/src/lang/be.c +++ b/harbour/src/lang/be.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (BEUTF) + * Language Support Module (be) * * Copyright 2004 Pavel Tsarenko * www - http://www.xharbour.org @@ -57,7 +57,7 @@ static HB_LANG s_lang = { /* Identification */ - "BEUTF", /* ISO ID (2 chars) */ + "be", /* ISO ID (2 chars) */ "Belorussian", /* Name (in English) */ "Беларуская", /* Name (in native language) */ "BY", /* RFC ID */ @@ -196,5 +196,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID BEUTF +#define HB_LANG_ID BE #include "hbmsgreg.h" diff --git a/harbour/src/lang/bg.c b/harbour/src/lang/bg.c index 1753ef0169..355ff4e8e5 100644 --- a/harbour/src/lang/bg.c +++ b/harbour/src/lang/bg.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (BGUTF) + * Language Support Module (bg) * * Copyright 1999-2005 Viktor Szakats (harbour syenar.net) * www - http://harbour-project.org @@ -57,7 +57,7 @@ static HB_LANG s_lang = { /* Identification */ - "BGUTF", /* ISO ID (2 chars) */ + "bg", /* ISO ID (2 chars) */ "Bulgarian", /* Name (in English) */ "Български", /* Name (in native language) */ "BG", /* RFC ID */ @@ -196,5 +196,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID BGUTF +#define HB_LANG_ID BG #include "hbmsgreg.h" diff --git a/harbour/src/lang/ca.c b/harbour/src/lang/ca.c index 7ef14ee0f7..2f6d4c42d2 100644 --- a/harbour/src/lang/ca.c +++ b/harbour/src/lang/ca.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (CAUTF) + * Language Support Module (ca) * * Copyright 2000 Jose Lalin * www - http://harbour-project.org @@ -57,7 +57,7 @@ static HB_LANG s_lang = { /* Identification */ - "CAUTF", /* ISO ID (2 chars) */ + "ca", /* ISO ID (2 chars) */ "Catalan", /* Name (in English) */ "Catalán", /* Name (in native language) */ "CA", /* RFC ID */ @@ -196,5 +196,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID CAUTF +#define HB_LANG_ID CA #include "hbmsgreg.h" diff --git a/harbour/src/lang/cs.c b/harbour/src/lang/cs.c index 97d2c02b1c..c05e6916ea 100644 --- a/harbour/src/lang/cs.c +++ b/harbour/src/lang/cs.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (CSUTF) + * Language Support Module (cs) * * Copyright 2000 Viktor Szakats (harbour syenar.net) (English) * Copyright 2000 Roman Masek @@ -60,7 +60,7 @@ static HB_LANG s_lang = { /* Identification */ - "CSUTF", /* ISO ID (2 chars) */ + "cs", /* ISO ID (2 chars) */ "Czech", /* Name (in English) */ "Česky", /* Name (in native language) */ "CS", /* RFC ID */ @@ -199,5 +199,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID CSUTF +#define HB_LANG_ID CS #include "hbmsgreg.h" diff --git a/harbour/src/lang/de.c b/harbour/src/lang/de.c index c544d92f0b..311c831738 100644 --- a/harbour/src/lang/de.c +++ b/harbour/src/lang/de.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (DEUTF) + * Language Support Module (de) * * Copyright 1999 {list of individual authors and e-mail addresses} * modified 2003 Guenther Steiner @@ -58,7 +58,7 @@ static HB_LANG s_lang = { /* Identification */ - "DEUTF", /* ISO ID (2 chars) */ + "de", /* ISO ID (2 chars) */ "German", /* Name (in English) */ "Deutsch", /* Name (in native language) */ "DE", /* RFC ID */ @@ -197,5 +197,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID DEUTF +#define HB_LANG_ID DE #include "hbmsgreg.h" diff --git a/harbour/src/lang/el.c b/harbour/src/lang/el.c index 8534765707..af317b416c 100644 --- a/harbour/src/lang/el.c +++ b/harbour/src/lang/el.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (ELUTF) + * Language Support Module (el) * * Copyright 2004 Pete Dionisopoulos * www - http://harbour-project.org @@ -57,7 +57,7 @@ static HB_LANG s_lang = { /* Identification */ - "ELUTF", /* ISO ID (2 chars) */ + "el", /* ISO ID (2 chars) */ "Greek", /* Name (in English) */ "Ελληνικά", /* Name (in native language) */ "EL", /* RFC ID */ @@ -196,5 +196,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID ELUTF +#define HB_LANG_ID EL #include "hbmsgreg.h" diff --git a/harbour/src/lang/en_tpl.c b/harbour/src/lang/en_tpl.c index 61e1cc362c..fce5710ca4 100644 --- a/harbour/src/lang/en_tpl.c +++ b/harbour/src/lang/en_tpl.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (Template) + * Language Support Module (en) (Template) * * Copyright 1999-2005 {list of individual authors and e-mail addresses} * www - http://harbour-project.org @@ -57,7 +57,7 @@ static HB_LANG s_lang = { /* Identification */ - "EN", /* ISO ID (2 chars) */ + "en", /* ISO ID (2 chars) */ "English", /* Name (in English) */ "English", /* Name (in native language) */ "EN", /* RFC ID */ diff --git a/harbour/src/lang/eo.c b/harbour/src/lang/eo.c index 0efc2b9e9e..76a777f0a6 100644 --- a/harbour/src/lang/eo.c +++ b/harbour/src/lang/eo.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (EOUTF) + * Language Support Module (eo) * * Copyright 2000 Jose Lalin * www - http://harbour-project.org @@ -57,7 +57,7 @@ static HB_LANG s_lang = { /* Identification */ - "EOUTF", /* ISO ID (2 chars) */ + "eo", /* ISO ID (2 chars) */ "Esperanto", /* Name (in English) */ "Esperanto", /* Name (in native language) */ "EO", /* RFC ID */ @@ -196,5 +196,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID EOUTF +#define HB_LANG_ID EO #include "hbmsgreg.h" diff --git a/harbour/src/lang/es.c b/harbour/src/lang/es.c index 66985d313f..ba1cc29162 100644 --- a/harbour/src/lang/es.c +++ b/harbour/src/lang/es.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (ESUTF) + * Language Support Module (es) * * Copyright 2000 Jose Lalin * Adapted to Windows by Antonio Linares @@ -58,7 +58,7 @@ static HB_LANG s_lang = { /* Identification */ - "ESUTF", /* ISO ID (2 chars) */ + "es", /* ISO ID (2 chars) */ "Spanish", /* Name (in English) */ "Español", /* Name (in native language) */ "ES", /* RFC ID */ @@ -197,5 +197,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID ESUTF +#define HB_LANG_ID ES #include "hbmsgreg.h" diff --git a/harbour/src/lang/eu.c b/harbour/src/lang/eu.c index c86285dc32..e0a505bfd7 100644 --- a/harbour/src/lang/eu.c +++ b/harbour/src/lang/eu.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (EUUTF) + * Language Support Module (eu) * * Copyright 2000 Nicolas del Pozo * www - http://harbour-project.org @@ -57,7 +57,7 @@ static HB_LANG s_lang = { /* Identification */ - "EUUTF", /* ISO ID (2 chars) */ + "eu", /* ISO ID (2 chars) */ "Basque", /* Name (in English) */ "English", /* Name (in native language) */ "EU", /* RFC ID */ @@ -196,5 +196,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID EUUTF +#define HB_LANG_ID EU #include "hbmsgreg.h" diff --git a/harbour/src/lang/fr.c b/harbour/src/lang/fr.c index 690167e3ef..7f5b5186dc 100644 --- a/harbour/src/lang/fr.c +++ b/harbour/src/lang/fr.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (FRUTF) + * Language Support Module (fr) * * Copyright 1999-2001 Viktor Szakats (harbour syenar.net) * www - http://harbour-project.org @@ -57,7 +57,7 @@ static HB_LANG s_lang = { /* Identification */ - "FRUTF", /* ISO ID (2 chars) */ + "fr", /* ISO ID (2 chars) */ "French", /* Name (in English) */ "français", /* Name (in native language) */ "FR", /* RFC ID */ @@ -196,5 +196,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID FRUTF +#define HB_LANG_ID FR #include "hbmsgreg.h" diff --git a/harbour/src/lang/gl.c b/harbour/src/lang/gl.c index 1c9df95d23..b89d9d07e9 100644 --- a/harbour/src/lang/gl.c +++ b/harbour/src/lang/gl.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (GLUTF) + * Language Support Module (gl) * * Copyright 2000 Jose Lalin * www - http://harbour-project.org @@ -57,7 +57,7 @@ static HB_LANG s_lang = { /* Identification */ - "GLUTF", /* ISO ID (2 chars) */ + "gl", /* ISO ID (2 chars) */ "Galician", /* Name (in English) */ "Galego", /* Name (in native language) */ "GL", /* RFC ID */ @@ -196,5 +196,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID GLUTF +#define HB_LANG_ID GL #include "hbmsgreg.h" diff --git a/harbour/src/lang/he.c b/harbour/src/lang/he.c index 18d7197731..9dc9e892a6 100644 --- a/harbour/src/lang/he.c +++ b/harbour/src/lang/he.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (HEUTF) + * Language Support Module (he) * * Copyright 2000 Viktor Szakats (harbour syenar.net) (English) * Copyright 2000 Chen Kedem (Hebrew) @@ -58,7 +58,7 @@ static HB_LANG s_lang = { /* Identification */ - "HEUTF", /* ISO ID (2 chars) */ + "he", /* ISO ID (2 chars) */ "Hebrew", /* Name (in English) */ "עברית", /* Name (in native language) */ "HE", /* RFC ID */ @@ -197,5 +197,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID HEUTF +#define HB_LANG_ID HE #include "hbmsgreg.h" diff --git a/harbour/src/lang/hr.c b/harbour/src/lang/hr.c index 22c736bd6b..b105427c66 100644 --- a/harbour/src/lang/hr.c +++ b/harbour/src/lang/hr.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (HRUTF) + * Language Support Module (hr) * * Copyright 2000 Viktor Szakats (harbour syenar.net) (English) * Copyright 2000 Davor Siklic @@ -59,7 +59,7 @@ static HB_LANG s_lang = { /* Identification */ - "HRUTF", /* ISO ID (2 chars) */ + "hr", /* ISO ID (2 chars) */ "Croatian", /* Name (in English) */ "Hrvatski", /* Name (in native language) */ "HR", /* RFC ID */ @@ -198,5 +198,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID HRUTF +#define HB_LANG_ID HR #include "hbmsgreg.h" diff --git a/harbour/src/lang/hu.c b/harbour/src/lang/hu.c index 8a204b939b..10f08d8d34 100644 --- a/harbour/src/lang/hu.c +++ b/harbour/src/lang/hu.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (HUUTF) + * Language Support Module (hu) * * Copyright 2012 Viktor Szakats (harbour syenar.net) * www - http://harbour-project.org @@ -57,7 +57,7 @@ static HB_LANG s_lang = { /* Identification */ - "HUUTF", /* ISO ID (2 chars) */ + "hu", /* ISO ID (2 chars) */ "Hungarian", /* Name (in English) */ "Magyar", /* Name (in native language) */ "HU", /* RFC ID */ @@ -196,5 +196,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID HUUTF +#define HB_LANG_ID HU #include "hbmsgreg.h" diff --git a/harbour/src/lang/id.c b/harbour/src/lang/id.c index 767d8f056b..b31d61b6b1 100644 --- a/harbour/src/lang/id.c +++ b/harbour/src/lang/id.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (IDUTF) + * Language Support Module (id) * * Copyright 2000 Andi Jahja * www - http://harbour-project.org @@ -57,7 +57,7 @@ static HB_LANG s_lang = { /* Identification */ - "IDUTF", /* ISO ID (2 chars) */ + "id", /* ISO ID (2 chars) */ "Indonesian", /* Name (in English) */ "Bahasa Indonesia", /* Name (in native language) */ "ID", /* RFC ID */ @@ -196,5 +196,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID IDUTF +#define HB_LANG_ID ID #include "hbmsgreg.h" diff --git a/harbour/src/lang/is.c b/harbour/src/lang/is.c index 1423dfeae3..fbe8a53aad 100644 --- a/harbour/src/lang/is.c +++ b/harbour/src/lang/is.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (ISUTF) + * Language Support Module (is) * * Copyright 2000 Viktor Szakats (harbour syenar.net) (English) * Copyright 2000 David G. Holm (Icelandic) @@ -58,7 +58,7 @@ static HB_LANG s_lang = { /* Identification */ - "ISUTF", /* ISO ID (2 chars) */ + "is", /* ISO ID (2 chars) */ "Icelandic", /* Name (in English) */ "Íslenska", /* Name (in native language) */ "IS", /* RFC ID */ @@ -197,5 +197,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID ISUTF +#define HB_LANG_ID IS #include "hbmsgreg.h" diff --git a/harbour/src/lang/it.c b/harbour/src/lang/it.c index 6ef9f04bd1..efed005c14 100644 --- a/harbour/src/lang/it.c +++ b/harbour/src/lang/it.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (ITUTF) + * Language Support Module (it) * * Copyright 2000 Maurilio Longo * www - http://harbour-project.org @@ -57,7 +57,7 @@ static HB_LANG s_lang = { /* Identification */ - "ITUTF", /* ISO ID (2 chars) */ + "it", /* ISO ID (2 chars) */ "Italian", /* Name (in English) */ "Italiano", /* Name (in native language) */ "IT", /* RFC ID */ @@ -196,5 +196,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID ITUTF +#define HB_LANG_ID IT #include "hbmsgreg.h" diff --git a/harbour/src/lang/ko.c b/harbour/src/lang/ko.c index fe27a4fead..93c486325d 100644 --- a/harbour/src/lang/ko.c +++ b/harbour/src/lang/ko.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (KOUTF) + * Language Support Module (ko) * * Copyright 2000 Kwon, Oh-Jun * www - http://harbour-project.org @@ -57,7 +57,7 @@ static HB_LANG s_lang = { /* Identification */ - "KOUTF", /* ISO ID (2 chars) */ + "ko", /* ISO ID (2 chars) */ "Korean", /* Name (in English) */ "한국어", /* Name (in native language) */ "KO", /* RFC ID */ @@ -196,5 +196,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID KOUTF +#define HB_LANG_ID KO #include "hbmsgreg.h" diff --git a/harbour/src/lang/lt.c b/harbour/src/lang/lt.c index fd2180c2f4..882a6358a5 100644 --- a/harbour/src/lang/lt.c +++ b/harbour/src/lang/lt.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (LTUTF) + * Language Support Module (lt) * * Copyright 2003 Mindaugas Kavaliauskas * www - http://harbour-project.org @@ -57,7 +57,7 @@ static HB_LANG s_lang = { /* Identification */ - "LTUTF", /* ISO ID (2 chars) */ + "lt", /* ISO ID (2 chars) */ "Lithuanian", /* Name (in English) */ "Lietuvių", /* Name (in native language) */ "LT", /* RFC ID */ @@ -196,5 +196,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID LTUTF +#define HB_LANG_ID LT #include "hbmsgreg.h" diff --git a/harbour/src/lang/nl.c b/harbour/src/lang/nl.c index c8907a7a9b..04026b6046 100644 --- a/harbour/src/lang/nl.c +++ b/harbour/src/lang/nl.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (NLUTF) + * Language Support Module (nl) * * Copyright 2007 Rene Koot * www - http://harbour-project.org @@ -57,7 +57,7 @@ static HB_LANG s_lang = { /* Identification */ - "NLUTF", /* ISO ID (2 chars) */ + "nl", /* ISO ID (2 chars) */ "Dutch", /* Name (in English) */ "Nederlands", /* Name (in native language) */ "NL", /* RFC ID */ @@ -196,5 +196,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID NLUTF +#define HB_LANG_ID NL #include "hbmsgreg.h" diff --git a/harbour/src/lang/pl.c b/harbour/src/lang/pl.c index 2864f07cd6..922591612d 100644 --- a/harbour/src/lang/pl.c +++ b/harbour/src/lang/pl.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (PLUTF) + * Language Support Module (pl) * * Copyright 1999 {list of individual authors and e-mail addresses} * www - http://harbour-project.org @@ -57,7 +57,7 @@ static HB_LANG s_lang = { /* Identification */ - "PLUTF", /* ISO ID (2 chars) */ + "pl", /* ISO ID (2 chars) */ "Polish", /* Name (in English) */ "Polski", /* Name (in native language) */ "PL", /* RFC ID */ @@ -196,5 +196,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID PLUTF +#define HB_LANG_ID PL #include "hbmsgreg.h" diff --git a/harbour/src/lang/pt.c b/harbour/src/lang/pt.c index c2ef2d13df..aa84801150 100644 --- a/harbour/src/lang/pt.c +++ b/harbour/src/lang/pt.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (PTUTF) + * Language Support Module (pt) * * Copyright 1999 {list of individual authors and e-mail addresses} * Copyright 2000 Felipe Coury (small fixes, internal error names) @@ -58,7 +58,7 @@ static HB_LANG s_lang = { /* Identification */ - "PTUTF", /* ISO ID (2 chars) */ + "pt", /* ISO ID (2 chars) */ "Portuguese", /* Name (in English) */ "Portugues", /* Name (in native language) */ "PT", /* RFC ID */ @@ -197,5 +197,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID PTUTF +#define HB_LANG_ID PT #include "hbmsgreg.h" diff --git a/harbour/src/lang/ro.c b/harbour/src/lang/ro.c index 4f699f2769..6e93b1774f 100644 --- a/harbour/src/lang/ro.c +++ b/harbour/src/lang/ro.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (ROUTF) + * Language Support Module (ro) * * Copyright 1999-2001 Viktor Szakats (harbour syenar.net) * www - http://harbour-project.org @@ -57,7 +57,7 @@ static HB_LANG s_lang = { /* Identification */ - "ROUTF", /* ISO ID (2 chars) */ + "ro", /* ISO ID (2 chars) */ "Romanian", /* Name (in English) */ "Român", /* Name (in native language) */ "RO", /* RFC ID */ @@ -196,5 +196,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID ROUTF +#define HB_LANG_ID RO #include "hbmsgreg.h" diff --git a/harbour/src/lang/ru.c b/harbour/src/lang/ru.c index 2cdd8bc6fa..590821be5d 100644 --- a/harbour/src/lang/ru.c +++ b/harbour/src/lang/ru.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (RUUTF) + * Language Support Module (ru) * * Copyright 2002 Alexander S.Kresin * www - http://harbour-project.org @@ -57,7 +57,7 @@ static HB_LANG s_lang = { /* Identification */ - "RUUTF", /* ISO ID (2 chars) */ + "ru", /* ISO ID (2 chars) */ "Russian", /* Name (in English) */ "Русский", /* Name (in native language) */ "RU", /* RFC ID */ @@ -196,5 +196,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID RUUTF +#define HB_LANG_ID RU #include "hbmsgreg.h" diff --git a/harbour/src/lang/sk.c b/harbour/src/lang/sk.c index 6818abb3c6..2a77cce39f 100644 --- a/harbour/src/lang/sk.c +++ b/harbour/src/lang/sk.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (SKUTF) + * Language Support Module (sk) * * Copyright 2008, 2012 Gyula Bartal (from CSWIN) * Update December 25, 2011 Jaroslav Janik @@ -58,7 +58,7 @@ static HB_LANG s_lang = { /* Identification */ - "SKUTF", /* ISO ID (2 chars) */ + "sk", /* ISO ID (2 chars) */ "Slovak", /* Name (in English) */ "Slovensky", /* Name (in native language) */ "SK", /* RFC ID */ @@ -197,5 +197,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID SKUTF +#define HB_LANG_ID SK #include "hbmsgreg.h" diff --git a/harbour/src/lang/sl.c b/harbour/src/lang/sl.c index 7ff7d299d0..873718bfd0 100644 --- a/harbour/src/lang/sl.c +++ b/harbour/src/lang/sl.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (SLUTF) + * Language Support Module (sl) * * Copyright 2003 Mitja Podgornik * www - http://harbour-project.org @@ -57,7 +57,7 @@ static HB_LANG s_lang = { /* Identification */ - "SLUTF", /* ISO ID (2 chars) */ + "sl", /* ISO ID (2 chars) */ "Slovenian", /* Name (in English) */ "Slovenščina", /* Name (in native language) */ "SL", /* RFC ID */ @@ -196,5 +196,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID SLUTF +#define HB_LANG_ID SL #include "hbmsgreg.h" diff --git a/harbour/src/lang/sr_cyr.c b/harbour/src/lang/sr_cyr.c index e7693ed668..300e0973af 100644 --- a/harbour/src/lang/sr_cyr.c +++ b/harbour/src/lang/sr_cyr.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (SRUTF) + * Language Support Module (sr_cyr) * * Copyright 2003 Srdjan Dragojlovic * www - http://www.xharbour.org @@ -57,7 +57,7 @@ static HB_LANG s_lang = { /* Identification */ - "SRUTF", /* ISO ID (2 chars) */ + "sr_cyr", /* ISO ID (2 chars) */ "Serbian (cyrillic)", /* Name (in English) */ "Српски", /* Name (in native language) */ "SR", /* RFC ID */ @@ -196,5 +196,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID SRUTF +#define HB_LANG_ID SR_CYR #include "hbmsgreg.h" diff --git a/harbour/src/lang/sr_lat.c b/harbour/src/lang/sr_lat.c index 6d21663d88..0e081ea059 100644 --- a/harbour/src/lang/sr_lat.c +++ b/harbour/src/lang/sr_lat.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (SRLAT) + * Language Support Module (sr_lat) * * Copyright 2000 Davor Siklic * www - http://harbour-project.org @@ -57,7 +57,7 @@ static HB_LANG s_lang = { /* Identification */ - "SRLAT", /* ISO ID (2 chars) */ + "sr_lat", /* ISO ID (2 chars) */ "Serbian (latin)", /* Name (in English) */ "Srpski", /* Name (in native language) */ "SR", /* RFC ID */ @@ -196,5 +196,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID SRLAT +#define HB_LANG_ID SR_LAT #include "hbmsgreg.h" diff --git a/harbour/src/lang/sv.c b/harbour/src/lang/sv.c index b585cb946c..78f2b65dc6 100644 --- a/harbour/src/lang/sv.c +++ b/harbour/src/lang/sv.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (SVUTF) + * Language Support Module (sv) * * Copyright 2006 Klas Engwall * www - http://harbour-project.org @@ -57,7 +57,7 @@ static HB_LANG s_lang = { /* Identification */ - "SVUTF", /* ISO ID (2 chars) */ + "sv", /* ISO ID (2 chars) */ "Swedish", /* Name (in English) */ "svenska", /* Name (in native language) */ "SV", /* RFC ID */ @@ -196,5 +196,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID SVUTF +#define HB_LANG_ID SV #include "hbmsgreg.h" diff --git a/harbour/src/lang/tr.c b/harbour/src/lang/tr.c index 5493004557..31b5fd5daa 100644 --- a/harbour/src/lang/tr.c +++ b/harbour/src/lang/tr.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (TRUTF) + * Language Support Module (tr) * * Copyright 2006 Bicahi Esgici * www - http://harbour-project.org @@ -57,7 +57,7 @@ static HB_LANG s_lang = { /* Identification */ - "TRUTF", /* ISO ID (2 chars) */ + "tr", /* ISO ID (2 chars) */ "Turkish", /* Name (in English) */ "Türkçe", /* Name (in native language) */ "TR", /* RFC ID */ @@ -196,5 +196,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID TRUTF +#define HB_LANG_ID TR #include "hbmsgreg.h" diff --git a/harbour/src/lang/uk.c b/harbour/src/lang/uk.c index 49b65c2fc3..d2f481461f 100644 --- a/harbour/src/lang/uk.c +++ b/harbour/src/lang/uk.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (UAUTF) + * Language Support Module (uk) * * Copyright 2004 Pavel Tsarenko * www - http://www.xharbour.org @@ -57,7 +57,7 @@ static HB_LANG s_lang = { /* Identification */ - "UAUTF", /* ISO ID (2 chars) */ + "uk", /* ISO ID (2 chars) */ "Ukrainian", /* Name (in English) */ "Украєнська", /* Name (in native language) */ "UA", /* RFC ID */ @@ -196,5 +196,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID UAUTF +#define HB_LANG_ID UK #include "hbmsgreg.h" diff --git a/harbour/src/lang/zh_sim.c b/harbour/src/lang/zh_sim.c index 3b89162757..11bff8048d 100644 --- a/harbour/src/lang/zh_sim.c +++ b/harbour/src/lang/zh_sim.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (ZHSIM) + * Language Support Module (zh_sim) * * Copyright 1999-2001 dongming / * www - http://harbour-project.org @@ -57,7 +57,7 @@ static HB_LANG s_lang = { /* Identification */ - "ZHSIM", /* ISO ID (2 chars) */ + "zh_sim", /* ISO ID (2 chars) */ "Chinese Simplified", /* Name (in English) */ "中文简体", /* Name (in native language) */ "ZH", /* RFC ID */ @@ -196,5 +196,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID ZHSIM +#define HB_LANG_ID ZH_SIM #include "hbmsgreg.h" diff --git a/harbour/src/lang/zh_tra.c b/harbour/src/lang/zh_tra.c index eb7338d92e..05b647d9e0 100644 --- a/harbour/src/lang/zh_tra.c +++ b/harbour/src/lang/zh_tra.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Language Support Module (ZHUTF) + * Language Support Module (zh_tra) * * Copyright 1999-2001 dongming / * www - http://harbour-project.org @@ -57,7 +57,7 @@ static HB_LANG s_lang = { /* Identification */ - "ZHUTF", /* ISO ID (2 chars) */ + "zh_tra", /* ISO ID (2 chars) */ "Chinese Traditional", /* Name (in English) */ "中文繁體", /* Name (in native language) */ "ZH", /* RFC ID */ @@ -196,5 +196,5 @@ static HB_LANG s_lang = } }; -#define HB_LANG_ID ZHUTF +#define HB_LANG_ID ZH_TRA #include "hbmsgreg.h" diff --git a/harbour/src/rtl/langcomp.prg b/harbour/src/rtl/langcomp.prg index d1d2582a61..fcdc872cbf 100644 --- a/harbour/src/rtl/langcomp.prg +++ b/harbour/src/rtl/langcomp.prg @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * The Language API compatibility layer + * The Language API module selection * * Copyright 2012 Viktor Szakats (harbour syenar.net) * www - http://harbour-project.org @@ -50,94 +50,136 @@ * */ -FUNCTION hb_langSelect( cLangID ) +REQUEST HB_CODEPAGE_UTF8 + +#ifdef HB_LEGACY_LEVEL5 + /* Required for legacy language modules with a two character ID. + These cannot have a compatibility puller symbol in langlgcy.prg, + which in turn pulls all CP modules, so we're pulling them from + here. */ + REQUEST HB_CODEPAGE_CS852 + REQUEST HB_CODEPAGE_DE850 + REQUEST HB_CODEPAGE_EL737 +#endif + +FUNCTION hb_langSelect( cLangID, cCP ) LOCAL tmp + LOCAL cCPDef + LOCAL cLangIDBase IF HB_ISSTRING( cLangID ) - tmp := __CtryStdToBaseLangID( cLangID ) - IF ! Empty( tmp ) - hb_langNew( cLangID, hb_cdpSelect(), tmp, "UTF8" ) + + cCPDef := hb_cdpSelect() + +#ifdef HB_LEGACY_LEVEL5 + + /* Emulate legacy Harbour language modules for compatibility */ + SWITCH cLangID + CASE "BE866" ; cCPDef := "BG866" ; cLangIDBase := "be" ; EXIT + CASE "BEWIN" ; cCPDef := "BGWIN" ; cLangIDBase := "be" ; EXIT + CASE "BG866" ; cCPDef := "BG866" ; cLangIDBase := "bg" ; EXIT + CASE "BGISO" ; cCPDef := "BGISO" ; cLangIDBase := "bg" ; EXIT + CASE "BGMIK" ; cCPDef := "BGMIK" ; cLangIDBase := "bg" ; EXIT + CASE "BGWIN" ; cCPDef := "BGWIN" ; cLangIDBase := "bg" ; EXIT + CASE "CA" ; cCPDef := "DE850" ; cLangIDBase := "ca" ; EXIT + CASE "CS852" ; cCPDef := "CS852" ; cLangIDBase := "cs" ; EXIT + CASE "CSISO" ; cCPDef := "CSISO" ; cLangIDBase := "cs" ; EXIT + CASE "CSKAM" ; cCPDef := "CSKAMC"; cLangIDBase := "cs" ; EXIT + CASE "CSWIN" ; cCPDef := "CSWIN" ; cLangIDBase := "cs" ; EXIT + CASE "DE" ; cCPDef := "DE850" ; cLangIDBase := "de" ; EXIT + CASE "DEWIN" ; cCPDef := "DEWIN" ; cLangIDBase := "de" ; EXIT + CASE "EL" ; cCPDef := "EL737" ; cLangIDBase := "el" ; EXIT + CASE "ELWIN" ; cCPDef := "ELWIN" ; cLangIDBase := "el" ; EXIT + CASE "EO" ; cCPDef := "DE850" ; cLangIDBase := "eo" ; EXIT + CASE "ES" ; cCPDef := "DE850" ; cLangIDBase := "es" ; EXIT + CASE "ESWIN" ; cCPDef := "ESWIN" ; cLangIDBase := "es" ; EXIT + CASE "EU" ; cCPDef := "DE850" ; cLangIDBase := "eu" ; EXIT + CASE "FR" ; cCPDef := "DE850" ; cLangIDBase := "fr" ; EXIT + CASE "GL" ; cCPDef := "DE850" ; cLangIDBase := "gl" ; EXIT + CASE "HE862" ; cCPDef := "HE862" ; cLangIDBase := "he" ; EXIT + CASE "HEWIN" ; cCPDef := "HEWIN" ; cLangIDBase := "he" ; EXIT + CASE "HR646" ; cCPDef := "HR646" ; cLangIDBase := "hr" ; EXIT + CASE "HR852" ; cCPDef := "HR852" ; cLangIDBase := "hr" ; EXIT + CASE "HRISO" ; cCPDef := "HRISO" ; cLangIDBase := "hr" ; EXIT + CASE "HRWIN" ; cCPDef := "HRWIN" ; cLangIDBase := "hr" ; EXIT + CASE "HU852" ; cCPDef := "HU852" ; cLangIDBase := "hu" ; EXIT + CASE "HUISO" ; cCPDef := "HUISO" ; cLangIDBase := "hu" ; EXIT + CASE "HUWIN" ; cCPDef := "HUWIN" ; cLangIDBase := "hu" ; EXIT + CASE "ID" ; cCPDef := "EN" ; cLangIDBase := "id" ; EXIT + CASE "IS850" ; cCPDef := "IS850" ; cLangIDBase := "is" ; EXIT + CASE "IT" ; cCPDef := "DE850" ; cLangIDBase := "it" ; EXIT + /* INCOMPATIBILITY: "KO" (Korean) using CP949 is not supported anymore. */ + CASE "LTWIN" ; cCPDef := "LTWIN" ; cLangIDBase := "lt" ; EXIT + CASE "NL" ; cCPDef := "EN" ; cLangIDBase := "nl" ; EXIT + CASE "PL852" ; cCPDef := "PL852" ; cLangIDBase := "pl" ; EXIT + CASE "PLISO" ; cCPDef := "PLISO" ; cLangIDBase := "pl" ; EXIT + CASE "PLMAZ" ; cCPDef := "PLMAZ" ; cLangIDBase := "pl" ; EXIT + CASE "PLWIN" ; cCPDef := "PLWIN" ; cLangIDBase := "pl" ; EXIT + CASE "PT" ; cCPDef := "DE850" ; cLangIDBase := "pt" ; EXIT + CASE "PTISO" ; cCPDef := "PTISO" ; cLangIDBase := "pt" ; EXIT + CASE "RO" ; cCPDef := "CS852" ; cLangIDBase := "ro" ; EXIT + CASE "RU866" ; cCPDef := "RU866" ; cLangIDBase := "ru" ; EXIT + CASE "RUKOI8" ; cCPDef := "RUKOI8"; cLangIDBase := "ru" ; EXIT + CASE "RUWIN" ; cCPDef := "RU1251"; cLangIDBase := "ru" ; EXIT + CASE "SK852" ; cCPDef := "SK852" ; cLangIDBase := "sk" ; EXIT + CASE "SKISO" ; cCPDef := "SKISO" ; cLangIDBase := "sk" ; EXIT + CASE "SKKAM" ; cCPDef := "SKKAMC"; cLangIDBase := "sk" ; EXIT + CASE "SKWIN" ; cCPDef := "SKWIN" ; cLangIDBase := "sk" ; EXIT + CASE "SL646" ; cCPDef := "SL646" ; cLangIDBase := "sl" ; EXIT + CASE "SL852" ; cCPDef := "SL852" ; cLangIDBase := "sl" ; EXIT + CASE "SLISO" ; cCPDef := "SLISO" ; cLangIDBase := "sl" ; EXIT + CASE "SLWIN" ; cCPDef := "SLWIN" ; cLangIDBase := "sl" ; EXIT + CASE "SR852" ; cCPDef := "SL852" ; cLangIDBase := "sr_lat" ; EXIT + CASE "SRISO" ; cCPDef := "SLISO" ; cLangIDBase := "sr_lat" ; EXIT + CASE "SRWIN" ; cCPDef := "SRWIN" ; cLangIDBase := "sr_cyr" ; EXIT + CASE "SV" ; cCPDef := "DE850" ; cLangIDBase := "sv" ; EXIT + CASE "SVWIN" ; cCPDef := "SVWIN" ; cLangIDBase := "sv" ; EXIT + CASE "TR857" ; cCPDef := "TR857" ; cLangIDBase := "tr" ; EXIT + CASE "TRWIN" ; cCPDef := "TRWIN" ; cLangIDBase := "tr" ; EXIT + CASE "UA866" ; cCPDef := "UA866" ; cLangIDBase := "uk" ; EXIT + CASE "UADOS" ; cCPDef := "UA1125"; cLangIDBase := "uk" ; EXIT + CASE "UAKOI8" ; cCPDef := "UAKOI8"; cLangIDBase := "uk" ; EXIT + CASE "UAWIN" ; cCPDef := "UA1125"; cLangIDBase := "uk" ; EXIT + CASE "ZHB5" ; cCPDef := "BIG5" ; cLangIDBase := "zh_tra" ; EXIT + CASE "ZHGB" ; cCPDef := "BIG5" ; cLangIDBase := "zh_sim" ; EXIT /* INCOMPATIBILITY: Was using CP936 in legacy implementation. */ + ENDSWITCH + +#endif + + IF ! HB_ISSTRING( cCP ) + cCP := cCPDef + ENDIF + +#ifdef HB_LEGACY_LEVEL5 + IF ! Empty( cLangIDBase ) + /* Legacy emulation */ + cLangID := cLangIDBase ELSE - /* For compatibility with legacy codepages */ - SWITCH cLangID - CASE "BE866" ; hb_langNew( cLangID, "BG866" , "BEUTF", "UTF8" ) ; EXIT - CASE "BEWIN" ; hb_langNew( cLangID, "BGWIN" , "BEUTF", "UTF8" ) ; EXIT - CASE "BG866" ; hb_langNew( cLangID, "BG866" , "BGUTF", "UTF8" ) ; EXIT - CASE "BGISO" ; hb_langNew( cLangID, "BGISO" , "BGUTF", "UTF8" ) ; EXIT - CASE "BGMIK" ; hb_langNew( cLangID, "BGMIK" , "BGUTF", "UTF8" ) ; EXIT - CASE "BGWIN" ; hb_langNew( cLangID, "BGWIN" , "BGUTF", "UTF8" ) ; EXIT - CASE "CA" ; hb_langNew( cLangID, "ES850" , "CAUTF", "UTF8" ) ; EXIT - CASE "CS852" ; hb_langNew( cLangID, "CS852" , "CSUTF", "UTF8" ) ; EXIT - CASE "CSISO" ; hb_langNew( cLangID, "CSISO" , "CSUTF", "UTF8" ) ; EXIT - CASE "CSKAM" ; hb_langNew( cLangID, "CSKAMC", "CSUTF", "UTF8" ) ; EXIT - CASE "CSWIN" ; hb_langNew( cLangID, "CSWIN" , "CSUTF", "UTF8" ) ; EXIT - CASE "DE" ; hb_langNew( cLangID, "DE850" , "DEUTF", "UTF8" ) ; EXIT - CASE "DEWIN" ; hb_langNew( cLangID, "DEWIN" , "DEUTF", "UTF8" ) ; EXIT - CASE "EL" ; hb_langNew( cLangID, "EL737" , "ELUTF", "UTF8" ) ; EXIT - CASE "ELWIN" ; hb_langNew( cLangID, "ELWIN" , "ELUTF", "UTF8" ) ; EXIT - CASE "EO" ; hb_langNew( cLangID, "ES850" , "EOUTF", "UTF8" ) ; EXIT - CASE "ES" ; hb_langNew( cLangID, "ES850" , "ESUTF", "UTF8" ) ; EXIT - CASE "ESWIN" ; hb_langNew( cLangID, "ESWIN" , "ESUTF", "UTF8" ) ; EXIT - CASE "EU" ; hb_langNew( cLangID, "ES850" , "EUUTF", "UTF8" ) ; EXIT - CASE "FR" ; hb_langNew( cLangID, "FR850" , "FRUTF", "UTF8" ) ; EXIT - CASE "GL" ; hb_langNew( cLangID, "ES850" , "GLUTF", "UTF8" ) ; EXIT - CASE "HE862" ; hb_langNew( cLangID, "HE862" , "HEUTF", "UTF8" ) ; EXIT - CASE "HEWIN" ; hb_langNew( cLangID, "HEWIN" , "HEUTF", "UTF8" ) ; EXIT - CASE "HR646" ; hb_langNew( cLangID, "HR646" , "HRUTF", "UTF8" ) ; EXIT - CASE "HR852" ; hb_langNew( cLangID, "HR852" , "HRUTF", "UTF8" ) ; EXIT - CASE "HRISO" ; hb_langNew( cLangID, "HRISO" , "HRUTF", "UTF8" ) ; EXIT - CASE "HRWIN" ; hb_langNew( cLangID, "HRWIN" , "HRUTF", "UTF8" ) ; EXIT - CASE "HU852" ; hb_langNew( cLangID, "HU852" , "HUUTF", "UTF8" ) ; EXIT - CASE "HUISO" ; hb_langNew( cLangID, "HUISO" , "HUUTF", "UTF8" ) ; EXIT - CASE "HUWIN" ; hb_langNew( cLangID, "HUWIN" , "HUUTF", "UTF8" ) ; EXIT - CASE "ID" ; hb_langNew( cLangID, "EN" , "IDUTF", "UTF8" ) ; EXIT - CASE "IS850" ; hb_langNew( cLangID, "IS850" , "ISUTF", "UTF8" ) ; EXIT - CASE "IT" ; hb_langNew( cLangID, "IT850" , "ITUTF", "UTF8" ) ; EXIT - CASE "LTWIN" ; hb_langNew( cLangID, "LTWIN" , "LTUTF", "UTF8" ) ; EXIT - CASE "NL" ; hb_langNew( cLangID, "EN" , "NLUTF", "UTF8" ) ; EXIT - CASE "PL852" ; hb_langNew( cLangID, "PL852" , "PLUTF", "UTF8" ) ; EXIT - CASE "PLISO" ; hb_langNew( cLangID, "PLISO" , "PLUTF", "UTF8" ) ; EXIT - CASE "PLMAZ" ; hb_langNew( cLangID, "PLMAZ" , "PLUTF", "UTF8" ) ; EXIT - CASE "PLWIN" ; hb_langNew( cLangID, "PLWIN" , "PLUTF", "UTF8" ) ; EXIT - CASE "PT" ; hb_langNew( cLangID, "PT850" , "PTUTF", "UTF8" ) ; EXIT - CASE "PTISO" ; hb_langNew( cLangID, "PTISO" , "PTUTF", "UTF8" ) ; EXIT - CASE "RO" ; hb_langNew( cLangID, "RO852" , "ROUTF", "UTF8" ) ; EXIT - CASE "RU866" ; hb_langNew( cLangID, "RU866" , "RUUTF", "UTF8" ) ; EXIT - CASE "RUKOI8" ; hb_langNew( cLangID, "RUKOI8", "RUUTF", "UTF8" ) ; EXIT - CASE "RUWIN" ; hb_langNew( cLangID, "RU1251", "RUUTF", "UTF8" ) ; EXIT - CASE "SK852" ; hb_langNew( cLangID, "SK852" , "SKUTF", "UTF8" ) ; EXIT - CASE "SKISO" ; hb_langNew( cLangID, "SKISO" , "SKUTF", "UTF8" ) ; EXIT - CASE "SKKAM" ; hb_langNew( cLangID, "SKKAMC", "SKUTF", "UTF8" ) ; EXIT - CASE "SKWIN" ; hb_langNew( cLangID, "SKWIN" , "SKUTF", "UTF8" ) ; EXIT - CASE "SL646" ; hb_langNew( cLangID, "SL646" , "SLUTF", "UTF8" ) ; EXIT - CASE "SL852" ; hb_langNew( cLangID, "SL852" , "SLUTF", "UTF8" ) ; EXIT - CASE "SLISO" ; hb_langNew( cLangID, "SLISO" , "SLUTF", "UTF8" ) ; EXIT - CASE "SLWIN" ; hb_langNew( cLangID, "SLWIN" , "SLUTF", "UTF8" ) ; EXIT - CASE "SR852" ; hb_langNew( cLangID, "SL852" , "SRLAT", "UTF8" ) ; EXIT - CASE "SRISO" ; hb_langNew( cLangID, "SLISO" , "SRLAT", "UTF8" ) ; EXIT - CASE "SRWIN" ; hb_langNew( cLangID, "SRWIN" , "SRUTF", "UTF8" ) ; EXIT - CASE "SV" ; hb_langNew( cLangID, "SV850" , "SVUTF", "UTF8" ) ; EXIT - CASE "SVWIN" ; hb_langNew( cLangID, "SVWIN" , "SVUTF", "UTF8" ) ; EXIT - CASE "TR857" ; hb_langNew( cLangID, "TR857" , "TRUTF", "UTF8" ) ; EXIT - CASE "TRWIN" ; hb_langNew( cLangID, "TRWIN" , "TRUTF", "UTF8" ) ; EXIT - CASE "UA866" ; hb_langNew( cLangID, "UA866" , "UAUTF", "UTF8" ) ; EXIT - CASE "UADOS" ; hb_langNew( cLangID, "UA1125", "UAUTF", "UTF8" ) ; EXIT - CASE "UAKOI8" ; hb_langNew( cLangID, "UAKOI8", "UAUTF", "UTF8" ) ; EXIT - CASE "UAWIN" ; hb_langNew( cLangID, "UA1125", "UAUTF", "UTF8" ) ; EXIT - CASE "ZHB5" ; hb_langNew( cLangID, "BIG5" , "ZHUTF", "UTF8" ) ; EXIT - CASE "ZHGB" ; hb_langNew( cLangID, "BIG5" , "ZHSIM", "UTF8" ) ; EXIT /* INCOMPATIBILITY: Was using CP936 in legacy implementation. */ - ENDSWITCH - /* INCOMPATIBILITY: "KO" (Korean) using CP949 is not supported anymore. */ +#endif + /* Support standard ISO language IDs */ + IF ! Empty( tmp := __LangStdToLangHb( cLangID ) ) + cLangID := cLangIDBase := tmp + ELSE + /* Normal case */ + cLangIDBase := cLangID + ENDIF +#ifdef HB_LEGACY_LEVEL5 + ENDIF +#endif + + IF ! hb_cdpIsUTF8( cCP ) + cLangID += "." + cCP + hb_langNew( cLangID, cCP, cLangIDBase, "UTF8" ) ENDIF ENDIF RETURN __hb_langSelect( cLangID ) -STATIC FUNCTION __CtryStdToBaseLangID( cCtryStd ) - LOCAL cCtryHb := "" +STATIC FUNCTION __LangStdToLangHb( cLangStd ) + LOCAL cLangHb := "" - IF HB_ISSTRING( cCtryStd ) - SWITCH Lower( cCtryStd ) + IF HB_ISSTRING( cLangStd ) + SWITCH Lower( cLangStd ) CASE "af-za" ; EXIT CASE "af" ; EXIT CASE "ar-ae" ; EXIT @@ -161,14 +203,14 @@ STATIC FUNCTION __CtryStdToBaseLangID( cCtryStd ) CASE "az-az-latn" ; EXIT CASE "az" ; EXIT CASE "be-by" ; EXIT - CASE "be" ; cCtryHb := "BEUTF" ; EXIT + CASE "be" ; cLangHb := "be" ; EXIT CASE "bg-bg" - CASE "bg" ; cCtryHb := "BGUTF" ; EXIT + CASE "bg" ; cLangHb := "bg" ; EXIT CASE "ca-es" - CASE "ca" ; cCtryHb := "CAUTF" ; EXIT + CASE "ca" ; cLangHb := "ca" ; EXIT CASE "cy-gb" ; EXIT CASE "cs-cz" - CASE "cs" ; cCtryHb := "CSUTF" ; EXIT + CASE "cs" ; cLangHb := "cs" ; EXIT CASE "da-dk" ; EXIT CASE "da" ; EXIT CASE "de-at" @@ -176,11 +218,11 @@ STATIC FUNCTION __CtryStdToBaseLangID( cCtryStd ) CASE "de-de" CASE "de-li" CASE "de-lu" - CASE "de" ; cCtryHb := "DEUTF" ; EXIT + CASE "de" ; cLangHb := "de" ; EXIT CASE "div-mv" ; EXIT CASE "div" ; EXIT CASE "el-gr" - CASE "el" ; cCtryHb := "ELUTF" ; EXIT + CASE "el" ; cLangHb := "el" ; EXIT CASE "en-au" CASE "en-bz" CASE "en-ca" @@ -194,8 +236,8 @@ STATIC FUNCTION __CtryStdToBaseLangID( cCtryStd ) CASE "en-us" CASE "en-za" CASE "en-zw" - CASE "en" ; cCtryHb := "EN" ; EXIT - CASE "eo" ; cCtryHb := "EOUTF" ; EXIT + CASE "en" ; cLangHb := "en" ; EXIT + CASE "eo" ; cLangHb := "eo" ; EXIT CASE "es-ar" CASE "es-bo" CASE "es-cl" @@ -215,11 +257,11 @@ STATIC FUNCTION __CtryStdToBaseLangID( cCtryStd ) CASE "es-sv" CASE "es-uy" CASE "es-ve" - CASE "es" ; cCtryHb := "ESUTF" ; EXIT + CASE "es" ; cLangHb := "es" ; EXIT CASE "et-ee" ; EXIT CASE "et" ; EXIT CASE "eu-es" - CASE "eu" ; cCtryHb := "EUUTF" ; EXIT + CASE "eu" ; cLangHb := "eu" ; EXIT CASE "fa-ir" ; EXIT CASE "fa" ; EXIT CASE "fi-fi" ; EXIT @@ -232,28 +274,28 @@ STATIC FUNCTION __CtryStdToBaseLangID( cCtryStd ) CASE "fr-fr" CASE "fr-lu" CASE "fr-mc" - CASE "fr" ; cCtryHb := "FRUTF" ; EXIT + CASE "fr" ; cLangHb := "fr" ; EXIT CASE "gl-es" - CASE "gl" ; cCtryHb := "GLUTF" ; EXIT + CASE "gl" ; cLangHb := "gl" ; EXIT CASE "gu-in" ; EXIT CASE "gu" ; EXIT CASE "he-il" - CASE "he" ; cCtryHb := "HEUTF" ; EXIT + CASE "he" ; cLangHb := "he" ; EXIT CASE "hi-in" ; EXIT CASE "hi" ; EXIT CASE "hr-hr" - CASE "hr" ; cCtryHb := "HRUTF" ; EXIT + CASE "hr" ; cLangHb := "hr" ; EXIT CASE "hu-hu" - CASE "hu" ; cCtryHb := "HUUTF" ; EXIT + CASE "hu" ; cLangHb := "hu" ; EXIT CASE "hy-am" ; EXIT CASE "hy" ; EXIT CASE "id-id" - CASE "id" ; cCtryHb := "IDUTF" ; EXIT + CASE "id" ; cLangHb := "id" ; EXIT CASE "is-is" - CASE "is" ; cCtryHb := "ISUTF" ; EXIT + CASE "is" ; cLangHb := "is" ; EXIT CASE "it-ch" CASE "it-it" - CASE "it" ; cCtryHb := "ITUTF" ; EXIT + CASE "it" ; cLangHb := "it" ; EXIT CASE "ja-jp" ; EXIT CASE "ja" ; EXIT CASE "ka-ge" ; EXIT @@ -263,13 +305,13 @@ STATIC FUNCTION __CtryStdToBaseLangID( cCtryStd ) CASE "kn-in" ; EXIT CASE "kn" ; EXIT CASE "ko-kr" - CASE "ko" ; cCtryHb := "KOUTF" ; EXIT + CASE "ko" ; cLangHb := "ko" ; EXIT CASE "kok-in" ; EXIT CASE "kok" ; EXIT CASE "ky-kz" ; EXIT CASE "ky" ; EXIT CASE "lt-lt" - CASE "lt" ; cCtryHb := "LTUTF" ; EXIT + CASE "lt" ; cLangHb := "lt" ; EXIT CASE "lv-lv" ; EXIT CASE "lv" ; EXIT CASE "mk-mk" ; EXIT @@ -284,33 +326,33 @@ STATIC FUNCTION __CtryStdToBaseLangID( cCtryStd ) CASE "nb-no" ; EXIT CASE "nl-be" CASE "nl-nl" - CASE "nl" ; cCtryHb := "NLUTF" ; EXIT + CASE "nl" ; cLangHb := "nl" ; EXIT CASE "nn-no" ; EXIT CASE "no" ; EXIT CASE "pa-in" ; EXIT CASE "pa" ; EXIT CASE "pl-pl" - CASE "pl" ; cCtryHb := "PLUTF" ; EXIT + CASE "pl" ; cLangHb := "pl" ; EXIT CASE "pt-br" CASE "pt-pt" - CASE "pt" ; cCtryHb := "PTUTF" ; EXIT + CASE "pt" ; cLangHb := "pt" ; EXIT CASE "ro-ro" - CASE "ro" ; cCtryHb := "ROUTF" ; EXIT + CASE "ro" ; cLangHb := "ro" ; EXIT CASE "ru-ru" - CASE "ru" ; cCtryHb := "RUUTF" ; EXIT + CASE "ru" ; cLangHb := "ru" ; EXIT CASE "sa-in" ; EXIT CASE "sa" ; EXIT CASE "sk-sk" - CASE "sk" ; cCtryHb := "SKUTF" ; EXIT + CASE "sk" ; cLangHb := "sk" ; EXIT CASE "sl-si" - CASE "sl" ; cCtryHb := "SLUTF" ; EXIT + CASE "sl" ; cLangHb := "sl" ; EXIT CASE "sq-al" ; EXIT CASE "sq" ; EXIT - CASE "sr-sp-cyrl" ; cCtryHb := "SRUTF" ; EXIT - CASE "sr-sp-latn" ; cCtryHb := "SRLAT" ; EXIT + CASE "sr-sp-cyrl" ; cLangHb := "sr_cyrl" ; EXIT + CASE "sr-sp-latn" ; cLangHb := "sr_lat" ; EXIT CASE "sv-fi" CASE "sv-se" - CASE "sv" ; cCtryHb := "SVUTF" ; EXIT + CASE "sv" ; cLangHb := "sv" ; EXIT CASE "sw-ke" ; EXIT CASE "sw" ; EXIT CASE "syr-sy" ; EXIT @@ -322,11 +364,11 @@ STATIC FUNCTION __CtryStdToBaseLangID( cCtryStd ) CASE "th-th" ; EXIT CASE "th" ; EXIT CASE "tr-tr" - CASE "tr" ; cCtryHb := "TRUTF" ; EXIT + CASE "tr" ; cLangHb := "tr" ; EXIT CASE "tt-ru" ; EXIT CASE "tt" ; EXIT CASE "uk-ua" - CASE "uk" ; cCtryHb := "UAUTF" ; EXIT + CASE "uk" ; cLangHb := "uk" ; EXIT CASE "ur-pk" ; EXIT CASE "ur" ; EXIT CASE "uz-uz-cyrl" ; EXIT @@ -334,14 +376,14 @@ STATIC FUNCTION __CtryStdToBaseLangID( cCtryStd ) CASE "uz" ; EXIT CASE "vi-vn" ; EXIT CASE "vi" ; EXIT - CASE "zh-chs" ; cCtryHb := "ZHSIM" ; EXIT + CASE "zh-chs" ; cLangHb := "zh_sim" ; EXIT CASE "zh-cht" CASE "zh-cn" CASE "zh-hk" CASE "zh-mo" CASE "zh-sg" - CASE "zh-tw" ; cCtryHb := "ZHUTF" ; EXIT + CASE "zh-tw" ; cLangHb := "zh_tra" ; EXIT ENDSWITCH ENDIF - RETURN cCtryHb + RETURN cLangHb diff --git a/harbour/src/rtl/langlgcy.prg b/harbour/src/rtl/langlgcy.prg index 0880fe8be8..86b4cee30d 100644 --- a/harbour/src/rtl/langlgcy.prg +++ b/harbour/src/rtl/langlgcy.prg @@ -53,33 +53,21 @@ #include "hbextcdp.ch" #include "hbextlng.ch" -REQUEST HB_CODEPAGE_UTF8 - #ifdef HB_LEGACY_LEVEL5 -PROCEDURE HB_LANG_LEGACY() ; RETURN - PROCEDURE HB_LANG_BE866() ; RETURN PROCEDURE HB_LANG_BEWIN() ; RETURN PROCEDURE HB_LANG_BG866() ; RETURN PROCEDURE HB_LANG_BGISO() ; RETURN PROCEDURE HB_LANG_BGMIK() ; RETURN PROCEDURE HB_LANG_BGWIN() ; RETURN -PROCEDURE HB_LANG_CA() ; RETURN PROCEDURE HB_LANG_CS852() ; RETURN PROCEDURE HB_LANG_CSISO() ; RETURN PROCEDURE HB_LANG_CSKAM() ; RETURN PROCEDURE HB_LANG_CSWIN() ; RETURN -PROCEDURE HB_LANG_DE() ; RETURN PROCEDURE HB_LANG_DEWIN() ; RETURN -PROCEDURE HB_LANG_EL() ; RETURN PROCEDURE HB_LANG_ELWIN() ; RETURN -PROCEDURE HB_LANG_EO() ; RETURN -PROCEDURE HB_LANG_ES() ; RETURN PROCEDURE HB_LANG_ESWIN() ; RETURN -PROCEDURE HB_LANG_EU() ; RETURN -PROCEDURE HB_LANG_FR() ; RETURN -PROCEDURE HB_LANG_GL() ; RETURN PROCEDURE HB_LANG_HE862() ; RETURN PROCEDURE HB_LANG_HEWIN() ; RETURN PROCEDURE HB_LANG_HR646() ; RETURN @@ -89,18 +77,13 @@ PROCEDURE HB_LANG_HRWIN() ; RETURN PROCEDURE HB_LANG_HU852() ; RETURN PROCEDURE HB_LANG_HUISO() ; RETURN PROCEDURE HB_LANG_HUWIN() ; RETURN -PROCEDURE HB_LANG_ID() ; RETURN PROCEDURE HB_LANG_IS850() ; RETURN -PROCEDURE HB_LANG_IT() ; RETURN PROCEDURE HB_LANG_LTWIN() ; RETURN -PROCEDURE HB_LANG_NL() ; RETURN PROCEDURE HB_LANG_PL852() ; RETURN PROCEDURE HB_LANG_PLISO() ; RETURN PROCEDURE HB_LANG_PLMAZ() ; RETURN PROCEDURE HB_LANG_PLWIN() ; RETURN -PROCEDURE HB_LANG_PT() ; RETURN PROCEDURE HB_LANG_PTISO() ; RETURN -PROCEDURE HB_LANG_RO() ; RETURN PROCEDURE HB_LANG_RU866() ; RETURN PROCEDURE HB_LANG_RUKOI8() ; RETURN PROCEDURE HB_LANG_RUWIN() ; RETURN @@ -115,7 +98,6 @@ PROCEDURE HB_LANG_SLWIN() ; RETURN PROCEDURE HB_LANG_SR852() ; RETURN PROCEDURE HB_LANG_SRISO() ; RETURN PROCEDURE HB_LANG_SRWIN() ; RETURN -PROCEDURE HB_LANG_SV() ; RETURN PROCEDURE HB_LANG_SVWIN() ; RETURN PROCEDURE HB_LANG_TR857() ; RETURN PROCEDURE HB_LANG_TRWIN() ; RETURN