(svn r1880) [Codechange] Added isocodes to langfiles and support code to strgen (Lauri Nurmi)
--- a/lang/american.txt Thu Feb 17 06:46:36 2005 +0000
+++ b/lang/american.txt Thu Feb 17 07:49:31 2005 +0000
@@ -1,5 +1,6 @@
##name American
##ownname English (US)
+##isocode en_US
##id 0x0000
STR_NULL :
--- a/lang/catalan.txt Thu Feb 17 06:46:36 2005 +0000
+++ b/lang/catalan.txt Thu Feb 17 07:49:31 2005 +0000
@@ -1,5 +1,6 @@
##name Catalan
##ownname Català
+##isocode ca
##id 0x0000
STR_NULL :
--- a/lang/czech.txt Thu Feb 17 06:46:36 2005 +0000
+++ b/lang/czech.txt Thu Feb 17 07:49:31 2005 +0000
@@ -1,5 +1,6 @@
##name Czech
##ownname Cesky
+##isocode cs
##id 0x0000
STR_NULL :
--- a/lang/danish.txt Thu Feb 17 06:46:36 2005 +0000
+++ b/lang/danish.txt Thu Feb 17 07:49:31 2005 +0000
@@ -1,5 +1,6 @@
##name Danish
##ownname Dansk
+##isocode da
##id 0x0000
STR_NULL :
--- a/lang/dutch.txt Thu Feb 17 06:46:36 2005 +0000
+++ b/lang/dutch.txt Thu Feb 17 07:49:31 2005 +0000
@@ -1,5 +1,6 @@
##name Dutch
##ownname Nederlands
+##isocode nl
##id 0x0000
STR_NULL :
--- a/lang/english.txt Thu Feb 17 06:46:36 2005 +0000
+++ b/lang/english.txt Thu Feb 17 07:49:31 2005 +0000
@@ -1,5 +1,6 @@
##name English
##ownname English (UK)
+##isocode en_GB
##id 0x0000
STR_NULL :
--- a/lang/finnish.txt Thu Feb 17 06:46:36 2005 +0000
+++ b/lang/finnish.txt Thu Feb 17 07:49:31 2005 +0000
@@ -1,5 +1,6 @@
##name Finnish
##ownname Suomi
+##isocode fi
##id 0x0000
STR_NULL :
--- a/lang/french.txt Thu Feb 17 06:46:36 2005 +0000
+++ b/lang/french.txt Thu Feb 17 07:49:31 2005 +0000
@@ -1,5 +1,6 @@
##name French
##ownname Français
+##isocode fr
##id 0x0000
STR_NULL :
--- a/lang/galician.txt Thu Feb 17 06:46:36 2005 +0000
+++ b/lang/galician.txt Thu Feb 17 07:49:31 2005 +0000
@@ -1,5 +1,6 @@
##name Galician
##ownname Galego
+##isocode gl
##id 0x0000
STR_NULL :
--- a/lang/german.txt Thu Feb 17 06:46:36 2005 +0000
+++ b/lang/german.txt Thu Feb 17 07:49:31 2005 +0000
@@ -1,5 +1,6 @@
##name German
##ownname Deutsch
+##isocode de
##id 0x0000
STR_NULL :
--- a/lang/hungarian.txt Thu Feb 17 06:46:36 2005 +0000
+++ b/lang/hungarian.txt Thu Feb 17 07:49:31 2005 +0000
@@ -1,5 +1,6 @@
##name Hungarian
##ownname Magyar
+##isocode hu
##id 0x0000
STR_NULL :
--- a/lang/icelandic.txt Thu Feb 17 06:46:36 2005 +0000
+++ b/lang/icelandic.txt Thu Feb 17 07:49:31 2005 +0000
@@ -1,5 +1,6 @@
##name Icelandic
##ownname Íslenska
+##isocode is
##id 0x0000
STR_NULL :
--- a/lang/italian.txt Thu Feb 17 06:46:36 2005 +0000
+++ b/lang/italian.txt Thu Feb 17 07:49:31 2005 +0000
@@ -1,5 +1,6 @@
##name Italian
##ownname Italian (IT)
+##isocode it
##id 0x0000
STR_NULL :
--- a/lang/norwegian.txt Thu Feb 17 06:46:36 2005 +0000
+++ b/lang/norwegian.txt Thu Feb 17 07:49:31 2005 +0000
@@ -1,5 +1,6 @@
##name Norwegian
##ownname Norsk, bokmål
+##isocode nb
##id 0x0000
STR_NULL :
--- a/lang/origveh.txt Thu Feb 17 06:46:36 2005 +0000
+++ b/lang/origveh.txt Thu Feb 17 07:49:31 2005 +0000
@@ -1,5 +1,6 @@
##name Original vehicle names (ENG)
##ownname Original vehicle names (ENG)
+##isocode xx
##id 0x8000
STR_8000_KIRBY_PAUL_TANK_STEAM :Collett Pannier Tank (Steam)
--- a/lang/polish.txt Thu Feb 17 06:46:36 2005 +0000
+++ b/lang/polish.txt Thu Feb 17 07:49:31 2005 +0000
@@ -1,5 +1,6 @@
##name Polish
##ownname Polski
+##isocode pl
##id 0x0000
STR_NULL :
--- a/lang/portuguese.txt Thu Feb 17 06:46:36 2005 +0000
+++ b/lang/portuguese.txt Thu Feb 17 07:49:31 2005 +0000
@@ -1,5 +1,6 @@
##name Portuguese
##ownname Português
+##isocode pt
##id 0x0000
STR_NULL :
--- a/lang/romanian.txt Thu Feb 17 06:46:36 2005 +0000
+++ b/lang/romanian.txt Thu Feb 17 07:49:31 2005 +0000
@@ -1,5 +1,6 @@
##name Romanian
##ownname Românã
+##isocode ro
##id 0x0000
STR_NULL :
--- a/lang/slovak.txt Thu Feb 17 06:46:36 2005 +0000
+++ b/lang/slovak.txt Thu Feb 17 07:49:31 2005 +0000
@@ -1,5 +1,6 @@
##name Slovak
##ownname Slovensky
+##isocode sk
##id 0x0000
STR_NULL :
--- a/lang/spanish.txt Thu Feb 17 06:46:36 2005 +0000
+++ b/lang/spanish.txt Thu Feb 17 07:49:31 2005 +0000
@@ -1,5 +1,6 @@
##name Spanish
##ownname Español (ES)
+##isocode es
##id 0x0000
STR_NULL :
--- a/lang/swedish.txt Thu Feb 17 06:46:36 2005 +0000
+++ b/lang/swedish.txt Thu Feb 17 07:49:31 2005 +0000
@@ -1,5 +1,6 @@
##name Swedish
##ownname Svenska
+##isocode sv
##id 0x0000
STR_NULL :
--- a/strgen/strgen.c Thu Feb 17 06:46:36 2005 +0000
+++ b/strgen/strgen.c Thu Feb 17 07:49:31 2005 +0000
@@ -26,6 +26,7 @@
uint32 version; // 32-bits of auto generated version info which is basically a hash of strings.h
char name[32]; // the international name of this language
char own_name[32]; // the localized name of this language
+ char isocode[16]; // the ISO code for the language (not country code)
uint16 offsets[32]; // the offsets
} LanguagePackHeader;
@@ -45,7 +46,7 @@
bool _warnings;
uint32 _hash;
-char _lang_name[32], _lang_ownname[32];
+char _lang_name[32], _lang_ownname[32], _lang_isocode[16];
#define HASH_SIZE 1023
LineName *_hash_head[HASH_SIZE];
@@ -362,6 +363,8 @@
ttd_strlcpy(_lang_name, str + 5, sizeof(_lang_name));
} else if (!memcmp(str, "ownname ", 8)) {
ttd_strlcpy(_lang_ownname, str + 8, sizeof(_lang_ownname));
+ } else if (!memcmp(str, "isocode ", 8)) {
+ ttd_strlcpy(_lang_isocode, str + 8, sizeof(_lang_isocode));
} else {
error("unknown pragma '%s'", str);
}
@@ -700,6 +703,7 @@
hdr.version = TO_LE32(_hash);
strcpy(hdr.name, _lang_name);
strcpy(hdr.own_name, _lang_ownname);
+ strcpy(hdr.isocode, _lang_isocode);
fwrite(&hdr, sizeof(hdr), 1, f);
--- a/strings.c Thu Feb 17 06:46:36 2005 +0000
+++ b/strings.c Thu Feb 17 07:49:31 2005 +0000
@@ -23,6 +23,7 @@
uint32 version; // 32-bits of auto generated version info which is basically a hash of strings.h
char name[32]; // the international name of this language
char own_name[32]; // the localized name of this language
+ char isocode[16]; // the ISO code for the language (not country code)
uint16 offsets[32]; // the offsets
char data[VARARRAY_SIZE];
} LanguagePack;